diff --git a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
index 95abb964..3faa112e 100644
--- a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
+++ b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
@@ -1128,7 +1128,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 ch.TotalBreakTimeStr = ch.CheckoutRollCall.TotalBreakTimeSpan.ToFarsiHoursAndMinutes("-");
                 ch.TotalPresentTimeStr = ch.CheckoutRollCall.TotalPresentTimeSpan.ToFarsiHoursAndMinutes("-");
                 ch.TotalMandatoryTimeStr = ch.CheckoutRollCall.TotalMandatoryTimeSpan.ToFarsiHoursAndMinutes("-");
-
+                ch.TotalPaidLeave = ch.CheckoutRollCall.TotalPaidLeaveTmeSpan.ToFarsiDaysAndHoursAndMinutes("-");
                 ch.MonthlyRollCall = ch.CheckoutRollCall.RollCallDaysCollection
                     .Select(x => new CheckoutDailyRollCallViewModel
                     {
diff --git a/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs b/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs
index 48adbbe5..57e27cdc 100644
--- a/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs
+++ b/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs
@@ -94,7 +94,14 @@ public class PersonnelCodeRepository : RepositoryBase<long, PersonnelCodeDomain>
     #region Mahan
     public long GetLastPersonnelCodeByWorkshop(long workshopId)
     {
-        return _context.PersonnelCodeSet.Where(x => x.WorkshopId == workshopId).Max(x => x.PersonnelCode);
+        var codes = _context.PersonnelCodeSet.Where(x => x.WorkshopId == workshopId);
+
+        if (!codes.Any())
+        {
+            return 0;  // مقدار پیش‌فرض یا هندل خاص تو این حالت
+        }
+
+        return codes.Max(x => x.PersonnelCode);
     }
 
     #endregion
diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
index 5cbdf426..d396d52f 100644
--- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
@@ -398,13 +398,15 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
                 if (sumLeave > starndardHoursesPerTotalDaysSapn)
                 {
                     sumSpans = sumSpans.Add(starndardHoursesPerTotalDaysSapn);
+                    totalLeaveSpan = starndardHoursesPerTotalDaysSapn;
                 }
                 else
                 {
                     sumSpans = sumSpans.Add(sumLeave);
+                    totalLeaveSpan = sumLeave;
                 }
 
-                totalLeaveSpan = sumLeave;
+               
             }