|
|
@@ -1534,8 +1534,8 @@ public class ElderlyInfoServiceImpl implements ElderlyInfoService {
|
|
|
}
|
|
|
|
|
|
LocalDate today = LocalDate.now();
|
|
|
- LocalDate weekStart = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.SATURDAY));
|
|
|
- LocalDate weekEnd = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.FRIDAY));
|
|
|
+ LocalDate weekStart = today.with(DayOfWeek.MONDAY);
|
|
|
+ LocalDate weekEnd = today.with(DayOfWeek.SUNDAY);
|
|
|
LocalDate monthStart = today.withDayOfMonth(1);
|
|
|
|
|
|
LocalDateTime weekStartDateTime = weekStart.atStartOfDay();
|