Merge branch 'release/v22.4.18-Beta-wuzhou' into develop

2569411f · ruyun.zhang@suvalue.com · 331a8fff · cace3dbc · 2569411f
Commit 2569411f authored Sep 06, 2022 by ruyun.zhang@suvalue.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

performance/Performance.Services/RedistributionService.cs
+2 -2

No files found.
--- a/performance/Performance.Services/RedistributionService.cs
+++ b/performance/Performance.Services/RedistributionService.cs
@@ -456,9 +456,9 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
            {
                // 优先取 业务中层实际人均绩效 否则 取 科室人均
                var empolyee = _imemployeeclinicRepository.GetEntity(w => w.AllotID == allot.ID && w.AccountingUnit == second.Department && w.UnitType == second.UnitType);
-                var rescompute = _resaccountRepository.GetEntity(w => w.AllotID == allot.ID && w.AccountingUnit == second.Department && w.UnitType == (int)((UnitType)unittype));
+                var rescompute = _resaccountRepository.GetEntity(w => w.AllotID == allot.ID && w.AccountingUnit == second.Department && w.UnitType == (int)unittype);
                var avg = (empolyee != null && empolyee.FitPeopleValue.HasValue) ? empolyee.FitPeopleValue : rescompute?.Avg ?? 0;
-                refAvg = rescompute?.Avg ?? 0;
+                refAvg = avg ?? 0;
            }
            head.AddOrUpdate("RefAvg", Math.Round(refAvg, 0, MidpointRounding.AwayFromZero));
            #endregion