绩效发放--实发绩效字段，护理组科室绩效foreach循环出错；原始数据列头重复，时间格式更改；

performance/Performance.EntityModels/Entity/res_compute.cs

@@ -136,5 +136,10 @@ public class res_compute
         /// 年资系数(来自人员名单)
         /// </summary>
         public Nullable<decimal> WorkYear { get; set; }
+
+        /// <summary>
+        /// 实发绩效
+        /// </summary>
+        public Nullable<decimal> RealGiveFee { get; set; }
     }
 }

performance/Performance.Services/ComputeService.cs

@@ -154,13 +154,15 @@ public DeptDetailResponse GetDepartmentDetail(DeptDetailRequest request)
                 if (sheetWorkload == null)
                     return null;
                 var dataWorkloadList = _perforImDataRepository.GetEntities(t => t.SheetID == sheetWorkload.ID && t.IsTotal != 1 && t.AccountingUnit == nurse.AccountingUnit);
-                dataWorkloadList.ForEach(t => response.Workload.Add(new DeptDetail { ItemName = t.TypeName, ItemValue = t.CellValue ?? 0 }));
+                if (dataWorkloadList != null && dataWorkloadList.Count > 0)
+                    dataWorkloadList.ForEach(t => response.Workload.Add(new DeptDetail { ItemName = t.TypeName, ItemValue = t.CellValue ?? 0 }));
 
                 var sheetEconomic = sheetList.FirstOrDefault(t => t.SheetType == (int)SheetType.ComputeEconomic);
                 if (sheetEconomic == null)
                     return null;
                 var dataEconomicList = _perforImDataRepository.GetEntities(t => t.SheetID == sheetEconomic.ID && t.UnitType == 2 && t.IsTotal != 1 && t.AccountingUnit == nurse.AccountingUnit);
-                dataEconomicList.ForEach(t => response.Economic.Add(new DeptDetail { ItemName = t.TypeName, ItemValue = t.CellValue ?? 0 }));
+                if (dataEconomicList != null && dataEconomicList.Count > 0)
+                    dataEconomicList.ForEach(t => response.Economic.Add(new DeptDetail { ItemName = t.TypeName, ItemValue = t.CellValue ?? 0 }));
                 return response;
             }
 

performance/Performance.Services/SheetSevice.cs

@@ -136,7 +136,7 @@ private void SpecialUnitExport(int sheetID, SheetExportResponse response)
                     rowbody.Data.Add(new Cell(9, item.Punishment, 1, 1, false, true));
                     rowbody.Data.Add(new Cell(10, item.Adjust, 1, 1, false, true));
                     response.Row.Add(rowbody);
-                } 
+                }
             }
         }
 
@@ -397,8 +397,8 @@ private void EmployeeExport(int sheetID, SheetExportResponse response)
                 row.Data.Add(new Cell(4, "职称", 1, 1, false, true));
                 row.Data.Add(new Cell(5, "绩效基数核算参考对象", 1, 1, false, true));
                 row.Data.Add(new Cell(6, "岗位系数", 1, 1, false, true));
-                row.Data.Add(new Cell(7, "考核得分率", 1, 1, false, true));
-                row.Data.Add(new Cell(8, "医生姓名", 1, 1, false, true));
+                row.Data.Add(new Cell(7, "参加工作时间", 1, 1, false, true));
+                row.Data.Add(new Cell(8, "考核得分率", 1, 1, false, true));
                 row.Data.Add(new Cell(9, "出勤率", 1, 1, false, true));
                 row.Data.Add(new Cell(10, "核算单元医生数", 1, 1, false, true));
                 row.Data.Add(new Cell(11, "工作量绩效", 1, 1, false, true));
@@ -410,6 +410,7 @@ private void EmployeeExport(int sheetID, SheetExportResponse response)
                 for (int i = 0; i < employeeList.Count(); i++)
                 {
                     var item = employeeList.ElementAt(i);
+                    var workTime = item.WorkTime != null ? ((DateTime)item.WorkTime).ToString("yyyy-MM-dd") : "";
                     var rowbody = new Row(i);
                     rowbody.Data.Add(new Cell(1, item.AccountingUnit, 1, 1, false, false));
                     rowbody.Data.Add(new Cell(2, item.Department, 1, 1, false, false));
@@ -417,7 +418,7 @@ private void EmployeeExport(int sheetID, SheetExportResponse response)
                     rowbody.Data.Add(new Cell(4, item.JobTitle, 1, 1, false, true));
                     rowbody.Data.Add(new Cell(5, item.FitPeople, 1, 1, false, true));
                     rowbody.Data.Add(new Cell(6, item.PostCoefficient, 1, 1, false, true));
-                    rowbody.Data.Add(new Cell(7, item.WorkTime, 1, 1, false, true));
+                    rowbody.Data.Add(new Cell(7, workTime, 1, 1, false, true));
                     rowbody.Data.Add(new Cell(8, item.ScoreAverageRate, 1, 1, false, true));
                     rowbody.Data.Add(new Cell(9, item.Attendance, 1, 1, false, true));
                     rowbody.Data.Add(new Cell(10, item.PeopleNumber, 1, 1, false, true));