转入记录、转入记录、无输血或使用血液制品知情同意书加入对知情同意书标题正则判断

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

@@ -75,7 +75,11 @@ public class CLI0301 extends QCCatalogue {
             if (ListUtil.isNotEmpty(informedConsentDocList)) {
                 for (InformedConsentDoc informedConsentDoc : informedConsentDocList) {
                     String str = informedConsentDoc.getStructureMap().get("标题");
-                    if(Content.BLOODRECORDLIST.contains(str)){
+                    if(StringUtil.isBlank(str)){
+                        continue;
+                    }
+                    String rex="[\\s\\S]*(?=输血)[^,;，；。]{0,10}(?=知情同意书)[\\s\\S]*";
+                    if(Content.BLOODRECORDLIST.contains(str)||str.matches(rex)){
                         status.set("0");
                         return;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03137.java

@@ -120,13 +120,16 @@ public class THR03137 extends QCCatalogue {
 
         //2.1不存在【转入记录】或【转出记录】与【转入记录】数量不一致则报
         TransferRecordDoc transferRecordDocs = inputInfo.getTransferRecordDocs();
-        status.set("0");
         if(transferRecordDocs==null){
             return;
         }
         List<TransferIntoDoc> transferIntoDocs = transferRecordDocs.getTransferIntoDocs();
         List<TransferOutDoc> transferOutDocs = transferRecordDocs.getTransferOutDocs();
-        if(ListUtil.isEmpty(transferIntoDocs) || (transferIntoDocs.size()>0 && transferIntoDocs.size() != transferOutDocs.size())){
+        status.set("0");
+        if(ListUtil.isEmpty(transferOutDocs)){
+            return;
+        }
+        if(ListUtil.isEmpty(transferIntoDocs) || (transferIntoDocs.size()>0 && transferIntoDocs.size() < transferOutDocs.size())){
             status.set("-1");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03138.java

@@ -120,13 +120,16 @@ public class THR03138 extends QCCatalogue {
 
         //2.1不存在【转出记录】或【转出记录】与【转入记录】数量不一致则报
         TransferRecordDoc transferRecordDocs = inputInfo.getTransferRecordDocs();
-        status.set("0");
         if(transferRecordDocs==null){
             return;
         }
         List<TransferIntoDoc> transferIntoDocs = transferRecordDocs.getTransferIntoDocs();
         List<TransferOutDoc> transferOutDocs = transferRecordDocs.getTransferOutDocs();
-        if(ListUtil.isEmpty(transferOutDocs) || (transferOutDocs.size()>0 && transferIntoDocs.size()!= transferOutDocs.size())){
+        status.set("0");
+        if(ListUtil.isEmpty(transferIntoDocs)){
+            return;
+        }
+        if(ListUtil.isEmpty(transferOutDocs) || (transferOutDocs.size()>0 && transferIntoDocs.size() > transferOutDocs.size())){
             status.set("-1");
             return;
         }