diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java index a58b32f1..0f371f8e 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java @@ -69,6 +69,9 @@ public class MedicalRecAnswerExcelDTO { private String dictNamePath; + // 默认视频后缀 + private String answerVideoSuffix = ".mp4"; + public static final List READ_ANSWER_VIDEO_TITLE = CollUtil.newArrayList("问诊类目Ⅰ", "问诊类目Ⅱ", "* 知识", "* 回答","* 视频名称"); @@ -83,16 +86,18 @@ public class MedicalRecAnswerExcelDTO { List askPatientAnswerList, List materialLibraryList, List questionTypeDicList){ - // 如果视频名称没有后缀,默认添加.mp4后缀 - if (StrUtil.isNotEmpty(this.answerVideoName) - && StrUtil.split(this.answerVideoName,".").size() >1){ - answerVideoName = answerVideoName + ".mp4"; + + if (StrUtil.isNotEmpty(this.answerVideoName)){ + List split = StrUtil.split(this.answerVideoName, "."); + if (split.size() > 1){ + answerVideoSuffix = "." + split.get(split.size() - 1); + } } this.absentCheck(); this.matchQuestion(questionLibraryList); this.matchAskPatientAnswer(askPatientAnswerList); this.matchAnswerResource(materialLibraryList); - this.matchQuestionDicId(questionTypeDicList); + //this.matchQuestionDicId(questionTypeDicList); } public AskPatientAnswer toAskPatientAnswer(){ @@ -193,8 +198,11 @@ public class MedicalRecAnswerExcelDTO { errorCodeEnums.add(ErrorCodeEnum.ANSWER_VIDEO_NAME_NOT_FIND); } + // 完整视频名称 + String fullAnswerVideoName = this.answerVideoName + answerVideoSuffix; + for (MaterialLibrary materialLibrary : materialLibraryList) { - if (this.answerVideoName.equals(materialLibrary.getMaterialName())){ + if (fullAnswerVideoName.equals(materialLibrary.getMaterialName())){ this.answerResourceId = materialLibrary.getFileResourceId(); return; } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/UploadQuestionLibraryDTO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/UploadQuestionLibraryDTO.java index 59a905ec..549cf863 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/UploadQuestionLibraryDTO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/UploadQuestionLibraryDTO.java @@ -58,7 +58,7 @@ public class UploadQuestionLibraryDTO { public void doAction(List questionLibraryList, List questionTypeDicList){ this.absentCheck(); this.matchQuestion(questionLibraryList); - this.matchQuestionDicId(questionTypeDicList); + //this.matchQuestionDicId(questionTypeDicList); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java index d7f98578..7a0216a4 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java @@ -222,8 +222,8 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa // 查询问题库问题 List questionLibraryList = askTemplateQuestionLibraryService.list(); // 查询类目字段 - List questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list(); - uploadQuestionLibraryDTOS.forEach(dto->dto.doAction(questionLibraryList,questionTypeDicList)); + //List questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list(); + uploadQuestionLibraryDTOS.forEach(dto->dto.doAction(questionLibraryList,CollUtil.newArrayList())); } /** diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java index 23a01bbe..91999c1d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java @@ -94,10 +94,10 @@ public class OfflineAnswerVideoResource implements AnswerVideoResourceService { // 查询资源库资源 List materialLibraryList = materialLibraryService.list(); // 查询类目字段 - List questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list(); + //List questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list(); medicalRecAnswerExcelDTOS.forEach(dto->dto.doAction( - questionLibraryList,askPatientAnswerList,materialLibraryList,questionTypeDicList)); + questionLibraryList,askPatientAnswerList,materialLibraryList,CollUtil.newArrayList())); } public void updateAskPatientAnswer(List medicalRecAnswerExcelDTOS,String medicalId){