manage : fix 知识库导入

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

@@ -57,7 +57,7 @@ public class UploadQuestionLibraryDTO {
 
     public void doAction(List<AskTemplateQuestionLibrary> questionLibraryList, List<CommonDic> questionTypeDicList){
         this.absentCheck();
-        this.matchQuestion(questionLibraryList);
+        //this.matchQuestion(questionLibraryList);
         this.matchQuestionDicId(questionTypeDicList);
     }
 
@@ -76,18 +76,18 @@ public class UploadQuestionLibraryDTO {
         return map;
     }
     public void absentCheck(){
-        /*if (StrUtil.isEmpty(questionTypeOne)){
+        if (StrUtil.isEmpty(questionTypeOne)){
             errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.QUESTION_TYPE_ONE_EMPTY);
         }
         if (StrUtil.isEmpty(questionTypeTwo)){
             errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.QUESTION_TYPE_TWO_EMPTY);
-        }*/
+        }
         if (StrUtil.isEmpty(question)){
             errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.QUESTION_EMPTY);
         }
-        if (StrUtil.isEmpty(answer)){
+        /*if (StrUtil.isEmpty(answer)){
             errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.ANSWER_EMPTY);
-        }
+        }*/
     }
 
     /**
@@ -115,12 +115,8 @@ public class UploadQuestionLibraryDTO {
         if (StrUtil.isEmpty(this.questionTypeTwo)){
             return;
         }
-
+        if(CollUtil.isEmpty(questionTypeDicList)){
-        for (CommonDic questionTypeDic : questionTypeDicList) {
+            errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.DICE_NOT_FIND);
-            if (this.questionTypeTwo.equals(questionTypeDic.getNameZh())){
-                this.dictId = String.valueOf(questionTypeDic.getId());
-                return;
-            }
         }
         for (CommonDic questionTypeDic : questionTypeDicList) {
             if (this.questionTypeTwo.equals(questionTypeDic.getNameZh())) {
@@ -138,6 +134,7 @@ public class UploadQuestionLibraryDTO {
                 return;
             }
         }
+        errorCodeEnums.add(UploadQuestionLibraryDTO.ErrorCodeEnum.DICE_NOT_FIND);
     }
 
 

virtual-patient-model/src/main/resources/mapper/MaterialLibraryMapper.xml

@@ -34,7 +34,7 @@
         from vp_material_library ml
                  left join vp_directory_info di on ml.directory_id = di.id
         where 1=1
-        <if test="materialLibrary.materialType != null and materialLibrary.materialType != ''">
+        <if test="materialLibrary.materialType != null">
             and ml.material_type = #{materialLibrary.materialType}
         </if>
         <if test="materialLibrary.materialName != null and materialLibrary.materialName != ''">

virtual-patient-web/src/main/resources/sqlScript/todo.sql

@@ -5,7 +5,7 @@ alter table vp_user
 alter table vp_config_drug
     add interval_hour varchar(64) null comment '用药间隔(小时)' after interval_day;
 alter table vp_config_drug
-    modify dose decimal null comment '剂量';
+    modify dose decimal(10, 2) null comment '剂量';
 
 alter table vp_disease_ancillary
     modify result text null comment '结果';