BUG修复

parent 965592cb
......@@ -172,8 +172,9 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
var resAccount = dataList.Where(t => t.UnitType == accountbasic.UnitType && t.AccountingUnit == accountbasic.DoctorAccountingUnit);
var number = resAccount.OrderByDescending(t => t.ManagerNumber).Sum(t => t.ManagerNumber + t.Number);
var perforTotal = resAccount.Sum(t => t.PerforTotal);
var realGiveFee = resAccount.Sum(t => t.RealGiveFee);
var avg = resAccount.Average(t => t.Avg);
if (isMinimum && resAccount.Any(t => t.ManagerNumber > 0 || t.Number > 0))
if (!isMinimum && resAccount.Any(t => t.ManagerNumber > 0 || t.Number > 0))
avg = resAccount.Sum(t => t.RealGiveFee / (t.ManagerNumber + t.Number)) / resAccount.Count();
var basicRule = basicRuleList.FirstOrDefault(t => t.UnitType == (UnitType)accountbasic.UnitType);
......@@ -208,7 +209,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
OtherPerfor = empolyee.OtherPerfor,
Number = number,
PerforTotal = perforTotal,
PerforTotal = realGiveFee,
Avg = avg,
Efficiency = avg * (accountbasic.DoctorEffic ?? 1),
Scale = perforTotal * (accountbasic.DoctorScale ?? 1),
......
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