Merge remote-tracking branch 'origin/master'

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

@@ -11,14 +11,11 @@ import com.diagbot.enums.TypeEnum;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.model.label.VitalLabel;
 import com.diagbot.rule.CommonRule;
-import com.diagbot.util.CoreUtil;
-import com.diagbot.util.MsgUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 高风险总入口
@@ -39,77 +36,27 @@ public class HighRiskProcess {
      */
     public void process(List<HighRiskNeoDTO> highRiskNeoDTOList, IndicationDTO res, WordCrfDTO wordCrfDTO) {
         List<BillMsg> highRiskList = new ArrayList<>();
+        CommonRule commonRule = new CommonRule();
         for (HighRiskNeoDTO highRiskNeoDTO : highRiskNeoDTOList) {
             System.out.println(highRiskNeoDTO);
             String type = highRiskNeoDTO.getType();
-            if (highRiskNeoDTO.getIsHighrisk()==true) {
+            if (highRiskNeoDTO.getIsHighrisk() == true) {
                 commonRule.highRisk(highRiskNeoDTO, highRiskList);
             } else {
-
-                List<Item> diag = wordCrfDTO.getDiag();
-                List<Lis> lisList = wordCrfDTO.getLis();
-                PacsLabel pacsLabel = wordCrfDTO.getPacsLabel();
-                VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
-                Integer age1 = wordCrfDTO.getAge();
                 // 复杂情况高危手术
                 if (TypeEnum.operation.getName().equals(type)) {
                     List<NodeNeoDTO> factor = highRiskNeoDTO.getFactor();
                     for (NodeNeoDTO nodeNeoDTO : factor) {
                         if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) {
-                            /*String name = nodeNeoDTO.getName();
-                            for (Item item : diag) {
-                                if (item.getUniqueName().equals(name)) {
-                                    BillMsg billMsg = MsgUtil.getComplexOperationMsg( item.getName(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
-                                    res.getHighRiskList().add(billMsg);
-                                }
-                            }*/
-                            BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
-                            highRiskList.add(billMsg);
+                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
                         } else if (TypeEnum.lis.getName().equals(nodeNeoDTO.getTermtype())) {
-                            /*for (Lis lis : lisList) {
-                                if (lis.getUniqueName().equals(nodeNeoDTO.getName())) {
-                                    Map<String, Object> map = CoreUtil.compareLis(nodeNeoDTO, lis);
-                                    if ((Boolean) map.get("flag") == true) {
-                                        BillMsg billMsg = MsgUtil.getComplexOperationMsg((String)map.get("msg"), highRiskNeoDTO.getName(), nodeNeoDTO.getTermtype());
-                                        res.getHighRiskList().add(billMsg);
-                                    }
-                                }
-                            }*/
-                            BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
-                            highRiskList.add(billMsg);
+                            commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
                         } else if (TypeEnum.pacs.getName().equals(nodeNeoDTO.getTermtype())) {
-                            /*List<Item> pacsDescList = pacsLabel.getRes();
-                            //辅检匹配结果
-                            for (Item item : pacsDescList) {
-                                if (item.getUniqueName().equals(nodeNeoDTO.getVal())) {
-                                    BillMsg billMsg = MsgUtil.getComplexOperationMsg(item.getName(), highRiskNeoDTO.getName(), nodeNeoDTO.getTermtype());
-                                    res.getHighRiskList().add(billMsg);
-                                }
-                            }*/
-                            BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
-                            highRiskList.add(billMsg);
-                        } else if (TypeEnum.vital.getName().equals(nodeNeoDTO.getTermtype())){
-                            /*Map<String, Object> map = CoreUtil.compareVital(nodeNeoDTO, vitalLabel);
-                            if ((Boolean) map.get("flag") == true) {
-                                BillMsg commonBillMsg = MsgUtil.getComplexOperationMsg((String)map.get("msg"),highRiskNeoDTO.getName(), nodeNeoDTO.getTermtype());
-                                res.getHighRiskList().add(commonBillMsg);
-                            }
-*/
-                            BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
-                            highRiskList.add(billMsg);
-                        }else if(TypeEnum.age.getName().equals(nodeNeoDTO.getTermtype())){
-                            /*Boolean flag = false;
-                            if(nodeNeoDTO != null && wordCrfDTO.getAge() != null) {
-                                Integer age = wordCrfDTO.getAge();
-                                flag = CoreUtil.compareNum(nodeNeoDTO, age);
-                            }
-                            if (flag) {
-                                String message = "年龄" + wordCrfDTO.getAge();
-                                BillMsg billMsg = MsgUtil.getComplexOperationMsg(message, highRiskNeoDTO.getName(), nodeNeoDTO.getTermtype());
-                                res.getHighRiskList().add(billMsg);
-                            }*/
-                            BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
-                            highRiskList.add(billMsg);
+                            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);
                         }
                     }
                 }

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

@@ -182,4 +182,13 @@ public class CommonRule {
         highRiskList.add(billMsg);
     }
 
+    /**
+     * fa'zha
+     * @param highRiskNeoDTO
+     * @param highRiskList
+     */
+    public void highRiskComplex(NodeNeoDTO nodeNeoDTO, List<BillMsg> highRiskList,HighRiskNeoDTO highRiskNeoDTO) {
+        BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
+        highRiskList.add(billMsg);
+    }
 }