From 7bb23651c3b4fc554986f9caab6fb333ce1d16cb Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 3 Jun 2024 09:53:07 +0800 Subject: [PATCH] =?UTF-8?q?1:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DiagnoseHallServiceImpl.java | 46 ++++--------------- 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java index 8c78f8a3..34d26f31 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java @@ -58,8 +58,8 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService { // 3.把疾病名填充到诊断列表中 List medicalRecIds = records.stream().map(DiagnoseProcessResVo::getMedicalRecId).filter(Objects::nonNull).collect(Collectors.toList()); - Map askPatientAnswerMap = queryAskPatientSilentVideoAnswer(medicalRecIds); - Map dynamicAskPatientAnswerMap = queryAskPatientDynamicVideoAnswer(medicalRecIds); + Map askPatientAnswerMap = queryAskPatientSystemVideoAnswer(medicalRecIds,"system_silent"); + Map dynamicAskPatientAnswerMap = queryAskPatientSystemVideoAnswer(medicalRecIds,"system_dynamic"); diagnoseProcessResVoPage.getRecords().forEach(vo->{ List list = diagnosisPrimaryVOsMap.getOrDefault(vo.getProcessId(),new ArrayList<>()); vo.setPrimaryDiseaseNameList(list.stream().map(DiagnosisPrimaryVO::getPrimaryDiseaseName).distinct().collect(Collectors.toList())); @@ -80,57 +80,29 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService { return medicalRecPageResVOIPage; } List medicalRecIds = medicalRecPageResVOIPage.getRecords().stream().map(MedicalRecPageResVO::getMedicalId).collect(Collectors.toList()); - Map askPatientAnswerMap = queryAskPatientSilentVideoAnswer(medicalRecIds); + Map askPatientAnswerMap = queryAskPatientSystemVideoAnswer(medicalRecIds,"system_silent"); medicalRecPageResVOIPage.getRecords().forEach(vo->{ vo.setPatientSilentVideo(askPatientAnswerMap.getOrDefault(vo.getMedicalId(),new AskPatientAnswer()).getAnswerResourceId()); }); return medicalRecPageResVOIPage; } + private Map queryAskPatientSystemVideoAnswer(List medicalRecIds,String code){ - /** - * 疾病静默视频信息 - * @param medicalRecIds - * @return - */ - private Map queryAskPatientSilentVideoAnswer(List medicalRecIds){ - - if (CollUtil.isEmpty(medicalRecIds)){ - return new HashMap<>(); - } - - CommonDic one = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").eq(CommonDic::getCode, "system_silent").one(); - Assert.notNull(one,"字典项目未配置"); - - AskTemplateQuestionLibrary silentInfo = askTemplateQuestionLibraryService.lambdaQuery() - .eq(AskTemplateQuestionLibrary::getDictId, one.getId()).eq(AskTemplateQuestionLibrary::getDictId, one.getId()).one(); - Assert.notNull(silentInfo,"静默视频未配置"); - - List askPatientAnswerList = askPatientAnswerService.lambdaQuery() - .in(AskPatientAnswer::getMedicalId, medicalRecIds) - .eq(AskPatientAnswer::getLibraryQuestionId, silentInfo.getId()).list(); - if (CollUtil.isEmpty(askPatientAnswerList)){ - return new HashMap<>(); - } - return askPatientAnswerList.stream().collect(Collectors.toMap(AskPatientAnswer::getMedicalId, o -> o)); - } - - - private Map queryAskPatientDynamicVideoAnswer(List medicalRecIds){ - + Assert.notEmpty(code,"code不允许为空"); if (CollUtil.isEmpty(medicalRecIds)){ return new HashMap<>(); } - CommonDic one = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").eq(CommonDic::getCode, "system_dynamic").one(); + CommonDic one = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").eq(CommonDic::getCode, code).one(); Assert.notNull(one,"字典项目未配置"); - AskTemplateQuestionLibrary silentInfo = askTemplateQuestionLibraryService.lambdaQuery() + AskTemplateQuestionLibrary questionLibrary = askTemplateQuestionLibraryService.lambdaQuery() .eq(AskTemplateQuestionLibrary::getDictId, one.getId()).eq(AskTemplateQuestionLibrary::getDictId, one.getId()).one(); - Assert.notNull(silentInfo,"静默视频未配置"); + Assert.notNull(questionLibrary,code+"对应的问题库未配置"); List askPatientAnswerList = askPatientAnswerService.lambdaQuery() .in(AskPatientAnswer::getMedicalId, medicalRecIds) - .eq(AskPatientAnswer::getLibraryQuestionId, silentInfo.getId()).list(); + .eq(AskPatientAnswer::getLibraryQuestionId, questionLibrary.getId()).list(); if (CollUtil.isEmpty(askPatientAnswerList)){ return new HashMap<>(); }