model: 修改查询处置计划树

virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java

@@ -32,38 +32,43 @@ public class ConfigConfigTreatmentPlanServiceImpl extends ServiceImpl<ConfigTrea
         }
 
         TreatmentPlanTreeNode root = new TreatmentPlanTreeNode();
+        String tmpId;
         for (ConfigTreatmentPlan configTreatmentPlan : list) {
             String id = configTreatmentPlan.getId();
-            String disposalPlan = configTreatmentPlan.getDisposalPlan();
+            String disposalPlanId = configTreatmentPlan.getDisposalPlanId();
-            String firstMeasures = configTreatmentPlan.getFirstMeasures();
+            String firstMeasuresId = configTreatmentPlan.getFirstMeasuresId();
             String secondMeasures = configTreatmentPlan.getSecondMeasures();
 
             // 一级节点
-            if (StrUtil.isEmpty(disposalPlan)){
+            if (StrUtil.isEmpty(disposalPlanId)){
                 continue;
             }
-            TreatmentPlanTreeNode disposalPlanNode = root.findChildByName(disposalPlan);
+
+            TreatmentPlanTreeNode disposalPlanNode = root.findChildById(disposalPlanId);
             if (null == disposalPlanNode){
-                disposalPlanNode = new TreatmentPlanTreeNode(configTreatmentPlan.getDisposalPlanId(), disposalPlan);
+                disposalPlanNode = new TreatmentPlanTreeNode(disposalPlanId, configTreatmentPlan.getDisposalPlan());
                 root.getOrDefaultChild().add(disposalPlanNode);
             }
 
             // 二级节点
-            if (StrUtil.isEmpty(firstMeasures)){
+            if (StrUtil.isEmpty(firstMeasuresId)){
                 continue;
             }
-            TreatmentPlanTreeNode firstMeasuresNode = disposalPlanNode.findChildByName(firstMeasures);
+
+            // 一级措施不为空，且二级措施为空 id采用数据id;
+            // 一级措施不为空，且二级措施不为空，id采用一级措施id
+            tmpId = StrUtil.isEmpty(secondMeasures) ? id : firstMeasuresId;
+            TreatmentPlanTreeNode firstMeasuresNode = disposalPlanNode.findChildById(tmpId);
             if (null == firstMeasuresNode){
-                firstMeasuresNode = new TreatmentPlanTreeNode(configTreatmentPlan.getFirstMeasuresId(),firstMeasures);
+                firstMeasuresNode = new TreatmentPlanTreeNode(tmpId,configTreatmentPlan.getFirstMeasures());
                 disposalPlanNode.getOrDefaultChild().add(firstMeasuresNode);
             }
 
-
             // 三级节点
             if (StrUtil.isEmpty(secondMeasures)){
                 continue;
             }
-            TreatmentPlanTreeNode secondMeasuresNode = firstMeasuresNode.findChildByName(secondMeasures);
+            TreatmentPlanTreeNode secondMeasuresNode = firstMeasuresNode.findChildById(secondMeasures);
             if (null == secondMeasuresNode){
                 secondMeasuresNode = new TreatmentPlanTreeNode(id,secondMeasures);
                 firstMeasuresNode.getOrDefaultChild().add(secondMeasuresNode);

virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java

@@ -38,12 +38,12 @@ public class TreatmentPlanTreeNode {
       return child;
    }
 
-   public TreatmentPlanTreeNode findChildByName(String name){
+   public TreatmentPlanTreeNode findChildById(String id){
-      if (CollUtil.isEmpty(child) || StrUtil.isEmpty(name)){
+      if (CollUtil.isEmpty(child) || StrUtil.isEmpty(id)){
          return null;
       }
 
-     return child.stream().filter(node -> name.equals(node.getName())).findFirst().orElse(null);
+     return child.stream().filter(node -> id.equals(node.getId())).findFirst().orElse(null);
 
 
    }