结构优化

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

@@ -136,6 +136,11 @@ public class TestFacade {
                         symptom.append(bean.getNeoName()).append("。");
                         indicationPushVO.setSymptom(symptom.toString());
                         break;
+                    case "7" : // 药品过敏原
+                        StringBuffer pastStr = new StringBuffer("");
+                        pastStr.append("有“").append(bean.getNeoName()).append("”过敏。");
+                        indicationPushVO.setPasts(pastStr.toString());
+                        break;
                     case "12": // 体征
                         StringBuffer sbVital = new StringBuffer();
                         String[] vitalArr = bean.getNeoName().split("，");

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

@@ -1,15 +1,11 @@
 package com.diagbot.process;
 
-import com.diagbot.biz.push.entity.Item;
-import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.HighRiskNeoDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.TypeEnum;
-import com.diagbot.model.label.PacsLabel;
-import com.diagbot.model.label.VitalLabel;
 import com.diagbot.rule.CommonRule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -47,16 +43,14 @@ public class HighRiskProcess {
                 if (TypeEnum.operation.getName().equals(type)) {
                     List<NodeNeoDTO> factor = highRiskNeoDTO.getFactor();
                     for (NodeNeoDTO nodeNeoDTO : factor) {
-                        if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) {
-                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
-                        } else if (TypeEnum.lis.getName().equals(nodeNeoDTO.getTermtype())) {
-                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
-                        } else if (TypeEnum.pacs.getName().equals(nodeNeoDTO.getTermtype())) {
-                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
-                        } else if (TypeEnum.vital.getName().equals(nodeNeoDTO.getTermtype())) {
-                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
-                        } else if (TypeEnum.age.getName().equals(nodeNeoDTO.getTermtype())) {
-                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
+                        switch (TypeEnum.getEnum(nodeNeoDTO.getTermtype())) {
+                            case disease:
+                            case lis:
+                            case pacs:
+                            case vital:
+                            case age:
+                                commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
+                                break;
                         }
                     }
                 }

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

@@ -42,7 +42,7 @@ public class DrugRule {
         if (ListUtil.isNotEmpty(drugList) && ListUtil.isNotEmpty(inputList)) {
             List<String> allDrug = new ArrayList<>();
             for (NodeNeoDTO nodeNeoDTO : drugList) {
-                if ("服用药品".equals(nodeNeoDTO.getTermtype())) {
+                if ("服用药品".equals(nodeNeoDTO.getTermtype()) || "药物过敏原".equals(nodeNeoDTO.getTermtype())) {
                     allDrug.add(nodeNeoDTO.getName());
                 } else if ("药品解剖学类别".equals(nodeNeoDTO.getTermtype())){
                     String drugType = nodeNeoDTO.getName();