浏览代码

把Integer key改成int key

gaodm 5 年之前
父节点
当前提交
978bbfa00d
共有 89 个文件被更改,包括 510 次插入530 次删除
  1. 6 7
      aipt-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java
  2. 4 4
      aipt-service/src/main/java/com/diagbot/enums/DisTypeEnum.java
  3. 4 4
      aipt-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java
  4. 23 23
      aipt-service/src/main/java/com/diagbot/enums/LexiconRSTypeEnum.java
  5. 75 75
      aipt-service/src/main/java/com/diagbot/enums/LexiconTypeEnum.java
  6. 4 4
      aipt-service/src/main/java/com/diagbot/enums/LisSourceEnum.java
  7. 4 4
      aipt-service/src/main/java/com/diagbot/enums/PositionTypeEnum.java
  8. 5 5
      aipt-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java
  9. 4 5
      aipt-service/src/main/java/com/diagbot/enums/ScaleTypeEnum.java
  10. 4 5
      aipt-service/src/main/java/com/diagbot/enums/StatusEnum.java
  11. 1 1
      common/src/main/java/com/diagbot/enums/IsDeleteEnum.java
  12. 4 4
      data-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java
  13. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/AccessTypeEnum.java
  14. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/AuditStatusEnum.java
  15. 4 4
      diagbotman-service/src/main/java/com/diagbot/enums/AuthStatusEnum.java
  16. 6 6
      diagbotman-service/src/main/java/com/diagbot/enums/CancelRenewalsEnum.java
  17. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/ChargeTypeEnum.java
  18. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/NotPassEnum.java
  19. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/PaymentMethodEnum.java
  20. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/ProductAuditEnum.java
  21. 5 5
      diagbotman-service/src/main/java/com/diagbot/enums/RenewalsEnum.java
  22. 4 4
      diagbotman-service/src/main/java/com/diagbot/enums/ServiceTypeEnum.java
  23. 4 4
      diagbotman-service/src/main/java/com/diagbot/enums/StatusEnum.java
  24. 4 4
      diagbotman-service/src/main/java/com/diagbot/enums/TokenTypeEnum.java
  25. 4 4
      diagbotman-service/src/main/java/com/diagbot/enums/TrialStatusEnum.java
  26. 4 4
      icss-service/src/main/java/com/diagbot/enums/CalculateTypeEnum.java
  27. 6 7
      icss-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java
  28. 4 4
      icss-service/src/main/java/com/diagbot/enums/ControlTypeEnum.java
  29. 4 5
      icss-service/src/main/java/com/diagbot/enums/DisTypeEnum.java
  30. 4 4
      icss-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java
  31. 6 6
      icss-service/src/main/java/com/diagbot/enums/GBControlTypeEnum.java
  32. 4 4
      icss-service/src/main/java/com/diagbot/enums/InputModeEnum.java
  33. 4 4
      icss-service/src/main/java/com/diagbot/enums/IsReasonEnum.java
  34. 5 5
      icss-service/src/main/java/com/diagbot/enums/LisSourceEnum.java
  35. 4 4
      icss-service/src/main/java/com/diagbot/enums/QualitativeTypeEnum.java
  36. 5 5
      icss-service/src/main/java/com/diagbot/enums/QuantitativeTypeEnum.java
  37. 5 5
      icss-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java
  38. 4 5
      icss-service/src/main/java/com/diagbot/enums/ScaleTypeEnum.java
  39. 5 6
      icss-service/src/main/java/com/diagbot/enums/SexTypeEnum.java
  40. 5 6
      icss-service/src/main/java/com/diagbot/enums/StatusEnum.java
  41. 4 4
      icss-service/src/main/java/com/diagbot/enums/TagTypeEnum.java
  42. 6 7
      icssman-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java
  43. 4 4
      icssman-service/src/main/java/com/diagbot/enums/ControlTypeEnum.java
  44. 4 5
      icssman-service/src/main/java/com/diagbot/enums/DisTypeEnum.java
  45. 4 5
      icssman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java
  46. 4 4
      icssman-service/src/main/java/com/diagbot/enums/IsReasonEnum.java
  47. 4 4
      icssman-service/src/main/java/com/diagbot/enums/ModuleInfoTypeEnum.java
  48. 5 5
      icssman-service/src/main/java/com/diagbot/enums/ModuleTypeEnum.java
  49. 4 4
      icssman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java
  50. 5 5
      icssman-service/src/main/java/com/diagbot/enums/QuestionUsualTypeEnum.java
  51. 5 6
      icssman-service/src/main/java/com/diagbot/enums/StatusEnum.java
  52. 4 4
      icssman-service/src/main/java/com/diagbot/enums/TagTypeEnum.java
  53. 4 4
      icssman-service/src/main/java/com/diagbot/enums/UsualEnum.java
  54. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java
  55. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseFeatureTypeEnum.java
  56. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseFieldEnum.java
  57. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseTypeEnum.java
  58. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/DisclaimerCodeEnum.java
  59. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/DiseaseClassifyEnum.java
  60. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/HasQuestionEnum.java
  61. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java
  62. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/LexiconRSTypeEnum.java
  63. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/LexiconTypeEnum.java
  64. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/PositionTypeEnum.java
  65. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/RelationModelTypeEnum.java
  66. 4 4
      knowledgeman-service/src/main/java/com/diagbot/enums/StatusEnum.java
  67. 4 5
      knowledgeman-service/src/main/java/com/diagbot/enums/TermEnum.java
  68. 4 4
      ltapi-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java
  69. 4 4
      prec-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java
  70. 4 4
      prec-service/src/main/java/com/diagbot/enums/PhysicalTypeEnum.java
  71. 5 5
      prec-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java
  72. 4 4
      prec-service/src/main/java/com/diagbot/enums/SexEnum.java
  73. 4 5
      precman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java
  74. 4 4
      precman-service/src/main/java/com/diagbot/enums/ModuleInfoTypeEnum.java
  75. 4 4
      precman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java
  76. 5 5
      precman-service/src/main/java/com/diagbot/enums/TagTypeEnum.java
  77. 5 6
      tran-service/src/main/java/com/diagbot/enums/SexTypeEnum.java
  78. 4 5
      tran-service/src/main/java/com/diagbot/enums/StatusEnum.java
  79. 4 4
      tran-service/src/main/java/com/diagbot/enums/TypeEnum.java
  80. 4 4
      triage-service/src/main/java/com/diagbot/enums/ShowTypeEnum.java
  81. 39 41
      user-service/src/main/java/com/diagbot/enums/AccdenEnum.java
  82. 6 7
      user-service/src/main/java/com/diagbot/enums/AccessTypeEnum.java
  83. 4 4
      user-service/src/main/java/com/diagbot/enums/AuthHandleEnum.java
  84. 4 4
      user-service/src/main/java/com/diagbot/enums/AuthStatusEnum.java
  85. 4 4
      user-service/src/main/java/com/diagbot/enums/ChargeTypeEnum.java
  86. 4 4
      user-service/src/main/java/com/diagbot/enums/ConstantEnum.java
  87. 4 4
      user-service/src/main/java/com/diagbot/enums/OrganizationTypeEnum.java
  88. 4 4
      user-service/src/main/java/com/diagbot/enums/RejectEnum.java
  89. 5 6
      user-service/src/main/java/com/diagbot/enums/StatusEnum.java

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

