无输血或使用血液制品知情同意书

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0301.java

@@ -79,7 +79,7 @@ public class CLI0301 extends QCCatalogue {
                         continue;
                     }
                     String rex="[\\s\\S]*(?=输血)[^,;，；。]{0,10}(?=知情同意书)[\\s\\S]*";
-                    if(Content.BLOODRECORDLIST.contains(str)||str.matches(rex)){
+                    if(Content.BLOODRECORDLIST.stream().anyMatch(obj -> str.contains(obj))||str.matches(rex)){
                         status.set("0");
                         return;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/changshaxy/clinicalblood/CLI0301.java

@@ -36,8 +36,8 @@ public class CLI0301 extends QCCatalogue {
                 informedConsentDoc -> {
                     boolean flag = false;
                     if (informedConsentDoc.getStructureMap() != null
-                            && StringUtil.isBlank(informedConsentDoc.getStructureMap().get("标题"))
-                            && Content.BLOODRECORDLIST.contains(informedConsentDoc.getStructureMap().get("标题"))) {
+                            && StringUtil.isNotBlank(informedConsentDoc.getStructureMap().get("标题"))
+                            && Content.BLOODRECORDLIST.stream().anyMatch(obj -> informedConsentDoc.getStructureMap().get("标题").contains(obj))) {
                         flag = true;
                     }
                     return flag;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shengzhouyy/clinicalblood/CLI0301.java

@@ -84,7 +84,7 @@ public class CLI0301 extends QCCatalogue {
                         continue;
                     }
                     String rex="[\\s\\S]*(?=输血)[^,;，；。]{0,10}(?=知情同意书)[\\s\\S]*";
-                    if(Content.BLOODRECORDLIST.contains(str)||str.matches(rex)){
+                    if( Content.BLOODRECORDLIST.stream().anyMatch(obj -> str.contains(obj))||str.matches(rex)){
                         status.set("0");
                         return;
                     }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -684,7 +684,7 @@ public class Content {
      *   临床用血
      */
     public static List<String> BLOODRECORDLIST = Arrays.asList(
-            "输血/成份血知情同意书","成份血知情同意书","输血知情同意书","使用血液制品知情同意书","血液制品治疗知情同意书","输血治疗知情同意书","输血治疗同意书","血液制品治疗同意书","输血（血制品）治疗知情同意书","输血制品同意书","临床输血治疗知情同意书");
+           "血制品","血液制品", "输血/成份血知情同意书","成份血知情同意书","输血知情同意书","输血治疗知情同意书","输血治疗同意书","临床输血治疗知情同意书");
 
     /**
      *   植入物