Merge remote-tracking branch 'origin/master'

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

@@ -25,8 +25,8 @@ public class BEH0026 extends QCCatalogue {
             long count = allergies.stream().filter(
                     i -> i != null
                             && StringUtil.isNotBlank(i.getName())
-                            && i.getAllergyFood() != null
-                            && StringUtil.isNotBlank(i.getAllergyFood().getName())
+//                            && i.getAllergyFood() != null
+//                            && StringUtil.isNotBlank(i.getAllergyFood().getName())
             ).count();
             if (count > 0) {
                 status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0328.java

@@ -21,7 +21,7 @@ public class PRE0328 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+       /* boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
             if (ListUtil.isEmpty(operationDocs)) {
@@ -33,6 +33,15 @@ public class PRE0328 extends QCCatalogue {
                     }
                 }
             }
+        }*/
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs != null && operationDocs.size()>0){
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null) {
+                    status.set("-1");
+                    break;
+                }
+            }
         }
     }