@@ -20,26 +20,25 @@ public enum ConceptTypeEnum implements KeyedNamed {
     Drug_Category_Big(9, "药品分类-大类"),
     SIDE_EFFECTS(10, "不良反应"),
     Drug_Category_Small(11, "药品分类-小类"),
-    LIS_TABLES(12,"化验公表项"),
-    DEPARTMENT(15,"科室"),
+    LIS_TABLES(12, "化验公表项"),
+    DEPARTMENT(15, "科室"),
     Scale(21, "量表"),
     Indication(22, "指标"),
     LisDetail(51, "化验明细");
 
 
-
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ConceptTypeEnum(Integer key, String name) {
+    ConceptTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ConceptTypeEnum getEnum(Integer key) {
+    public static ConceptTypeEnum getEnum(int key) {
         for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -48,7 +47,7 @@ public enum ConceptTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ConceptTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
aipt-service/src/main/java/com/diagbot/enums/DisTypeEnum.java

@@ -13,17 +13,17 @@ public enum DisTypeEnum implements KeyedNamed {
     EMERGENCY(2, "急诊");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DisTypeEnum(Integer key, String name) {
+    DisTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DisTypeEnum getEnum(Integer key) {
+    public static DisTypeEnum getEnum(int key) {
         for (DisTypeEnum item : DisTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum DisTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DisTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
aipt-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -23,17 +23,17 @@ public enum FeatureTypeEnum implements KeyedNamed {
     Feature_Type_Indication(22, "指标");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    FeatureTypeEnum(Integer key, String name) {
+    FeatureTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static FeatureTypeEnum getEnum(Integer key) {
+    public static FeatureTypeEnum getEnum(int key) {
         for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -42,7 +42,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         FeatureTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 23 - 23
aipt-service/src/main/java/com/diagbot/enums/LexiconRSTypeEnum.java

@@ -9,38 +9,38 @@ import lombok.Setter;
  * @time: 2019/5/6 13:58
  */
 public enum LexiconRSTypeEnum implements KeyedNamed {
-    IS_A(1,"是"),
-    EQUAL_TO(2,"同义于"),
-    INCLUDE_OF(3,"包含于"),
-    ASSOCIATED_WITH(4,"与相关"),
-    CAUSE(5,"引起"),
-    LOCATED_AT(6,"位于"),
-    AKA(7,"别名"),
-    INSURE_LEVEL(8,"医保"),
-    APPLIED_TO(9,"适用于"),
-    PREFERRED_MEDS(10,"首选药物"),
-    TREAT(11,"治疗"),
-    USAGE(12,"用法"),
-    REACTION(13,"不良反应"),
-    DO_AND_DONOT(14,"注意事项"),
-    SPEC(15,"规格"),
-    HAS(16,"有"),
-    ORDER_BY(17,"包含排列于"),
-    SUBITEM(18,"包含子项"),
-    PUSH(19,"推送");
+    IS_A(1, "是"),
+    EQUAL_TO(2, "同义于"),
+    INCLUDE_OF(3, "包含于"),
+    ASSOCIATED_WITH(4, "与相关"),
+    CAUSE(5, "引起"),
+    LOCATED_AT(6, "位于"),
+    AKA(7, "别名"),
+    INSURE_LEVEL(8, "医保"),
+    APPLIED_TO(9, "适用于"),
+    PREFERRED_MEDS(10, "首选药物"),
+    TREAT(11, "治疗"),
+    USAGE(12, "用法"),
+    REACTION(13, "不良反应"),
+    DO_AND_DONOT(14, "注意事项"),
+    SPEC(15, "规格"),
+    HAS(16, "有"),
+    ORDER_BY(17, "包含排列于"),
+    SUBITEM(18, "包含子项"),
+    PUSH(19, "推送");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    LexiconRSTypeEnum(Integer key, String name) {
+    LexiconRSTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static LexiconRSTypeEnum getEnum(Integer key) {
+    public static LexiconRSTypeEnum getEnum(int key) {
         for (LexiconRSTypeEnum item : LexiconRSTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -49,7 +49,7 @@ public enum LexiconRSTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         LexiconRSTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 75 - 75
aipt-service/src/main/java/com/diagbot/enums/LexiconTypeEnum.java

@@ -9,91 +9,91 @@ import lombok.Setter;
  * @time: 2019/5/6 13:58
  */
 public enum LexiconTypeEnum implements KeyedNamed {
-    SYMPTOM(1,"症状"),
-    TIME(2,"时间"),
-    BODYPART(3,"部位"),
-    NATURE(4,"性质"),
-    CAUSE(5,"诱因"),
-    DEGREE(6,"程度"),
-    NEGATIVE(7,"阴性"),
-    POSITIVE(8,"阳性"),
-    COMPANY(9,"单位"),
-    DRUGS(10,"药品通用名"),
-    TREATMENT(11,"治疗"),
-    LIS_PACKAGE(12,"化验套餐"),
-    LIS_DETAILS(13,"化验明细"),
-    LIS_RESULTS(14,"化验结果"),
-    PACS_PACKAGE(15,"辅检套餐"),
-    PACS_ITEMS(16,"辅检项目"),
-    PACS_RESULTS(17,"辅检结果"),
-    DIAGNOSIS(18,"诊断"),
-    CONNECTIVES(19,"连接词"),
-    POSITION(20,"方位"),
-    RELATIVES(21,"亲属"),
-    MARRIAGE(22,"婚姻"),
-    FOOD(23,"食品"),
-    HISTORY(24,"历史"),
-    OPERATION(25,"手术"),
-    SYMPTOM_MANIFESTATION(26,"症状表现"),
-    DIGITAL_QUANTIFIER(27,"数字量词"),
-    NUMBER(28,"数字"),
-    DRUG_CATEGORY_BIG(29,"药品大类"),
-    DRUG_CATEGORY_SMALL(30,"药品小类"),
-    PACS_CATEGORY_BIG(31,"辅检大类"),
-    PACS_CATEGORY_SMALL(32,"辅检小类"),
-    VITAL_INDEX(33,"体征指标"),
-    VITAL_INDEX_VALUE(34,"体征指标值"),
-    VITAL_RESULT(35,"体征结果"),
-    PLACE(36,"地点"),
-    OCCUPATION(37,"职业"),
-    PERSONAL_HISTORY(38,"个人史"),
-    PERSONAL_HISTORY_DESCRIPTION(39,"个人史描述"),
-    TIME_DESCRIPTION(40,"时间描述"),
-    SYMPTOM_INDEX(41,"症状指标"),
-    MEDICAL_SUPPLIES(42,"医用耗材 "),
-    DEGREE_CLASSIFIER(43,"程度量词"),
-    OTHER(44,"其他"),
-    DELETE(45,"删除"),
-    LIS_TABLES(46,"化验公表项"),
-    DEPARTMENT(47,"科室"),
-    GAUGE(48,"量表"),
-    SIDE_EFFECTS(49,"不良反应"),
-    CORE_INDICATORS(50,"核心指标"),
-    TYPES_OF_DISEASE(51,"疾病类型(慢病|急诊)"),
-    PART_AREA(52,"部位区域"),
-    LOCATION_AREA(52,"部位区域"),
-    CHEMICAL_NAME_OF_DRUG(53,"药品化学名"),
-    DRUG_TRADE_NAMES(54,"药品商品名"),
-    HISTORY_OF_PAST_DISEASES(55,"既往疾病史"),
-    HISTORY_OF_TRAUMA(56,"外伤史"),
-    HISTORY_OF_SURGERY(57,"手术史"),
-    HISTORY_OF_BLOOD_TRANSFUSION(58,"输血史"),
-    INFECTIOUS_DISEASE_HISTORY(59,"传染病史"),
-    BAD_HABITS(60,"不良习惯"),
-    MARITAL_HISTORY(61,"冶游史"),
-    HISTORY_OF_MARRIAGE_AND_CHILDBEARING(62,"婚育史"),
-    BIRTH_HISTORY(63,"生育史"),
-    FAMILY_HISTORY(64,"家族史"),
-    FOOD_ALLERGY_HISTORY(65,"食物过敏史"),
-    HISTORY_OF_DRUG_ALLERGY(66,"药物过敏史"),
-    FAMILY_RELATED_INFECTIOUS_DISEASE_HISTORY(67,"家族相关传染病史"),
-    FURTHER_CONSULTATION(68,"复诊"),
-    DIAGNOSTIC_CRITERIA(69,"诊断依据条件"),
-    OTHER_DIAGNOSTIC_CRITERIA(70,"诊断依据其他");
+    SYMPTOM(1, "症状"),
+    TIME(2, "时间"),
+    BODYPART(3, "部位"),
+    NATURE(4, "性质"),
+    CAUSE(5, "诱因"),
+    DEGREE(6, "程度"),
+    NEGATIVE(7, "阴性"),
+    POSITIVE(8, "阳性"),
+    COMPANY(9, "单位"),
+    DRUGS(10, "药品通用名"),
+    TREATMENT(11, "治疗"),
+    LIS_PACKAGE(12, "化验套餐"),
+    LIS_DETAILS(13, "化验明细"),
+    LIS_RESULTS(14, "化验结果"),
+    PACS_PACKAGE(15, "辅检套餐"),
+    PACS_ITEMS(16, "辅检项目"),
+    PACS_RESULTS(17, "辅检结果"),
+    DIAGNOSIS(18, "诊断"),
+    CONNECTIVES(19, "连接词"),
+    POSITION(20, "方位"),
+    RELATIVES(21, "亲属"),
+    MARRIAGE(22, "婚姻"),
+    FOOD(23, "食品"),
+    HISTORY(24, "历史"),
+    OPERATION(25, "手术"),
+    SYMPTOM_MANIFESTATION(26, "症状表现"),
+    DIGITAL_QUANTIFIER(27, "数字量词"),
+    NUMBER(28, "数字"),
+    DRUG_CATEGORY_BIG(29, "药品大类"),
+    DRUG_CATEGORY_SMALL(30, "药品小类"),
+    PACS_CATEGORY_BIG(31, "辅检大类"),
+    PACS_CATEGORY_SMALL(32, "辅检小类"),
+    VITAL_INDEX(33, "体征指标"),
+    VITAL_INDEX_VALUE(34, "体征指标值"),
+    VITAL_RESULT(35, "体征结果"),
+    PLACE(36, "地点"),
+    OCCUPATION(37, "职业"),
+    PERSONAL_HISTORY(38, "个人史"),
+    PERSONAL_HISTORY_DESCRIPTION(39, "个人史描述"),
+    TIME_DESCRIPTION(40, "时间描述"),
+    SYMPTOM_INDEX(41, "症状指标"),
+    MEDICAL_SUPPLIES(42, "医用耗材 "),
+    DEGREE_CLASSIFIER(43, "程度量词"),
+    OTHER(44, "其他"),
+    DELETE(45, "删除"),
+    LIS_TABLES(46, "化验公表项"),
+    DEPARTMENT(47, "科室"),
+    GAUGE(48, "量表"),
+    SIDE_EFFECTS(49, "不良反应"),
+    CORE_INDICATORS(50, "核心指标"),
+    TYPES_OF_DISEASE(51, "疾病类型(慢病|急诊)"),
+    PART_AREA(52, "部位区域"),
+    LOCATION_AREA(52, "部位区域"),
+    CHEMICAL_NAME_OF_DRUG(53, "药品化学名"),
+    DRUG_TRADE_NAMES(54, "药品商品名"),
+    HISTORY_OF_PAST_DISEASES(55, "既往疾病史"),
+    HISTORY_OF_TRAUMA(56, "外伤史"),
+    HISTORY_OF_SURGERY(57, "手术史"),
+    HISTORY_OF_BLOOD_TRANSFUSION(58, "输血史"),
+    INFECTIOUS_DISEASE_HISTORY(59, "传染病史"),
+    BAD_HABITS(60, "不良习惯"),
+    MARITAL_HISTORY(61, "冶游史"),
+    HISTORY_OF_MARRIAGE_AND_CHILDBEARING(62, "婚育史"),
+    BIRTH_HISTORY(63, "生育史"),
+    FAMILY_HISTORY(64, "家族史"),
+    FOOD_ALLERGY_HISTORY(65, "食物过敏史"),
+    HISTORY_OF_DRUG_ALLERGY(66, "药物过敏史"),
+    FAMILY_RELATED_INFECTIOUS_DISEASE_HISTORY(67, "家族相关传染病史"),
+    FURTHER_CONSULTATION(68, "复诊"),
+    DIAGNOSTIC_CRITERIA(69, "诊断依据条件"),
+    OTHER_DIAGNOSTIC_CRITERIA(70, "诊断依据其他");
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    LexiconTypeEnum(Integer key, String name) {
+    LexiconTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static LexiconTypeEnum getEnum(Integer key) {
+    public static LexiconTypeEnum getEnum(int key) {
         for (LexiconTypeEnum item : LexiconTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -102,7 +102,7 @@ public enum LexiconTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         LexiconTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
aipt-service/src/main/java/com/diagbot/enums/LisSourceEnum.java

@@ -13,17 +13,17 @@ public enum LisSourceEnum implements KeyedNamed {
     Outer(1, "外部");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    LisSourceEnum(Integer key, String name) {
+    LisSourceEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static LisSourceEnum getEnum(Integer key) {
+    public static LisSourceEnum getEnum(int key) {
         for (LisSourceEnum item : LisSourceEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum LisSourceEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         LisSourceEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
aipt-service/src/main/java/com/diagbot/enums/PositionTypeEnum.java

@@ -18,17 +18,17 @@ public enum PositionTypeEnum implements KeyedNamed {
     T7(7, "描述信息");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    PositionTypeEnum(Integer key, String name) {
+    PositionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static PositionTypeEnum getEnum(Integer key) {
+    public static PositionTypeEnum getEnum(int key) {
         for (PositionTypeEnum item : PositionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -37,7 +37,7 @@ public enum PositionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         PositionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
aipt-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -17,22 +17,22 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Disease(7, "诊断"),
     Drug(8, "药品"),
     DrugClass(9, "药品分类"),
-    AdverseReaction(10,"不良反应"),
+    AdverseReaction(10, "不良反应"),
     Scale(21, "量表"),
     MedicalIndication(22, "推送指标");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuestionTypeEnum(Integer key, String name) {
+    QuestionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuestionTypeEnum getEnum(Integer key) {
+    public static QuestionTypeEnum getEnum(int key) {
         for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum QuestionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuestionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
aipt-service/src/main/java/com/diagbot/enums/ScaleTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description: 诊断类型
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum ScaleTypeEnum implements KeyedNamed {
     PUSH(1, "推理");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ScaleTypeEnum(Integer key, String name) {
+    ScaleTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ScaleTypeEnum getEnum(Integer key) {
+    public static ScaleTypeEnum getEnum(int key) {
         for (ScaleTypeEnum item : ScaleTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum ScaleTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ScaleTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
aipt-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 1 - 1
common/src/main/java/com/diagbot/enums/IsDeleteEnum.java

@@ -28,7 +28,7 @@ public enum IsDeleteEnum {
 
     public static IsDeleteEnum getEnum(String key) {
         for (IsDeleteEnum item : IsDeleteEnum.values()) {
-            if (item.key == key) {
+            if (item.key.equals(key)) {
                 return item;
             }
         }

+ 4 - 4
data-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -22,17 +22,17 @@ public enum FeatureTypeEnum implements KeyedNamed {
     ManagementEvaluation(11, "管理评估");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    FeatureTypeEnum(Integer key, String name) {
+    FeatureTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static FeatureTypeEnum getEnum(Integer key) {
+    public static FeatureTypeEnum getEnum(int key) {
         for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         FeatureTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/AccessTypeEnum.java

@@ -9,22 +9,22 @@ import lombok.Setter;
  * @time: 11:06 2018/9/27
  */
 public enum AccessTypeEnum implements KeyedNamed {
-    Online(1,"线上模式"),
+    Online(1, "线上模式"),
     Embedded(3, "嵌入式"),
     InterfaceType(2, "接口方式");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    AccessTypeEnum(Integer key, String name) {
+    AccessTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AccessTypeEnum getEnum(Integer key) {
+    public static AccessTypeEnum getEnum(int key) {
         for (AccessTypeEnum item : AccessTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum AccessTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         AccessTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/AuditStatusEnum.java

@@ -13,20 +13,20 @@ public enum AuditStatusEnum implements KeyedNamed {
     Adopt(1, "通过"),
     NotAudit(2, "待审核"),
     Adopt_Part(3, "部分通过"),
-    Audit_Part(4,"部分审核");
+    Audit_Part(4, "部分审核");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    AuditStatusEnum(Integer key, String name) {
+    AuditStatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AuditStatusEnum getEnum(Integer key) {
+    public static AuditStatusEnum getEnum(int key) {
         for (AuditStatusEnum item : AuditStatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -35,7 +35,7 @@ public enum AuditStatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         AuditStatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
diagbotman-service/src/main/java/com/diagbot/enums/AuthStatusEnum.java

@@ -15,17 +15,17 @@ public enum AuthStatusEnum implements KeyedNamed {
     Authorizing(2, "认证中");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    AuthStatusEnum(Integer key, String name) {
+    AuthStatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AuthStatusEnum getEnum(Integer key) {
+    public static AuthStatusEnum getEnum(int key) {
         for (AuthStatusEnum item : AuthStatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +34,7 @@ public enum AuthStatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         AuthStatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 6 - 6
diagbotman-service/src/main/java/com/diagbot/enums/CancelRenewalsEnum.java

@@ -4,26 +4,26 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * @Description: 
+ * @Description:
  * @Author: wangyu
  * @Date: 13:07 2018/10/18
  */
 public enum CancelRenewalsEnum implements KeyedNamed {
-    CANCEL_RENEWALS_ENUM(1,"取消"),
+    CANCEL_RENEWALS_ENUM(1, "取消"),
     NOT_CANCEL(0, "未取消");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    CancelRenewalsEnum(Integer key, String name) {
+    CancelRenewalsEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static CancelRenewalsEnum getEnum(Integer key) {
+    public static CancelRenewalsEnum getEnum(int key) {
         for (CancelRenewalsEnum item : CancelRenewalsEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum CancelRenewalsEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         CancelRenewalsEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/ChargeTypeEnum.java

@@ -11,20 +11,20 @@ import lombok.Setter;
 public enum ChargeTypeEnum implements KeyedNamed {
     ByFlow(1, "按流程计费"),
     ByOrginations(2, "按机构计费"),
-    ByUser(3,"按用户计费");
+    ByUser(3, "按用户计费");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ChargeTypeEnum(Integer key, String name) {
+    ChargeTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ChargeTypeEnum getEnum(Integer key) {
+    public static ChargeTypeEnum getEnum(int key) {
         for (ChargeTypeEnum item : ChargeTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum ChargeTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ChargeTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/NotPassEnum.java

@@ -11,20 +11,20 @@ import lombok.Setter;
 public enum NotPassEnum implements KeyedNamed {
     ImperfectInformation(1, "产品即将升级"),
     AgencyError(2, "付款异常"),
-    CancellationOfOrder(3,"取消购买");
+    CancellationOfOrder(3, "取消购买");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    NotPassEnum(Integer key, String name) {
+    NotPassEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static NotPassEnum getEnum(Integer key) {
+    public static NotPassEnum getEnum(int key) {
         for (NotPassEnum item : NotPassEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum NotPassEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         NotPassEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/PaymentMethodEnum.java

@@ -9,21 +9,21 @@ import lombok.Setter;
  * @time: 11:06 2018/9/27
  */
 public enum PaymentMethodEnum implements KeyedNamed {
-    PAY(1,"已付款"),
+    PAY(1, "已付款"),
     NOT_PAY(0, "未付款");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    PaymentMethodEnum(Integer key, String name) {
+    PaymentMethodEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static PaymentMethodEnum getEnum(Integer key) {
+    public static PaymentMethodEnum getEnum(int key) {
         for (PaymentMethodEnum item : PaymentMethodEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum PaymentMethodEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         PaymentMethodEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/ProductAuditEnum.java

@@ -9,22 +9,22 @@ import lombok.Setter;
  * @time: 11:06 2018/9/27
  */
 public enum ProductAuditEnum implements KeyedNamed {
-    Opended(1,"已开通"),
+    Opended(1, "已开通"),
     Audit(2, "开通中"),
     NotOpend(0, "未开通");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ProductAuditEnum(Integer key, String name) {
+    ProductAuditEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ProductAuditEnum getEnum(Integer key) {
+    public static ProductAuditEnum getEnum(int key) {
         for (ProductAuditEnum item : ProductAuditEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum ProductAuditEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ProductAuditEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
diagbotman-service/src/main/java/com/diagbot/enums/RenewalsEnum.java

@@ -9,21 +9,21 @@ import lombok.Setter;
  * @time: 11:06 2018/9/27
  */
 public enum RenewalsEnum implements KeyedNamed {
-    RENEWALS(1,"已续费"),
+    RENEWALS(1, "已续费"),
     NOT_RENEWALS(0, "未续费");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    RenewalsEnum(Integer key, String name) {
+    RenewalsEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static RenewalsEnum getEnum(Integer key) {
+    public static RenewalsEnum getEnum(int key) {
         for (RenewalsEnum item : RenewalsEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum RenewalsEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         RenewalsEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
diagbotman-service/src/main/java/com/diagbot/enums/ServiceTypeEnum.java

@@ -13,17 +13,17 @@ public enum ServiceTypeEnum implements KeyedNamed {
     Sys_Create(2, "系统生成");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ServiceTypeEnum(Integer key, String name) {
+    ServiceTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ServiceTypeEnum getEnum(Integer key) {
+    public static ServiceTypeEnum getEnum(int key) {
         for (ServiceTypeEnum item : ServiceTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum ServiceTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ServiceTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
diagbotman-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -13,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
diagbotman-service/src/main/java/com/diagbot/enums/TokenTypeEnum.java

@@ -14,17 +14,17 @@ public enum TokenTypeEnum implements KeyedNamed {
     Trial(3, "试用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TokenTypeEnum(Integer key, String name) {
+    TokenTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TokenTypeEnum getEnum(Integer key) {
+    public static TokenTypeEnum getEnum(int key) {
         for (TokenTypeEnum item : TokenTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum TokenTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TokenTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
diagbotman-service/src/main/java/com/diagbot/enums/TrialStatusEnum.java

@@ -13,17 +13,17 @@ public enum TrialStatusEnum implements KeyedNamed {
     OnTrial(1, "是");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TrialStatusEnum(Integer key, String name) {
+    TrialStatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TrialStatusEnum getEnum(Integer key) {
+    public static TrialStatusEnum getEnum(int key) {
         for (TrialStatusEnum item : TrialStatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum TrialStatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TrialStatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/CalculateTypeEnum.java

@@ -13,17 +13,17 @@ public enum CalculateTypeEnum implements KeyedNamed {
     Formula(11, "公式计算");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    CalculateTypeEnum(Integer key, String name) {
+    CalculateTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static CalculateTypeEnum getEnum(Integer key) {
+    public static CalculateTypeEnum getEnum(int key) {
         for (CalculateTypeEnum item : CalculateTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum CalculateTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         CalculateTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 6 - 7
icss-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -20,26 +20,25 @@ public enum ConceptTypeEnum implements KeyedNamed {
     Drug_Category_Big(9, "药品分类-大类"),
     SIDE_EFFECTS(10, "不良反应"),
     Drug_Category_Small(11, "药品分类-小类"),
-    LIS_TABLES(12,"化验公表项"),
-    DEPARTMENT(15,"科室"),
+    LIS_TABLES(12, "化验公表项"),
+    DEPARTMENT(15, "科室"),
     Scale(21, "量表"),
     Indication(22, "指标"),
     LisDetail(51, "化验明细");
 
 
-
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ConceptTypeEnum(Integer key, String name) {
+    ConceptTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ConceptTypeEnum getEnum(Integer key) {
+    public static ConceptTypeEnum getEnum(int key) {
         for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -48,7 +47,7 @@ public enum ConceptTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ConceptTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/ControlTypeEnum.java

@@ -13,17 +13,17 @@ public enum ControlTypeEnum implements KeyedNamed {
     EMPTY_TAG(0, "空标签");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ControlTypeEnum(Integer key, String name) {
+    ControlTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ControlTypeEnum getEnum(Integer key) {
+    public static ControlTypeEnum getEnum(int key) {
         for (ControlTypeEnum item : ControlTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum ControlTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ControlTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
icss-service/src/main/java/com/diagbot/enums/DisTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description: 诊断类型
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum DisTypeEnum implements KeyedNamed {
     EMERGENCY(2, "急诊");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DisTypeEnum(Integer key, String name) {
+    DisTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DisTypeEnum getEnum(Integer key) {
+    public static DisTypeEnum getEnum(int key) {
         for (DisTypeEnum item : DisTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum DisTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DisTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -23,17 +23,17 @@ public enum FeatureTypeEnum implements KeyedNamed {
     ManagementEvaluation(11, "管理评估");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    FeatureTypeEnum(Integer key, String name) {
+    FeatureTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static FeatureTypeEnum getEnum(Integer key) {
+    public static FeatureTypeEnum getEnum(int key) {
         for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -42,7 +42,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         FeatureTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 6 - 6
icss-service/src/main/java/com/diagbot/enums/GBControlTypeEnum.java

@@ -11,21 +11,21 @@ import lombok.Setter;
 public enum GBControlTypeEnum implements KeyedNamed {
     Radio(0, "单选"),
     CheckBox(1, "多选"),
-    Text(2,"文本"),
-    Dropdownlist(3,"下拉列表");
+    Text(2, "文本"),
+    Dropdownlist(3, "下拉列表");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    GBControlTypeEnum(Integer key, String name) {
+    GBControlTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static GBControlTypeEnum getEnum(Integer key) {
+    public static GBControlTypeEnum getEnum(int key) {
         for (GBControlTypeEnum item : GBControlTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +34,7 @@ public enum GBControlTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         GBControlTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/InputModeEnum.java

@@ -13,17 +13,17 @@ public enum InputModeEnum implements KeyedNamed {
     Text(2, "文本");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    InputModeEnum(Integer key, String name) {
+    InputModeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static InputModeEnum getEnum(Integer key) {
+    public static InputModeEnum getEnum(int key) {
         for (InputModeEnum item : InputModeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum InputModeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         InputModeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/IsReasonEnum.java

@@ -14,17 +14,17 @@ public enum IsReasonEnum implements KeyedNamed {
     Yes(1, "是");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    IsReasonEnum(Integer key, String name) {
+    IsReasonEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static IsReasonEnum getEnum(Integer key) {
+    public static IsReasonEnum getEnum(int key) {
         for (IsReasonEnum item : IsReasonEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum IsReasonEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         IsReasonEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
icss-service/src/main/java/com/diagbot/enums/LisSourceEnum.java

@@ -8,22 +8,22 @@ import lombok.Setter;
  * @Author:zhaops
  * @time: 2018/12/26 16:37
  */
-public enum LisSourceEnum  implements KeyedNamed {
+public enum LisSourceEnum implements KeyedNamed {
     Inner(0, "ICSS-内部"),
     Outer(1, "外部");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    LisSourceEnum(Integer key, String name) {
+    LisSourceEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static LisSourceEnum getEnum(Integer key) {
+    public static LisSourceEnum getEnum(int key) {
         for (LisSourceEnum item : LisSourceEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum LisSourceEnum  implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         LisSourceEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/QualitativeTypeEnum.java

@@ -13,17 +13,17 @@ public enum QualitativeTypeEnum implements KeyedNamed {
     Positive(1, "阳性");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QualitativeTypeEnum(Integer key, String name) {
+    QualitativeTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QualitativeTypeEnum getEnum(Integer key) {
+    public static QualitativeTypeEnum getEnum(int key) {
         for (QualitativeTypeEnum item : QualitativeTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum QualitativeTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QualitativeTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
icss-service/src/main/java/com/diagbot/enums/QuantitativeTypeEnum.java

@@ -8,24 +8,24 @@ import lombok.Setter;
  * @Author:zhaops
  * @time: 2018/11/26 17:42
  */
-public enum  QuantitativeTypeEnum implements KeyedNamed {
+public enum QuantitativeTypeEnum implements KeyedNamed {
     Normal(0, "正常"),
     Up(1, "升高"),
     Down(2, "降低");
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuantitativeTypeEnum(Integer key, String name) {
+    QuantitativeTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuantitativeTypeEnum getEnum(Integer key) {
+    public static QuantitativeTypeEnum getEnum(int key) {
         for (QuantitativeTypeEnum item : QuantitativeTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +34,7 @@ public enum  QuantitativeTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuantitativeTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
icss-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -17,22 +17,22 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Disease(7, "诊断"),
     Drug(8, "药品"),
     DrugClass(9, "药品分类"),
-    AdverseReaction(10,"不良反应"),
+    AdverseReaction(10, "不良反应"),
     Scale(21, "量表"),
     MedicalIndication(22, "推送指标");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuestionTypeEnum(Integer key, String name) {
+    QuestionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuestionTypeEnum getEnum(Integer key) {
+    public static QuestionTypeEnum getEnum(int key) {
         for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum QuestionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuestionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
icss-service/src/main/java/com/diagbot/enums/ScaleTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description: 诊断类型
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum ScaleTypeEnum implements KeyedNamed {
     PUSH(1, "推理");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ScaleTypeEnum(Integer key, String name) {
+    ScaleTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ScaleTypeEnum getEnum(Integer key) {
+    public static ScaleTypeEnum getEnum(int key) {
         for (ScaleTypeEnum item : ScaleTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum ScaleTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ScaleTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 6
icss-service/src/main/java/com/diagbot/enums/SexTypeEnum.java

@@ -1,10 +1,9 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
+
 /**
- * 
  * @author rgb
  * @Description: TODO
  * @date 2018年12月11日 下午2:31:42
@@ -14,17 +13,17 @@ public enum SexTypeEnum implements KeyedNamed {
     Enable(2, "女");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    SexTypeEnum(Integer key, String name) {
+    SexTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static SexTypeEnum getEnum(Integer key) {
+    public static SexTypeEnum getEnum(int key) {
         for (SexTypeEnum item : SexTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum SexTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         SexTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 6
icss-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -1,10 +1,9 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
+
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icss-service/src/main/java/com/diagbot/enums/TagTypeEnum.java

@@ -23,17 +23,17 @@ public enum TagTypeEnum implements KeyedNamed {
     T11(11, "推送类型");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TagTypeEnum(Integer key, String name) {
+    TagTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TagTypeEnum getEnum(Integer key) {
+    public static TagTypeEnum getEnum(int key) {
         for (TagTypeEnum item : TagTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -42,7 +42,7 @@ public enum TagTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TagTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 6 - 7
icssman-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -20,26 +20,25 @@ public enum ConceptTypeEnum implements KeyedNamed {
     Drug_Category_Big(9, "药品分类-大类"),
     SIDE_EFFECTS(10, "不良反应"),
     Drug_Category_Small(11, "药品分类-小类"),
-    LIS_TABLES(12,"化验公表项"),
-    DEPARTMENT(15,"科室"),
+    LIS_TABLES(12, "化验公表项"),
+    DEPARTMENT(15, "科室"),
     Scale(21, "量表"),
     Indication(22, "指标"),
     LisDetail(51, "化验明细");
 
 
-
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ConceptTypeEnum(Integer key, String name) {
+    ConceptTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ConceptTypeEnum getEnum(Integer key) {
+    public static ConceptTypeEnum getEnum(int key) {
         for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -48,7 +47,7 @@ public enum ConceptTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ConceptTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icssman-service/src/main/java/com/diagbot/enums/ControlTypeEnum.java

@@ -20,17 +20,17 @@ public enum ControlTypeEnum implements KeyedNamed {
     CONTROLTYPE_99(99, "联合推送");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ControlTypeEnum(Integer key, String name) {
+    ControlTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ControlTypeEnum getEnum(Integer key) {
+    public static ControlTypeEnum getEnum(int key) {
         for (ControlTypeEnum item : ControlTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -39,7 +39,7 @@ public enum ControlTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ControlTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
icssman-service/src/main/java/com/diagbot/enums/DisTypeEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author zhoutg
  * @Description: 诊断类型
  * @date 2018年11月21日 下午2:31:42
@@ -15,17 +14,17 @@ public enum DisTypeEnum implements KeyedNamed {
     EMERGENCY(2, "急诊");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DisTypeEnum(Integer key, String name) {
+    DisTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DisTypeEnum getEnum(Integer key) {
+    public static DisTypeEnum getEnum(int key) {
         for (DisTypeEnum item : DisTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +33,7 @@ public enum DisTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DisTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
icssman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum InsertOrUpdateEnum implements KeyedNamed {
     Update(2, "修改");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    InsertOrUpdateEnum(Integer key, String name) {
+    InsertOrUpdateEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static InsertOrUpdateEnum getEnum(Integer key) {
+    public static InsertOrUpdateEnum getEnum(int key) {
         for (InsertOrUpdateEnum item : InsertOrUpdateEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum InsertOrUpdateEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         InsertOrUpdateEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icssman-service/src/main/java/com/diagbot/enums/IsReasonEnum.java

@@ -14,17 +14,17 @@ public enum IsReasonEnum implements KeyedNamed {
     Yes(1, "是");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    IsReasonEnum(Integer key, String name) {
+    IsReasonEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static IsReasonEnum getEnum(Integer key) {
+    public static IsReasonEnum getEnum(int key) {
         for (IsReasonEnum item : IsReasonEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum IsReasonEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         IsReasonEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icssman-service/src/main/java/com/diagbot/enums/ModuleInfoTypeEnum.java

@@ -13,17 +13,17 @@ public enum ModuleInfoTypeEnum implements KeyedNamed {
     ByDept(1, "根据科室划分"),
     ByDis(2, "慢病");
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ModuleInfoTypeEnum(Integer key, String name) {
+    ModuleInfoTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ModuleInfoTypeEnum getEnum(Integer key) {
+    public static ModuleInfoTypeEnum getEnum(int key) {
         for (ModuleInfoTypeEnum item : ModuleInfoTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum ModuleInfoTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ModuleInfoTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
icssman-service/src/main/java/com/diagbot/enums/ModuleTypeEnum.java

@@ -4,7 +4,7 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * @Description: 
+ * @Description:
  * @Author: wangyu
  * @Date: 13:41 2019/3/28
  */
@@ -16,17 +16,17 @@ public enum ModuleTypeEnum implements KeyedNamed {
     Nesting(5, "嵌套模板");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ModuleTypeEnum(Integer key, String name) {
+    ModuleTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ModuleTypeEnum getEnum(Integer key) {
+    public static ModuleTypeEnum getEnum(int key) {
         for (ModuleTypeEnum item : ModuleTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -35,7 +35,7 @@ public enum ModuleTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ModuleTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

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

@@ -22,17 +22,17 @@ public enum QuestionTypeEnum implements KeyedNamed {
     LisDetail(51, "化验明细");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuestionTypeEnum(Integer key, String name) {
+    QuestionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuestionTypeEnum getEnum(Integer key) {
+    public static QuestionTypeEnum getEnum(int key) {
         for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum QuestionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuestionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
icssman-service/src/main/java/com/diagbot/enums/QuestionUsualTypeEnum.java

@@ -4,7 +4,7 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * @Description: 
+ * @Description:
  * @Author: wangyu
  * @Date: 13:41 2019/3/28
  */
@@ -14,17 +14,17 @@ public enum QuestionUsualTypeEnum implements KeyedNamed {
     Pacs(6, "辅检");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuestionUsualTypeEnum(Integer key, String name) {
+    QuestionUsualTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuestionUsualTypeEnum getEnum(Integer key) {
+    public static QuestionUsualTypeEnum getEnum(int key) {
         for (QuestionUsualTypeEnum item : QuestionUsualTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum QuestionUsualTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuestionUsualTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 6
icssman-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -1,10 +1,9 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
+
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icssman-service/src/main/java/com/diagbot/enums/TagTypeEnum.java

@@ -22,17 +22,17 @@ public enum TagTypeEnum implements KeyedNamed {
     T11(11, "推送类型");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TagTypeEnum(Integer key, String name) {
+    TagTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TagTypeEnum getEnum(Integer key) {
+    public static TagTypeEnum getEnum(int key) {
         for (TagTypeEnum item : TagTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum TagTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TagTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
icssman-service/src/main/java/com/diagbot/enums/UsualEnum.java

@@ -13,17 +13,17 @@ public enum UsualEnum implements KeyedNamed {
     Enable(1, "常用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    UsualEnum(Integer key, String name) {
+    UsualEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static UsualEnum getEnum(Integer key) {
+    public static UsualEnum getEnum(int key) {
         for (UsualEnum item : UsualEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum UsualEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         UsualEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -28,17 +28,17 @@ public enum ConceptTypeEnum implements KeyedNamed {
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ConceptTypeEnum(Integer key, String name) {
+    ConceptTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ConceptTypeEnum getEnum(Integer key) {
+    public static ConceptTypeEnum getEnum(int key) {
         for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -47,7 +47,7 @@ public enum ConceptTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ConceptTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseFeatureTypeEnum.java

@@ -22,17 +22,17 @@ public enum DiagnoseFeatureTypeEnum implements KeyedNamed {
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DiagnoseFeatureTypeEnum(Integer key, String name) {
+    DiagnoseFeatureTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DiagnoseFeatureTypeEnum getEnum(Integer key) {
+    public static DiagnoseFeatureTypeEnum getEnum(int key) {
         for (DiagnoseFeatureTypeEnum item : DiagnoseFeatureTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum DiagnoseFeatureTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DiagnoseFeatureTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseFieldEnum.java

@@ -16,17 +16,17 @@ public enum DiagnoseFieldEnum implements KeyedNamed {
     disName(5, "诊断名称");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DiagnoseFieldEnum(Integer key, String name) {
+    DiagnoseFieldEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DiagnoseFieldEnum getEnum(Integer key) {
+    public static DiagnoseFieldEnum getEnum(int key) {
         for (DiagnoseFieldEnum item : DiagnoseFieldEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -35,7 +35,7 @@ public enum DiagnoseFieldEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DiagnoseFieldEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/DiagnoseTypeEnum.java

@@ -16,17 +16,17 @@ public enum DiagnoseTypeEnum implements KeyedNamed {
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DiagnoseTypeEnum(Integer key, String name) {
+    DiagnoseTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DiagnoseTypeEnum getEnum(Integer key) {
+    public static DiagnoseTypeEnum getEnum(int key) {
         for (DiagnoseTypeEnum item : DiagnoseTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -35,7 +35,7 @@ public enum DiagnoseTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DiagnoseTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/DisclaimerCodeEnum.java

@@ -10,17 +10,17 @@ public enum DisclaimerCodeEnum implements KeyedNamed {
     Disclaimer(3, "免责声明");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DisclaimerCodeEnum(Integer key, String name) {
+    DisclaimerCodeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DisclaimerCodeEnum getEnum(Integer key) {
+    public static DisclaimerCodeEnum getEnum(int key) {
         for (DisclaimerCodeEnum item : DisclaimerCodeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -29,7 +29,7 @@ public enum DisclaimerCodeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DisclaimerCodeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/DiseaseClassifyEnum.java

@@ -9,17 +9,17 @@ public enum DiseaseClassifyEnum implements KeyedNamed {
     LevelSecond(2, "Ⅱ");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    DiseaseClassifyEnum(Integer key, String name) {
+    DiseaseClassifyEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static DiseaseClassifyEnum getEnum(Integer key) {
+    public static DiseaseClassifyEnum getEnum(int key) {
         for (DiseaseClassifyEnum item : DiseaseClassifyEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -28,7 +28,7 @@ public enum DiseaseClassifyEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         DiseaseClassifyEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/HasQuestionEnum.java

@@ -14,17 +14,17 @@ public enum HasQuestionEnum implements KeyedNamed {
     NO_QUESTION(0, "无问题词");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    HasQuestionEnum(Integer key, String name) {
+    HasQuestionEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static HasQuestionEnum getEnum(Integer key) {
+    public static HasQuestionEnum getEnum(int key) {
         for (HasQuestionEnum item : HasQuestionEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum HasQuestionEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         HasQuestionEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java

@@ -13,17 +13,17 @@ public enum InsertOrUpdateEnum implements KeyedNamed {
     Update(2, "修改");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    InsertOrUpdateEnum(Integer key, String name) {
+    InsertOrUpdateEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static InsertOrUpdateEnum getEnum(Integer key) {
+    public static InsertOrUpdateEnum getEnum(int key) {
         for (InsertOrUpdateEnum item : InsertOrUpdateEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum InsertOrUpdateEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         InsertOrUpdateEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/LexiconRSTypeEnum.java

@@ -30,17 +30,17 @@ public enum LexiconRSTypeEnum implements KeyedNamed {
     PUSH(19, "推送");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    LexiconRSTypeEnum(Integer key, String name) {
+    LexiconRSTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static LexiconRSTypeEnum getEnum(Integer key) {
+    public static LexiconRSTypeEnum getEnum(int key) {
         for (LexiconRSTypeEnum item : LexiconRSTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -49,7 +49,7 @@ public enum LexiconRSTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         LexiconRSTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/LexiconTypeEnum.java

@@ -83,17 +83,17 @@ public enum LexiconTypeEnum implements KeyedNamed {
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    LexiconTypeEnum(Integer key, String name) {
+    LexiconTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static LexiconTypeEnum getEnum(Integer key) {
+    public static LexiconTypeEnum getEnum(int key) {
         for (LexiconTypeEnum item : LexiconTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -111,7 +111,7 @@ public enum LexiconTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         LexiconTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

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

@@ -18,17 +18,17 @@ public enum PositionTypeEnum implements KeyedNamed {
     T7(7, "描述信息");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    PositionTypeEnum(Integer key, String name) {
+    PositionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static PositionTypeEnum getEnum(Integer key) {
+    public static PositionTypeEnum getEnum(int key) {
         for (PositionTypeEnum item : PositionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -37,7 +37,7 @@ public enum PositionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         PositionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/RelationModelTypeEnum.java

@@ -15,17 +15,17 @@ public enum RelationModelTypeEnum implements KeyedNamed {
     ZDGLLB(1810148, "诊断关联量表");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    RelationModelTypeEnum(Integer key, String name) {
+    RelationModelTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static RelationModelTypeEnum getEnum(Integer key) {
+    public static RelationModelTypeEnum getEnum(int key) {
         for (RelationModelTypeEnum item : RelationModelTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +34,7 @@ public enum RelationModelTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         RelationModelTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
knowledgeman-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -13,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
knowledgeman-service/src/main/java/com/diagbot/enums/TermEnum.java

@@ -1,7 +1,6 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
 
 public enum TermEnum implements KeyedNamed {
@@ -20,17 +19,17 @@ public enum TermEnum implements KeyedNamed {
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TermEnum(Integer key, String name) {
+    TermEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TermEnum getEnum(Integer key) {
+    public static TermEnum getEnum(int key) {
         for (TermEnum item : TermEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -39,7 +38,7 @@ public enum TermEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TermEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
ltapi-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -22,17 +22,17 @@ public enum FeatureTypeEnum implements KeyedNamed {
     ManagementEvaluation(11, "管理评估");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    FeatureTypeEnum(Integer key, String name) {
+    FeatureTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static FeatureTypeEnum getEnum(Integer key) {
+    public static FeatureTypeEnum getEnum(int key) {
         for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         FeatureTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
prec-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -21,17 +21,17 @@ public enum FeatureTypeEnum implements KeyedNamed {
     ManagementEvaluation(11, "管理评估");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    FeatureTypeEnum(Integer key, String name) {
+    FeatureTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static FeatureTypeEnum getEnum(Integer key) {
+    public static FeatureTypeEnum getEnum(int key) {
         for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -40,7 +40,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         FeatureTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
prec-service/src/main/java/com/diagbot/enums/PhysicalTypeEnum.java

@@ -18,17 +18,17 @@ public enum PhysicalTypeEnum implements KeyedNamed {
     except(6, "异禀体质");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    PhysicalTypeEnum(Integer key, String name) {
+    PhysicalTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static PhysicalTypeEnum getEnum(Integer key) {
+    public static PhysicalTypeEnum getEnum(int key) {
         for (PhysicalTypeEnum item : PhysicalTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -37,7 +37,7 @@ public enum PhysicalTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         PhysicalTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 5
prec-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -17,22 +17,22 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Disease(7, "诊断"),
     Drug(8, "药品"),
     DrugClass(9, "药品分类"),
-    AdverseReaction(10,"不良反应"),
+    AdverseReaction(10, "不良反应"),
     Scale(21, "量表"),
     MedicalIndication(22, "推送指标");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuestionTypeEnum(Integer key, String name) {
+    QuestionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuestionTypeEnum getEnum(Integer key) {
+    public static QuestionTypeEnum getEnum(int key) {
         for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -41,7 +41,7 @@ public enum QuestionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuestionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
prec-service/src/main/java/com/diagbot/enums/SexEnum.java

@@ -13,17 +13,17 @@ public enum SexEnum implements KeyedNamed {
     Enable(2, "女");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    SexEnum(Integer key, String name) {
+    SexEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static SexEnum getEnum(Integer key) {
+    public static SexEnum getEnum(int key) {
         for (SexEnum item : SexEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum SexEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         SexEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
precman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum InsertOrUpdateEnum implements KeyedNamed {
     Update(2, "修改");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    InsertOrUpdateEnum(Integer key, String name) {
+    InsertOrUpdateEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static InsertOrUpdateEnum getEnum(Integer key) {
+    public static InsertOrUpdateEnum getEnum(int key) {
         for (InsertOrUpdateEnum item : InsertOrUpdateEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum InsertOrUpdateEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         InsertOrUpdateEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
precman-service/src/main/java/com/diagbot/enums/ModuleInfoTypeEnum.java

@@ -13,17 +13,17 @@ public enum ModuleInfoTypeEnum implements KeyedNamed {
     ByDept(1, "科室"),
     ByDis(2, "慢病");
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ModuleInfoTypeEnum(Integer key, String name) {
+    ModuleInfoTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ModuleInfoTypeEnum getEnum(Integer key) {
+    public static ModuleInfoTypeEnum getEnum(int key) {
         for (ModuleInfoTypeEnum item : ModuleInfoTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum ModuleInfoTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ModuleInfoTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
precman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -21,17 +21,17 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Index(22, "核心指标");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    QuestionTypeEnum(Integer key, String name) {
+    QuestionTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static QuestionTypeEnum getEnum(Integer key) {
+    public static QuestionTypeEnum getEnum(int key) {
         for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -40,7 +40,7 @@ public enum QuestionTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         QuestionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

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

@@ -12,21 +12,21 @@ public enum TagTypeEnum implements KeyedNamed {
     T1(1, "单项单列"),
     T4(4, "横铺多标签形式"),
     T6(6, "组合项多列"),
-    T8(8,"文字标签"),
+    T8(8, "文字标签"),
     T10(10, "组合项标签");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TagTypeEnum(Integer key, String name) {
+    TagTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TagTypeEnum getEnum(Integer key) {
+    public static TagTypeEnum getEnum(int key) {
         for (TagTypeEnum item : TagTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -35,7 +35,7 @@ public enum TagTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TagTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 6
tran-service/src/main/java/com/diagbot/enums/SexTypeEnum.java

@@ -1,10 +1,9 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
+
 /**
- * 
  * @author rgb
  * @Description: TODO
  * @date 2018年12月11日 下午2:31:42
@@ -14,17 +13,17 @@ public enum SexTypeEnum implements KeyedNamed {
     Enable(2, "女");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    SexTypeEnum(Integer key, String name) {
+    SexTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static SexTypeEnum getEnum(Integer key) {
+    public static SexTypeEnum getEnum(int key) {
         for (SexTypeEnum item : SexTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum SexTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         SexTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 5
tran-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -4,7 +4,6 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午2:31:42
@@ -14,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
tran-service/src/main/java/com/diagbot/enums/TypeEnum.java

@@ -14,17 +14,17 @@ public enum TypeEnum implements KeyedNamed {
     Pacs(6, "检验");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    TypeEnum(Integer key, String name) {
+    TypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static TypeEnum getEnum(Integer key) {
+    public static TypeEnum getEnum(int key) {
         for (TypeEnum item : TypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum TypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         TypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
triage-service/src/main/java/com/diagbot/enums/ShowTypeEnum.java

@@ -13,17 +13,17 @@ public enum ShowTypeEnum implements KeyedNamed {
     Noumenon(1, "本体");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ShowTypeEnum(Integer key, String name) {
+    ShowTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ShowTypeEnum getEnum(Integer key) {
+    public static ShowTypeEnum getEnum(int key) {
         for (ShowTypeEnum item : ShowTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum ShowTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ShowTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 39 - 41
user-service/src/main/java/com/diagbot/enums/AccdenEnum.java

@@ -1,56 +1,54 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: 被拒原因
  * @date 2018年10月11日 下午3:33:22
  */
 
-public enum AccdenEnum  implements KeyedNamed{
-	   
+public enum AccdenEnum implements KeyedNamed {
+
     AccountNotPerfect(1, "账号信息有误"),
     AgencyWrong(2, "机构信息有误"),
-    CancelPurchase(3,"该机构已有违规操作");
-
-	    @Setter
-	    private Integer key;
-
-	    @Setter
-	    private String name;
-
-	    AccdenEnum(Integer key, String name) {
-	        this.key = key;
-	        this.name = name;
-	    }
-
-	    public static AccdenEnum getEnum(Integer key) {
-	        for (AccdenEnum item : AccdenEnum.values()) {
-	            if (item.key == key) {
-	                return item;
-	            }
-	        }
-	        return null;
-	    }
-
-	    public static String getName(Integer key) {
-	    	AccdenEnum item = getEnum(key);
-	        return item != null ? item.name : null;
-	    }
-
-	    @Override
-	    public int getKey() {
-	        return key;
-	    }
-
-	    @Override
-	    public String getName() {
-	        return name;
-	    }
-	
+    CancelPurchase(3, "该机构已有违规操作");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    AccdenEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static AccdenEnum getEnum(int key) {
+        for (AccdenEnum item : AccdenEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        AccdenEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
 
 }

+ 6 - 7
user-service/src/main/java/com/diagbot/enums/AccessTypeEnum.java

@@ -4,28 +4,27 @@ import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
- * @Description: 接入方式枚举
  * @author wangfeng
+ * @Description: 接入方式枚举
  * @date 2018年9月27日 下午4:21:29
  */
 public enum AccessTypeEnum implements KeyedNamed {
-    Online(1,"线上模式"),
+    Online(1, "线上模式"),
     Embedded(3, "嵌入式"),
     InterfaceType(2, "接口方式");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    AccessTypeEnum(Integer key, String name) {
+    AccessTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AccessTypeEnum getEnum(Integer key) {
+    public static AccessTypeEnum getEnum(int key) {
         for (AccessTypeEnum item : AccessTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +33,7 @@ public enum AccessTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         AccessTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
user-service/src/main/java/com/diagbot/enums/AuthHandleEnum.java

@@ -13,17 +13,17 @@ public enum AuthHandleEnum implements KeyedNamed {
     Handled(1, "已处理");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    AuthHandleEnum(Integer key, String name) {
+    AuthHandleEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AuthHandleEnum getEnum(Integer key) {
+    public static AuthHandleEnum getEnum(int key) {
         for (AuthHandleEnum item : AuthHandleEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -32,7 +32,7 @@ public enum AuthHandleEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         AuthHandleEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
user-service/src/main/java/com/diagbot/enums/AuthStatusEnum.java

@@ -15,17 +15,17 @@ public enum AuthStatusEnum implements KeyedNamed {
     Authorizing(2, "认证中");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    AuthStatusEnum(Integer key, String name) {
+    AuthStatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AuthStatusEnum getEnum(Integer key) {
+    public static AuthStatusEnum getEnum(int key) {
         for (AuthStatusEnum item : AuthStatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +34,7 @@ public enum AuthStatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         AuthStatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
user-service/src/main/java/com/diagbot/enums/ChargeTypeEnum.java

@@ -15,17 +15,17 @@ public enum ChargeTypeEnum implements KeyedNamed {
     ByUser(3,"按用户计费");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ChargeTypeEnum(Integer key, String name) {
+    ChargeTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ChargeTypeEnum getEnum(Integer key) {
+    public static ChargeTypeEnum getEnum(int key) {
         for (ChargeTypeEnum item : ChargeTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -34,7 +34,7 @@ public enum ChargeTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ChargeTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
user-service/src/main/java/com/diagbot/enums/ConstantEnum.java

@@ -19,17 +19,17 @@ public enum ConstantEnum implements KeyedNamed {
 
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    ConstantEnum(Integer key, String name) {
+    ConstantEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static ConstantEnum getEnum(Integer key) {
+    public static ConstantEnum getEnum(int key) {
         for (ConstantEnum item : ConstantEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -38,7 +38,7 @@ public enum ConstantEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         ConstantEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
user-service/src/main/java/com/diagbot/enums/OrganizationTypeEnum.java

@@ -16,17 +16,17 @@ public enum OrganizationTypeEnum implements KeyedNamed {
     Other(99, "其他");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    OrganizationTypeEnum(Integer key, String name) {
+    OrganizationTypeEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static OrganizationTypeEnum getEnum(Integer key) {
+    public static OrganizationTypeEnum getEnum(int key) {
         for (OrganizationTypeEnum item : OrganizationTypeEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -35,7 +35,7 @@ public enum OrganizationTypeEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         OrganizationTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 4 - 4
user-service/src/main/java/com/diagbot/enums/RejectEnum.java

@@ -14,17 +14,17 @@ public enum RejectEnum implements KeyedNamed {
     PASS(1, "已通过");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    RejectEnum(Integer key, String name) {
+    RejectEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static RejectEnum getEnum(Integer key) {
+    public static RejectEnum getEnum(int key) {
         for (RejectEnum item : RejectEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +33,7 @@ public enum RejectEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         RejectEnum item = getEnum(key);
         return item != null ? item.name : null;
     }

+ 5 - 6
user-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -1,10 +1,9 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
-
 import lombok.Setter;
+
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年10月29日 下午7:07:18
@@ -14,17 +13,17 @@ public enum StatusEnum implements KeyedNamed {
     Enable(1, "启用");
 
     @Setter
-    private Integer key;
+    private int key;
 
     @Setter
     private String name;
 
-    StatusEnum(Integer key, String name) {
+    StatusEnum(int key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static StatusEnum getEnum(Integer key) {
+    public static StatusEnum getEnum(int key) {
         for (StatusEnum item : StatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -33,7 +32,7 @@ public enum StatusEnum implements KeyedNamed {
         return null;
     }
 
-    public static String getName(Integer key) {
+    public static String getName(int key) {
         StatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }