From 848cb5e84e06018b137f08f6eaeb19c4ba7bf052 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 31 Jan 2024 13:19:02 +0800 Subject: [PATCH] =?UTF-8?q?manage=20:=20=E4=BF=AE=E6=94=B9=20queryMedicalR?= =?UTF-8?q?ecInfo=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/supervision/manage/pojo/vo/MedicalRecQaVO.java | 3 +++ .../manage/service/impl/MedicalRecManageServiceImpl.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java index de81c24e..afd40552 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java @@ -35,6 +35,9 @@ public class MedicalRecQaVO { @ApiModelProperty("针对病例的特定回答,新增更新时必填") private String medicalRecAnswer; + @ApiModelProperty(value = "回答类型",hidden = true) + private String answerType; + } 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 6cf1ea96..27ea5591 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 @@ -204,7 +204,10 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { // 处置计划 medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId())); // 问答策略 - medicalRecInfoVO.setQaList(queryMedicalRecQaInfo(id)); + List medicalRecQaVOS = queryMedicalRecQaInfo(id); + Map> qaListMap = medicalRecQaVOS.stream().collect(Collectors.groupingBy(MedicalRecQaVO::getAnswerType)); + medicalRecInfoVO.setQaList(qaListMap.getOrDefault("1", Collections.emptyList())); + medicalRecInfoVO.setDefaultQaList(qaListMap.getOrDefault("0", Collections.emptyList())); return medicalRecInfoVO; } @@ -217,7 +220,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { MedicalRecQaVO medicalRecQaVO = new MedicalRecQaVO(); medicalRecQaVO.setId(e.getId()); medicalRecQaVO.setLibraryQuestionId(e.getLibraryQuestionId()); - + medicalRecQaVO.setAnswerType(StrUtil.isEmpty(e.getAnswerType()) ? "1" : e.getAnswerType()); // 病历的回答 medicalRecQaVO.setMedicalRecAnswer(e.getAnswer()); return medicalRecQaVO;