manage：代码结构调整

virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java

@@ -1,7 +1,7 @@
 package com.supervision.manage.controller;
 
 import com.supervision.manage.service.ConfigTreatmentPlanManageService;
-import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo;
+import com.supervision.vo.manage.TreeNode;
 import com.supervision.model.ConfigTreatmentPlan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,7 +24,7 @@ public class TreatmentPlanManageController {
 
     @ApiOperation("查询处置计划树")
     @GetMapping("/queryTree")
-    public ConfigTreatmentPlanWrapVo queryTree(@RequestParam("处置方式") Integer disposalMethod) {
+    public List<TreeNode> queryTree(@RequestParam("处置方式") Integer disposalMethod) {
 
         return configTreatmentPlanManageService.queryTree(disposalMethod);
 
@@ -40,7 +40,7 @@ public class TreatmentPlanManageController {
 
     @ApiOperation("根据id查询处置计划详情")
     @GetMapping("/findById")
-    public ConfigTreatmentPlanWrapVo findById(@RequestParam("处置方式") String id) {
+    public TreeNode findById(@RequestParam("处置方式") String id) {
 
         return configTreatmentPlanManageService.findById(id);
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java

@@ -1,15 +1,15 @@
 package com.supervision.manage.service;
 
 import com.supervision.model.ConfigTreatmentPlan;
-import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo;
+import com.supervision.vo.manage.TreeNode;
 
 import java.util.List;
 
 public interface ConfigTreatmentPlanManageService {
 
-    ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod);
+    List<TreeNode> queryTree(Integer disposalMethod);
 
     List<ConfigTreatmentPlan> queryList(Integer disposalMethod);
 
-    ConfigTreatmentPlanWrapVo findById(String id);
+    TreeNode findById(String id);
 }

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java

@@ -1,21 +1,75 @@
 package com.supervision.manage.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.supervision.manage.service.ConfigTreatmentPlanManageService;
 import com.supervision.model.ConfigTreatmentPlan;
-import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo;
+import com.supervision.service.ConfigTreatmentPlanService;
+import com.supervision.vo.manage.TreeNode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlanManageService {
 
+    private final ConfigTreatmentPlanService configTreatmentPlanService;
 
     @Override
-    public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) {
+    public List<TreeNode> queryTree(Integer disposalMethod) {
-        return null;
+        List<ConfigTreatmentPlan> list = configTreatmentPlanService.lambdaQuery().eq(!Objects.isNull(disposalMethod),
+                ConfigTreatmentPlan::getDisposalPlan, disposalMethod).list();
+
+        if (CollUtil.isEmpty(list)){
+            return CollUtil.newArrayList();
+        }
+
+        TreeNode root = new TreeNode();
+        for (ConfigTreatmentPlan configTreatmentPlan : list) {
+            String id = configTreatmentPlan.getId();
+            String disposalPlan = configTreatmentPlan.getDisposalPlan();
+            String firstMeasures = configTreatmentPlan.getFirstMeasures();
+            String secondMeasures = configTreatmentPlan.getSecondMeasures();
+
+            // 一级节点
+            if (StrUtil.isEmpty(disposalPlan)){
+                continue;
+            }
+            TreeNode disposalPlanNode = root.findChildByName(disposalPlan);
+            if (null == disposalPlanNode){
+                disposalPlanNode = new TreeNode(StrUtil.isNotEmpty(firstMeasures) ? null : id, disposalPlan);
+                root.getOrDefaultChild().add(disposalPlanNode);
+            }
+
+            // 二级节点
+            if (StrUtil.isEmpty(firstMeasures)){
+                continue;
+            }
+            TreeNode firstMeasuresNode = disposalPlanNode.findChildByName(firstMeasures);
+            if (null == firstMeasuresNode){
+                firstMeasuresNode = new TreeNode(StrUtil.isNotEmpty(secondMeasures) ? null : id,firstMeasures);
+                disposalPlanNode.getOrDefaultChild().add(firstMeasuresNode);
+            }
+
+
+            // 三级节点
+            if (StrUtil.isEmpty(secondMeasures)){
+                continue;
+            }
+            TreeNode secondMeasuresNode = firstMeasuresNode.findChildByName(secondMeasures);
+            if (null == secondMeasuresNode){
+                secondMeasuresNode = new TreeNode(id,secondMeasures);
+                firstMeasuresNode.getOrDefaultChild().add(secondMeasuresNode);
+            }
+        }
+
+        return root.getChild();
     }
 
     @Override
@@ -24,7 +78,7 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
     }
 
     @Override
-    public ConfigTreatmentPlanWrapVo findById(String id) {
+    public TreeNode findById(String id) {
         return null;
     }
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java

@@ -3,17 +3,13 @@ package com.supervision.manage.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import com.supervision.manage.service.ConfigTreatmentPlanManageService;
 import com.supervision.manage.service.DiseaseAncillaryManageService;
-import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.model.DiseaseAncillary;
 import com.supervision.service.DiseaseAncillaryService;
-import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 

virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java

@@ -15,7 +15,7 @@ import lombok.Data;
  * 处置计划表
  * @TableName vp_treatment_plan
  */
-@TableName(value ="vp_treatment_plan")
+@TableName(value ="vp_config_treatment_plan")
 @Data
 public class ConfigTreatmentPlan implements Serializable {
     /**

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

@@ -2,9 +2,6 @@ package com.supervision.service;
 
 import com.supervision.model.ConfigTreatmentPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo;
-
-import java.util.List;
 
 /**
 * @author Administrator

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

@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.service.ConfigTreatmentPlanService;
 import com.supervision.mapper.ConfigTreatmentPlanMapper;
-import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
 * @author Administrator
 * @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Service实现

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

@@ -1,20 +0,0 @@
-package com.supervision.vo.manage;
-
-import com.supervision.model.ConfigTreatmentPlan;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@Data
-public class ConfigTreatmentPlanWrapVo {
-
-    private List<ConfigTreatmentPlanWrap> configTreatmentPlanWraps;
-
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    static class ConfigTreatmentPlanWrap extends ConfigTreatmentPlan {
-
-        private List<ConfigTreatmentPlan> child;
-    }
-}

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

@@ -0,0 +1,47 @@
+package com.supervision.vo.manage;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Data
+public class TreeNode {
+
+   private String id;
+
+   private String name;
+
+   private List<TreeNode> child;
+
+
+   public TreeNode() {
+   }
+
+   public TreeNode(String id, String name) {
+      this.id = id;
+      this.name = name;
+   }
+
+   @JsonIgnore
+   public List<TreeNode> getOrDefaultChild(){
+      if (null == child){
+         child = new ArrayList<>();
+      }
+      return child;
+   }
+
+   public TreeNode findChildByName(String name){
+      if (CollUtil.isEmpty(child) || StrUtil.isEmpty(name)){
+         return null;
+      }
+
+     return child.stream().filter(node -> name.equals(node.getName())).findFirst().orElse(null);
+
+
+   }
+}