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

icssman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -16,7 +16,9 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Pacs(6, "辅检"),
     Disease(7, "诊断"),
     Drug(8, "药品"),
-    DrugClass(9, "药品分类");
+    DrugClass(9, "药品分类"),
+    Scale(21, "量表"),
+    Index(22, "核心指标");
 
     @Setter
     private Integer key;

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

@@ -27,7 +27,7 @@ public class DisTypeVO implements Serializable {
 //    private Long disId;
 
     /**
-     * 1：慢病，2：急诊
+     * 0:普通病，1：慢病，2：急诊
      */
     private Integer type;
 }