manage：代码结构调整

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

@@ -1,15 +1,17 @@
 package com.supervision.manage.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.manage.service.AskQuestionLibraryManageService;
+import com.supervision.model.CommonDic;
+import com.supervision.model.Disease;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
 import com.supervision.vo.manage.AskQuestionLibraryResVo;
+import com.supervision.vo.manage.DiseaseVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -21,11 +23,30 @@ public class AskQuestionLibraryManageController {
 
     private final AskQuestionLibraryManageService askQuestionLibraryManageService;
     @ApiOperation("查询问题库列表")
-    @PostMapping("/queryList")
+    @GetMapping("/queryList")
     public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
 
         return askQuestionLibraryManageService.queryList(askQuestionLibraryReqVo);
 
     }
 
+    @ApiOperation("分页查询问题库列表")
+    @GetMapping("/queryPageList")
+    public Page<AskQuestionLibraryResVo> queryPageList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                                       @RequestParam(defaultValue = "10") Integer pageSize,
+                                                       AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
+
+        return askQuestionLibraryManageService.queryPageList(pageNum, pageSize, askQuestionLibraryReqVo);
+
+    }
+
+
+    @ApiOperation("查询问题类目编码列表")
+    @GetMapping("/queryItemList")
+    public List<CommonDic> queryItemList() {
+
+        return askQuestionLibraryManageService.queryItemList();
+
+    }
+
 }

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

@@ -1,12 +1,12 @@
 package com.supervision.manage.controller;
 
 import com.supervision.manage.service.ConfigTreatmentPlanManageService;
