Commit 63f24b58 by lcx

全员绩效发放,是否带出管理绩效

parent 7f9e132a
...@@ -360,7 +360,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId) ...@@ -360,7 +360,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
{ AccountUnitType.行政中层.ToString(), AccountUnitType.行政中层.ToString() }, { AccountUnitType.行政中层.ToString(), AccountUnitType.行政中层.ToString() },
{ AccountUnitType.行政工勤.ToString(), AccountUnitType.行政工勤.ToString() } { AccountUnitType.行政工勤.ToString(), AccountUnitType.行政工勤.ToString() }
}; };
var adminDepartments = new string[] { AccountUnitType.行政高层.ToString(), AccountUnitType.行政中层.ToString(), AccountUnitType.行政工勤.ToString() }; var doctors = new string[] { "医生组", "护理组", "医技组" };
List<DeptResponse> adminPerfor = list.GroupBy(t => new { t.AccountingUnit, t.AccountType }).Select(t => List<DeptResponse> adminPerfor = list.GroupBy(t => new { t.AccountingUnit, t.AccountType }).Select(t =>
{ {
string unitName = result.Where(w => !dict.Values.Contains(w.UnitName)).FirstOrDefault(w => w.AccountingUnit == t.Key.AccountingUnit)?.UnitName ?? ""; string unitName = result.Where(w => !dict.Values.Contains(w.UnitName)).FirstOrDefault(w => w.AccountingUnit == t.Key.AccountingUnit)?.UnitName ?? "";
...@@ -371,7 +371,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId) ...@@ -371,7 +371,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
Department = t.Key.AccountingUnit, Department = t.Key.AccountingUnit,
Number = t.Count(), Number = t.Count(),
}; };
if (!adminDepartments.Contains(t.Key.AccountType)) if (doctors.Contains(data.UnitName))
{ {
data.AssessLaterManagementFee = isShowManage == 1 data.AssessLaterManagementFee = isShowManage == 1
? t.Sum(group => group.RealGiveFee ?? 0) + t.Sum(group => group.OtherPerfor ?? 0) //实发绩效 ? t.Sum(group => group.RealGiveFee ?? 0) + t.Sum(group => group.OtherPerfor ?? 0) //实发绩效
......
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