义乌妇保规则更新-补充诊断不进行规则触发，术前讨论记录无拟行术式逻辑修改

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

@@ -54,7 +54,8 @@ public class BEH03335 extends QCCatalogue {
         //修正诊断
         DiagLabel revisedDiagLabel = beHospitalizedDoc.getRevisedDiagLabel();
         //补充诊断
-        DiagLabel suppleDiagLabel = beHospitalizedDoc.getSuppleDiagLabel();
+        //贾主任说补充诊断不用搞
+        //DiagLabel suppleDiagLabel = beHospitalizedDoc.getSuppleDiagLabel();
         if (initialDiagLabel != null) {
             List<Diag> diagLists = initialDiagLabel.getDiags();
             if (ListUtil.isNotEmpty(diagLists)) {
@@ -70,13 +71,13 @@ public class BEH03335 extends QCCatalogue {
                         diagList.add(diag.getHospitalDiagName()));
             }
         }
-        if (suppleDiagLabel != null) {
-            List<Diag> diagLists = suppleDiagLabel.getDiags();
-            if (ListUtil.isNotEmpty(diagLists)) {
-                diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
-                        diagList.add(diag.getHospitalDiagName()));
-            }
-        }
+//        if (suppleDiagLabel != null) {
+//            List<Diag> diagLists = suppleDiagLabel.getDiags();
+//            if (ListUtil.isNotEmpty(diagLists)) {
+//                diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+//                        diagList.add(diag.getHospitalDiagName()));
+//            }
+//        }
 
         //如果疾病集合为空则直接返回
         if (ListUtil.isEmpty(diagList)) {

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

@@ -56,7 +56,8 @@ public class BEH03336 extends QCCatalogue {
         //修正诊断
         DiagLabel revisedDiagLabel = beHospitalizedDoc.getRevisedDiagLabel();
         //补充诊断
-        DiagLabel suppleDiagLabel = beHospitalizedDoc.getSuppleDiagLabel();
+        //贾主任说补充诊断不用搞
+        //DiagLabel suppleDiagLabel = beHospitalizedDoc.getSuppleDiagLabel();
         if (initialDiagLabel != null) {
             List<Diag> diagLists = initialDiagLabel.getDiags();
             if (ListUtil.isNotEmpty(diagLists)) {
@@ -72,13 +73,13 @@ public class BEH03336 extends QCCatalogue {
                         diagList.add(diag.getHospitalDiagName()));
             }
         }
-        if (suppleDiagLabel != null) {
-            List<Diag> diagLists = suppleDiagLabel.getDiags();
-            if (ListUtil.isNotEmpty(diagLists)) {
-                diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
-                        diagList.add(diag.getHospitalDiagName()));
-            }
-        }
+//        if (suppleDiagLabel != null) {
+//            List<Diag> diagLists = suppleDiagLabel.getDiags();
+//            if (ListUtil.isNotEmpty(diagLists)) {
+//                diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+//                        diagList.add(diag.getHospitalDiagName()));
+//            }
+//        }
 
         //如果疾病集合为空则直接返回
         if (ListUtil.isEmpty(diagList)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/yiwu/preoperativediscussion/PRE0330.java

@@ -36,7 +36,7 @@ public class PRE0330 extends QCCatalogue {
             if (!map.containsKey("拟施手术方式名称及可能的变更与禁忌症") && !map.containsKey("拟施手术名称和方式及可能的变更")) {
                 continue;
             }
-            if (StringUtil.isEmpty(map.get("拟施手术方式名称及可能的变更与禁忌症")) && StringUtil.isEmpty(map.get("拟施手术名称和方式及可能的变更"))) {
+            if (StringUtil.isEmpty(map.get("拟施手术方式名称及可能的变更与禁忌症")) || StringUtil.isEmpty(map.get("拟施手术名称和方式及可能的变更"))) {
                 status.set("-1");
             }
         }