义乌首次病程录未在8小时内完成规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstcourserecord/FIRC0093.java

@@ -32,6 +32,8 @@ public class FIRC0093 extends QCCatalogue {
             if (courseRecordDocStructureMap != null && beHospitalizedDocStructureMap != null) {
                 String couDate = courseRecordDocStructureMap.get("病历日期");
                 String beDate = beHospitalizedDocStructureMap.get("入院日期");
+                String [] str=courseRecordDocStructureMap.get("病历内容").split("于");
+                String beDate1=str[str.length-1].replaceAll("入院","").replaceAll("。","");
                 if (StringUtils.isNotEmpty(couDate) && StringUtils.isNotEmpty(beDate)) {
                     Date date_in = StringUtil.parseDateTime(beDate);
                     Date date_out = StringUtil.parseDateTime(couDate);
@@ -40,7 +42,30 @@ public class FIRC0093 extends QCCatalogue {
                     }
                     boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
                     if (firc) {
-                        status.set("-1");
+                        if(StringUtils.isNotEmpty(beDate1)){
+                            Date date_in_1 = StringUtil.parseDateTime(beDate1);
+                            boolean firc1 = CatalogueUtil.compareTime(date_in_1, date_out, 8 * 60L);
+                            if (date_in_1 == null || date_out == null){
+                                return;
+                            }
+                            if(firc1){
+                                status.set("-1");
+                            }
+                        }
+                    }
+                }else if(StringUtils.isNotEmpty(couDate) && StringUtils.isEmpty(beDate)){
+                    if(StringUtils.isEmpty(beDate1)){
+                        return;
+                    }else {
+                        Date date_in = StringUtil.parseDateTime(beDate1);
+                        Date date_out = StringUtil.parseDateTime(couDate);
+                        if (date_in == null || date_out == null) {
+                            return;
+                        }
+                        boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
+                        if(firc){
+                            status.set("-1");
+                        }
                     }
                 }
             }

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

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