Commit ea8747c4 by 钟博

修改发放表实发金额计算公式

parent a3f37477
......@@ -494,8 +494,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
var employee = clinicalEmployees.FirstOrDefault(e => e.PersonnelNumber == t.JobNumber && e.AccountingUnit == t.AccountingUnit);
var scoreAverageRate = t.ScoreAverageRate ?? employee.ScoreAverageRate ?? 1;
var attendance = t.Attendance ?? employee.Attendance ?? 0;
t.GiveFee = Math.Round((t.ShouldGiveFee ?? 0) * scoreAverageRate * attendance + (t.Punishment ?? 0) + (t.AssessLaterOtherFee ?? 0), 2);
t.RealGiveFee = Math.Round(t.GiveFee * (t.Adjust ?? 1m) + (t.AdjustLaterOtherFee ?? 0) ?? 0, 2);
t.RealGiveFee = Math.Round(t.AssessLaterManagementFee * (t.Adjust ?? 1m) + (t.AdjustLaterOtherFee ?? 0) ?? 0, 2);
}
});
......@@ -602,7 +601,8 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
AssessLaterPerforTotal = t.Sum(w => Math.Round(w.GiveFee ?? 0, MidpointRounding.AwayFromZero)),
AdjustFactor = t.FirstOrDefault()?.Adjust ?? 1,
AdjustLaterOtherFee = t.Sum(w => w.AdjustLaterOtherFee),
RealGiveFee = t.Sum(w => w.RealGiveFee),
RealGiveFee = t.Sum(w => Math.Round((w.GiveFee * w.Adjust + w.AdjustLaterOtherFee) ?? 0, MidpointRounding.AwayFromZero)),
AssessLaterManagementFee = 0,
}); ;
result.AddRange(officeResult);
#endregion
......@@ -889,9 +889,9 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
if (item.Source == "一次绩效")
{
if (isShowManage == 1)
real = Math.Round(real, 0);
real = Math.Round(real, 0, MidpointRounding.AwayFromZero);
else if (types.Contains(item.UnitType))
real = Math.Round(real, 0);
real = Math.Round(real, 0, MidpointRounding.AwayFromZero);
}
item.OthePerfor = Math.Round((item.OthePerfor ?? 0), 2, MidpointRounding.AwayFromZero);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment