diff --git a/core/src/main/java/org/phoenixctms/ctsms/service/shared/ToolsServiceImpl.java b/core/src/main/java/org/phoenixctms/ctsms/service/shared/ToolsServiceImpl.java index 0bd08e3561b9..02da99a08158 100644 --- a/core/src/main/java/org/phoenixctms/ctsms/service/shared/ToolsServiceImpl.java +++ b/core/src/main/java/org/phoenixctms/ctsms/service/shared/ToolsServiceImpl.java @@ -1129,7 +1129,8 @@ protected long handlePrepareNotifications(Long departmentId) throws Exception { } } } - Iterator staffStatusIt = this.getStaffStatusEntryDao().findStaffStatus(CommonUtil.dateToTimestamp(today), null, departmentId, null, false, null, null) + Iterator staffStatusIt = this.getStaffStatusEntryDao() + .findStaffStatus(CommonUtil.dateToTimestamp(today), null, departmentId, null, false, true, null, null) .iterator(); while (staffStatusIt.hasNext()) { StaffStatusEntry staffStatusEntry = staffStatusIt.next(); diff --git a/core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java b/core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java index 5cd33c7b9f3b..d7b3211c9a9e 100644 --- a/core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java +++ b/core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java @@ -4663,7 +4663,7 @@ public static void populateShiftDurationSummary(boolean trialBreakDown, ShiftDur durationSummaryDetail.setStaffStatusEntryDuration(0); if (!trialBreakDown && staff != null) { Iterator statusEntryIt = staffStatusEntryDao.findByStaffInterval(staff.getId(), CommonUtil.dateToTimestamp(summary.getStart()), - CommonUtil.dateToTimestamp(summary.getStop()), false, null, false).iterator(); + CommonUtil.dateToTimestamp(summary.getStop()), false, null, null, false).iterator(); while (statusEntryIt.hasNext()) { StaffStatusEntry statusEntry = statusEntryIt.next(); Date start = statusEntry.getStart();