diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
index 681013c..f50aeec 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
@@ -1796,7 +1796,7 @@ open class DashboardService(
                 + " WHERE"
                 + " DATE(:startdate + INTERVAL numbers.num DAY) BETWEEN"
                 + " :startdate AND"
-                + " LAST_DAY(:startdate)"
+                + " CURDATE()"
                 + " AND DAYOFWEEK(DATE(:startdate + INTERVAL numbers.num DAY)) BETWEEN 2 AND 6"
                 + " AND DATE(:startdate + INTERVAL numbers.num DAY) not in (select ch.date from company_holiday ch where ch.deleted = 0)"
                 + " AND DATE(:startdate + INTERVAL numbers.num DAY) not in (:publicHolidayList)"