-import com.supervision.vo.manage.TreeNode;
+import com.supervision.vo.manage.TreatmentPlanTreeNode;
 import com.supervision.model.ConfigTreatmentPlan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import lombok.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,7 +25,7 @@ public class TreatmentPlanManageController {
 
     @ApiOperation("查询处置计划树")
     @GetMapping("/queryTree")
-    public List<TreeNode> queryTree(@RequestParam(name = "disposalMethod",required = false) Integer disposalMethod) {
+    public List<TreatmentPlanTreeNode> queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod) {
 
         return configTreatmentPlanManageService.queryTree(disposalMethod);
 
@@ -34,7 +34,7 @@ public class TreatmentPlanManageController {
 
     @ApiOperation("根据id查询处置计划详情")
     @GetMapping("/findById")
-    public ConfigTreatmentPlan findById(@RequestParam("处置方式") String id) {
+    public ConfigTreatmentPlan findById(@ApiParam("主键") @RequestParam String id) {
 
         return configTreatmentPlanManageService.findById(id);
 

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

@@ -5,8 +5,11 @@ import com.supervision.manage.service.DiseaseTreatmentPlanManageService;
 import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.model.DiseaseTreatmentPlan;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
+import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode;
+import com.supervision.vo.manage.TreatmentPlanTreeNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -55,5 +58,14 @@ public class DiseaseTreatmentPlanManageController {
 
     }
 
+    @ApiOperation("查询处置计划树")
+    @GetMapping("/queryTree")
+    public List<DiseaseTreatmentPlanTreeNode> queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod,
+                                                        @ApiParam("疾病id") String diseaseId) {
+
+        return diseaseTreatmentPlanManageService.queryDiseaseTreatmentPlanTree(disposalMethod,diseaseId);
+
+    }
+
 
 }

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

@@ -1,5 +1,7 @@
 package com.supervision.manage.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.supervision.model.CommonDic;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
 import com.supervision.vo.manage.AskQuestionLibraryResVo;
 
@@ -7,4 +9,9 @@ import java.util.List;
 
 public interface AskQuestionLibraryManageService {
     List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo);
+
+    Page<AskQuestionLibraryResVo> queryPageList(Integer pageNum, Integer pageSize, AskQuestionLibraryReqVo askQuestionLibraryReqVo);
+
+    List<CommonDic> queryItemList();
+
 }

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

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

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

@@ -3,6 +3,7 @@ package com.supervision.manage.service;
 import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.model.DiseaseTreatmentPlan;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
+import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode;
 
 import java.util.List;
 
@@ -17,4 +18,6 @@ public interface DiseaseTreatmentPlanManageService {
     boolean deleteDiseaseTreatmentPlan(String id);
 
     boolean deleteByDiseaseId(String diseaseId);
+
+    List<DiseaseTreatmentPlanTreeNode> queryDiseaseTreatmentPlanTree(Integer disposalMethod, String diseaseId);
 }

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

@@ -1,7 +1,11 @@
 package com.supervision.manage.service.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.manage.service.AskQuestionLibraryManageService;
+import com.supervision.model.CommonDic;
 import com.supervision.service.AskTemplateQuestionLibraryService;
+import com.supervision.service.CommonDicService;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
 import com.supervision.vo.manage.AskQuestionLibraryResVo;
 import lombok.RequiredArgsConstructor;
@@ -14,10 +18,24 @@ import java.util.List;
 public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryManageService {
 
     private final AskTemplateQuestionLibraryService askTemplateQuestionLibraryService;
+
+    private final CommonDicService commonDicService;
     @Override
     public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
 
 
         return askTemplateQuestionLibraryService.queryList(askQuestionLibraryReqVo);
     }
+
+    @Override
+    public Page<AskQuestionLibraryResVo> queryPageList(Integer pageNum, Integer pageSize,
+                                                       AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
+
+        return askTemplateQuestionLibraryService.queryPageList(pageNum,pageSize,askQuestionLibraryReqVo);
+    }
+
+    @Override
+    public List<CommonDic> queryItemList() {
+        return commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").isNull(CommonDic::getParentId).list();
+    }
 }

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

@@ -6,15 +6,12 @@ import cn.hutool.core.util.StrUtil;
 import com.supervision.manage.service.ConfigTreatmentPlanManageService;
 import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.service.ConfigTreatmentPlanService;
-import com.supervision.vo.manage.TreeNode;
+import com.supervision.vo.manage.TreatmentPlanTreeNode;
 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
@@ -23,7 +20,7 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
     private final ConfigTreatmentPlanService configTreatmentPlanService;
 
     @Override
-    public List<TreeNode> queryTree(Integer disposalMethod) {
+    public List<TreatmentPlanTreeNode> queryTree(Integer disposalMethod) {
         List<ConfigTreatmentPlan> list = configTreatmentPlanService.lambdaQuery().eq(!Objects.isNull(disposalMethod),
                 ConfigTreatmentPlan::getDisposalPlan, disposalMethod).list();
 
@@ -31,7 +28,7 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
             return CollUtil.newArrayList();
         }
 
-        TreeNode root = new TreeNode();
+        TreatmentPlanTreeNode root = new TreatmentPlanTreeNode();
         for (ConfigTreatmentPlan configTreatmentPlan : list) {
             String id = configTreatmentPlan.getId();
             String disposalPlan = configTreatmentPlan.getDisposalPlan();
@@ -42,9 +39,9 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
             if (StrUtil.isEmpty(disposalPlan)){
                 continue;
             }
-            TreeNode disposalPlanNode = root.findChildByName(disposalPlan);
+            TreatmentPlanTreeNode disposalPlanNode = root.findChildByName(disposalPlan);
             if (null == disposalPlanNode){
-                disposalPlanNode = new TreeNode(StrUtil.isNotEmpty(firstMeasures) ? null : id, disposalPlan);
+                disposalPlanNode = new TreatmentPlanTreeNode(StrUtil.isNotEmpty(firstMeasures) ? null : id, disposalPlan);
                 root.getOrDefaultChild().add(disposalPlanNode);
             }
 
@@ -52,9 +49,9 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
             if (StrUtil.isEmpty(firstMeasures)){
                 continue;
             }
-            TreeNode firstMeasuresNode = disposalPlanNode.findChildByName(firstMeasures);
+            TreatmentPlanTreeNode firstMeasuresNode = disposalPlanNode.findChildByName(firstMeasures);
             if (null == firstMeasuresNode){
-                firstMeasuresNode = new TreeNode(StrUtil.isNotEmpty(secondMeasures) ? null : id,firstMeasures);
+                firstMeasuresNode = new TreatmentPlanTreeNode(StrUtil.isNotEmpty(secondMeasures) ? null : id,firstMeasures);
                 disposalPlanNode.getOrDefaultChild().add(firstMeasuresNode);
             }
 
@@ -63,9 +60,9 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan
             if (StrUtil.isEmpty(secondMeasures)){
                 continue;
             }
-            TreeNode secondMeasuresNode = firstMeasuresNode.findChildByName(secondMeasures);
+            TreatmentPlanTreeNode secondMeasuresNode = firstMeasuresNode.findChildByName(secondMeasures);
             if (null == secondMeasuresNode){
-                secondMeasuresNode = new TreeNode(id,secondMeasures);
+                secondMeasuresNode = new TreatmentPlanTreeNode(id,secondMeasures);
                 firstMeasuresNode.getOrDefaultChild().add(secondMeasuresNode);
             }
         }

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

@@ -1,22 +1,30 @@
 package com.supervision.manage.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
+import com.supervision.manage.service.ConfigTreatmentPlanManageService;
 import com.supervision.manage.service.DiseaseTreatmentPlanManageService;
-import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.model.DiseaseTreatmentPlan;
-import com.supervision.service.DiseaseQuestionService;
 import com.supervision.service.DiseaseTreatmentPlanService;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
+import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode;
+import com.supervision.vo.manage.TreatmentPlanTreeNode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPlanManageService {
 
     private final DiseaseTreatmentPlanService diseaseTreatmentPlanService;
+
+    private final ConfigTreatmentPlanManageService configTreatmentPlanManageService;
+
     @Override
     public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
 
@@ -57,6 +65,29 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
         return diseaseTreatmentPlanService.lambdaUpdate().eq(DiseaseTreatmentPlan::getDiseaseId,diseaseId).remove();
     }
 
+    @Override
+    public List<DiseaseTreatmentPlanTreeNode> queryDiseaseTreatmentPlanTree(Integer disposalMethod, String diseaseId) {
+        List<TreatmentPlanTreeNode> treatmentPlanTreeNodes = configTreatmentPlanManageService.queryTree(disposalMethod);
+
+        if (CollUtil.isEmpty(treatmentPlanTreeNodes)){
+            return CollectionUtil.newArrayList();
+        }
+
+        TreatmentPlanTreeNode treatmentPlanTreeNode = new TreatmentPlanTreeNode();
+        treatmentPlanTreeNode.setChild(treatmentPlanTreeNodes);
+        DiseaseTreatmentPlanTreeNode rootNode = new DiseaseTreatmentPlanTreeNode(treatmentPlanTreeNode);
+
+        List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = this.queryListByDiseaseId(diseaseId);
+        if (CollUtil.isNotEmpty(diseaseTreatmentPlanResVos)){
+            rootNode.initFlag(diseaseTreatmentPlanResVos.stream().map(DiseaseTreatmentPlanResVo::getPlanId).collect(Collectors.toList()));
+        }
+
+
+
+        return rootNode.getChild();
+    }
+
+
 
     private void assertDiseaseTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan){
 

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

@@ -118,7 +118,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
                 // 类目名称
                 medicalRecQaVO.setDictNamePath(dictMap.getOrDefault(questionLibrary.getDictId(), new CommonDic()).getNameZhPath());
                 // 默认回答
-                medicalRecQaVO.setDefaultAnswer(CollUtil.getFirst(questionLibrary.getDefaultAnswer()));
+                medicalRecQaVO.setDefaultAnswer(questionLibrary.getDefaultAnswer());
                 result.add(medicalRecQaVO);
             }
         }
