diff --git a/src/main/java/com/ffii/tsms/modules/data/service/TeamLogService.kt b/src/main/java/com/ffii/tsms/modules/data/service/TeamLogService.kt
index ee7bf4b..9f456b6 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/TeamLogService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/TeamLogService.kt
@@ -25,7 +25,7 @@ open class TeamLogService (
         val team = teamLog.find{
             it.deleted == false
                     && it.staff.id == staffId
-                    && it.from.isBefore(recordDate) && (it.to == null || it.to.isAfter(recordDate))
+                    && it.from <= recordDate && (it.to == null || it.to> recordDate)
         }
         return team
     }
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt b/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt
index b43d9ef..fc17dac 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt
@@ -348,6 +348,7 @@ class DashboardController(
         val startdate = request?.getParameter("startdate")
         val enddate = request?.getParameter("enddate")
         val publicHolidayListParam = request?.getParameter("publicHolidayList")
+        println(enddate)
         if (teamId != null) {
             args["teamId"] = teamId
         }
@@ -361,29 +362,37 @@ class DashboardController(
             val publicHolidayList = publicHolidayListParam.split(",").map { it.trim() }
             args["publicHolidayList"] = publicHolidayList
         }
+        println(args)
         return dashboardService.weeklyUnsubmittedTimeSheet(args)
     }
     @GetMapping("/searchMonthlyUnsubmittedTimeSheet")
     fun searchMonthlyUnsubmittedTimeSheet(request: HttpServletRequest?): List<Map<String, Any>> {
+        val startTime = LocalDateTime.now()
+        println(" --- start --- ")
         val args = mutableMapOf<String, Any>()
         val teamId = request?.getParameter("teamId")
         val startdate = request?.getParameter("startdate")
         val enddate = request?.getParameter("enddate")
         val publicHolidayListParam = request?.getParameter("publicHolidayList")
         if (teamId != null) {
-            args["teamId"] = teamId
+            args["teamId"] = teamId.toLong()
         }
         if (startdate != null) {
-            args["startdate"] = startdate
+            args["startdate"] = LocalDate.parse(startdate)
         }
         if (enddate != null) {
-            args["enddate"] = enddate
+            args["enddate"] = LocalDate.parse(enddate)
         }
         if (publicHolidayListParam != null) {
-            val publicHolidayList = publicHolidayListParam.split(",").map { it.trim() }
+            val publicHolidayList = publicHolidayListParam.split(",").map { LocalDate.parse(it.trim()) }
             args["publicHolidayList"] = publicHolidayList
         }
-        return dashboardService.monthlyUnsubmittedTimeSheet(args)
+        val endTime = LocalDateTime.now()
+        println(" --- end --- ")
+        val duration = java.time.Duration.between(startTime, endTime)
+        println("Duration: ${duration.toMillis()} milliseconds")
+        return dashboardService.getMonthlyUnsubmittedTimesheet(args)
+//        return dashboardService.monthlyUnsubmittedTimeSheet(args)
     }
     @GetMapping("/searchTotalManhoursSpentByStaffGrade")
     fun searchTotalManhoursSpentByStaffGrade(request: HttpServletRequest?): List<Map<String, Any>> {