diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs
index 640f3592..b4a76632 100644
--- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs
@@ -118,13 +118,11 @@ public class WorkGridService : IWorkGridService
             {
                 var date = DateOnly.FromDateTime(request.Date);
 
-                var tasks = workGridCodes.Select(code => _workGridScheduleRepository.GetListSummaryAsync(code, date, date));
-                var scheduleSummaryResponsesPack = await Task.WhenAll(tasks);
-                var scheduleSummaryResponses = scheduleSummaryResponsesPack.SelectMany(x => x).ToList();
-
-                foreach (var item in pagination.Data)
+                foreach (var workGridCode in workGridCodes)
                 {
-                    item.DateScheduleSummary = scheduleSummaryResponses.FirstOrDefault(x => x.WorkGridCode == item.Code);
+                    var scheduleSummaryResponses = await _workGridScheduleRepository.GetListSummaryAsync(workGridCode, date, date);
+
+                    pagination.Data.First(x => x.Code == workGridCode).DateScheduleSummary = scheduleSummaryResponses.FirstOrDefault();
                 }
             }
         }