台州修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0149.java

@@ -47,7 +47,7 @@ public class LEA0149 extends QCCatalogue {
 
             //如果出院小结结构化数据能取出主诉，则直接用该主诉和入院记录主诉比较
             if (StringUtil.isNotBlank(leaveChief)) {
-                leaveChief = leaveChief.replaceAll("[\\p{Punct}\\pP。-]", "");
+                leaveChief = CatalogueUtil.int2ChineseNum(leaveChief.replaceAll("[\\p{Punct}\\pP。-]", ""));
                 if (bhChief.equals(leaveChief)) {
                     status.set("0");
                     return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0559.java

@@ -29,7 +29,9 @@ public class LEA0559 extends QCCatalogue {
         if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
             Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
             if (structureMap != null) {
-                if (StringUtils.isBlank(structureMap.get("出院带药"))) {
+                String dischargeWithMedicine = structureMap.get("出院带药");
+                String dischargeOrder = structureMap.get("出院医嘱");
+                if (StringUtils.isBlank(dischargeWithMedicine) && StringUtils.isBlank(dischargeOrder)) {
                     status.set("-1");
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0635.java

@@ -33,7 +33,7 @@ public class OPE0635 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("手术经过及处理（包括患者的体位、切口处理、病灶所见及手术步骤等）"))) {
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("手术经过"))) {
                         flag = true;
                     }
                     return flag;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0637.java

@@ -22,28 +22,28 @@ public class OPE0637 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-//        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size() == 0){
+        //        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+        //        if (isOperativePatient) {
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if (operationDocs == null || operationDocs.size() == 0) {
             status.set("0");
             return;
         }
-            if (ListUtil.isNotEmpty(operationDocs)) {
-                long count = operationDocs.stream().filter(operationDoc -> {
-                    boolean flag = false;
-                    if (operationDoc.getOperationRecordDoc() != null
-                            && (StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("助手I"))
-                            || StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("助手II")))) {
-                        flag = true;
-                    }
-                    return flag;
-                }).count();
-                if (count > 0) {
-                    status.set("-1");
+        if (ListUtil.isNotEmpty(operationDocs)) {
+            long count = operationDocs.stream().filter(operationDoc -> {
+                boolean flag = false;
+                if (operationDoc.getOperationRecordDoc() != null
+                        && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("助手"))
+                        && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("助手II"))) {
+                    flag = true;
                 }
+                return flag;
+            }).count();
+            if (count > 0) {
+                status.set("-1");
             }
         }
-//    }
+    }
+    //    }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0638.java

@@ -33,7 +33,8 @@ public class OPE0638 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("器械护士"))) {
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("器械护士1"))
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("器械护士2"))) {
                         flag = true;
                     }
                     return flag;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0639.java

@@ -33,7 +33,8 @@ public class OPE0639 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("巡回护士"))) {
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("巡回护士1"))
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("巡回护士2"))) {
                         flag = true;
                     }
                     return flag;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0644.java

@@ -33,7 +33,7 @@ public class OPE0644 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("术中并发症"))) {
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("是否术中并发症"))) {
                         flag = true;
                     }
                     return flag;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0602.java

@@ -94,7 +94,7 @@ public class THR0602 extends QCCatalogue {
         );
         //按时间排好序查房记录的第一条主刀医师查房记录存进doctorRecord
         for (String record : sortRecord) {
-            if (!CatalogueUtil.subTitle(record).contains("主刀")) {
+            if (record.contains("主刀")) {
                 continue;
             }
             doctorRecord.put("主刀", record);

trans/src/main/java/com/lantone/qc/trans/comsis/OrdinaryAssistant.java

@@ -85,4 +85,19 @@ public class OrdinaryAssistant {
         }
     }
 
+    /**
+     * 去除value中空格（HTML格式空格）
+     *
+     * @param structureMap
+     */
+    public static void removeBlank(Map<String, String> structureMap) {
+        for (Map.Entry<String, String> map : structureMap.entrySet()) {
+            String value = map.getValue();
+            if (StringUtil.isBlank(value) || !(value.contains("&amp;") || value.contains("amp;") || value.contains("nbsp;"))) {
+                continue;
+            }
+            structureMap.put(map.getKey(), value.replaceAll("[&amp;|amp;|nbsp;]", ""));
+        }
+    }
+
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -138,7 +138,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
-
+        OrdinaryAssistant.removeBlank(structureMap);
         OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
         operationRecordDoc.setStructureMap(structureMap);
         operationRecordDoc.setPageData((Map) structureMap);