diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
index f8f83640..b1927e03 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
@@ -131,7 +131,7 @@ public class InvoicingApi {
     }
 
 
-    @ApiOperation(value="获取物料分类树（购物车使用）", notes="获取物料分类树（购物车使用）")
+    @ApiOperation(value="获取物料分类树（库存预警使用）", notes="获取物料分类树（库存预警使用）")
     @GetMapping(value = "/getWaringMaterialTreeData")
     public Result<List<Map<String,Object>>> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory) {
         configMaterialCategory.setIzEnabled("0");
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java
index 12ae0004..c3a27a4c 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java
@@ -95,6 +95,11 @@ public class NuBaseInfoEntity implements Serializable {
     private java.lang.String fzrTel;
 
     private java.lang.String fzrHeadPath;
+//    @ApiModelProperty(value = "负责人性别")
+    private java.lang.String fzrSex;
+
+//    @ApiModelProperty(value = "负责人年龄")
+    private java.lang.String fzrAge;
 
 
 
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
index db18f423..cd3fdb99 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
@@ -47,10 +47,12 @@
     </select>
 
     <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
-        left join nu_config_material_info b on a.wl_id = b.id
-        left join nu_warehouse_material_info c on b.id = c.wl_id and c.del_flag = 0 and c.iz_enabled = 0
-        where c.kcsl - 0 &lt;= b.lower_limit
+        select b.category_id,b.type_id,b.medication_id from  nu_warehouse_material_info c ,nu_config_material_info b
+        where b.id = c.wl_id and c.del_flag = 0 and c.iz_enabled = 0
+        and 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
     </select>
 </mapper>
\ No newline at end of file
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
index 7381aa09..8c0cfb93 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
@@ -139,6 +139,12 @@ public class NuBaseInfo implements Serializable {
     @ApiModelProperty(value = "负责人头像")
     private java.lang.String fzrHeadPath;
 
+    @ApiModelProperty(value = "负责人性别")
+    private java.lang.String fzrSex;
+
+    @ApiModelProperty(value = "负责人年龄")
+    private java.lang.String fzrAge;
+
     @TableField(exist = false)
     private String deviceId;//摄像头 ID
     @TableField(exist = false)