智能预问诊模板新增

precman-service/src/main/java/com/diagbot/enums/TagTypeEnum.java

@@ -11,7 +11,8 @@ import lombok.Setter;
 public enum TagTypeEnum implements KeyedNamed {
     T1(1, "单项单列"),
     T4(4, "横铺多标签形式"),
-    T6(6, "组合项多列");
+    T6(6, "组合项多列"),
+    T8(8,"文字标签");
 
     @Setter
     private Integer key;

precman-service/src/main/java/com/diagbot/facade/ModuleDetailFacade.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.ModuleDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.TagTypeEnum;
 import com.diagbot.service.ModuleDetailService;
 import com.diagbot.service.QuestionInfoService;
 import com.diagbot.service.impl.ModuleDetailServiceImpl;
@@ -91,7 +92,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
         }
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_type",1 /*TagTypeEnum.T8.getKey()*/)
+                .eq("tag_type", TagTypeEnum.T8.getKey())
                 .eq("type", addModuleInfoVO.getTextType())
                 .in("name", textList);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
@@ -115,7 +116,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
                     addquestionInfo.setCreator(userId);
                     addquestionInfo.setGmtCreate(now);
                     addquestionInfo.setGmtModified(now);
-                    addquestionInfo.setTagType(1/*TagTypeEnum.T8.getKey()*/);
+                    addquestionInfo.setTagType(TagTypeEnum.T8.getKey());
                     addquestionInfo.setTagName(addModuleDetailVO.getText());
                     addquestionInfo.setName(addModuleDetailVO.getText());
                     addquestionInfo.setType(addModuleInfoVO.getTextType());
@@ -132,7 +133,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper1 = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("type", addModuleInfoVO.getTextType())
-                .eq("tag_type", 1/*TagTypeEnum.T8.getKey()*/);
+                .eq("tag_type", TagTypeEnum.T8.getKey());
         List<QuestionInfo> questionInfoList1 = questionFacade.list(questionInfoQueryWrapper1);
         if (ListUtil.isNotEmpty(questionInfoList1)) {
             for (QuestionInfo questionInfo : questionInfoList1) {

precman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -132,8 +132,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         moduleInfo.setGmtModified(now);
         moduleInfo.setType(addModulInfoVO.getType());
         moduleInfo.setModuleType(addModulInfoVO.getModuleType());
-        //当添加为科室专用模板或者慢病模板时添加关联id
-        if(addModulInfoVO.getModuleType().intValue() == 1 || addModulInfoVO.getModuleType().intValue() == 2){
+        //当添加为科室专用模板时添加关联id
+        if(addModulInfoVO.getModuleType().intValue() == 1){
             moduleInfo.setRelationId(addModulInfoVO.getRelationId());
         }
         this.save(moduleInfo);