Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icssman-service/src/main/java/com/diagbot/facade/QuestionInfoFacade.java

@@ -91,18 +91,18 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
             case "1":   //单项，例如：程度、体温
                 saveQuestionDetail(questionWrapper, param);
                 break;
-            case "2":   //组合项，例如：杂音，修改主表和mapping
-            case "3":   //组合项，例如：血压
-            case "4":   //组合项，例如：咳嗽
+            case "2":  //组合项，例如：杂音，修改主表和mapping
+            case "3":  //组合项，例如：血压
+            case "4":  //组合项，例如：咳嗽
+            case "5":  //组合项，例如：有无治疗
+            case "7":  //化验
                 saveQuestionMapping(questionWrapper, param);
                 break;
-            case "5":   //组合项，例如：有无治疗
-                break;
             case "6":  // 组合项，例如：既往史
                 break;
-            case "7":  //化验
-                break;
             case "8":  //模板专用文字,无单独维护
+            case "9":  //空标签，只维护主表信息
+            case "10": //疾病组合类型
                 break;
             default:
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请选择标签显示类型");

icssman-service/src/main/java/com/diagbot/vo/QuestionPageVO.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description: 标签列表入参
  * @Author: ztg
@@ -15,5 +17,5 @@ public class QuestionPageVO extends Page {
 
     private String type;
     private String tagName;
-    private String tagType;
+    private List<String> tagTypeList;
 }

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -107,8 +107,11 @@
         <if test="tagName != null and tagName != ''">
             AND a.name like concat ('%', #{tagName}, '%')
         </if>
-        <if test="tagType != null and tagType != ''">
-            AND a.tag_type = #{tagType}
+        <if test="tagTypeList != null and tagTypeList.size() > 0 ">
+            and a.tag_type in
+            <foreach  collection="tagTypeList" item="tagType" open="("  separator=","  close=")">
+                #{tagType}
+            </foreach>
         </if>
         order by a.gmt_create desc