From 898fb904071793488c48e2e92c4e1cb40239b7b5 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Tue, 6 Feb 2024 11:14:07 +0800
Subject: [PATCH] =?UTF-8?q?web:=E4=BF=AE=E6=94=B9vp=5Fconfig=5Fdrug?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/dto/MedicalRecAnswerExcelDTO.java  | 23 +++++++++++--------
 .../manage/dto/UploadQuestionLibraryDTO.java  | 21 +++++++++++++----
 .../impl/OfflineAnswerVideoResource.java      |  4 ++--
 3 files changed, 33 insertions(+), 15 deletions(-)

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 0f371f8e..f05c5714 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
@@ -97,7 +97,7 @@ public class MedicalRecAnswerExcelDTO {
         this.matchQuestion(questionLibraryList);
         this.matchAskPatientAnswer(askPatientAnswerList);
         this.matchAnswerResource(materialLibraryList);
-        //this.matchQuestionDicId(questionTypeDicList);
+        this.matchQuestionDicId(questionTypeDicList);
     }
 
     public AskPatientAnswer toAskPatientAnswer(){
@@ -210,23 +210,28 @@ public class MedicalRecAnswerExcelDTO {
         errorCodeEnums.add(ErrorCodeEnum.ANSWER_VIDEO_NAME_NOT_FIND);
     }
 
-    public void matchQuestionDicId(List<CommonDic> questionTypeDicList){
-        if (StrUtil.isEmpty(this.questionTypeTwo)){
+    public void matchQuestionDicId(List<CommonDic> questionTypeDicList) {
+        if (StrUtil.isEmpty(this.questionTypeTwo) || StrUtil.isEmpty(questionTypeOne)) {
             return;
         }
-        if(CollUtil.isEmpty(questionTypeDicList)){
-            errorCodeEnums.add(ErrorCodeEnum.DICE_NOT_FIND);
-        }
 
         for (CommonDic questionTypeDic : questionTypeDicList) {
-            if (this.questionTypeTwo.equals(questionTypeDic.getNameZh())){
-                // todo:再次校验questionTypeOne是否正确
+            if (this.questionTypeTwo.equals(questionTypeDic.getNameZh())) {
+                String nameZhPath = questionTypeDic.getNameZhPath();
+                if (StrUtil.isEmpty(nameZhPath)) {
+                    continue;
+                }
+                // 一共两个级别
+                List<String> split = StrUtil.split(nameZhPath, "/");
+                if (!this.questionTypeOne.equals(CollUtil.getFirst(split))) {
+                    // 如果类目一匹配不正确，也不进行处理
+                    continue;
+                }
                 this.dictId = String.valueOf(questionTypeDic.getId());
                 this.dictNamePath = questionTypeDic.getNameZhPath();
                 return;
             }
         }
-        errorCodeEnums.add(ErrorCodeEnum.DICE_NOT_FIND);
     }
 
 
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 549cf863..03de70b5 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<AskTemplateQuestionLibrary> questionLibraryList, List<CommonDic> questionTypeDicList){
         this.absentCheck();
         this.matchQuestion(questionLibraryList);
-        //this.matchQuestionDicId(questionTypeDicList);
+        this.matchQuestionDicId(questionTypeDicList);
     }
 
 
@@ -115,9 +115,6 @@ public class UploadQuestionLibraryDTO {
         if (StrUtil.isEmpty(this.questionTypeTwo)){
             return;
         }
-        if(CollUtil.isEmpty(questionTypeDicList)){
-            errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.DICE_NOT_FIND);
-        }
 
         for (CommonDic questionTypeDic : questionTypeDicList) {
             if (this.questionTypeTwo.equals(questionTypeDic.getNameZh())){
@@ -125,6 +122,22 @@ public class UploadQuestionLibraryDTO {
                 return;
             }
         }
+        for (CommonDic questionTypeDic : questionTypeDicList) {
+            if (this.questionTypeTwo.equals(questionTypeDic.getNameZh())) {
+                String nameZhPath = questionTypeDic.getNameZhPath();
+                if (StrUtil.isEmpty(nameZhPath)) {
+                    continue;
+                }
+                // 一共两个级别
+                List<String> split = StrUtil.split(nameZhPath, "/");
+                if (!this.questionTypeOne.equals(CollUtil.getFirst(split))) {
+                    // 如果类目一匹配不正确，也不进行处理
+                    continue;
+                }
+                this.dictId = String.valueOf(questionTypeDic.getId());
+                return;
+            }
+        }
     }
 
 
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 0a726035..bf582077 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<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,CollUtil.newArrayList()));
+                questionLibraryList,askPatientAnswerList,materialLibraryList,questionTypeDicList));
     }
 
     public void updateAskPatientAnswer(List<MedicalRecAnswerExcelDTO> medicalRecAnswerExcelDTOS,String medicalId){