Merge branch 'develop' into innerDevelop

aipt-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -25,7 +25,19 @@ public enum ConceptTypeEnum implements KeyedNamed {
     Scale(21, "量表"),
     Indication(22, "指标"),
     OPERATION(25, "手术"),
-    LisDetail(51, "化验明细");
+    LisDetail(51, "化验明细"),
+    GUIDELINES_OUTPATIENT(72,"诊疗指南（门诊）"),
+    GUIDELINES_HOS(73,"诊疗指南（住院）"),
+    NURSE(74,"护理"),
+    CLINICAL_PATHWAY(75,"临床路径"),
+    BLOOD(76,"血液"),
+    ANESTHESIA(77,"麻醉"),
+    TUTELAGE(78,"监护"),
+    TCM(79,"中医"),
+    THE_DIVISION_PROCESS(80,"入科流程"),
+    CENSORSHIP_RULES(81,"审查规则"),
+    E_BOOK (82,"电子书"),
+    VIDEO(83,"视频");
 
 
     @Setter

aipt-service/src/main/java/com/diagbot/util/ParamConvertUtil.java

@@ -2,7 +2,6 @@ package com.diagbot.util;
 
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
-import io.swagger.models.auth.In;
 
 /**
  * @Description:参数转换
@@ -69,6 +68,42 @@ public class ParamConvertUtil {
             case OPERATION:
                 libType = LexiconTypeEnum.OPERATION.getKey();
                 break;
+            case GUIDELINES_OUTPATIENT:
+                libType = LexiconTypeEnum.GUIDELINES_OUTPATIENT.getKey();
+                break;
+            case GUIDELINES_HOS:
+                libType = LexiconTypeEnum.GUIDELINES_HOS.getKey();
+                break;
+            case NURSE:
+                libType = LexiconTypeEnum.NURSE.getKey();
+                break;
+            case CLINICAL_PATHWAY:
+                libType = LexiconTypeEnum.CLINICAL_PATHWAY.getKey();
+                break;
+            case BLOOD:
+                libType = LexiconTypeEnum.BLOOD.getKey();
+                break;
+            case ANESTHESIA:
+                libType = LexiconTypeEnum.ANESTHESIA.getKey();
+                break;
+            case TUTELAGE:
+                libType = LexiconTypeEnum.TUTELAGE.getKey();
+                break;
+            case TCM:
+                libType = LexiconTypeEnum.TCM.getKey();
+                break;
+            case THE_DIVISION_PROCESS:
+                libType = LexiconTypeEnum.THE_DIVISION_PROCESS.getKey();
+                break;
+            case CENSORSHIP_RULES:
+                libType = LexiconTypeEnum.CENSORSHIP_RULES.getKey();
+                break;
+            case E_BOOK:
+                libType = LexiconTypeEnum.E_BOOK.getKey();
+                break;
+            case VIDEO:
+                libType = LexiconTypeEnum.VIDEO.getKey();
+                break;
             default:
                 break;
         }
@@ -151,6 +186,42 @@ public class ParamConvertUtil {
             case OPERATION:
                 type = ConceptTypeEnum.OPERATION.getKey();
                 break;
+            case GUIDELINES_OUTPATIENT:
+                type = ConceptTypeEnum.GUIDELINES_OUTPATIENT.getKey();
+                break;
+            case GUIDELINES_HOS:
+                type = ConceptTypeEnum.GUIDELINES_HOS.getKey();
+                break;
+            case NURSE:
+                type = ConceptTypeEnum.NURSE.getKey();
+                break;
+            case CLINICAL_PATHWAY:
+                type = ConceptTypeEnum.CLINICAL_PATHWAY.getKey();
+                break;
+            case BLOOD:
+                type = ConceptTypeEnum.BLOOD.getKey();
+                break;
+            case ANESTHESIA:
+                type = ConceptTypeEnum.ANESTHESIA.getKey();
+                break;
+            case TUTELAGE:
+                type = ConceptTypeEnum.TUTELAGE.getKey();
+                break;
+            case TCM:
+                type = ConceptTypeEnum.TCM.getKey();
+                break;
+            case THE_DIVISION_PROCESS:
+                type = ConceptTypeEnum.THE_DIVISION_PROCESS.getKey();
+                break;
+            case CENSORSHIP_RULES:
+                type = ConceptTypeEnum.CENSORSHIP_RULES.getKey();
+                break;
+            case E_BOOK:
+                type = ConceptTypeEnum.E_BOOK.getKey();
+                break;
+            case VIDEO:
+                type = ConceptTypeEnum.VIDEO.getKey();
+                break;
             default:
                 break;
         }

aipt-service/src/main/resources/mapper/ConceptMapper.xml

@@ -1310,6 +1310,7 @@
             CASE t6.`name`
             when '药品通用名' then '药品'
             when '辅检项目' then '辅检'
+            when '体征指标' then '体征'
             ELSE t6.`name`
             END libTypeName
             FROM
@@ -1391,6 +1392,7 @@
             CASE t6.`name`
             when '药品通用名' then '药品'
             when '辅检项目' then '辅检'
+            when '体征指标' then '体征'
             ELSE t6.`name`
             END libTypeName
             FROM
@@ -1472,6 +1474,7 @@
             CASE t6.`name`
             when '药品通用名' then '药品'
             when '辅检项目' then '辅检'
+            when '体征指标' then '体征'
             ELSE t6.`name`
             END libTypeName
             FROM

knowledgeman-service/src/main/java/com/diagbot/enums/PositionTypeEnum.java

@@ -15,9 +15,7 @@ public enum PositionTypeEnum implements KeyedNamed {
     T4(4, "手术治疗展示"),
     T5(5, "药品说明书"),
     T6(6, "不良反应"),
-    T7(7, "描述信息"),
-    T8(8, "电子书"),
-    T9(9, "视频");
+    T7(7, "描述信息");
 
     @Setter
     private int key;