枚举类型修改

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

@@ -1,35 +1,49 @@
 package com.diagbot.enums;
 
+import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
- * 
- * @author zhoutg
- * @Description: 诊断类型
- * @date 2018年11月21日 下午2:31:42
+ * @Description: 推送类型
+ * @Author:zhaops
+ * @time: 2019/3/14 11:28
  */
-public enum DisTypeEnum  {
-    CHRONIC("慢病"),
-    EMERGENCY("急诊");
+public enum DisTypeEnum implements KeyedNamed {
+    CHRONIC(1, "慢病"),
+    EMERGENCY(2, "急诊");
 
     @Setter
-    private String typeName;
+    private Integer key;
 
-    DisTypeEnum(String typeName) {
-        this.typeName = typeName;
+    @Setter
+    private String name;
+
+    DisTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
     }
 
-    public static DisTypeEnum getEnum(String typeName) {
+    public static DisTypeEnum getEnum(Integer key) {
         for (DisTypeEnum item : DisTypeEnum.values()) {
-            if (item.typeName.equals(typeName)) {
+            if (item.key == key) {
                 return item;
             }
         }
         return null;
     }
 
-    public String getTypeName() {
-        return this.typeName;
+    public static String getName(Integer key) {
+        DisTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
     }
-}
 
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

aipt-service/src/main/java/com/diagbot/facade/DisTypeFacade.java

@@ -54,11 +54,11 @@ public class DisTypeFacade extends DisTypeServiceImpl {
         }
         Map<String, List<DisDTO>> map = EntityUtil.makeEntityListMap(data, "typeName");
         if (map != null) {
-            List<DisDTO> chr = map.get(DisTypeEnum.CHRONIC.getTypeName()); //放入慢病列表
+            List<DisDTO> chr = map.get(DisTypeEnum.CHRONIC.getName()); //放入慢病列表
             if (ListUtil.isNotEmpty(chr)) {
                 res.setChronic(chr);
             }
-            List<DisDTO> eme = map.get(DisTypeEnum.EMERGENCY.getTypeName()); //放入急诊列表
+            List<DisDTO> eme = map.get(DisTypeEnum.EMERGENCY.getName()); //放入急诊列表
             if (ListUtil.isNotEmpty(eme)) {
                 res.setEmergency(eme);
             }