全院发放表调节系数调整

performance/Performance.Services/ComputeService.cs

@@ -469,18 +469,19 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
                 var empDic = perforPeremployeeRepository.GetEntities(w => w.AllotId == allotId);
                 foreach (var item in result)
                 {
-                    item.PerforSumFee = Math.Round(item.PerforSumFee ?? 0, 0, MidpointRounding.AwayFromZero);
-                    item.PerforManagementFee = Math.Round(item.PerforManagementFee ?? 0, 0, MidpointRounding.AwayFromZero);
+                    // 二次分配默认 调节系数100%
+                    var adjust = item.Source == "二次绩效" ? 1 : (item.Adjust ?? 1);
+                    // 计算调节后业绩绩效、管理绩效
+                    item.PerforSumFee = Math.Round((item.PerforSumFee * adjust ?? 0), 0, MidpointRounding.AwayFromZero);
+                    item.PerforManagementFee = Math.Round((item.PerforManagementFee * adjust ?? 0), 0, MidpointRounding.AwayFromZero);
 
-                    //二次分配默认 调节系数100%
-                    item.Adjust = item.Source == "二次绩效" ? 1 : item.Adjust;
-                    var real = Math.Round((item.PerforSumFee ?? 0) + (item.PerforManagementFee ?? 0), 0) * item.Adjust + (item.AdjustLaterOtherFee ?? 0);
+                    var real = Math.Round((item.PerforSumFee ?? 0) + (item.PerforManagementFee ?? 0) + (item.AdjustLaterOtherFee ?? 0), 0);
 
                     item.OthePerfor = Math.Round((item.OthePerfor ?? 0), 0, MidpointRounding.AwayFromZero);
                     item.NightWorkPerfor = Math.Round((item.NightWorkPerfor ?? 0), 0, MidpointRounding.AwayFromZero);
-                    item.ShouldGiveFee = Math.Round((real ?? 0) + (item.OthePerfor ?? 0) + (item.NightWorkPerfor ?? 0), 0, MidpointRounding.AwayFromZero);
+                    item.ShouldGiveFee = Math.Round(real + (item.OthePerfor ?? 0) + (item.NightWorkPerfor ?? 0), 0, MidpointRounding.AwayFromZero);
                     item.ReservedRatio = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.ReservedRatio ?? 0;
-                    item.ReservedRatioFee = Math.Round((real ?? 0) * (item.ReservedRatio ?? 0), 0, MidpointRounding.AwayFromZero);
+                    item.ReservedRatioFee = Math.Round(real * (item.ReservedRatio ?? 0), 0, MidpointRounding.AwayFromZero);
                     item.RealGiveFee = Math.Round(item.ShouldGiveFee - (item.ReservedRatioFee ?? 0) ?? 0, 0, MidpointRounding.AwayFromZero);
                 }
             }