岗位 绩效总额值带出

performance/Performance.Services/SecondAllotService.cs

@@ -347,8 +347,8 @@ private List<BodyItem> GetEmployees(int allotId, int userId, List<HeadItem> head
             Dictionary<(string, string), Func<per_employee, object>> dict = new Dictionary<(string, string), Func<per_employee, object>>
             {
                 { ("姓名", "FullName"), (t) => t.DoctorName },
-                { ("岗位", "Post"), (t) => t.JobTitle },
-                { ("实际出勤", "ActualAttendance"), (t) => t.AttendanceDay },
+                { ("岗位", "Post"), (t) => !string.IsNullOrEmpty(t.Duty) && (t.Duty.IndexOf("主任") > -1 || t.Duty.IndexOf("护士长") > -1) ? "主任" : "其他" },
+                { ("出勤", "ActualAttendance"), (t) => t.AttendanceDay },
             };
 
             int rowNumber = 1;
@@ -360,7 +360,7 @@ private List<BodyItem> GetEmployees(int allotId, int userId, List<HeadItem> head
                     if (head != null)
                     {
                         var body = Mapper.Map<BodyItem>(head);
-                        body.Value = item.Value.Invoke(employee).ToString();
+                        body.Value = item.Value.Invoke(employee)?.ToString();
                         body.RowNumber = rowNumber;
                         list.Add(body);
                     }
@@ -467,8 +467,8 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
             var keyValue = new Dictionary<string, string>
             {
                 {"发放月份",  $"{second.Year}年{second.Month.ToString().PadLeft(2, '0')}月"},
-                {"绩效合计(考核后)",  second.RealGiveFee.ToString()},
-                {"主任基础绩效", account?.Avg?.ToString()}
+                {"可分配绩效",  second.RealGiveFee.ToString()},
+                //{"主任基础绩效", account?.Avg?.ToString()}
             };
             var pairs = new Dictionary<string, string>
             {