定值转化为枚举

src/main/java/com/diagbot/enums/StaticTypeEnum.java

@@ -1,6 +1,7 @@
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
+import com.diagbot.repository.Constants;
 import lombok.Setter;
 
 /**
@@ -10,12 +11,12 @@ import lombok.Setter;
  */
 public enum StaticTypeEnum implements KeyedNamed {
 
-    DIS(1, "医保ICD_10疾病"),
-    DRUG(2, "药品通用名"),
-    LISMIX(3, "实验室检查套餐"),
-    LIS(4, "实验室检查"),
-    PACS(5, "辅助检查"),
-    OPT(6, "手术和操作");
+    DIS(1, Constants.icddisease),
+    DRUG(2, Constants.medicine),
+    LISSET(3, Constants.lissetname),
+    LIS(4, Constants.lisname),
+    PACS(5, Constants.pacsname),
+    OPT(6, Constants.yibaoopname);
 
     @Setter
     private int key;

src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.OperationInfoDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.entity.node.*;
+import com.diagbot.enums.StaticTypeEnum;
 import com.diagbot.repository.*;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.RetrievalVO;
@@ -184,8 +185,8 @@ public class RetrievalFacade {
         for (YiBaoDiseaseName icdDisease : icdDiseaseList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(icdDisease.getName());
-            staticDTO.setType(1);
-            staticDTO.setTypeName(Constants.icddisease);
+            staticDTO.setType(StaticTypeEnum.DIS.getKey());
+            staticDTO.setTypeName(StaticTypeEnum.DIS.getName());
             disRetList.add(staticDTO);
         }
         //TODO 药品
@@ -195,8 +196,8 @@ public class RetrievalFacade {
         for (Medicine medicine : medicineList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(medicine.getName());
-            staticDTO.setType(2);
-            staticDTO.setTypeName(Constants.medicine);
+            staticDTO.setType(StaticTypeEnum.DRUG.getKey());
+            staticDTO.setTypeName(StaticTypeEnum.DRUG.getName());
             drugRetList.add(staticDTO);
         }
         //TODO 检验套餐
@@ -206,8 +207,8 @@ public class RetrievalFacade {
         for (LisSet lisSet : lisSetList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(lisSet.getName());
-            staticDTO.setType(3);
-            staticDTO.setTypeName(Constants.lissetname);
+            staticDTO.setType(StaticTypeEnum.LISSET.getKey());
+            staticDTO.setTypeName(StaticTypeEnum.LISSET.getName());
             lisSetRetList.add(staticDTO);
         }
         //TODO 检验明细关联出检验套餐
@@ -220,8 +221,8 @@ public class RetrievalFacade {
                     StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
                     staticDTO.setRetrievalName(lis.getName());
                     staticDTO.setName(lisSet.getName());
-                    staticDTO.setType(3);
-                    staticDTO.setTypeName(Constants.lissetname);
+                    staticDTO.setType(StaticTypeEnum.LISSET.getKey());
+                    staticDTO.setTypeName(StaticTypeEnum.LISSET.getName());
                     lisSetRelatecLisRetList.add(staticDTO);
                 }
             }
@@ -233,8 +234,8 @@ public class RetrievalFacade {
         for (LisName lis : lisList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(lis.getName());
-            staticDTO.setType(3);
-            staticDTO.setTypeName(Constants.lisname);
+            staticDTO.setType(StaticTypeEnum.LIS.getKey());
+            staticDTO.setTypeName(StaticTypeEnum.LIS.getName());
             lisRetList.add(staticDTO);
         }
         //TODO 检查
@@ -244,8 +245,8 @@ public class RetrievalFacade {
         for (PacsName pacs : pacsList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(pacs.getName());
-            staticDTO.setType(4);
-            staticDTO.setTypeName(Constants.pacsname);
+            staticDTO.setType(StaticTypeEnum.PACS.getKey());
+            staticDTO.setTypeName(StaticTypeEnum.PACS.getName());
             pacsRetList.add(staticDTO);
         }
 
@@ -258,8 +259,8 @@ public class RetrievalFacade {
         for (YiBaoOperationName operation : operationList) {
             StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
             staticDTO.setName(operation.getName());
-            staticDTO.setType(6);
-            staticDTO.setTypeName(Constants.yibaoopname);
+            staticDTO.setType(StaticTypeEnum.OPT.getKey());
+            staticDTO.setTypeName(StaticTypeEnum.OPT.getName());
             operationRetList.add(staticDTO);
         }