diff --git a/IRaCIS.Core.Application/Financial/CalculateService.cs b/IRaCIS.Core.Application/Financial/CalculateService.cs
index 947a34b..b6d8850 100644
--- a/IRaCIS.Core.Application/Financial/CalculateService.cs
+++ b/IRaCIS.Core.Application/Financial/CalculateService.cs
@@ -888,15 +888,29 @@ namespace IRaCIS.Application.Services
         public List<CalculateNeededDTO> GetNeedCalculateReviewerList(Guid reviewerId, string yearMonth)
         {
             Expression<Func<Payment, bool>> calculateLambda = u => !u.IsLock;
+
+            Expression<Func<Workload, bool>> workloadLambda = u => u.IsLock==false && u.DataFrom==(int)WorkLoadFromStatus.FinalConfirm;
             if (reviewerId != Guid.Empty)
             {
                 calculateLambda = calculateLambda.And(u => u.DoctorId == reviewerId);
+                workloadLambda = workloadLambda.And(u => u.DoctorId == reviewerId);
             }
             if (!string.IsNullOrWhiteSpace(yearMonth))
             {
                 calculateLambda = calculateLambda.And(u => u.YearMonth == yearMonth);
+                workloadLambda = workloadLambda.And(u => u.YearMonth == yearMonth);
             }
-            return _paymentRepository.Find(calculateLambda).ProjectTo<CalculateNeededDTO>(_mapper.ConfigurationProvider).ToList();
+
+            var workloadlist = _doctorWorkloadRepository.GetAll().Where(workloadLambda)
+                .Select(x => new CalculateNeededDTO()
+                {
+                    DoctorId = x.DoctorId,
+                    YearMonth = x.YearMonth,
+                    IsLock = x.IsLock
+                }).Distinct().ToList();
+
+            return workloadlist;
+           // return _paymentRepository.Find(calculateLambda).ProjectTo<CalculateNeededDTO>(_mapper.ConfigurationProvider).ToList();
         }
 
         /// <summary>