Merge remote-tracking branch 'origin/hb/beilun' into hb/beilun

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/xszyy/operationdiscussion/OPE03143.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.hospital.xszyy.operationdiscussion;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
 import com.lantone.qc.pub.util.StringUtil;
@@ -30,32 +31,37 @@ public class OPE03143 extends QCCatalogue {
         boolean flag = true;
         //先判断有无手术记录
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if (operationDocs != null && operationDocs.size() > 0) {
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc == null) {
+        if (operationDocs == null && operationDocs.size() == 0) {
+            return;
+        }
+        //先判断有无输血记录
+        List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
+        if (clinicalBloodDocs == null) {
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc == null) {
+                continue;
+            }
+            OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
+            if (operationRecordDoc != null) {
+                Map<String, String> structureMap = operationRecordDoc.getStructureMap();
+                if (structureMap == null) {
                     continue;
                 }
-                OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
-                if (operationRecordDoc != null) {
-                    Map<String, String> structureMap = operationRecordDoc.getStructureMap();
-                    if (structureMap == null) {
-                        continue;
-                    }
-                    String bloodTransfusion = structureMap.get("输血情况");
-                    if (StringUtil.isNotBlank(bloodTransfusion)) {
-                        flag = false;
-                    }
+                String bloodTransfusion = structureMap.get("输血情况");
+                if (StringUtil.isNotBlank(bloodTransfusion)) {
+                    flag = false;
+                }
 
-                    String afterOperation = structureMap.get("手术经过及处理");
-                    if (StringUtil.isNotBlank(afterOperation)) {
-                        if (afterOperation.contains("输血")) {
-                            flag = false;
-                        }
+                String afterOperation = structureMap.get("手术经过及处理");
+                if (StringUtil.isNotBlank(afterOperation)) {
+                    if (afterOperation.contains("输血")) {
+                        flag = false;
                     }
                 }
             }
         }
-
         if (flag) {
             status.set("-1");
             return;

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

@@ -1,15 +1,14 @@
 package com.lantone.qc.kernel.catalogue.operationdiscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -32,32 +31,37 @@ public class OPE03143 extends QCCatalogue {
         boolean flag = true;
         //先判断有无手术记录
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if (operationDocs != null && operationDocs.size() > 0) {
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc == null) {
+        if (operationDocs == null && operationDocs.size() == 0) {
+            return;
+        }
+        //先判断有无输血记录
+        List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
+        if (clinicalBloodDocs == null) {
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc == null) {
+                continue;
+            }
+            OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
+            if (operationRecordDoc != null) {
+                Map<String, String> structureMap = operationRecordDoc.getStructureMap();
+                if (structureMap == null) {
                     continue;
                 }
-                OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
-                if (operationRecordDoc != null) {
-                    Map<String, String> structureMap = operationRecordDoc.getStructureMap();
-                    if (structureMap == null) {
-                        continue;
-                    }
-                    String bloodTransfusion = structureMap.get("输血情况");
-                    if (StringUtil.isNotBlank(bloodTransfusion)) {
-                        flag = false;
-                    }
+                String bloodTransfusion = structureMap.get("输血情况");
+                if (StringUtil.isNotBlank(bloodTransfusion)) {
+                    flag = false;
+                }
 
-                    String afterOperation = structureMap.get("手术经过");
-                    if (StringUtil.isNotBlank(afterOperation)) {
-                        if (afterOperation.contains("输血")) {
-                            flag = false;
-                        }
+                String afterOperation = structureMap.get("手术经过");
+                if (StringUtil.isNotBlank(afterOperation)) {
+                    if (afterOperation.contains("输血")) {
+                        flag = false;
                     }
                 }
             }
         }
-
         if (flag) {
             status.set("-1");
             return;