From 74b3b93a01b2747558b29b010b07fca68dbe49e9 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 8 Aug 2025 14:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigServiceDirectiveController.java          | 14 +++++++-------
 .../modules/servicedirective/entity/TreeNode.java  |  4 +++-
 .../impl/ConfigServiceDirectiveServiceImpl.java    | 10 +++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
index 1c9f75f..5c2ca87 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
@@ -137,14 +137,14 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
         }
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义多选的查询规则为：LIKE_WITH_OR
-        customeRuleMap.put("categoryId", QueryRuleEnum.EQ);
-        customeRuleMap.put("typeId", QueryRuleEnum.EQ);
-        customeRuleMap.put("instructionTagId", QueryRuleEnum.EQ);
-        customeRuleMap.put("izReimbursement", QueryRuleEnum.EQ);
-        customeRuleMap.put("izPreferential", QueryRuleEnum.EQ);
+        customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR);
-        customeRuleMap.put("cycleType", QueryRuleEnum.EQ);
-        customeRuleMap.put("izEnabled", QueryRuleEnum.EQ);
+        customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR);
         QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap);
         queryWrapper.select("id");
         //如果有服务指令需要提前查询下对应的服务指令id
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 7f44904..8fcabea 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
@@ -23,8 +23,9 @@ public class TreeNode {
     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) {
+    public TreeNode(String instructionId,String categoryId,String typeId,String key, String title,int level,String cycleTypeName,String izEnabled,Integer sort,boolean canAdd,boolean parentLevelEnabled) {
         this.instructionId = instructionId;
         this.categoryId = categoryId;
         this.typeId = typeId;
@@ -35,6 +36,7 @@ public class TreeNode {
         this.izEnabled = izEnabled;
         this.sort = sort;
         this.canAdd = canAdd;
+        this.parentLevelEnabled = parentLevelEnabled;
     }
 
     public void addChild(TreeNode node) { children.add(node); }
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 f3134f1..3174423 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
@@ -479,7 +479,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);
+            TreeNode instNode = new TreeNode(inst.getId(), "", "", inst.getId(), inst.getInstructionName(), 1, "", inst.getIzEnabled(), inst.getSort(), insUsing,true);
             List<ConfigServiceCategory> catList = catMap.get(inst.getId());
             if (catList != null) {
                 catList.sort(Comparator.comparingInt(ConfigServiceCategory::getSort));
@@ -488,7 +488,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);
+                    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));
@@ -497,7 +497,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);
+                            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));
@@ -505,8 +505,8 @@ 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);
-                                    TreeNode tagNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), IdUtil.simpleUUID(), "标签", 5, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), 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());
                                     typeNode.addChild(dirNode);