起搏器删除，添加注释

src/main/java/com/diagbot/aggregate/IndicationTestAggregate.java

@@ -65,6 +65,18 @@ public class IndicationTestAggregate {
         Map<String, Object> criticalMapPacs = testFacade.importCriticalPacsExcel(file, new TestLineVO());
         map.put("【危急值_辅检】",criticalMapPacs);
 
+        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_化验】"));
+        Map<String, Object> otherLisMap = testFacade.testOtherTipLis(file, new TestLineVO());
+        map.put("【其他值提醒_化验】",otherLisMap);
+
+        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_辅检】"));
+        Map<String, Object> otherPacsMap = testFacade.testOtherTipPacs(file, new TestLineVO());
+        map.put("【其他值提醒_辅检】",otherPacsMap);
+
+        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_输血】"));
+        Map<String, Object> otherTransfusionMap = testFacade.testOtherTipTransfusion(file, new TestLineVO());
+        map.put("【其他值提醒_输血】",otherTransfusionMap);
+
         return map;
     }
 
@@ -74,16 +86,23 @@ public class IndicationTestAggregate {
         MultipartFile file = testFacade.getMulFileByPath(mapPath.get("【高危药品】"));
         Map<String, Object> highDrugMap = testFacade.testHighRiskDrugExcel(file, new TestLineVO());
         map.put("【高危药品】",highDrugMap);
+
+        file = testFacade.getMulFileByPath(mapPath.get("【高危手术整合】"));
+        Map<String, Object> highOperationMap = testFacade.testHighRiskOperationExcel(file, new TestLineVO());
+        map.put("【高危手术】",highOperationMap);
+
         return map;
     }
 
     @DataProvider("t3")
     public Map<String, Object> t3(@InvokeParameter("mapPath") Map<String, String> mapPath) {
         Map<String, Object> map = new LinkedHashMap<>();
-
         MultipartFile file = testFacade.getMulFileByPath(mapPath.get("【高危手术整合】"));
-        Map<String, Object> highOperationMap = testFacade.testHighRiskOperationExcel(file, new TestLineVO());
-        map.put("【高危手术整合】",highOperationMap);
+
+        TestLineVO testLineVO = new TestLineVO();
+        testLineVO.setGetOne(true);
+        Map<String, Object> highOperationComplexMap = testFacade.testHighRiskProcess(file, testLineVO);
+        map.put("【高危手术复杂情况】",highOperationComplexMap);
         return map;
     }
 
@@ -97,18 +116,6 @@ public class IndicationTestAggregate {
         Map<String, Object> billMap = testFacade.importExcel(file, testLineVO);
         map.put("【开单合理性】",billMap);
 
-        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_化验】"));
-        Map<String, Object> otherLisMap = testFacade.testOtherTipLis(file, new TestLineVO());
-        map.put("【其他值提醒_化验】",otherLisMap);
-
-        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_辅检】"));
-        Map<String, Object> otherPacsMap = testFacade.testOtherTipPacs(file, new TestLineVO());
-        map.put("【其他值提醒_辅检】",otherPacsMap);
-
-        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_输血】"));
-        Map<String, Object> otherTransfusionMap = testFacade.testOtherTipTransfusion(file, new TestLineVO());
-        map.put("【其他值提醒_输血】",otherTransfusionMap);
-
         return map;
     }
 }

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

@@ -141,18 +141,18 @@ public class CommonFacade {
         DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
         PastLabel pastLabel = wordCrfDTO.getPastLabel();
         List<String> diagList = new ArrayList<>();
-        diagList.addAll(CoreUtil.getPropertyList(chiefLabel.getDiags()));
-        diagList.addAll(CoreUtil.getPropertyList(presentLabel.getDiags()));
-        diagList.addAll(CoreUtil.getPropertyList(diagLabel.getDiags()));
-        diagList.addAll(CoreUtil.getPropertyList(pastLabel.getDiags()));
-        //下的诊断
+        CoreUtil.addList(diagList, CoreUtil.getPropertyList(chiefLabel.getDiags())); // 主诉诊断
+        CoreUtil.addList(diagList, CoreUtil.getPropertyList(presentLabel.getDiags())); // 现病史诊断
+        CoreUtil.addList(diagList, CoreUtil.getPropertyList(diagLabel.getDiags())); // 文本诊断
+        CoreUtil.addList(diagList, CoreUtil.getPropertyList(pastLabel.getDiags())); // 既往史诊断
+        // 开单项诊断
         diagList.addAll(wordCrfDTO.getDiagOrder().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                 .map(x -> x.getName()).collect(Collectors.toList()));
-        //传的诊断
+        // 结构化诊断
         diagList.addAll(wordCrfDTO.getDiag().stream().filter(x ->
                 StringUtils.isBlank(x.getUniqueName()))
                 .map(x -> x.getName()).collect(Collectors.toList()));
-        //选中的诊断
+        // 选中诊断
         if (wordCrfDTO.getDiseaseName() != null && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())) {
             diagList.add(wordCrfDTO.getDiseaseName().getName());
         }
