From c89bf42035f0ed4ab824c319c4e196c870369bca Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 30 Nov 2023 15:00:14 +0800 Subject: [PATCH] =?UTF-8?q?manage=EF=BC=9A=E6=B7=BB=E5=8A=A0=E4=BD=93?= =?UTF-8?q?=E6=A0=BC=E6=A3=80=E6=9F=A5=E3=80=81=E8=BE=85=E5=8A=A9=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=20=E8=AF=8A=E6=96=AD=E4=BE=9D=E6=8D=AE=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DiseaseAncillaryManageController.java | 4 ++-- .../DiseasePhysicalManageController.java | 5 +++-- .../DiseaseQuestionManageController.java | 2 +- .../DiseaseTreatmentPlanManageController.java | 2 +- .../service/DiseasePhysicalManageService.java | 2 +- .../impl/DiseasePhysicalManageServiceImpl.java | 18 +++++++++++------- .../DiseaseTreatmentPlanManageServiceImpl.java | 4 +++- .../manage/DiseasePhysicalLocationNodeVo.java | 4 +++- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java index 98e318ee..9bac18ea 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java @@ -33,7 +33,7 @@ public class DiseaseAncillaryManageController { @ApiOperation("删除疾病辅助检查信息") @DeleteMapping("/delete") - public boolean deleteDiseaseAncillary(String id) { + public boolean deleteDiseaseAncillary(@RequestParam("id") String id) { return diseaseAncillaryManageService.deleteDiseaseAncillary(id); @@ -51,7 +51,7 @@ public class DiseaseAncillaryManageController { @ApiOperation("根据疾病id查询疾病辅助检查信息列表") @GetMapping("/queryListByDiseaseId") - public List queryListByDiseaseId(String diseaseId) { + public List queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) { return diseaseAncillaryManageService.queryListByDiseaseId(diseaseId); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java index 8423da58..d4d417b0 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java @@ -59,9 +59,10 @@ public class DiseasePhysicalManageController { @ApiOperation("查询疾病身体部位树") @GetMapping("/queryTree") - public List queryTree(@RequestParam String diseaseId) { + public List queryTree(@RequestParam("diseaseId") String diseaseId, + @RequestParam(value = "toolId",required = false) String toolId) { - return diseasePhysicalManageService.queryTree(diseaseId); + return diseasePhysicalManageService.queryTree(diseaseId, toolId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java index 19715102..f5fd5b57 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java @@ -40,7 +40,7 @@ public class DiseaseQuestionManageController { @ApiOperation("根据疾病id查询问题库信息列表") @GetMapping("/queryListByDiseaseId") - public List queryPageByDiseaseId(String diseaseId) { + public List queryPageByDiseaseId(@RequestParam("diseaseId") String diseaseId) { return diseaseQuestionManageService.queryPageByDiseaseId(diseaseId); 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 a9483fdd..a58d8942 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 @@ -52,7 +52,7 @@ public class DiseaseTreatmentPlanManageController { @ApiOperation("删除疾病处置计划") @DeleteMapping("/delete") - public boolean deleteDiseaseTreatmentPlan(@RequestParam String id) { + public boolean deleteDiseaseTreatmentPlan(@RequestParam("id") String id) { return diseaseTreatmentPlanManageService.deleteDiseaseTreatmentPlan(id); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java index 68001cc8..ac4b402e 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java @@ -19,5 +19,5 @@ public interface DiseasePhysicalManageService { boolean deleteByDiseaseId(String diseaseId); - List queryTree(String diseaseId); + List queryTree(String diseaseId, String toolId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java index bdbe148e..8ca7b9dd 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java @@ -72,9 +72,9 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe } @Override - public List queryTree(String diseaseId) { + public List queryTree(String diseaseId, String toolId) { - // 1. 查询体格检查工具树 + // 1. 查询体格检查位置树 List physicalLocationNodes = physicalToolManageService.queryTree(); if (CollectionUtil.isEmpty(physicalLocationNodes)){ return CollectionUtil.newArrayList(); @@ -84,6 +84,9 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe physicalLocationNode.setChild(physicalLocationNodes); DiseasePhysicalLocationNodeVo bean = BeanUtil.toBean(physicalLocationNode, DiseasePhysicalLocationNodeVo.class); + if (StrUtil.isEmpty(toolId)){ + return bean.getChild(); + } // 2. 根据疾病id查询疾病体格检查项 List diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId); if (CollectionUtil.isEmpty(diseasePhysicalResVos)){ @@ -91,20 +94,21 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe } // 3. 填充疾病体格检查树中的flag属性 - List toolIds = diseasePhysicalResVos.stream().map(DiseasePhysical::getToolId).distinct().collect(Collectors.toList()); - populateDiseasePhysicalLocationNodeFlag(bean,toolIds); + List locationIds = diseasePhysicalResVos.stream().filter(vo->toolId.equals(vo.getToolId())) + .map(DiseasePhysical::getLocationId).distinct().collect(Collectors.toList()); + populateDiseasePhysicalLocationNodeFlag(bean,locationIds); return bean.getChild(); } - private void populateDiseasePhysicalLocationNodeFlag(DiseasePhysicalLocationNodeVo node,List toolIds) { + private void populateDiseasePhysicalLocationNodeFlag(DiseasePhysicalLocationNodeVo node,List locationIds) { if (StrUtil.isNotEmpty(node.getId())){ - node.setFlag(toolIds.stream().anyMatch(id->node.getId().equals(id))); + node.setFlag(locationIds.stream().anyMatch(locationId->node.getId().equals(locationId))); } if (CollectionUtil.isNotEmpty(node.getChild())){ for (DiseasePhysicalLocationNodeVo childNode : node.getChild()) { - populateDiseasePhysicalLocationNodeFlag(childNode,toolIds); + populateDiseasePhysicalLocationNodeFlag(childNode,locationIds); } } } 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 fac7724f..7e96e8bf 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 @@ -78,8 +78,10 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl treatmentPlanTreeNode.setChild(treatmentPlanTreeNodes); DiseaseTreatmentPlanTreeNode rootNode = new DiseaseTreatmentPlanTreeNode(treatmentPlanTreeNode); - // 2. + // 2.根据疾病id查询疾病处置计划信息 List diseaseTreatmentPlanResVos = this.queryListByDiseaseId(diseaseId); + + // 3. 初始化flag if (CollUtil.isNotEmpty(diseaseTreatmentPlanResVos)){ rootNode.initFlag(diseaseTreatmentPlanResVos.stream().map(DiseaseTreatmentPlanResVo::getPlanId).collect(Collectors.toList())); } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java index c8de7930..09a3d4d3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java @@ -9,7 +9,9 @@ import java.util.List; @Data public class DiseasePhysicalLocationNodeVo { - @TableId + /** + * 身体部位id + */ private String id; /**