北仑：规则优化

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0378.java

@@ -30,7 +30,7 @@ public class BEH0378 extends QCCatalogue {
         FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
 
-        if (familyLabel == null && maritalLabel == null) {
+        if (familyLabel == null || maritalLabel == null) {
             return;
         }
         List<Family> familiesFl = null;
@@ -48,11 +48,11 @@ public class BEH0378 extends QCCatalogue {
         if (maritalLabel != null) {
             familiesMl = maritalLabel.getFamily();
             for (Family family : familiesMl) {
-                if(family.getDead()!=null && family.getName()!=null){
+                if (family.getDead() != null && family.getName() != null) {
                     String maritalText = maritalLabel.getText();
                     int index1 = maritalText.indexOf(family.getDead().getName());
                     int index2 = maritalText.indexOf(family.getName());
-                    if(0<index1 && index1<index2 && maritalText.substring(index1,index2).contains("，")){
+                    if (0 < index1 && index1 < index2 && maritalText.substring(index1, index2).contains("，")) {
                         family.setDead(null);
                     }
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0422.java

@@ -4,6 +4,7 @@ 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.BeHospitalizedDoc;
+import com.lantone.qc.pub.util.DateUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -29,13 +30,13 @@ public class BEH0422 extends QCCatalogue {
         }
         Map<String, String> docStructureMap = beHospitalizedDoc.getStructureMap();
         String admissionDateStr = docStructureMap.get("入院日期");
-        String recordDateStr = docStructureMap.get("记录日期");
+        String recordDateStr = docStructureMap.get("记录时间");
         if (StringUtil.isBlank(admissionDateStr) || StringUtil.isBlank(recordDateStr)) {
             return;
         }
         // 如果时间格式不一致，就不比较 “2020-05-06 14:06” 与 “2020-05-06”
-        if (admissionDateStr.length() != recordDateStr.length()) {
-            return ;
+        if (admissionDateStr.length() != recordDateStr.length() || DateUtil.parseDate(recordDateStr) == null) {
+            return;
         }
         Date admissionDate = StringUtil.parseDateTime(admissionDateStr);
         Date recordDate = StringUtil.parseDateTime(recordDateStr);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0134.java

@@ -40,7 +40,7 @@ public class THR0134 extends QCCatalogue {
         String content = firstAttendStructureMap.get("病情记录");
         if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") || content.contains("当前诊断") ||
                 content.contains("考虑诊断") || content.contains("诊断考虑") || content.contains("诊断基本明确") || content.contains("初步诊断") ||
-                regexFind(content, "诊断", "基本明确")) {
+                content.contains("诊断为") || regexFind(content, "诊断", "基本明确")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0139.java

@@ -40,7 +40,7 @@ public class THR0139 extends QCCatalogue {
         String content = firstDirectStructureMap.get("病情记录");
         if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") || content.contains("当前诊断") ||
                 content.contains("考虑诊断") || content.contains("诊断考虑") || content.contains("诊断基本明确") || content.contains("初步诊断") ||
-                regexFind(content, "诊断", "基本明确")) {
+                content.contains("诊断为") || regexFind(content, "诊断", "基本明确")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0588.java

@@ -61,8 +61,8 @@ public class THR0588 extends QCCatalogue {
         /******************************************术后首程********************************************************/
         if (inputInfo.getOperationDocs().size() > 0) {
             List<String> recordDateList = inputInfo.getOperationDocs().stream().map(OperationDoc::getOperationDiscussionDoc).filter(Objects::nonNull)
-                    .map(OperationDiscussionDoc::getStructureMap).filter(i -> StringUtil.isNotBlank(i.get("记录日期")))
-                    .map(i -> i.get("记录日期")).collect(Collectors.toList());
+                    .map(OperationDiscussionDoc::getStructureMap).filter(i -> StringUtil.isNotBlank(i.get("病历日期")))
+                    .map(i -> i.get("病历日期")).collect(Collectors.toList());
             for (String recordDateStr : recordDateList) {
                 Date recordDate = StringUtil.parseDateTime(recordDateStr);
                 if (recordDate == null) {
@@ -75,8 +75,8 @@ public class THR0588 extends QCCatalogue {
         if (inputInfo.getTransferRecordDocs() != null) {
             TransferRecordDoc transferRecordDocs = inputInfo.getTransferRecordDocs();
             List<String> intoRecordDateList = transferRecordDocs.getTransferIntoDocs()
-                    .stream().map(TransferIntoDoc::getStructureMap).filter(i -> StringUtil.isNotBlank(i.get("记录日期")))
-                    .map(i -> i.get("记录日期")).collect(Collectors.toList());
+                    .stream().map(TransferIntoDoc::getStructureMap).filter(i -> StringUtil.isNotBlank(i.get("病历日期")))
+                    .map(i -> i.get("病历日期")).collect(Collectors.toList());
             for (String recordDateStr : intoRecordDateList) {
                 Date recordDate = StringUtil.parseDateTime(recordDateStr);
                 if (recordDate == null) {
@@ -85,8 +85,8 @@ public class THR0588 extends QCCatalogue {
                 dateThreeLevelDay.add(recordDate);
             }
             intoRecordDateList = transferRecordDocs.getTransferOutDocs()
-                    .stream().map(TransferOutDoc::getStructureMap).filter(i -> StringUtil.isNotBlank(i.get("记录日期")))
-                    .map(i -> i.get("记录日期")).collect(Collectors.toList());
+                    .stream().map(TransferOutDoc::getStructureMap).filter(i -> StringUtil.isNotBlank(i.get("病历日期")))
+                    .map(i -> i.get("病历日期")).collect(Collectors.toList());
             for (String recordDateStr : intoRecordDateList) {
                 Date recordDate = StringUtil.parseDateTime(recordDateStr);
                 if (recordDate == null) {
@@ -98,8 +98,8 @@ public class THR0588 extends QCCatalogue {
         /******************************************阶段小结********************************************************/
         if (inputInfo.getStagesSummaryDocs().size() > 0) {
             List<String> intoRecordDateList = inputInfo.getStagesSummaryDocs().stream().map(StagesSummaryDoc::getStructureMap)
-                    .filter(i -> StringUtil.isNotBlank(i.get("记录日期")))
-                    .map(i -> i.get("记录日期")).collect(Collectors.toList());
+                    .filter(i -> StringUtil.isNotBlank(i.get("病历日期")))
+                    .map(i -> i.get("病历日期")).collect(Collectors.toList());
             for (String recordDateStr : intoRecordDateList) {
                 Date recordDate = StringUtil.parseDateTime(recordDateStr);
                 if (recordDate == null) {