@@ -215,7 +215,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
                     // 类目名称
                     medicalRecQaVO.setDictNamePath(dictMap.getOrDefault(questionLibrary.getDictId(), new CommonDic()).getNameZhPath());
                     // 默认回答
-                    medicalRecQaVO.setDefaultAnswer(CollUtil.getFirst(questionLibrary.getDefaultAnswer()));
+                    medicalRecQaVO.setDefaultAnswer(questionLibrary.getDefaultAnswer());
                 }
             }
         }

virtual-patient-model/src/main/java/com/supervision/mapper/AskTemplateQuestionLibraryMapper.java

@@ -1,5 +1,7 @@
 package com.supervision.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.model.AskTemplateQuestionLibrary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
@@ -17,6 +19,10 @@ import java.util.List;
 public interface AskTemplateQuestionLibraryMapper extends BaseMapper<AskTemplateQuestionLibrary> {
 
     List<AskQuestionLibraryResVo> queryList(@Param("askQuestionLibrary")AskQuestionLibraryReqVo askQuestionLibraryReqVo);
+
+
+    Page<AskQuestionLibraryResVo> queryPageList(IPage<AskQuestionLibraryResVo> page,
+                                                @Param("askQuestionLibrary") AskQuestionLibraryReqVo askQuestionLibrary);
 }
 
 

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

