1.修改禅道bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -33,7 +33,9 @@ public class BEH0375 extends QCCatalogue {
         //硬规则 匹配未婚
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
         if (maritalLabel != null &&
-                (maritalLabel.getText().contains("未婚") || maritalLabel.getText().contains("离婚"))) {
+                (maritalLabel.getText().contains("未婚")
+                        || maritalLabel.getText().contains("离婚")
+                        || maritalLabel.getText().contains("已故"))) {
             status.set("0");
             return;
         }

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

@@ -28,37 +28,37 @@ public class OPE0353 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-//        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.isEmpty(operationDocs)) {
-                return;
+        if (ListUtil.isEmpty(operationDocs)) {
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
+            if (operationDiscussionDoc == null) {
+                continue;
+            }
+            //结构化读取手术术后处理措施和注意事项
+            if (operationDiscussionDoc.getStructureMap().get("术后处理措施") != null
+                    || operationDiscussionDoc.getStructureMap().get("术后注意事项") != null) {
+                continue;
             }
-            for (OperationDoc operationDoc : operationDocs) {
-                OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
-                if (operationDiscussionDoc == null) {
-                    continue;
-                }
-                //结构化读取手术术后处理措施和注意事项
-                if (operationDiscussionDoc.getStructureMap().get("术前术后注意事项") != null
-                        && operationDiscussionDoc.getStructureMap().get("可能意外和防范措施") != null) {
-                    continue;
-                }
 
-                OperationDiscussionLabel operationDiscussionLabel = operationDiscussionDoc.getOperationDiscussionLabel();
-                String measuresAfterOp = operationDiscussionLabel.getMeasuresAfterOp();
-                String attentionAfterOp = operationDiscussionLabel.getAttentionAfterOp();
-                if (StringUtil.isBlank(measuresAfterOp) || measuresAfterOp.length() < 10
-                        || StringUtil.isBlank(attentionAfterOp) || attentionAfterOp.length() < 10) {
-                    status.set("-1");
-                    return;
-                }
+            OperationDiscussionLabel operationDiscussionLabel = operationDiscussionDoc.getOperationDiscussionLabel();
+            String measuresAfterOp = operationDiscussionLabel.getMeasuresAfterOp();
+            String attentionAfterOp = operationDiscussionLabel.getAttentionAfterOp();
+            if (StringUtil.isBlank(measuresAfterOp) || measuresAfterOp.length() < 10
+                    || StringUtil.isBlank(attentionAfterOp) || attentionAfterOp.length() < 10) {
+                status.set("-1");
+                return;
             }
         }
-//    }
+    }
+    //    }
 
 }