diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs
index 326ed715..95d40067 100644
--- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs
@@ -180,7 +180,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
             .WhereIF(request.DateTimePeriod.HasValue(), log => log.RaiseDateTime >= request.DateTimePeriod.Start
                                                                && log.RaiseDateTime <= request.DateTimePeriod.End)
             .WhereIF(request.UserCode.IsPresent(), log => log.UserUniqueNo == request.UserCode)
-            .WhereIF(request.UserCode.IsEmpty(), log => SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == workGrid.Code && p.UserCode == log.UserUniqueNo).Any())
+            .WhereIF(request.UserCode.IsEmpty(), log => SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == workGrid.Code && p.UserCode == log.UserUniqueNo && p.IsDeleted == false).Any())
             .Where(log => log.WorkGridInfo.StartsWith(filterString))
             .Where((log, d) => d.Type == DeviceTypeEnumType.Attendance || (d.Type == DeviceTypeEnumType.Door && d.AsAttendance))
             .OrderBy(log => log.RaiseDateTime)
diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs
index 41286d8f..66313001 100644
--- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs
@@ -146,7 +146,7 @@ public class WorkGridService : IWorkGridService
                 LeaderUserCode = x.LeaderUserCode,
                 UserName = ga.Name,
                 Remark = x.Remark,
-                UserCount = SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == x.Code).Count()
+                UserCount = SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == x.Code && x.IsDeleted == false).Count()
             })
             .ToPageListAsync(request);
     }
@@ -259,7 +259,7 @@ public class WorkGridService : IWorkGridService
         var role = _currentUser.GetRole();
         var specific = (role is "admin" or "tenant-admin" or "WGZGLY") && request.WorkGridCode.HasValue;
         var currentUserCode = _currentUser.GetUserClaim(UserClaimConstants.JinkoCode);
-        
+
         var myWorkGrid = await _dbContext.Queryable<WorkGridEntity>()
             .WhereIF(specific, x => x.Code == request.WorkGridCode)
             .WhereIF(specific == false, x => x.LeaderUserCode == currentUserCode)