Merge remote-tracking branch 'origin/master'

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

@@ -730,7 +730,8 @@ public class TestFacade {
                 continue;
             }
             // 3,4是高危手术
-            if ("0" .equals(bean.getOperationLevel()) || "1" .equals(bean.getOperationLevel()) || "3" .equals(bean.getOperationLevel())) {
+            if ("0" .equals(bean.getOperationLevel()) || "1" .equals(bean.getOperationLevel())
+                    || "3" .equals(bean.getOperationLevel()) || "4" .equals(bean.getOperationLevel())) {
                 continue;
             }
             IndicationPushVO indicationPushVO = new IndicationPushVO();
@@ -743,7 +744,7 @@ public class TestFacade {
             //体格
             String physique = bean.getPhysique();
             String[] physiqueStrArray = physique.split("，");
-          for (String str : physiqueStrArray) {
+            for (String str : physiqueStrArray) {
                 if (str.contains(",")) {
                     //包含英文逗号
                     String[] strArray = str.split(",");
@@ -770,19 +771,25 @@ public class TestFacade {
                     lisBean.setDetailName(strArray[0]);
                     lisBean.setValue(getValue(strArray));
                     lisList.add(lisBean);
-                    indicationPushVO.setLis(lisList);
-                    break;
-                } else {
-                    indicationPushVO.setVital(str);
                     break;
                 }
             }
+            indicationPushVO.setLis(lisList);
             //辅检
             String pacsAll = bean.getPacsAll();
             String[] physiquepacsAll = pacsAll.split("，");
             indicationPushVO.setSymptom("B超:提示" + pacsAll);
-
-            //诊断
+            List<Pacs> pacs = new ArrayList<>();
+            for (String pacsStr : physiquepacsAll) {
+                Pacs pacs1 = new Pacs();
+                pacs1.setUniqueName("腹部CT");
+                pacs1.setName("腹部CT");
+                pacs1.setResult(pacsStr);
+                pacs.add(pacs1);
+                break;
+            }
+            indicationPushVO.setPacs(pacs);
+            //诊断"腹部CT"
             String disease = bean.getDisease();
             String[] physiquedisease = pacsAll.split("，");
             List<Item> diag = new ArrayList<>();
@@ -803,7 +810,6 @@ public class TestFacade {
         }
 
         Map<String, Object> map = new LinkedHashMap<>();
-
         List<String> msg = new ArrayList<>();
         List<String> errMsg = new ArrayList<>();
         for (IndicationPushVO indicationPushVO : indicationPushVOList) {

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

@@ -42,7 +42,7 @@ public class HighRiskProcess {
         for (HighRiskNeoDTO highRiskNeoDTO : highRiskNeoDTOList) {
             System.out.println(highRiskNeoDTO);
             String type = highRiskNeoDTO.getType();
-            if (highRiskNeoDTO.getIsHighrisk()) {
+            if (highRiskNeoDTO.getIsHighrisk()==true) {
                 commonRule.highRisk(highRiskNeoDTO, highRiskList);
             } else {
 
@@ -56,15 +56,17 @@ public class HighRiskProcess {
                     List<NodeNeoDTO> factor = highRiskNeoDTO.getFactor();
                     for (NodeNeoDTO nodeNeoDTO : factor) {
                         if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) {
-                            String name = nodeNeoDTO.getName();
+                            /*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);
                         } else if (TypeEnum.lis.getName().equals(nodeNeoDTO.getTermtype())) {
-                            for (Lis lis : lisList) {
+                            /*for (Lis lis : lisList) {
                                 if (lis.getUniqueName().equals(nodeNeoDTO.getName())) {
                                     Map<String, Object> map = CoreUtil.compareLis(nodeNeoDTO, lis);
                                     if ((Boolean) map.get("flag") == true) {
@@ -72,25 +74,31 @@ public class HighRiskProcess {
                                         res.getHighRiskList().add(billMsg);
                                     }
                                 }
-                            }
+                            }*/
+                            BillMsg billMsg = MsgUtil.getComplexOperationMsg( nodeNeoDTO.getVal(), highRiskNeoDTO.getName(),nodeNeoDTO.getTermtype());
+                            highRiskList.add(billMsg);
                         } else if (TypeEnum.pacs.getName().equals(nodeNeoDTO.getTermtype())) {
-                            List<Item> pacsDescList = pacsLabel.getRes();
+                            /*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);
+                            /*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;
+                            /*Boolean flag = false;
                             if(nodeNeoDTO != null && wordCrfDTO.getAge() != null) {
                                 Integer age = wordCrfDTO.getAge();
                                 flag = CoreUtil.compareNum(nodeNeoDTO, age);
@@ -99,7 +107,9 @@ public class HighRiskProcess {
                                 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);
                         }
                     }
                 }

src/main/java/com/diagbot/web/TestController.java

@@ -109,7 +109,9 @@ public class TestController {
     public RespDTO<StandConvertCrfBatchDTO> testStandConvertBatch(@RequestBody List<StandConvertCrfVO> standConvertCrfVOList) {
         return RespDTO.onSuc(testFacade.testStandConvertBatch(standConvertCrfVOList));
     }
-    @ApiOperation(value = "高危手术测试API[zhoutg]", notes = "类型，疾病: disease，症状: symptom，手术和操作:operation，药品: drug，实验室检查：lis，辅助检查：pacs， 辅助检查：vital")
+    @ApiOperation(value = "复杂高危手术测试API[zhoutg]",
+            notes = "idNum：指定行测试<br>" +
+                    "sheetIndex：sheet的下标，默认为0，表示第一个sheet")
     @PostMapping("/testHighRiskProcess")
     public RespDTO<Map<String, Object>> testHighRiskProcess(@RequestParam("file") MultipartFile file, TestLineVO testLineVO) {
         return RespDTO.onSuc(testFacade.testHighRiskProcess(file, testLineVO));