manage： 视频上传去除类目校验

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<String> READ_ANSWER_VIDEO_TITLE = CollUtil.newArrayList("问诊类目Ⅰ", "问诊类目Ⅱ", "* 知识", "* 回答","* 视频名称");
 
@@ -83,16 +86,18 @@ public class MedicalRecAnswerExcelDTO {
                          List<AskPatientAnswer> askPatientAnswerList,
                          List<MaterialLibrary> materialLibraryList,
                          List<CommonDic> questionTypeDicList){
-        // 如果视频名称没有后缀，默认添加.mp4后缀
+
-        if (StrUtil.isNotEmpty(this.answerVideoName)
+        if (StrUtil.isNotEmpty(this.answerVideoName)){
-                && StrUtil.split(this.answerVideoName,".").size() >1){
+            List<String> split = StrUtil.split(this.answerVideoName, ".");
-            answerVideoName = answerVideoName + ".mp4";
+            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;
             }

virtual-patient-manage/src/main/java/com/supervision/manage/dto/UploadQuestionLibraryDTO.java

@@ -58,7 +58,7 @@ public class UploadQuestionLibraryDTO {
     public void doAction(List<AskTemplateQuestionLibrary> questionLibraryList, List<CommonDic> questionTypeDicList){
         this.absentCheck();
         this.matchQuestion(questionLibraryList);
-        this.matchQuestionDicId(questionTypeDicList);
+        //this.matchQuestionDicId(questionTypeDicList);
     }
 
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java

@@ -222,8 +222,8 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa
         // 查询问题库问题
         List<AskTemplateQuestionLibrary> questionLibraryList = askTemplateQuestionLibraryService.list();
         // 查询类目字段
-        List<CommonDic> questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list();
+        //List<CommonDic> questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list();
-        uploadQuestionLibraryDTOS.forEach(dto->dto.doAction(questionLibraryList,questionTypeDicList));
+        uploadQuestionLibraryDTOS.forEach(dto->dto.doAction(questionLibraryList,CollUtil.newArrayList()));
     }
 
     /**

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java

@@ -94,10 +94,10 @@ public class OfflineAnswerVideoResource implements AnswerVideoResourceService {
         // 查询资源库资源
         List<MaterialLibrary> materialLibraryList = materialLibraryService.list();
         // 查询类目字段
-        List<CommonDic> questionTypeDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list();
+        //List<CommonDic> 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<MedicalRecAnswerExcelDTO> medicalRecAnswerExcelDTOS,String medicalId){