诊断依据规则

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

@@ -2,19 +2,20 @@ package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
+import org.springframework.stereotype.Component;
 
 /**
  * @author zhoutg
  * @Description: 类型枚举
  * @date 2018年10月11日 下午3:33:22
  */
-
+@Component
 public enum BaseDiagnoseTypeEnum implements KeyedNamed {
 
-    B1(1, "等于术语本身"),
-    B2(2, "存在比较"),
-    B3(3, "主诉现病史正则"),
-    B4(4, "既往史正则");
+    equals(1, "等于术语本身"),
+    compare(2, "存在比较"),
+    regexChiefSymptom(3, "主诉现病史正则"),
+    regexPast(4, "既往史正则");
 
     @Setter
     private int key;

src/main/java/com/diagbot/process/PushProcess.java

@@ -431,7 +431,7 @@ public class PushProcess {
             BeanUtil.copyProperties(base, ruleBaseDTO);
             String baseIds = base.getIds();
             switch (BaseDiagnoseTypeEnum.getEnum(base.getBaseType())) {
-                case B1: // 等于术语本身
+                case equals: // 等于术语本身
                     switch (LexiconEnum.getEnum(base.getBaseLibType())) {
                         case Symptom: // 症状
                             commonRule.compareNameWithPush(clinicals, ruleBaseDTO, baseIdList, baseIds);
@@ -447,7 +447,7 @@ public class PushProcess {
                             break;
                     }
                     break;
-                case B2: // 比较
+                case compare: // 比较
                     switch (LexiconEnum.getEnum(base.getBaseLibType())) {
                         case LisSubName: // 化验
                             lisRule.push(wordCrfDTO.getLis(), ruleBaseDTO, baseIdList, baseIds);
@@ -459,11 +459,11 @@ public class PushProcess {
                             break;
                     }
                     break;
-                case B3: // 主诉现病史正则
+                case regexChiefSymptom: // 主诉现病史正则
                     commonRule.getRegexResPush(wordCrfDTO.getChief() + wordCrfDTO.getSymptom(),
                             base.getBaseEqValue(), baseIdList, baseIds);
                     break;
-                case B4: // 既往史正则
+                case regexPast: // 既往史正则
                     commonRule.getRegexResPush(wordCrfDTO.getPasts() + wordCrfDTO.getPersonal() + wordCrfDTO.getMenstrual() + wordCrfDTO.getMarital() + wordCrfDTO.getFamily(),
                             base.getBaseEqValue(), baseIdList, baseIds);
                     break;