统一枚举类型

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

@@ -1,81 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @description: 词性类型枚举
- * @author: zhoutg
- * @date: 2021/2/22 13:44
- */
-public enum LibTypeEnum implements KeyedNamed {
-
-    disease(100, "疾病"),
-    drug(101, "药品通用名"),
-    clinical(103, "症状"),
-    vital(104, "体格检查项目"),
-    vitalRes(105, "体格检查结果"),
-    operation(106, "手术和操作"),
-    lis(107, "实验室检查套餐"),
-    lisDetail(108, "实验室检查子项目"),
-    pacs(109, "辅助检查项目"),
-    pacsSub(110, "辅助检查子项目"),
-    pacsResult(112, "辅助检查结果"),
-    transfusion(113, "输血类型"),
-    sex(116, "性别"),
-    group(117, "人群"),
-    otherAllergy(119, "其他过敏原"),
-    ylqxjwp(120, "医疗器械及物品"),
-    yphxwzlb(301, "药品化学物质类别"),
-    ypzlxlb(302, "药品治疗学类别"),
-    ypylxlb(303, "药品药理学类别"),
-    ypjpxlb(304, "药品解剖学类别"),
-    age(410, "年龄"),
-    ;
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    LibTypeEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static LibTypeEnum getEnum(int key) {
-        for (LibTypeEnum item : LibTypeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static LibTypeEnum getEnum(String value) {
-        for (LibTypeEnum item : LibTypeEnum.values()) {
-            if (item.getName().equals(value)) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        LibTypeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-
-}

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

@@ -5,7 +5,7 @@ import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RuleTypeEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.process.BillProcess;
@@ -67,7 +67,7 @@ public class BillFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(item.getName());
                 ruleVO.setLibName(item.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.drug.getKey());
+                ruleVO.setLibType(LexiconEnum.Medicine.getKey());
                 ruleVO.setLibTypeName(TypeEnum.drug.getName());
                 ruleVO.setDateValue(item.getDateValue());
                 ruleVOList.add(ruleVO);
@@ -81,7 +81,7 @@ public class BillFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(pacs.getName());
                 ruleVO.setLibName(pacs.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.pacs.getKey());
+                ruleVO.setLibType(LexiconEnum.PacsName.getKey());
                 ruleVO.setLibTypeName(TypeEnum.pacs.getName());
                 ruleVO.setDateValue(pacs.getDateValue());
                 ruleVOList.add(ruleVO);
@@ -89,7 +89,7 @@ public class BillFacade {
                 RuleVO ruleVO1 = new RuleVO();
                 ruleVO1.setInputName(pacs.getName());
                 ruleVO1.setLibName(pacs.getUniqueName());
-                ruleVO1.setLibType(LibTypeEnum.pacs.getKey());
+                ruleVO1.setLibType(LexiconEnum.PacsName.getKey());
                 ruleVO1.setLibTypeName(TypeEnum.pacs.getName());
                 ruleVO1.setSuffix(String.valueOf(RuleTypeEnum.repeat.getKey()));
                 ruleVO1.setDateValue(pacs.getDateValue());
@@ -104,7 +104,7 @@ public class BillFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(lis.getName());
                 ruleVO.setLibName(lis.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.lis.getKey());
+                ruleVO.setLibType(LexiconEnum.LisName.getKey());
                 ruleVO.setLibTypeName(TypeEnum.lis.getName());
                 ruleVO.setDateValue(lis.getDateValue());
                 ruleVOList.add(ruleVO);
@@ -118,7 +118,7 @@ public class BillFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(item.getName());
                 ruleVO.setLibName(item.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.operation.getKey());
+                ruleVO.setLibType(LexiconEnum.Operation.getKey());
                 ruleVO.setLibTypeName(TypeEnum.operation.getName());
                 ruleVO.setDateValue(item.getDateValue());
                 ruleVOList.add(ruleVO);
@@ -132,7 +132,7 @@ public class BillFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(item.getName());
                 ruleVO.setLibName(item.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.transfusion.getKey());
+                ruleVO.setLibType(LexiconEnum.Transfusion.getKey());
                 ruleVO.setLibTypeName(TypeEnum.transfusion.getName());
                 ruleVO.setDateValue(item.getDateValue());
                 ruleVOList.add(ruleVO);

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

@@ -7,7 +7,7 @@ import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.RuleDTO;
 import com.diagbot.dto.RuleExtDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.model.ai.AIAnalyze;
@@ -686,10 +686,10 @@ public class CommonFacade {
         RuleDTO ruleDTO = redisUtil.get(RedisEnum.allRule.getName() + ruleVO.getLibType() + "_" + ruleVO.getLibName() + "_" + ruleVO.getSuffix());
         if (ruleDTO == null) {
             // 辅检特殊处理，如果为空，再获取【辅助检查项目】【辅助检查子项目】中另外一个
-            if (ruleVO.getLibType().equals(LibTypeEnum.pacs.getKey())) {
-                ruleDTO = redisUtil.get("allRule:" + LibTypeEnum.pacsSub.getKey() + "_" + ruleVO.getLibName() + "_" + ruleVO.getSuffix());
-            } else if (ruleVO.getLibType().equals(LibTypeEnum.pacsSub.getKey())) {
-                ruleDTO = redisUtil.get("allRule:" + LibTypeEnum.pacs.getKey() + "_" + ruleVO.getLibName() + "_" + ruleVO.getSuffix());
+            if (ruleVO.getLibType().equals(LexiconEnum.PacsName.getKey())) {
+                ruleDTO = redisUtil.get("allRule:" + LexiconEnum.PacsSubName.getKey() + "_" + ruleVO.getLibName() + "_" + ruleVO.getSuffix());
+            } else if (ruleVO.getLibType().equals(LexiconEnum.PacsSubName.getKey())) {
+                ruleDTO = redisUtil.get("allRule:" + LexiconEnum.PacsName.getKey() + "_" + ruleVO.getLibName() + "_" + ruleVO.getSuffix());
             }
         }
         if (ruleDTO != null) {

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

@@ -4,7 +4,7 @@ import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RuleTypeEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.process.CriticalProcess;
@@ -62,7 +62,7 @@ public class CriticalFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(lis.getName());
                 ruleVO.setLibName(lis.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.lis.getKey());
+                ruleVO.setLibType(LexiconEnum.LisName.getKey());
                 ruleVO.setLibTypeName(TypeEnum.lis.getName());
                 ruleVO.setDateValue(lis.getDateValue());
                 ruleVO.setSuffix(String.valueOf(RuleTypeEnum.critical.getKey()));
@@ -77,7 +77,7 @@ public class CriticalFacade {
                 RuleVO ruleVO = new RuleVO();
                 ruleVO.setInputName(pacs.getName());
                 ruleVO.setLibName(pacs.getUniqueName());
-                ruleVO.setLibType(LibTypeEnum.pacs.getKey());
+                ruleVO.setLibType(LexiconEnum.PacsName.getKey());
                 ruleVO.setLibTypeName(TypeEnum.pacs.getName());
                 ruleVO.setDateValue(pacs.getDateValue());
                 ruleVOList.add(ruleVO);

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

@@ -212,8 +212,12 @@ public class TestFacade {
                                 }
                             }
                         }
-
+                        // 防止数据被删报错
+                        if  (ListUtil.isEmpty(drugAll)) {
+                            continue;
+                        }
                         if (testLineVO.isGetOne()) { // 随机取一条
+                            System.out.println("当前执行" + bean.getIdNum());
                             pastStr.append("对“").append(drugAll.get(getRandomNum(drugAll.size()))).append("”过敏。");
                             indicationPushVO.setPasts(pastStr.toString());
                         } else { // 遍历

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

@@ -10,7 +10,7 @@ import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.BaseTypeEnum;
 import com.diagbot.enums.ConEnum;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RuleTypeEnum;
 import com.diagbot.facade.CommonFacade;
 import com.diagbot.facade.NeoFacade;
@@ -132,24 +132,24 @@ public class BillProcess {
                 switch (RuleTypeEnum.getEnum(ruleExtDTO.getRuleType())) {
                     case bill: // redis 数据以 _1结尾
                         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-                            if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
-                                switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
-                                    case sex: // 性别
+                            if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
+                                switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                                    case Gender: // 性别
                                         sexRule.bill(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.gender.getName(), ruleSimpleDTO);
-                                    case age: // 年龄
+                                    case Age: // 年龄
                                         ageRule.bill(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.age.getName(), ruleSimpleDTO);
                                         break;
-                                    case disease: // 诊断
+                                    case Disease: // 诊断
                                         commonRule.compareItemWithBill(diags, ruleBaseDTO, billMsgList, ConEnum.disease.getName(), ruleSimpleDTO);
                                         break;
-                                    case lisDetail: // 化验
+                                    case LisSubName: // 化验
                                         lisRule.bill(wordCrfDTO.getLis(), ruleBaseDTO, billMsgList, ConEnum.lis.getName(), ruleSimpleDTO);
                                         break;
-                                    case vitalRes: //体格检查结果
-                                    case vital: // 体格检查项目
+                                    case VitalResult: //体格检查结果
+                                    case Vital: // 体格检查项目
                                         vitalRule.bill(wordCrfDTO.getVitalLabel(), ruleBaseDTO, billMsgList, ConEnum.vitals.getName(), ruleSimpleDTO);
                                         break;
-                                    case pacs: // 辅检项目
+                                    case PacsName: // 辅检项目
                                         if (ruleBaseDTO.getBaseType() != null && ruleBaseDTO.getBaseType().equals(BaseTypeEnum.B5.getKey())) {
                                             // 开单项互斥
                                             commonRule.exclusionBill(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.exclusion.getName(), ruleSimpleDTO, set);
@@ -158,17 +158,17 @@ public class BillProcess {
                                             pacsRule.bill(wordCrfDTO.getPacs(), ruleBaseDTO, billMsgList, ConEnum.pacs.getName(), ruleSimpleDTO);
                                         }
                                         break;
-                                    case clinical: // 临床表现
+                                    case Symptom: // 临床表现
                                         commonRule.compareNameWithBill(clinicals, ruleBaseDTO, billMsgList, ConEnum.clinicfindings.getName(), ruleSimpleDTO);
                                         break;
-                                    case operation: // 手术(既往史、现病史、医嘱手术)
+                                    case Operation: // 手术(既往史、现病史、医嘱手术)
                                         commonRule.compareNameWithBill(operations_all, ruleBaseDTO, billMsgList, ConEnum.operations.getName(), ruleSimpleDTO);
                                         break;
-                                    case drug:
-                                    case yphxwzlb:
-                                    case ypzlxlb:
-                                    case ypylxlb:
-                                    case ypjpxlb:
+                                    case Medicine:
+                                    case MedChemClass:
+                                    case MedZhiLiaoClass:
+                                    case MedYaoLiClass:
+                                    case MedJiePouClass:
                                         if (ruleBaseDTO.getBaseType().equals(4)) {
                                             // 禁忌过敏药品（既往史）
                                             drugRule.bill(allergyMedicines, ruleBaseDTO, billMsgList, ConEnum.allergicmeds.getName(), ruleSimpleDTO);
@@ -177,16 +177,16 @@ public class BillProcess {
                                             drugRule.bill(medicineAll, ruleBaseDTO, billMsgList, ConEnum.oralmeds.getName(), ruleSimpleDTO);
                                         }
                                         break;
-                                    case otherAllergy: // 其他过敏原
+                                    case Allergen: // 其他过敏原
                                         drugRule.bill(allergyMedicines, ruleBaseDTO, billMsgList, ConEnum.otherAllergy.getName(), ruleSimpleDTO);
                                         break;
-                                    case group: // 禁忌人群
+                                    case Group: // 禁忌人群
                                         groupRule.bill(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.group.getName(), ruleSimpleDTO);
                                         break;
-                                    case pacsResult: // 禁用辅助检查描述
+                                    case PacsResult: // 禁用辅助检查描述
                                         commonRule.compareItemWithBill(pacsDescList, ruleBaseDTO, billMsgList, ConEnum.pacsDesc.getName(), ruleSimpleDTO);
                                         break;
-                                    case ylqxjwp: // 禁忌医疗器械及物品
+                                    case Device: // 禁忌医疗器械及物品
                                         medEquRule.bill(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.medEqu.getName(), ruleSimpleDTO);
                                         break;
                                     default:

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

@@ -8,7 +8,7 @@ import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleConditionDTO;
 import com.diagbot.dto.RuleExtDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RuleTypeEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.facade.CommonFacade;
@@ -117,7 +117,7 @@ public class CriticalProcess {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(lis.getName());
             ruleVO.setLibName(lis.getUniqueName());
-            ruleVO.setLibType(LibTypeEnum.lisDetail.getKey());
+            ruleVO.setLibType(LexiconEnum.LisSubName.getKey());
             ruleVO.setLibTypeName(TypeEnum.lis.getName());
             ruleVO.setDateValue(lis.getDateValue());
             ruleVO.setSuffix(String.valueOf(RuleTypeEnum.critical.getKey()));
@@ -137,7 +137,7 @@ public class CriticalProcess {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(item.getName());
             ruleVO.setLibName(item.getUniqueName());
-            ruleVO.setLibType(LibTypeEnum.pacsResult.getKey());
+            ruleVO.setLibType(LexiconEnum.PacsResult.getKey());
             ruleVO.setLibTypeName(TypeEnum.pacs.getName());
             ruleVO.setDateValue(item.getDateValue());
             ruleVO.setSuffix(String.valueOf(RuleTypeEnum.critical.getKey()));

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

@@ -10,7 +10,7 @@ import com.diagbot.dto.RuleConditionDTO;
 import com.diagbot.dto.RuleExtDTO;
 import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RuleTypeEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.facade.CommonFacade;
@@ -113,22 +113,22 @@ public class HighRiskProcess {
                     } else { // 2级高危手术
                         List<RuleBaseDTO> ruleBaseDTOList = ruleConditionDTO.getRuleBaseDTOList();
                         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-                            if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
-                                switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
-                                    case age: // 年龄
+                            if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
+                                switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                                    case Age: // 年龄
                                         ageRule.highOperation(wordCrfDTO, ruleBaseDTO, highRiskList, ruleSimpleDTO);
                                         break;
-                                    case disease: // 诊断
+                                    case Disease: // 诊断
                                         commonRule.compareItemWithHighRisk(wordCrfDTO.getDiag(), ruleBaseDTO, highRiskList, ruleSimpleDTO);
                                         break;
-                                    case lisDetail: // 化验
+                                    case LisSubName: // 化验
                                         lisRule.highOperation(wordCrfDTO.getLis(), ruleBaseDTO, highRiskList, ruleSimpleDTO);
                                         break;
-                                    case vitalRes: //体格检查结果
-                                    case vital: // 体格检查项目
+                                    case VitalResult: //体格检查结果
+                                    case Vital: // 体格检查项目
                                         vitalRule.highOperation(wordCrfDTO.getVitalLabel(), ruleBaseDTO, highRiskList, ruleSimpleDTO);
                                         break;
-                                    case pacsResult: // 禁用辅助检查描述
+                                    case PacsResult: // 禁用辅助检查描述
                                         // 【辅检结果数据来源】
                                         PacsLabel pacsLabel = wordCrfDTO.getPacsLabel();
                                         List<Item> pacsDescList = pacsLabel.getRes();
@@ -154,7 +154,7 @@ public class HighRiskProcess {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(bean.getName());
             ruleVO.setLibName(bean.getUniqueName());
-            ruleVO.setLibType(LibTypeEnum.drug.getKey());
+            ruleVO.setLibType(LexiconEnum.Medicine.getKey());
             ruleVO.setLibTypeName(TypeEnum.drug.getName());
             ruleVO.setDateValue(bean.getDateValue());
             ruleVO.setSuffix(String.valueOf(RuleTypeEnum.high.getKey()));
@@ -175,7 +175,7 @@ public class HighRiskProcess {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(bean.getName());
             ruleVO.setLibName(bean.getUniqueName());
-            ruleVO.setLibType(LibTypeEnum.operation.getKey());
+            ruleVO.setLibType(LexiconEnum.Operation.getKey());
             ruleVO.setLibTypeName(TypeEnum.operation.getName());
             ruleVO.setDateValue(bean.getDateValue());
             ruleVO.setSuffix(String.valueOf(RuleTypeEnum.high.getKey()));

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

@@ -8,7 +8,7 @@ import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleConditionDTO;
 import com.diagbot.dto.RuleExtDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RuleTypeEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.facade.CommonFacade;
@@ -136,7 +136,7 @@ public class OtherTipProcess {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(bean.getName());
             ruleVO.setLibName(bean.getUniqueName());
-            ruleVO.setLibType(LibTypeEnum.pacsResult.getKey());
+            ruleVO.setLibType(LexiconEnum.PacsResult.getKey());
             ruleVO.setLibTypeName(TypeEnum.pacs.getName());
             ruleVO.setDateValue(bean.getDateValue());
             ruleVO.setSuffix(String.valueOf(RuleTypeEnum.other.getKey()));
@@ -156,7 +156,7 @@ public class OtherTipProcess {
             RuleVO ruleVO = new RuleVO();
             ruleVO.setInputName(lis.getName());
             ruleVO.setLibName(lis.getUniqueName());
-            ruleVO.setLibType(LibTypeEnum.lisDetail.getKey());
+            ruleVO.setLibType(LexiconEnum.LisSubName.getKey());
             ruleVO.setLibTypeName(TypeEnum.lis.getName());
             ruleVO.setDateValue(lis.getDateValue());
             ruleVO.setSuffix(String.valueOf(key));

src/main/java/com/diagbot/rule/DrugRule.java

@@ -3,7 +3,7 @@ package com.diagbot.rule;
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleSimpleDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -41,10 +41,10 @@ public class DrugRule {
                          RuleSimpleDTO ruleSimpleDTO) {
         if (ListUtil.isNotEmpty(inputList)) {
             List<String> allDrug = new ArrayList<>();
-            if (ruleBaseDTO.getBaseLibType().equals(LibTypeEnum.yphxwzlb.getKey())
-                    || ruleBaseDTO.getBaseLibType().equals(LibTypeEnum.ypzlxlb.getKey())
-                    || ruleBaseDTO.getBaseLibType().equals(LibTypeEnum.ypylxlb.getKey())
-                    || ruleBaseDTO.getBaseLibType().equals(LibTypeEnum.ypjpxlb.getKey())) {
+            if (ruleBaseDTO.getBaseLibType().equals(LexiconEnum.MedChemClass.getKey())
+                    || ruleBaseDTO.getBaseLibType().equals(LexiconEnum.MedZhiLiaoClass.getKey())
+                    || ruleBaseDTO.getBaseLibType().equals(LexiconEnum.MedYaoLiClass.getKey())
+                    || ruleBaseDTO.getBaseLibType().equals(LexiconEnum.MedJiePouClass.getKey())) {
                 List<String> drugRedis = redisUtil.get(RedisEnum.drugType.getName() + ruleBaseDTO.getBaseLibName());
                 if (ListUtil.isNotEmpty(drugRedis)) {
                     allDrug.addAll(drugRedis);

src/main/java/com/diagbot/rule/LisRule.java

@@ -6,7 +6,7 @@ import com.diagbot.dto.LisOtherDTO;
 import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -94,10 +94,10 @@ public class LisRule {
         LisOtherDTO lisOtherDTO = new LisOtherDTO();
         int i = 0;
         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-            if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
+            if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
                 Map<String, Object> map = null;
-                switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
-                    case lisDetail: // 化验细项
+                switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                    case LisSubName: // 化验细项
                         if (ruleBaseDTO.getBaseLibName().equals(lisBean.getUniqueName())) {
                             map = CoreUtil.compareLis(ruleBaseDTO, lisBean);
                             if ((Boolean) map.get("flag") == true) {
@@ -106,21 +106,21 @@ public class LisRule {
                             }
                         }
                         break;
-                    case group: // 人群
+                    case Group: // 人群
                         map = groupRule.rule(wordCrfDTO, ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.getGroupMsg().add((String)map.get("msg"));
                             i++;
                         }
                         break;
-                    case disease: // 诊断
+                    case Disease: // 诊断
                         map = commonRule.compareItem(wordCrfDTO.getDiag(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setDiseaseMsg((List<String>)map.get("msgList"));
                             i++;
                         }
                         break;
-                    case drug:
+                    case Medicine:
                         map = commonRule.compareItem(wordCrfDTO.getDrug(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setDrugMsg((List<String>)map.get("msgList"));
@@ -177,10 +177,10 @@ public class LisRule {
         lisOtherDTO.setMsg(msg);
         int i = 0;
         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-            if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
+            if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
                 Map<String, Object> map = null;
-                switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
-                    case lisDetail: // 化验细项
+                switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                    case LisSubName: // 化验细项
                         if (ruleBaseDTO.getBaseLibName().equals(lisBean.getUniqueName())) {
                             map = CoreUtil.compareLis(ruleBaseDTO, lisBean);
                             if ((Boolean) map.get("flag") == true) {
@@ -189,20 +189,20 @@ public class LisRule {
                             }
                         }
                         break;
-                    case disease: // 诊断
+                    case Disease: // 诊断
                         map = commonRule.compareItem(wordCrfDTO.getDiag(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setDiseaseMsg((List<String>)map.get("msgList"));
                             i++;
                         }
                         break;
-                    case drug: // 药品
+                    case Medicine: // 药品
                         map = commonRule.compareItem(wordCrfDTO.getDrug(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setDrugMsg((List<String>)map.get("msgList"));
                             i++;
                         }
-                    case operation: // 手术
+                    case Operation: // 手术
                         map = commonRule.compareItem(wordCrfDTO.getOperation(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setOperationMsg((List<String>)map.get("msgList"));
@@ -264,9 +264,9 @@ public class LisRule {
         String msg = "";
         int i = 0;
         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-            if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
-                switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
-                    case lisDetail: // 化验细项
+            if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
+                switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                    case LisSubName: // 化验细项
                         if (ruleBaseDTO.getBaseLibName().equals(lisBean.getUniqueName())) {
                             Map<String, Object> map = CoreUtil.compareLis(ruleBaseDTO, lisBean);
                             if ((Boolean) map.get("flag") == true) {
@@ -275,7 +275,7 @@ public class LisRule {
                             }
                         }
                         break;
-                    case group: // 人群
+                    case Group: // 人群
                         Map map = groupRule.rule(wordCrfDTO, ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             i++;

src/main/java/com/diagbot/rule/PacsRule.java

@@ -5,7 +5,7 @@ import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.BaseTypeEnum;
-import com.diagbot.enums.LibTypeEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -87,28 +87,28 @@ public class PacsRule {
         }
         int i = 0;
         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-            if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
+            if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
                 boolean flag = false;
-                switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
-                    case age: // 年龄
+                switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                    case Age: // 年龄
                         flag = ageRule.getFlag(wordCrfDTO, ruleBaseDTO);
                         if (flag) {
                             i++;
                         }
                         break;
-                    case sex: // 性别
+                    case Gender: // 性别
                         flag = sexRule.getFlag(wordCrfDTO, ruleBaseDTO);
                         if (flag) {
                             i++;
                         }
                         break;
-                    case group: // 人群
+                    case Group: // 人群
                         Map map = groupRule.rule(wordCrfDTO, ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             i++;
                         }
                         break;
-                    case pacsResult: // 辅检结果
+                    case PacsResult: // 辅检结果
                         map = commonRule.compareItem(wordCrfDTO.getPacsLabel().getRes(), ruleBaseDTO);
                         if (ruleBaseDTO.getBaseType().equals(BaseTypeEnum.B3.getKey())) {
                             if (!CoreUtil.getMapFlag(map)) {