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 ed2ed2d1..9e1da676 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 @@ -98,9 +98,15 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { private void assertDefaultAnswer(List qaList) { Assert.notEmpty(qaList, "默认问题列表不能为空"); + + qaList.forEach(qa->Assert.notEmpty(qa.getAnswerResourceId(),"默认问题回答视频不能为空")); + CommonDic systemDic = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").eq(CommonDic::getCode, "system").one(); Assert.notNull(systemDic, "未找到系统问题"); - List askTemplateQuestionLibraryList = askTemplateQuestionLibraryService.lambdaQuery().eq(AskTemplateQuestionLibrary::getDictId, systemDic.getId()).list(); + List chiildCommonDicList = commonDicService.lambdaQuery().eq(CommonDic::getParentId, systemDic.getId()).list(); + Assert.notEmpty(chiildCommonDicList, "系统问题未找到"); + List dicIds = chiildCommonDicList.stream().map(i -> String.valueOf(i.getId())).collect(Collectors.toList()); + List askTemplateQuestionLibraryList = askTemplateQuestionLibraryService.lambdaQuery().in(AskTemplateQuestionLibrary::getDictId, dicIds).list(); if (CollUtil.isEmpty(askTemplateQuestionLibraryList)){ return; }