|
@@ -109,10 +109,11 @@ public class THR0588 extends QCCatalogue {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
dateThreeLevelDay = dateThreeLevelDay.stream().sorted().collect(Collectors.toList());
|
|
dateThreeLevelDay = dateThreeLevelDay.stream().sorted().collect(Collectors.toList());
|
|
|
|
+ int timeCha = 259200000;
|
|
//获取连续3天无查房记录的时间
|
|
//获取连续3天无查房记录的时间
|
|
for (int i = 0; i < dateThreeLevelDay.size(); i++) {
|
|
for (int i = 0; i < dateThreeLevelDay.size(); i++) {
|
|
if (i + 1 < dateThreeLevelDay.size()) {
|
|
if (i + 1 < dateThreeLevelDay.size()) {
|
|
- if (CatalogueUtil.compareTime(DateUtil.dateZeroClear(dateThreeLevelDay.get(i)), DateUtil.dateZeroClear(dateThreeLevelDay.get(i + 1)), 72 * 60L) &&
|
|
|
|
|
|
+ if (DateUtil.dateZeroClear(dateThreeLevelDay.get(i + 1)).getTime() - DateUtil.dateZeroClear(dateThreeLevelDay.get(i)).getTime() > timeCha &&
|
|
dateThreeLevelDay.get(i + 1).before(leaveDate)) {
|
|
dateThreeLevelDay.get(i + 1).before(leaveDate)) {
|
|
infoAppend(sb, dateThreeLevelDay.get(i), dateThreeLevelDay.get(i + 1));
|
|
infoAppend(sb, dateThreeLevelDay.get(i), dateThreeLevelDay.get(i + 1));
|
|
}
|
|
}
|