yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2025-11-04 14:11:46 +08:00
parent cb6f481afd
commit 35f0ec6fe3
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
View File

@ -131,7 +131,7 @@ public class InvoicingApi {
} }
@ApiOperation(value="获取物料分类树（购物车使用）", notes="获取物料分类树（购物车使用）") @ApiOperation(value="获取物料分类树（库存预警使用）", notes="获取物料分类树（库存预警使用）")
@GetMapping(value = "/getWaringMaterialTreeData") @GetMapping(value = "/getWaringMaterialTreeData")
public Result<List<Map<String,Object>>> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { public Result<List<Map<String,Object>>> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory) {
configMaterialCategory.setIzEnabled("0"); configMaterialCategory.setIzEnabled("0");

5
nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java
View File

@ -95,6 +95,11 @@ public class NuBaseInfoEntity implements Serializable {
private java.lang.String fzrTel; private java.lang.String fzrTel;
private java.lang.String fzrHeadPath; private java.lang.String fzrHeadPath;
// @ApiModelProperty(value = "负责人性别")
private java.lang.String fzrSex;
// @ApiModelProperty(value = "负责人年龄")
private java.lang.String fzrAge;

10
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
View File

@ -47,10 +47,12 @@
</select> </select>
<select id="getWaringMaterialTreeData" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory"> <select id="getWaringMaterialTreeData" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory">
select b.category_id,b.type_id,b.medication_id from nu_invoicing_qgd_info a select b.category_id,b.type_id,b.medication_id from nu_warehouse_material_info c ,nu_config_material_info b
left join nu_config_material_info b on a.wl_id = b.id where b.id = c.wl_id and c.del_flag = 0 and c.iz_enabled = 0
left join nu_warehouse_material_info c on b.id = c.wl_id and c.del_flag = 0 and c.iz_enabled = 0 and c.kcsl - 0 &lt;= b.lower_limit
where c.kcsl - 0 &lt;= b.lower_limit <if test="params.nuId != null and params.nuId != ''">
and c.nu_id = #{params.nuId}
</if>
GROUP BY b.category_id,b.type_id,b.medication_id GROUP BY b.category_id,b.type_id,b.medication_id
</select> </select>
</mapper> </mapper>

6
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
View File

@ -139,6 +139,12 @@ public class NuBaseInfo implements Serializable {
@ApiModelProperty(value = "负责人头像") @ApiModelProperty(value = "负责人头像")
private java.lang.String fzrHeadPath; private java.lang.String fzrHeadPath;
@ApiModelProperty(value = "负责人性别")
private java.lang.String fzrSex;
@ApiModelProperty(value = "负责人年龄")
private java.lang.String fzrAge;
@TableField(exist = false) @TableField(exist = false)
private String deviceId;//摄像头 ID private String deviceId;//摄像头 ID
@TableField(exist = false) @TableField(exist = false)