Merge branch 'beilun/dev-fqw' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0122.java

@@ -27,22 +27,53 @@ public class THR0122 extends QCCatalogue {
             String admisDate = beHospitalStructureMap.get(Content.admisDate);
             Map<String, String> firstCourseRecordStructureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
             String recordTime = firstCourseRecordStructureMap.get("病历日期");
-            if (CatalogueUtil.isEmpty(admisDate) || CatalogueUtil.isEmpty(recordTime)) {
+            String [] str=firstCourseRecordStructureMap.get("病历内容").split("于");
+            String admisDate1=str[str.length-1].replaceAll("入院","").replaceAll("。","");
+            if (CatalogueUtil.isEmpty(admisDate)&&CatalogueUtil.isEmpty(admisDate1)|| CatalogueUtil.isEmpty(recordTime)) {
                 return;
             }
-            if (!CatalogueUtil.compareTime(
-                    StringUtil.parseDateTime(admisDate),
-                    StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(8 * 60))) {//如果入院未超过8小时，规则不判断
-                return;
+            if(!CatalogueUtil.isEmpty(admisDate)){
+                if (!CatalogueUtil.compareTime(
+                        StringUtil.parseDateTime(admisDate),
+                        StringUtil.parseDateTime(DateUtil.nowString()),
+                        Long.valueOf(8 * 60))) {//如果入院未超过8小时，规则不判断
+                    return;
+                }
+                if(!CatalogueUtil.isEmpty(admisDate1)){
+                    if (CatalogueUtil.compareTime(
+                            StringUtil.parseDateTime(admisDate),
+                            StringUtil.parseDateTime(recordTime),
+                            Long.valueOf(8 * 60))) {
+                        status.set("-1");
+                        return;
+                    }
+                    if (CatalogueUtil.compareTime(
+                            StringUtil.parseDateTime(admisDate1),
+                            StringUtil.parseDateTime(recordTime),
+                            Long.valueOf(8 * 60))) {
+                        status.set("-1");
+                    }
+                }
+
+
             }
-            if (CatalogueUtil.compareTime(
-                    StringUtil.parseDateTime(admisDate),
-                    StringUtil.parseDateTime(recordTime),
-                    Long.valueOf(8 * 60))) {
-                status.set("-1");
+            if(CatalogueUtil.isEmpty(admisDate)&& !CatalogueUtil.isEmpty(admisDate1)){
+                if (!CatalogueUtil.compareTime(
+                        StringUtil.parseDateTime(admisDate1),
+                        StringUtil.parseDateTime(DateUtil.nowString()),
+                        Long.valueOf(8 * 60))) {//如果入院未超过8小时，规则不判断
+                    return;
+                }
+                if (CatalogueUtil.compareTime(
+                        StringUtil.parseDateTime(admisDate1),
+                        StringUtil.parseDateTime(recordTime),
+                        Long.valueOf(8 * 60))) {
+                    status.set("-1");
+                }
             }
 
+
+
         }
     }
 }