From 6641bd4bbfa71551ca20d145cae4b9764b85353a Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 29 Nov 2023 14:11:14 +0800 Subject: [PATCH] =?UTF-8?q?manage=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AskQuestionLibraryManageController.java | 29 +++++++-- .../TreatmentPlanManageController.java | 8 +-- .../DiseaseTreatmentPlanManageController.java | 12 ++++ .../AskQuestionLibraryManageService.java | 7 ++ .../ConfigTreatmentPlanManageService.java | 4 +- .../DiseaseTreatmentPlanManageService.java | 3 + .../AskQuestionLibraryManageServiceImpl.java | 18 ++++++ .../ConfigTreatmentPlanManageServiceImpl.java | 21 +++--- ...DiseaseTreatmentPlanManageServiceImpl.java | 35 +++++++++- .../impl/MedicalRecManageServiceImpl.java | 4 +- .../AskTemplateQuestionLibraryMapper.java | 6 ++ .../model/AskTemplateQuestionLibrary.java | 3 +- .../AskTemplateQuestionLibraryService.java | 4 ++ ...AskTemplateQuestionLibraryServiceImpl.java | 8 +++ .../vo/ask/AncillaryItemReqVo.java | 3 +- .../vo/manage/AskQuestionLibraryResVo.java | 4 ++ .../manage/DiseaseTreatmentPlanTreeNode.java | 64 +++++++++++++++++++ ...eeNode.java => TreatmentPlanTreeNode.java} | 17 +++-- .../AskTemplateQuestionLibraryMapper.xml | 22 ++++++- 19 files changed, 232 insertions(+), 40 deletions(-) create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java rename virtual-patient-model/src/main/java/com/supervision/vo/manage/{TreeNode.java => TreatmentPlanTreeNode.java} (59%) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java index 6d92c23f..721f6157 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -21,11 +23,30 @@ public class AskQuestionLibraryManageController { private final AskQuestionLibraryManageService askQuestionLibraryManageService; @ApiOperation("查询问题库列表") - @PostMapping("/queryList") + @GetMapping("/queryList") public List queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) { return askQuestionLibraryManageService.queryList(askQuestionLibraryReqVo); } + @ApiOperation("分页查询问题库列表") + @GetMapping("/queryPageList") + public Page queryPageList(@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize, + AskQuestionLibraryReqVo askQuestionLibraryReqVo) { + + return askQuestionLibraryManageService.queryPageList(pageNum, pageSize, askQuestionLibraryReqVo); + + } + + + @ApiOperation("查询问题类目编码列表") + @GetMapping("/queryItemList") + public List queryItemList() { + + return askQuestionLibraryManageService.queryItemList(); + + } + } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java index a6537264..054be949 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java +++ b/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 queryTree(@RequestParam(name = "disposalMethod",required = false) Integer disposalMethod) { + public List 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); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java index 819660f3..16a566c3 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java +++ b/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 queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod, + @ApiParam("疾病id") String diseaseId) { + + return diseaseTreatmentPlanManageService.queryDiseaseTreatmentPlanTree(disposalMethod,diseaseId); + + } + } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java index 3be1d6af..e46c65eb 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java +++ b/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 queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo); + + Page queryPageList(Integer pageNum, Integer pageSize, AskQuestionLibraryReqVo askQuestionLibraryReqVo); + + List queryItemList(); + } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java index da706457..416d7756 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java +++ b/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 queryTree(Integer disposalMethod); + List queryTree(Integer disposalMethod); ConfigTreatmentPlan findById(String id); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java index 3ebc5ecc..b93764c5 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java +++ b/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 queryDiseaseTreatmentPlanTree(Integer disposalMethod, String diseaseId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java index e6a0912a..b907e631 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java +++ b/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 queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) { return askTemplateQuestionLibraryService.queryList(askQuestionLibraryReqVo); } + + @Override + public Page queryPageList(Integer pageNum, Integer pageSize, + AskQuestionLibraryReqVo askQuestionLibraryReqVo) { + + return askTemplateQuestionLibraryService.queryPageList(pageNum,pageSize,askQuestionLibraryReqVo); + } + + @Override + public List queryItemList() { + return commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").isNull(CommonDic::getParentId).list(); + } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java index d9321685..6331ad41 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java +++ b/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 queryTree(Integer disposalMethod) { + public List queryTree(Integer disposalMethod) { List 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); } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java index e8621b7c..695d1c41 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java +++ b/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 queryListByDiseaseId(String diseaseId) { @@ -57,6 +65,29 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl return diseaseTreatmentPlanService.lambdaUpdate().eq(DiseaseTreatmentPlan::getDiseaseId,diseaseId).remove(); } + @Override + public List queryDiseaseTreatmentPlanTree(Integer disposalMethod, String diseaseId) { + List treatmentPlanTreeNodes = configTreatmentPlanManageService.queryTree(disposalMethod); + + if (CollUtil.isEmpty(treatmentPlanTreeNodes)){ + return CollectionUtil.newArrayList(); + } + + TreatmentPlanTreeNode treatmentPlanTreeNode = new TreatmentPlanTreeNode(); + treatmentPlanTreeNode.setChild(treatmentPlanTreeNodes); + DiseaseTreatmentPlanTreeNode rootNode = new DiseaseTreatmentPlanTreeNode(treatmentPlanTreeNode); + + List 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){ diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java index ee49e9ed..613034b4 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java +++ b/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()); } } } diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/AskTemplateQuestionLibraryMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/AskTemplateQuestionLibraryMapper.java index 30d6d8a1..7a271187 100644 --- a/virtual-patient-model/src/main/java/com/supervision/mapper/AskTemplateQuestionLibraryMapper.java +++ b/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 { List queryList(@Param("askQuestionLibrary")AskQuestionLibraryReqVo askQuestionLibraryReqVo); + + + Page queryPageList(IPage page, + @Param("askQuestionLibrary") AskQuestionLibraryReqVo askQuestionLibrary); } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java index c8f81267..e743a891 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java +++ b/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 List defaultAnswer; + private String defaultAnswer; /** * 创建人ID diff --git a/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java b/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java index 106ec449..9d8e4b51 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java +++ b/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 { List queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo); + + + Page queryPageList(Integer pageNum, Integer pageSize, AskQuestionLibraryReqVo askQuestionLibraryReqVo); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/AskTemplateQuestionLibraryServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/AskTemplateQuestionLibraryServiceImpl.java index 733c1415..11dc6a63 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/AskTemplateQuestionLibraryServiceImpl.java +++ b/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 queryPageList(Integer pageNum, Integer pageSize, + AskQuestionLibraryReqVo askQuestionLibraryReqVo) { + + return super.getBaseMapper().queryPageList(new Page<>(pageNum,pageSize),askQuestionLibraryReqVo); + } } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java index 92759615..ff9feced 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java +++ b/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; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java index 59735fde..5cfbc02a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java +++ b/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 question; + @ApiModelProperty("默认回答") + private String defaultAnswer; + @ApiModelProperty("问题类目名") private String nameZhPath; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java new file mode 100644 index 00000000..7b3fdaea --- /dev/null +++ b/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 child; + + + public DiseaseTreatmentPlanTreeNode() { + } + + @JsonIgnore + public List getOrDefaultChild(){ + if (null == child){ + child = new ArrayList<>(); + } + return child; + } + + public DiseaseTreatmentPlanTreeNode(TreatmentPlanTreeNode treatmentPlanTreeNode) { + this.id = treatmentPlanTreeNode.getId(); + this.name = treatmentPlanTreeNode.getName(); + List child = treatmentPlanTreeNode.getChild(); + if (CollUtil.isNotEmpty(child)){ + for (TreatmentPlanTreeNode planTreeNode : child) { + this.getOrDefaultChild().add(new DiseaseTreatmentPlanTreeNode(planTreeNode)); + } + } + } + + public void initFlag(List 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); + } + } + } +} diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreeNode.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java similarity index 59% rename from virtual-patient-model/src/main/java/com/supervision/vo/manage/TreeNode.java rename to virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java index f16a847c..75cb41e0 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreeNode.java +++ b/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 child; + @ApiModelProperty("子节点") + private List 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 getOrDefaultChild(){ + public List 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; } diff --git a/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml b/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml index ed00334f..4d0d840f 100644 --- a/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml @@ -11,8 +11,7 @@ - + @@ -37,7 +36,8 @@ + +