From fa432a1d48aa36991e21ff02d22e017b613a73c7 Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 15 Dec 2023 09:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=8A=E6=AF=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskPrimaryController.java | 3 -- .../service/impl/AskPrimaryServiceImpl.java | 30 +++++++++---------- 2 files changed, 14 insertions(+), 19 deletions(-) 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 8aeff6ae..ba25f10a 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 @@ -59,9 +59,6 @@ public class AskPrimaryController { return askPrimaryService.queryRecordForPrimaryChoose(processId); } - - - @ApiOperation("删除初步诊断") @GetMapping("deletePrimary") public 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 63d06d77..13401830 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 @@ -39,11 +39,11 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { public List queryAskPrimaryList(String processId) { List resVoList = diagnosisPrimaryService.queryAskPrimaryList(processId); List list = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getProcessId, processId).list(); - if (CollUtil.isNotEmpty(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)){ + if (CollUtil.isNotEmpty(relationList)) { Map> relationIdMap = relationList.stream() .collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getType, Collectors.mapping(DiagnosisPrimaryRelation::getRelationId, Collectors.toList()))); diagnosisPrimaryVO.setAskIdList(relationIdMap.get(1)); @@ -74,7 +74,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { diagnosisPrimary.setCreateUserId(UserUtil.getUser().getId()); diagnosisPrimaryService.save(diagnosisPrimary); // 然后开始保存初步诊断关键的诊断 - if (CollUtil.isNotEmpty(reqVO.getAskIdList())){ + if (CollUtil.isNotEmpty(reqVO.getAskIdList())) { List askRelationList = reqVO.getAskIdList().stream().map(e -> { DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation(); relation.setProcessId(diagnosisPrimary.getProcessId()); @@ -88,7 +88,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { } - if (CollUtil.isNotEmpty(reqVO.getPhysicalIdList())){ + if (CollUtil.isNotEmpty(reqVO.getPhysicalIdList())) { List physicalRelationList = reqVO.getPhysicalIdList().stream().map(e -> { DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation(); relation.setProcessId(diagnosisPrimary.getProcessId()); @@ -102,7 +102,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { } - if (CollUtil.isNotEmpty(reqVO.getAncillaryIdList())){ + if (CollUtil.isNotEmpty(reqVO.getAncillaryIdList())) { List ancillaryRelationList = reqVO.getAncillaryIdList().stream().map(e -> { DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation(); relation.setProcessId(diagnosisPrimary.getProcessId()); @@ -151,7 +151,6 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { } - @Override @Transactional(rollbackFor = Exception.class) public void confirmPrimaryByAskEnd(List reqVOList) { @@ -211,7 +210,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { * @return 结果 */ @Override - public List queryDiagnosticBasisListForPrimary(String processId,String primaryId) { + public List queryDiagnosticBasisListForPrimary(String processId, String primaryId) { List resList = diagnosisPrimaryService.queryDiagnosticBasisListForPrimary(processId); if (CollUtil.isEmpty(resList)) { return resList; @@ -219,27 +218,26 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { // 找到process对应的所有的初步诊断 List diagnosisPrimaryVOS = diagnosisPrimaryService.queryAskPrimaryList(processId); Map diseaseNameMap = diagnosisPrimaryVOS.stream().collect(Collectors.toMap(DiagnosisPrimaryVO::getId, DiagnosisPrimaryVO::getPrimaryDiseaseName)); - // 首先根据诊断记录,找到对应的关联关系 - Set relationIdSet = resList.stream().map(DiagnosticBasisForPrimaryResVO::getId).collect(Collectors.toSet()); - // 查询诊疗记录对应的初步诊断关系 - List relationList = diagnosisPrimaryRelationService.lambdaQuery() - .in(DiagnosisPrimaryRelation::getRelationId, relationIdSet) - .list(); + // 查询诊疗记录对应的所有检查记录 + List relationList = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getProcessId, processId).list(); // 根据relationId进行分组 Map> relationMap = relationList.stream().collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getRelationId)); List result = new ArrayList<>(); for (DiagnosticBasisForPrimaryResVO node : resList) { List relationPrimaryList = relationMap.get(node.getId()); + if (CollUtil.isEmpty(relationPrimaryList)){ + continue; + } Set primarySet = relationPrimaryList.stream().map(DiagnosisPrimaryRelation::getPrimaryId).collect(Collectors.toSet()); if (CollUtil.isNotEmpty(primarySet)) { // 如果初步诊断ID的参数不为空,那么说明只查某一个初步诊断的数据 - if (StrUtil.isNotBlank(primaryId)){ - if (primarySet.contains(primaryId)){ + if (StrUtil.isNotBlank(primaryId)) { + if (primarySet.contains(primaryId)) { // 如果有,就只保留这一个初步诊断依据的 primarySet.removeIf(e -> !e.equals(primaryId)); - }else { + } else { // 如果没有,就直接跳过 continue; }