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;