@@ -48,8 +48,7 @@ public class AskTemplateQuestionLibrary implements Serializable {
     /**
      * 默认问题的回答
      */
-    @TableField(typeHandler = StringListTypeHandler.class)
+    private String defaultAnswer;
-    private List<String> defaultAnswer;
 
     /**
      * 创建人ID

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

@@ -1,5 +1,6 @@
 package com.supervision.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.model.AskTemplateQuestionLibrary;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.supervision.vo.manage.AskQuestionLibraryReqVo;
@@ -15,4 +16,7 @@ import java.util.List;
 public interface AskTemplateQuestionLibraryService extends IService<AskTemplateQuestionLibrary> {
 
     List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo);
+
+
+    Page<AskQuestionLibraryResVo> queryPageList(Integer pageNum, Integer pageSize, AskQuestionLibraryReqVo askQuestionLibraryReqVo);
 }

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

@@ -1,5 +1,6 @@
 package com.supervision.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.model.AskTemplateQuestionLibrary;
 import com.supervision.service.AskTemplateQuestionLibraryService;
@@ -24,6 +25,13 @@ public class AskTemplateQuestionLibraryServiceImpl extends ServiceImpl<AskTempla
 
         return super.getBaseMapper().queryList(askQuestionLibraryReqVo);
     }
+
+    @Override
+    public Page<AskQuestionLibraryResVo> queryPageList(Integer pageNum, Integer pageSize,
+                                                       AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
+
+        return super.getBaseMapper().queryPageList(new Page<>(pageNum,pageSize),askQuestionLibraryReqVo);
+    }
 }
 
 

virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java

@@ -9,8 +9,7 @@ public class AncillaryItemReqVo {
     @ApiModelProperty("流程id")
     private String processId;
 
-    @ApiModelProperty("搜索关键子")
+    @ApiModelProperty("搜索关键字")
-
     private String keyWord;
 
 }

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

@@ -2,6 +2,7 @@ package com.supervision.vo.manage;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import sun.dc.pr.PRError;
 
 import java.util.List;
 
@@ -20,6 +21,9 @@ public class AskQuestionLibraryResVo {
     @ApiModelProperty("问题")
     private List<String> question;
 
+    @ApiModelProperty("默认回答")
+    private String defaultAnswer;
+
     @ApiModelProperty("问题类目名")
     private String nameZhPath;
 }

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

@@ -0,0 +1,64 @@
+package com.supervision.vo.manage;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class DiseaseTreatmentPlanTreeNode {
+
+    @ApiModelProperty("处置计划id")
+    private String id;
+
+    @ApiModelProperty("节点名称")
+    private String name;
+
+    @ApiModelProperty("标识 0:未选择 1:已选择")
+    private int flag;
+
+    @ApiModelProperty("子节点")
+    private List<DiseaseTreatmentPlanTreeNode> child;
+
+
+    public DiseaseTreatmentPlanTreeNode() {
+    }
+
+    @JsonIgnore
+    public List<DiseaseTreatmentPlanTreeNode> getOrDefaultChild(){
+        if (null == child){
+            child = new ArrayList<>();
+        }
+        return child;
+    }
+
+    public DiseaseTreatmentPlanTreeNode(TreatmentPlanTreeNode treatmentPlanTreeNode) {
+        this.id = treatmentPlanTreeNode.getId();
+        this.name = treatmentPlanTreeNode.getName();
+        List<TreatmentPlanTreeNode> child = treatmentPlanTreeNode.getChild();
+        if (CollUtil.isNotEmpty(child)){
+            for (TreatmentPlanTreeNode planTreeNode : child) {
+                this.getOrDefaultChild().add(new DiseaseTreatmentPlanTreeNode(planTreeNode));
+            }
+        }
+    }
+
+    public void initFlag(List<String> ids){
+        if (CollUtil.isEmpty(ids)){
+            return;
+        }
+        if (StrUtil.isNotEmpty(this.getId())){
+            this.setFlag(ids.stream().allMatch(i -> i.equals(this.getId())) ? 1 : 0);
+        }
+        if (CollUtil.isNotEmpty(this.getChild())){
+            for (DiseaseTreatmentPlanTreeNode treatmentPlanTreeNode : this.getChild()) {
+                treatmentPlanTreeNode.initFlag(ids);
+            }
+        }
+    }
+}

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

@@ -3,39 +3,42 @@ package com.supervision.vo.manage;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 @Data
-public class TreeNode {
+public class TreatmentPlanTreeNode {
 
+   @ApiModelProperty("处置计划id")
    private String id;
 
+   @ApiModelProperty("节点名称")
    private String name;
 
-   private List<TreeNode> child;
+   @ApiModelProperty("子节点")
+   private List<TreatmentPlanTreeNode> child;
 
 
-   public TreeNode() {
+   public TreatmentPlanTreeNode() {
    }
 
-   public TreeNode(String id, String name) {
+   public TreatmentPlanTreeNode(String id, String name) {
       this.id = id;
       this.name = name;
    }
 
    @JsonIgnore
-   public List<TreeNode> getOrDefaultChild(){
+   public List<TreatmentPlanTreeNode> getOrDefaultChild(){
       if (null == child){
          child = new ArrayList<>();
       }
       return child;
    }
 
-   public TreeNode findChildByName(String name){
+   public TreatmentPlanTreeNode findChildByName(String name){
       if (CollUtil.isEmpty(child) || StrUtil.isEmpty(name)){
          return null;
       }

virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml

@@ -11,8 +11,7 @@
         <result property="description" column="description" jdbcType="VARCHAR"/>
         <result property="question" column="question" jdbcType="ARRAY"
                 typeHandler="com.supervision.handler.StringListTypeHandler"/>
-        <result property="defaultAnswer" column="default_answer" jdbcType="ARRAY"
+        <result property="defaultAnswer" column="default_answer" jdbcType="VARCHAR"/>
-                typeHandler="com.supervision.handler.StringListTypeHandler"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -37,7 +36,8 @@
 
     <select id="queryList" resultMap="askQuestionLibraryResultMap" parameterType="com.supervision.vo.manage.AskQuestionLibraryReqVo">
         select atql.id as id,
-               atql.code as code,
+               atql.default_answer,
+               cd.code as code,
                atql.dict_id as dictId,
                atql.question as question,
                cd.name_zh_path as nameZhPath
@@ -49,4 +49,20 @@
             </if>
         </where>
     </select>
+
+    <select id="queryPageList"  resultMap="askQuestionLibraryResultMap"  resultType="com.supervision.vo.manage.AskQuestionLibraryResVo">
+        select  atql.id as id,
+                atql.default_answer,
+                cd.code as code,
+                atql.dict_id as dictId,
+                atql.question as question,
+                cd.name_zh_path as nameZhPath
+        from vp_ask_template_question_library atql
+        left join vp_common_dic cd on atql.dict_id = cd.id
+        <where>
+            <if test="askQuestionLibrary.code != null and askQuestionLibrary.code !=  '' ">
+                AND cd.code = #{askQuestionLibrary.code}
+            </if>
+        </where>
+    </select>
 </mapper>