强制科室二次分配实发绩效使用最新

performance/Performance.Services/SecondAllotService.cs

@@ -541,6 +541,15 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
                 {"可分配绩效",  second.RealGiveFee.ToString()},
                 //{"主任基础绩效", account?.Avg?.ToString()}
             };
+
+            //二次绩效配置 列头数据始终用最新分配结果
+            foreach (var item in keyValue)
+            {
+                var kfp = bodyItems.FirstOrDefault(w => w.RowNumber == -1 && w.FiledName == item.Key);
+                if (kfp != null)
+                    kfp.Value = item.Value;
+            }
+
             var pairs = new Dictionary<string, string>
             {
                 {  "职称绩效", "年资职称绩效占比" },
@@ -548,12 +557,14 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
             };
             var config = perforCofagainRepository.GetEntities(t => t.AllotID == second.AllotId);
             if (config != null && config.Any())
-                config.ForEach(t =>
             {
-                    var key = pairs.ContainsKey(t.TypeName) ? pairs[t.TypeName] : t.TypeName;
+                foreach (var item in config)
+                {
+                    var key = pairs.ContainsKey(item.TypeName) ? pairs[item.TypeName] : item.TypeName;
                     if (!keyValue.Keys.Contains(key))
-                        keyValue.Add(key, t.Value.ToString());
-                });
+                        keyValue.Add(key, item.Value.ToString());
+                }
+            }
 
             foreach (var item in keyValue)
             {