From f6abc8c11b7d18bc3545b69ae82dfe699f1e927e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 27 Aug 2025 10:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=9B=BE=E6=A0=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ConfigMaterial/entity/ConfigMaterialCategory.java  | 1 +
 .../ConfigMaterial/entity/ConfigMaterialMedication.java        | 1 +
 .../nu/modules/ConfigMaterial/entity/ConfigMaterialType.java   | 1 +
 .../service/impl/ConfigMaterialCategoryServiceImpl.java        | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java
index cf18169..a848f90 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java
@@ -69,6 +69,7 @@ public class ConfigMaterialCategory implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+    private java.lang.String icon;
 
     private Integer sort;
 
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java
index 34d30d9..4a1a1f7 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java
@@ -78,6 +78,7 @@ public class ConfigMaterialMedication implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+    private java.lang.String icon;
 
     @TableField(exist = false)
     private String levle;//当前所在层级 1一级 2二级 3三级
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java
index f33a6f7..1230dc9 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java
@@ -73,6 +73,7 @@ public class ConfigMaterialType implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+    private java.lang.String icon;
 
     @TableField(exist = false)
     private Integer num;
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java
index 7074acd..3762562 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java
@@ -161,6 +161,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
                     yylxMap.put("typeId",yylxPar.getTypeId());
                     yylxMap.put("children","");
                     yylxMap.put("parentIzEnabled",par.getIzEnabled());
+                    yylxMap.put("icon",yylxPar.getIcon());
                     yylxMapList.add(yylxMap);
                 }
             }
@@ -180,6 +181,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
             wllxMap.put("children",yylxMapList);
             wllxMap.put("categoryId",par.getCategoryId());
             wllxMap.put("typeId",par.getId());
+            wllxMap.put("icon",par.getIcon());
             wllxMapList.add(wllxMap);
         }
 
@@ -210,6 +212,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
             infoMap.put("children",wllxMap2List);
             infoMap.put("categoryId",par.getId());
             infoMap.put("parentIzEnabled",par.getIzEnabled());
+            infoMap.put("icon",par.getIcon());
             infoMapList.add(infoMap);
         }