|
@@ -2315,8 +2315,7 @@ public class ConsoleFacade {
|
|
.ge("leave_hospital_date",filterVO.getStartDate())
|
|
.ge("leave_hospital_date",filterVO.getStartDate())
|
|
.le("leave_hospital_date",filterVO.getEndDate());
|
|
.le("leave_hospital_date",filterVO.getEndDate());
|
|
List<BehospitalInfo> list = behospitalInfoFacade.list(query);
|
|
List<BehospitalInfo> list = behospitalInfoFacade.list(query);
|
|
-
|
|
|
|
- Iterator<BehospitalInfo> iterator = list.iterator();
|
|
|
|
|
|
+ Iterator<BehospitalInfo> iterator = list.iterator();
|
|
while (iterator.hasNext()){
|
|
while (iterator.hasNext()){
|
|
BehospitalInfo beh = iterator.next();
|
|
BehospitalInfo beh = iterator.next();
|
|
Boolean flag = getTrueSecFile(beh.getBehospitalDate(), beh.getLeaveHospitalDate());
|
|
Boolean flag = getTrueSecFile(beh.getBehospitalDate(), beh.getLeaveHospitalDate());
|
|
@@ -2372,7 +2371,7 @@ public class ConsoleFacade {
|
|
Instant instant = ldt.atZone(zone).toInstant();
|
|
Instant instant = ldt.atZone(zone).toInstant();
|
|
Date endDate = Date.from(instant);
|
|
Date endDate = Date.from(instant);
|
|
//true表示未截止
|
|
//true表示未截止
|
|
- if(endDate.after(date1)){
|
|
|
|
|
|
+ if(endDate.after(date2)){
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|