发布

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

@@ -1,54 +1,47 @@
-package com.lantone.qc.kernel.catalogue.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.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 手术记录中麻醉方式未填写
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class OPE0356 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        //医嘱
-        //        List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
-        //        if (ListUtil.isEmpty(doctorAdviceDocs)) {
-        //            return;
-        //        }
-        //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-//        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("麻醉方式"))) {
-                        flag = true;
-                    }
-                    return flag;
-                }).count();
-                if (count > 0) {
-                    status.set("-1");
-                }
-            }
-        }
-//    }
-
+package com.lantone.qc.kernel.catalogue.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.operation.OperationDoc;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * @Description: 手术记录中麻醉方式未填写
+ * @author: rengb
+ * @time: 2020/3/23 15:09
+ */
+@Component
+public class OPE0356 extends QCCatalogue {
+
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
+        status.set("0");
+        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
+                            && operationDoc.getOperationRecordDoc().getStructureMap().containsKey("麻醉方式")
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("麻醉方式"))) {
+                        flag = true;
+                    }
+                    return flag;
+                }).count();
+                if (count > 0) {
+                    status.set("-1");
+                }
+            }
+        }
+//    }
+
 }

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

@@ -22,9 +22,7 @@ public class OPE0635 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();
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
         if(operationDocs == null || operationDocs.size() == 0){
             status.set("0");
             return;
@@ -33,6 +31,7 @@ public class OPE0635 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
+                            && operationDoc.getOperationRecordDoc().getStructureMap().containsKey("手术经过")
                             && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("手术经过"))) {
                         flag = true;
                     }

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

@@ -22,9 +22,7 @@ public class OPE0636 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();
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
         if(operationDocs == null || operationDocs.size() == 0){
             status.set("0");
             return;
@@ -33,6 +31,7 @@ public class OPE0636 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
+                            && operationDoc.getOperationRecordDoc().getStructureMap().containsKey("主刀医师")
                             && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师"))) {
                         flag = true;
                     }

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

@@ -33,6 +33,8 @@ public class OPE0637 extends QCCatalogue {
             long count = operationDocs.stream().filter(operationDoc -> {
                 boolean flag = false;
                 if (operationDoc.getOperationRecordDoc() != null
+                        && operationDoc.getOperationRecordDoc().getStructureMap().containsKey("一助")
+                        && operationDoc.getOperationRecordDoc().getStructureMap().containsKey("助手II")
                         && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("一助"))
                         && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("助手II"))) {
                     flag = true;