二次分配核算前单项计算BUG修复

performance/Performance.Services/RedistributionService.cs

@@ -982,8 +982,12 @@ private void overviewCalculate(Dictionary<string, object> head, List<Dictionary<
             //// 夜班工作量绩效总和
             //var nightShiftWorkPerforTotal = rows.Sum(row => GetDecimal2(row, nameof(ag_bodysource.NightWorkPerformance)));
             //head.AddOrUpdate(nameof(ag_headsource.NightShiftWorkPerforTotal), nightShiftWorkPerforTotal);
-            // 可分配绩效（顶栏） = 科室总绩效  - 夜班绩效（顶栏）
-            var totalPerformance = GetDecimal2(head, nameof(ag_headsource.TotalDistPerformance)) - GetDecimal2(head, nameof(ag_headsource.NightShiftWorkPerforTotal));
+
+            // 科室考核前奖励
+            var totalPreAccountingReward = rows.Sum(row => GetDecimal2(row, nameof(ag_bodysource.PreDeptReward)));
+            head.AddOrUpdate(nameof(ag_headsource.TotalPreAccountingReward), totalPreAccountingReward);
+            // 可分配绩效（顶栏） = 科室总绩效  - 夜班绩效（顶栏） - 科室考核前奖励
+            var totalPerformance = GetDecimal2(head, nameof(ag_headsource.TotalDistPerformance)) - GetDecimal2(head, nameof(ag_headsource.NightShiftWorkPerforTotal)) - totalPreAccountingReward;
             head.AddOrUpdate(nameof(ag_headsource.TotalPerformance), totalPerformance);
             //// 医院其他绩效总和
             //var otherPerformance = rows.Sum(row => GetDecimal2(row, nameof(ag_bodysource.OtherPerformance)));
@@ -998,14 +1002,11 @@ private void overviewCalculate(Dictionary<string, object> head, List<Dictionary<
             // 科室单项奖励
             var totalDeptReward = rows.Sum(row => GetDecimal2(row, nameof(ag_bodysource.DeptReward)));
             head.AddOrUpdate(nameof(ag_headsource.TotalDeptReward), totalDeptReward);
-            // 科室考核前奖励
-            var totalPreAccountingReward = rows.Sum(row => GetDecimal2(row, nameof(ag_bodysource.PreDeptReward)));
-            head.AddOrUpdate(nameof(ag_headsource.TotalPreAccountingReward), totalPreAccountingReward);
             // 主任基础绩效(顶部) =  行内主任基础绩效总和
             var directorBasisPerformance = rows.Sum(row => GetDecimal2(row, nameof(ag_bodysource.BasisPerformance)));
             head.AddOrUpdate(nameof(ag_headsource.DirectorBasisPerformance), directorBasisPerformance);
             // 业绩分配绩效总额 = 可分配绩效 - 科主任或护士长基础绩效 - 科室单项奖励 - 科室考核前奖励
-            var theTotalAllocationOfPerformanceResults = totalPerformance - directorBasisPerformance - totalDeptReward - totalPreAccountingReward;
+            var theTotalAllocationOfPerformanceResults = totalPerformance - directorBasisPerformance - totalDeptReward;
             head.AddOrUpdate(nameof(ag_headsource.TheTotalAllocationOfPerformanceResults), theTotalAllocationOfPerformanceResults);
         }