From 614f9b66234ce38f898536443809a9c9da589778 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 25 Aug 2025 15:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nu/modules/instructiontag/entity/InstructionTag.java  | 1 +
 .../com/nu/modules/servicedirective/entity/TreeNode.java  | 5 ++++-
 .../mapper/xml/ConfigServiceDirectiveMapper.xml           | 2 +-
 .../service/impl/ConfigServiceDirectiveServiceImpl.java   | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java
index c9fb52bd..f061ea92 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java
@@ -80,4 +80,5 @@ public class InstructionTag implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+    private java.lang.String icon;
 }
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java
index 8fcabea7..851f313b 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java
@@ -18,14 +18,16 @@ public class TreeNode {
     private String categoryId;
     private String typeId;
     private String izEnabled;
+    private String icon;
     private Integer sort;
     private boolean canAdd;
+    private boolean showContent;
     private List<TreeNode> children = new ArrayList<>();
     private List<DirectiveBodyTag> bodyTagList;
     private List<DirectiveEmotionTag> emotionTagList;
     private boolean parentLevelEnabled;//父级及往上是否启用
 
-    public TreeNode(String instructionId,String categoryId,String typeId,String key, String title,int level,String cycleTypeName,String izEnabled,Integer sort,boolean canAdd,boolean parentLevelEnabled) {
+    public TreeNode(String instructionId,String categoryId,String typeId,String key, String title,int level,String cycleTypeName,String izEnabled,Integer sort,boolean canAdd,boolean parentLevelEnabled,String icon) {
         this.instructionId = instructionId;
         this.categoryId = categoryId;
         this.typeId = typeId;
@@ -37,6 +39,7 @@ public class TreeNode {
         this.sort = sort;
         this.canAdd = canAdd;
         this.parentLevelEnabled = parentLevelEnabled;
+        this.icon = icon;
     }
 
     public void addChild(TreeNode node) { children.add(node); }
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
index bb05e345..07f50e73 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
@@ -179,7 +179,7 @@
 
     <!-- 查询被使用的一、二、三级分类（包含已删除，只要存在未删指令引用） -->
     <select id="getUsedInstructionTags" resultType="com.nu.modules.instructiontag.entity.InstructionTag">
-        SELECT id, instruction_name, sort, iz_enabled
+        SELECT id, instruction_name, sort, iz_enabled,icon
         FROM nu_config_service_instruction_tag
         WHERE del_flag = '0'
         ORDER BY sort ASC
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
index 11a88a73..243f09f6 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
@@ -398,7 +398,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
             if ("enabled".equals(filterIzEnabled) && !insUsing) {
                 continue;
             }
-            TreeNode instNode = new TreeNode(inst.getId(), "", "", inst.getId(), inst.getInstructionName(), 1, "", inst.getIzEnabled(), inst.getSort(), insUsing, true);
+            TreeNode instNode = new TreeNode(inst.getId(), "", "", inst.getId(), inst.getInstructionName(), 1, "", inst.getIzEnabled(), inst.getSort(), insUsing, true,inst.getIcon());
             List<ConfigServiceCategory> catList = catMap.get(inst.getId());
             if (catList != null) {
                 catList.sort(Comparator.comparingInt(ConfigServiceCategory::getSort));
@@ -407,7 +407,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
                     if ("enabled".equals(filterIzEnabled) && !catUsing) {
                         continue;
                     }
-                    TreeNode catNode = new TreeNode(inst.getId(), cat.getId(), "", cat.getId(), cat.getCategoryName(), 2, "", cat.getIzEnabled(), cat.getSort(), insUsing && catUsing, insUsing);
+                    TreeNode catNode = new TreeNode(inst.getId(), cat.getId(), "", cat.getId(), cat.getCategoryName(), 2, "", cat.getIzEnabled(), cat.getSort(), insUsing && catUsing, insUsing,"");
                     List<ConfigServiceType> typeList = typeMap.get(cat.getId());
                     if (typeList != null) {
                         typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort));
@@ -416,7 +416,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
                             if ("enabled".equals(filterIzEnabled) && !typUsing) {
                                 continue;
                             }
-                            TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing);
+                            TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,"");
                             List<ConfigServiceDirective> dirList = directiveMap.get(tp.getId());
                             if (dirList != null) {
                                 dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
@@ -424,7 +424,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
                                     if ("enabled".equals(filterIzEnabled) && "1".equals(dir.getIzEnabled())) {
                                         continue;
                                     }
-                                    TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing);
+                                    TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing,"");
 //                                    TreeNode tagNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), IdUtil.simpleUUID(), "标签", 5, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing,insUsing && catUsing && typUsing);
 //                                    tagNode.setBodyTagList(dir.getBodyTagList());
 //                                    tagNode.setEmotionTagList(dir.getEmotionTagList());