From 2aeeac2a8ec6623b8d2fa071bc1ad9ea62189d1c Mon Sep 17 00:00:00 2001 From: liu Date: Thu, 14 Dec 2023 11:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=9D=E6=AD=A5=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E5=9B=9E=E6=98=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ask/DiagnosisPrimaryVO.java | 12 +++++++ .../controller/AskPrimaryController.java | 6 ---- .../com/supervision/pojo/vo/ChooseNode.java | 6 ---- .../service/AskPrimaryService.java | 2 -- .../service/impl/AskPrimaryServiceImpl.java | 35 +++++++++---------- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java index 09a0a8c2..aab5ca4d 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java @@ -1,14 +1,26 @@ package com.supervision.vo.ask; import com.supervision.model.DiagnosisPrimary; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + @Data @EqualsAndHashCode(callSuper = true) public class DiagnosisPrimaryVO extends DiagnosisPrimary { private String primaryDiseaseName; + @ApiModelProperty("问诊ID列表") + private List askIdList; + + @ApiModelProperty("辅助检查ID列表") + private List ancillaryIdList; + + @ApiModelProperty("体格检查ID列表") + private List physicalIdList; + } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java index d2016cf1..b5749e83 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java @@ -57,12 +57,6 @@ public class AskPrimaryController { return askPrimaryService.queryRecordForPrimaryChoose(processId); } - @ApiOperation("查询已选择的初步诊断关联的问诊记录") - @GetMapping("queryPrimaryChooseList") - public RecordForPrimaryChooseVO queryPrimaryChooseList(@NotBlank(message = "流程ID不能为空") String processId, - @NotBlank(message = "初步诊断ID不能为空") @ApiParam("初步诊断ID") String primaryId) { - return askPrimaryService.queryPrimaryChooseList(processId, primaryId); - } @ApiOperation("确认诊断时,修改初步诊断的信息") @PostMapping("updatePrimaryByConfirm") diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java index 6361124f..32412b34 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java @@ -9,10 +9,4 @@ public class ChooseNode { private String nodeId; private String name; - - /** - * 是否选中 - */ - @ApiModelProperty("是否选中") - private boolean checkedFlag; } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java index 97710c37..3faa4360 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java @@ -24,8 +24,6 @@ public interface AskPrimaryService { RecordForPrimaryChooseVO queryRecordForPrimaryChoose(String processId); - RecordForPrimaryChooseVO queryPrimaryChooseList(String processId, String primaryId); - void updatePrimaryByConfirm(DiagnosisPrimary reqVO); void deletePrimary(String id); diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java index f53be5ef..1a2f2d35 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java @@ -40,7 +40,22 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { @Override public List queryAskPrimaryList(String processId) { - return diagnosisPrimaryService.queryAskPrimaryList(processId); + List resVoList = diagnosisPrimaryService.queryAskPrimaryList(processId); + List list = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getProcessId, processId).list(); + if (CollUtil.isNotEmpty(list)){ + Map> relationMap = list.stream().collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getPrimaryId)); + for (DiagnosisPrimaryVO diagnosisPrimaryVO : resVoList) { + List relationList = relationMap.get(diagnosisPrimaryVO.getId()); + if (CollUtil.isNotEmpty(relationList)){ + Map> relationIdMap = relationList.stream() + .collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getType, Collectors.mapping(DiagnosisPrimaryRelation::getRelationId, Collectors.toList()))); + diagnosisPrimaryVO.setAskIdList(relationIdMap.get(1)); + diagnosisPrimaryVO.setPhysicalIdList(relationIdMap.get(2)); + diagnosisPrimaryVO.setAncillaryIdList(relationIdMap.get(3)); + } + } + } + return resVoList; } @Override @@ -138,23 +153,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { return resVO; } - @Override - public RecordForPrimaryChooseVO queryPrimaryChooseList(String processId, String primaryId) { - RecordForPrimaryChooseVO resVO = queryRecordForPrimaryChoose(processId); - // 获取relation表的数据 - List relationList = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getPrimaryId, primaryId).list(); - Set relationSet = relationList.stream().map(DiagnosisPrimaryRelation::getRelationId).collect(Collectors.toSet()); - for (ChooseNode chooseNode : resVO.getAskList()) { - chooseNode.setChecked(relationSet.contains(chooseNode.getNodeId())); - } - for (ChooseNode chooseNode : resVO.getPhysicalList()) { - chooseNode.setChecked(relationSet.contains(chooseNode.getNodeId())); - } - for (ChooseNode chooseNode : resVO.getAncillaryList()) { - chooseNode.setChecked(relationSet.contains(chooseNode.getNodeId())); - } - return resVO; - } + @Override public void updatePrimaryByConfirm(DiagnosisPrimary reqVO) {