|
|
|
@ -204,7 +204,10 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
|
|
|
|
|
// 处置计划
|
|
|
|
|
medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
|
|
|
|
|
// 问答策略
|
|
|
|
|
medicalRecInfoVO.setQaList(queryMedicalRecQaInfo(id));
|
|
|
|
|
List<MedicalRecQaVO> medicalRecQaVOS = queryMedicalRecQaInfo(id);
|
|
|
|
|
Map<String, List<MedicalRecQaVO>> 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;
|
|
|
|
|