@@ -257,13 +257,13 @@ public class CommonFacade {
         CoreUtil.setPropertyList(chiefLabel.getClinicals(), map.get(StandConvertEnum.symptom.toString()));
         CoreUtil.setPropertyList(presentLabel.getClinicals(), map.get(StandConvertEnum.symptom.toString()));
         //诊断回填
-        CoreUtil.setPropertyList(diagLabel.getDiags(), map.get(StandConvertEnum.disease.toString()));
-        CoreUtil.setPropertyList(chiefLabel.getDiags(), map.get(StandConvertEnum.disease.toString()));
-        CoreUtil.setPropertyList(presentLabel.getDiags(), map.get(StandConvertEnum.disease.toString()));
-        CoreUtil.setPropertyList(pastLabel.getDiags(), map.get(StandConvertEnum.disease.toString()));
-        CoreUtil.setPropertyList(wordCrfDTO.getDiagOrder(), "name", "uniqueName", map.get(StandConvertEnum.disease.toString()));
-        CoreUtil.setPropertyList(wordCrfDTO.getDiag(), "name", "uniqueName", map.get(StandConvertEnum.disease.toString()));
-        CoreUtil.setPropertyList(wordCrfDTO.getDiseaseName(), "name", "uniqueName", map.get(StandConvertEnum.disease.toString()));
+        CoreUtil.setPropertyList(diagLabel.getDiags(), map.get(StandConvertEnum.disease.toString())); // 文本诊断
+        CoreUtil.setPropertyList(chiefLabel.getDiags(), map.get(StandConvertEnum.disease.toString())); // 主诉诊断
+        CoreUtil.setPropertyList(presentLabel.getDiags(), map.get(StandConvertEnum.disease.toString())); // 现病史诊断
+        CoreUtil.setPropertyList(pastLabel.getDiags(), map.get(StandConvertEnum.disease.toString())); // 既往史诊断
+        CoreUtil.setPropertyList(wordCrfDTO.getDiagOrder(), "name", "uniqueName", map.get(StandConvertEnum.disease.toString())); // 开单项诊断
+        CoreUtil.setPropertyList(wordCrfDTO.getDiag(), "name", "uniqueName", map.get(StandConvertEnum.disease.toString())); // 结构化诊断
+        CoreUtil.setPropertyList(wordCrfDTO.getDiseaseName(), "name", "uniqueName", map.get(StandConvertEnum.disease.toString())); // 选中诊断
         //药品回填
         CoreUtil.setPropertyList(presentLabel.getMedicines(), map.get(StandConvertEnum.drug.toString()));
         CoreUtil.setPropertyList(presentLabel.getTakeMedicine(), map.get(StandConvertEnum.drug.toString()));
@@ -310,7 +310,7 @@ public class CommonFacade {
         pushVO.setAgeNum(wordCrfDTO.getAgeNum());
         pushVO.setDiaeaseName(diseaseName);
         List<Item> depts = wordCrfDTO.getDept();
-        if(ListUtil.isNotEmpty(depts)){
+        if (ListUtil.isNotEmpty(depts)) {
             List<String> collect = depts.stream().map(x -> x.getUniqueName()).collect(Collectors.toList());
             pushVO.setDept(collect);
         }
@@ -332,11 +332,11 @@ public class CommonFacade {
                 List<Diag> chief_diags = chiefLabel.getDiags().stream()
                         .filter(x -> x.getNegative() == null && StringUtils.isNotBlank(x.getStandName()))
                         .map(x ->
-                {
-                    Diag diag = new Diag();
-                    diag.setName(x.getStandName());
-                    return diag;
-                }).collect(Collectors.toList());
+                        {
+                            Diag diag = new Diag();
+                            diag.setName(x.getStandName());
+                            return diag;
+                        }).collect(Collectors.toList());
                 chiefPushVo.setDiags(chief_diags);
             }
             if (ListUtil.isNotEmpty(chiefLabel.getPds())) {
@@ -349,22 +349,22 @@ public class CommonFacade {
             if (ListUtil.isNotEmpty(presentLabel.getClinicals())) {
                 List<Symptom> presentClinicals = presentLabel.getClinicals().stream()
                         .filter(x -> x.getNegative() == null).map(z ->
-                {
-                    Symptom symptom = new Symptom();
-                    symptom.setName(z.getStandName());
-                    return symptom;
-                }).collect(Collectors.toList());
+                        {
+                            Symptom symptom = new Symptom();
+                            symptom.setName(z.getStandName());
+                            return symptom;
+                        }).collect(Collectors.toList());
                 presentPushVo.setSymptoms(presentClinicals);
             }
             if (ListUtil.isNotEmpty(presentLabel.getDiags())) {
                 List<Diag> presentdiags = presentLabel.getDiags().stream()
                         .filter(x -> x.getNegative() == null && StringUtils.isNotBlank(x.getStandName())).map
-                        (x -> x.getStandName()).distinct().map(z ->
-                {
-                    Diag diag = new Diag();
-                    diag.setName(z);
-                    return diag;
-                }).collect(Collectors.toList());
+                                (x -> x.getStandName()).distinct().map(z ->
+                        {
+                            Diag diag = new Diag();
+                            diag.setName(z);
+                            return diag;
+                        }).collect(Collectors.toList());
                 presentPushVo.setDiags(presentdiags);
             }
             if (ListUtil.isNotEmpty(presentLabel.getMedicines())) {
@@ -626,11 +626,11 @@ public class CommonFacade {
         Lis lis = new Lis();
         lis.setUnits(unit);
         if (StringUtils.isBlank(unit)) {
-             if (CoreUtil.isNumbers(value)) {
-                 lis.setValue(Double.parseDouble(value));
-             } else {
-                 lis.setOtherValue(value);
-             }
+            if (CoreUtil.isNumbers(value)) {
+                lis.setValue(Double.parseDouble(value));
+            } else {
+                lis.setOtherValue(value);
+            }
         } else {
             lis.setValue(Double.parseDouble(value));
         }

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

@@ -383,7 +383,7 @@ public class TestFacade {
      *
      * @param file
      */
-    public Map<String, Object> testHighRiskOperationExcel(MultipartFile file, TestLineVO testLineVO) {
+    public Map<String, Object>   testHighRiskOperationExcel(MultipartFile file, TestLineVO testLineVO) {
         long start = System.currentTimeMillis();
         List<IndicationPushVO> indicationPushVOList = new ArrayList<>();
         List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);

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

@@ -35,16 +35,7 @@ public class MedEquRule {
         if (ListUtil.isNotEmpty(medEquList)) {
             for (NodeNeoDTO node : medEquList) {
                 boolean flag = false;
-                if ("起搏器".equals(node.getName())) {
-                    if (chief.contains("起搏器") || symptom.contains("起搏器") || pasts.contains("起搏器") ||
-                            chief.contains("起 搏器") || symptom.contains("起 搏器") || pasts.contains("起 搏器") ||
-                            chief.contains("起搏 器") || symptom.contains("起搏 器") || pasts.contains("起搏 器") ||
-                            chief.contains("起博器") || symptom.contains("起博器") || pasts.contains("起博器") ||
-                            chief.contains("起博 器") || symptom.contains("起博 器") || pasts.contains("起博 器") ||
-                            chief.contains("起 博器") || symptom.contains("起 博器") || pasts.contains("起 博器")) {
-                        flag = true;
-                    }
-                } else if (chief.contains(node.getName()) || symptom.contains(node.getName()) || pasts.contains(node.getName())) {
+                if (chief.contains(node.getName()) || symptom.contains(node.getName()) || pasts.contains(node.getName())) {
                     flag = true;
                 }
                 if (flag) {