Merge remote-tracking branch 'origin/hb/beilun' into hb/beilun

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/changshaxy/leavehospital/LEA0507.java

@@ -93,18 +93,26 @@ public class LEA0507 extends QCCatalogue {
                 Map<String, String> pageMap = firstPageRecordDoc.getStructureMap();
                 String outDate = pageMap.get("出院时间");
                 String inDate = pageMap.get("入院时间");
-                Date infusionEndDate = StringUtil.parseDateTime(inDate);
-                Date recordDate = StringUtil.parseDateTime(outDate);
-                if (CatalogueUtil.compareTime(infusionEndDate, recordDate, 30 * 60L)) {
-                    status.set("-1");
-                    return;
+                if(StringUtil.isEmpty(outDate) || StringUtil.isEmpty(inDate)){
+                    outDate = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
+                    inDate=leaveHospitalDate;
+                }
+                if(StringUtil.isNotEmpty(outDate) && StringUtil.isNotEmpty(inDate)) {
+                    Date infusionEndDate = StringUtil.parseDateTime(inDate);
+                    Date recordDate = StringUtil.parseDateTime(outDate);
+                    if (CatalogueUtil.compareTime(infusionEndDate, recordDate, 30 * 60L)) {
+                        status.set("-1");
+                        return;
+                    } else {
+                        return;
+                    }
                 }else {
                     return;
                 }
             }
         }
         LeaveHospitalDoc leaveHospitalDoc = inputInfo.getLeaveHospitalDoc();
-        if(leaveHospitalDate==null){
+        if(leaveHospitalDoc==null){
             status.set("-1");
             return;
         }