diff --git a/DOAN.Service/MES/group/GroupScheduleService.cs b/DOAN.Service/MES/group/GroupScheduleService.cs
index 0da51a0..a1a0f4d 100644
--- a/DOAN.Service/MES/group/GroupScheduleService.cs
+++ b/DOAN.Service/MES/group/GroupScheduleService.cs
@@ -97,13 +97,17 @@ namespace DOAN.Service.Business
         public PagedInfo<GroupScheduleDto> ListGroupByDate(GroupScheduleQueryDto2 query)
         {
             query.ScheduleDate = query.ScheduleDate.Date;
-            var result= Queryable().LeftJoin<GroupShift>((it, sh) => it.FkShift == sh.Id).Where((it, sh) => it.ScheduleDate == query.ScheduleDate)
-                 .Select((it, sh) => new GroupScheduleDto { ShiftName = sh.Name }, true)
-                 .ToPage<GroupScheduleDto, GroupScheduleDto>(query);
+            //var result= Queryable().LeftJoin<GroupShift>((it, sh) => it.FkShift == sh.Id).Where((it, sh) => it.ScheduleDate == query.ScheduleDate)
+            //     .Select((it, sh) => new GroupScheduleDto { ShiftName = sh.Name }, true)
+            //     .ToPage<GroupScheduleDto, GroupScheduleDto>(query);
+
+            var result = Queryable().Where((it) => it.ScheduleDate == query.ScheduleDate)
+                .Select((it) => new GroupScheduleDto { ShiftName = "" }, true)
+                .ToPage<GroupScheduleDto, GroupScheduleDto>(query);
 
             result.Result.ForEach(t =>
             {
-                t.WorkHours = Math.Round((decimal)(((t.EndTime.Value - t.StartTime.Value).TotalMinutes - t.PlanRestTime) / 60.0), 2);
+                t.WorkHours = Math.Round((decimal)(((t.EndTime - t.StartTime)?.TotalMinutes ?? 0 - t.PlanRestTime) / 60.0), 2);
             });
             return result;
         }