From 081e49a92c81f0c0cb92120478888431796561ce Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Fri, 22 Dec 2023 15:49:49 +0800
Subject: [PATCH] =?UTF-8?q?model:=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=AE=A1=E5=88=92=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigConfigTreatmentPlanServiceImpl.java | 25 +++++++++++--------
 .../vo/manage/TreatmentPlanTreeNode.java      |  6 ++---
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java
index 4edc4e29..005354c6 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java
+++ b/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 firstMeasures = configTreatmentPlan.getFirstMeasures();
+            String disposalPlanId = configTreatmentPlan.getDisposalPlanId();
+            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);
diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java
index 75cb41e0..b2dc2f29 100644
--- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java
+++ b/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){
-      if (CollUtil.isEmpty(child) || StrUtil.isEmpty(name)){
+   public TreatmentPlanTreeNode findChildById(String id){
+      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);
 
 
    }