BUG修复

performance/Performance.DtoModels/PerExcel/PerSheetHeader.cs

@@ -41,7 +41,7 @@ public class PerSheetHeader
                 ("职务分类", (t) => t.JobTitle, 1, 1, false, true, false, "JobTitle"),
                 //("岗位系数", (t) => t.PostCoefficient, 1, 1, false, true, false, "PostCoefficient"),
                 ("基础绩效系数", (t) => Math.Round(t.Basics.Value * 100, 2), 1, 1, false, true, false, "Basics"),
-                ("效率绩效人数", (t) => t.PermanentStaff, 1, 1, false, true, true, "PermanentStaff"),
+                ("效率绩效人数", (t) => t.PermanentStaff, 1, 1, false, true, false, "PermanentStaff"),
                 ("效率绩效系数", (t) => Math.Round(t.Efficiency.Value * 100, 2), 1, 1, false, true, true, "Efficiency"),
                 ("规模绩效系数", (t) => Math.Round(t.Scale.Value * 100, 2), 1, 1, false, true, true, "Scale"),
                 ("管理绩效发放系数", (t) => Math.Round(t.Management.Value * 100, 2), 1, 1, false, true, true, "Management"),

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -375,7 +375,6 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                         JobNumber = empolyee.JobNumber,
 
                         ScoreAverageRate = empolyee.ScoreAverageRate,
-                        //Punishment = empolyee.Punishment,
                         //OtherPerfor = empolyee.OtherPerfor,
 
                         Number = resAccount.ManagerNumber + resAccount.Number,
@@ -396,6 +395,8 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                             && (!string.IsNullOrEmpty(w.EmployeeName) || !string.IsNullOrEmpty(w.JobNumber)))
                         .FirstOrDefault(w => w.AccountingUnit == empolyee.AccountingUnit && w.UnitType == empolyee.UnitType
                             && w.JobNumber == empolyee.JobNumber && w.EmployeeName == empolyee.DoctorName)?.TotelValue;
+
+                    compute.Punishment = extra ?? 0;
                     //应发管理绩效
                     compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale) * (compute.Grant ?? 0) ?? 0);
                     //绩效合计