diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
index 3fd4fac8..4df9ed06 100644
--- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
@@ -939,19 +939,19 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 
 
 
-	//public static TimeSpan CalculateBreakTime(BreakTime breakTime, TimeSpan sumOneDaySpan)
-	//{
-	//    if (breakTime.BreakTimeType != BreakTimeType.WithTime)
-	//        return new TimeSpan();
+	public static TimeSpan CalculateBreakTime(BreakTime breakTime, TimeSpan sumOneDaySpan)
+	{
+		if (breakTime.BreakTimeType != BreakTimeType.WithTime)
+			return new TimeSpan();
 
-	//    var breakTimeSpan = breakTime.BreakTimeValue.ToTimeSpan();
+		var breakTimeSpan = breakTime.BreakTimeValue.ToTimeSpan();
 
-	//    if (breakTimeSpan * 2 >= sumOneDaySpan)
-	//        return new TimeSpan();
+		if (breakTimeSpan * 2 >= sumOneDaySpan)
+			return new TimeSpan();
 
-	//    return breakTimeSpan; ;
+		return breakTimeSpan; ;
 
-	//}
+	}
 	public static TimeSpan CalculateBreakTime(TimeSpan breakTimeSpan, TimeSpan sumOneDaySpan)
 	{
 		if (breakTimeSpan * 2 >= sumOneDaySpan)
diff --git a/CompanyManagment.EFCore/Repository/RollCallRepository.cs b/CompanyManagment.EFCore/Repository/RollCallRepository.cs
index a54f063c..0e07d3bb 100644
--- a/CompanyManagment.EFCore/Repository/RollCallRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallRepository.cs
@@ -152,16 +152,16 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 	public List<CheckoutDailyRollCallViewModel> GetEmployeeRollCallsForMonth(long employeeId, long workshopId, DateTime startMonthDay, DateTime endMonthDay)
     {
         var firstDayOfMonth = $"{startMonthDay.ToFarsi().Substring(0,8)}01".ToGeorgianDateTime();
-
+        var endFarvardin = "1404/01/31".ToGeorgianDateTime();
         //گرفتن ساعت استراحت پرسنل از تنظیمات
         #region breakTime
-        //BaseCustomizeEntity settings = _context.CustomizeWorkshopEmployeeSettings.AsSplitQuery().FirstOrDefault(x =>
-        //    x.WorkshopId == workshopId && x.EmployeeId == employeeId);
-        ////اگر ساعت استراحت پرسنل وجود نداشت صفر است
-        //var breakTime = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
+        BaseCustomizeEntity settings = _context.CustomizeWorkshopEmployeeSettings.AsSplitQuery().FirstOrDefault(x =>
+            x.WorkshopId == workshopId && x.EmployeeId == employeeId);
+        //اگر ساعت استراحت پرسنل وجود نداشت صفر است
+        var breakTime = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
         #endregion
 
-            var rollCalls = _context.RollCalls.Where(x =>
+        var rollCalls = _context.RollCalls.Where(x =>
                 x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate != null && x.EndDate != null && x.RollCallModifyType != RollCallModifyType.Undefined &&
                 x.ShiftDate.Date >= startMonthDay && x.ShiftDate.Date <= endMonthDay).ToList();
 
@@ -224,26 +224,30 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 
             var rollCallTimeSpanPerDay =
                 new TimeSpan(x.Where(y => y.EndDate != null).Sum(y => (y.EndDate - y.StartDate)!.Value.Ticks));
-            var breakTimePerDay = RollCallMandatoryRepository.CalculateBreakTime(x.First().BreakTimeSpan, rollCallTimeSpanPerDay);
+            TimeSpan breakTimePerDay ;
+                if(startMonthDay>endFarvardin)
+                    breakTimePerDay= RollCallMandatoryRepository.CalculateBreakTime(x.First().BreakTimeSpan, rollCallTimeSpanPerDay);
+            else
+                breakTimePerDay = RollCallMandatoryRepository.CalculateBreakTime(breakTime, rollCallTimeSpanPerDay);
 
             return new CheckoutDailyRollCallViewModel()
-            {
-                StartDate1 = orderedRollcalls.FirstOrDefault().StartDate.Value.ToString("HH:mm"),
-                EndDate1 = orderedRollcalls.FirstOrDefault().EndDate.Value.ToString("HH:mm"),
+                {
+                    StartDate1 = orderedRollcalls.FirstOrDefault().StartDate.Value.ToString("HH:mm"),
+                    EndDate1 = orderedRollcalls.FirstOrDefault().EndDate.Value.ToString("HH:mm"),
 
-                StartDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.StartDate?.ToString("HH:mm") ?? "",
-                EndDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.EndDate?.ToString("HH:mm") ?? "",
+                    StartDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.StartDate?.ToString("HH:mm") ?? "",
+                    EndDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.EndDate?.ToString("HH:mm") ?? "",
 
-                TotalhourseSpan = rollCallTimeSpanPerDay - breakTimePerDay,
+                    TotalhourseSpan = rollCallTimeSpanPerDay - breakTimePerDay,
 
-                BreakTimeTimeSpan = breakTimePerDay,
+                    BreakTimeTimeSpan = breakTimePerDay,
 
-                DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(),
-                RollCallDateFa = x.Key.Date.ToFarsi(),
-                DateTimeGr = x.Key.Date,
-                IsSliced = x.Count() > 2,
-                IsAbsent = false
-            };
+                    DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(),
+                    RollCallDateFa = x.Key.Date.ToFarsi(),
+                    DateTimeGr = x.Key.Date,
+                    IsSliced = x.Count() > 2,
+                    IsAbsent = false
+                };
         });
 
 
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintDetailsRollCall.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintDetailsRollCall.cshtml
index 4e9378ab..d79d4f32 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintDetailsRollCall.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintDetailsRollCall.cshtml
@@ -25,12 +25,12 @@
                              height: 28cm;
                              margin: 3mm 5mm 0 5mm; ">
             <div class="row" dir="rtl">
-	            <div class="col-xs-3 d-inline-block"></div>
-	            <div class="col-xs-6 d-inline-block text-center">
-		            <p style="font-size: 18px; font-family: 'IranNastaliq' !important; margin-top:0 !important;">بسمه تعالی</p>
-		            <p style="font-size: 15px; font-weight: bold; margin: 2px;">فیش حقوقی و رسید پرداخت حقوق</p>
-	            </div>
 	            <div class="col-xs-3 d-inline-block"><fieldset style="border: 1px solid black; border-radius: 15px; padding: 1px 15px 1px 15px; margin-top: 5px; width: 70%; font-size: 12px; text-align: center;"> @Model.ContractNo</fieldset></div>
+                <div class="col-xs-6 d-inline-block text-center">
+                    <p style="font-size: 18px; font-family: 'IranNastaliq' !important; margin-top:0 !important;">بسمه تعالی</p>
+                    <p style="font-size: 15px; font-weight: bold; margin: 2px;">فیش حقوقی و رسید پرداخت حقوق</p>
+                </div>
+                <div class="col-xs-3 d-inline-block"></div>
             </div>