Forráskód Böngészése

新增代码逻辑判断

daiyi 3 éve
szülő
commit
a06275a1c9

+ 7 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/ningbozhongyi/operationdiscussion/OPE03111.java

@@ -45,13 +45,6 @@ public class OPE03111 extends QCCatalogue {
                 if (operationRecordDoc == null) {
                     return;
                 }
-                String pathological = operationRecordDoc.getStructureMap().get("病理检查");
-                if (StringUtil.isNotEmpty(pathological)){
-                    if (pathological.contains("送")){
-                        status.set("0");
-                        continue;
-                    }
-                }
             }
         }
 
@@ -97,6 +90,7 @@ public class OPE03111 extends QCCatalogue {
                 //有手术记录的情况下,手术记录中应该出现体现有标本
                 for (OperationDoc operationDoc : operationDocs) {
                     String specimens = operationDoc.getOperationRecordDoc().getStructureMap().get("术中取病理标本");
+                    String pathological = operationDoc.getOperationRecordDoc().getStructureMap().get("病理检查");
                     if(StringUtil.isNotEmpty(specimens)){
                         if(specimens.equals("有")){
                             status.set("0");
@@ -107,6 +101,12 @@ public class OPE03111 extends QCCatalogue {
                             return;
                         }
                     }
+                    if (StringUtil.isNotEmpty(pathological)){
+                        if (pathological.equals("送")){
+                            status.set("0");
+                            continue;
+                        }
+                    }
                     OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
                     if (operationRecordDoc != null) {
                         String str = operationRecordDoc.getStructureMap().get("手术经过及处理");