公式修改

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -71,11 +71,16 @@ public class ComputeResult
         public Nullable<decimal> Grant { get; set; }
 
         /// <summary>
-        /// 应发管理绩效(需计算)
+        /// 考核前管理绩效
         /// </summary>
         public Nullable<decimal> ShouldGiveFee { get; set; }
 
         /// <summary>
+        /// 考核后管理绩效
+        /// </summary>
+        public Nullable<decimal> AssessLaterManagementFee { get; set; }
+
+        /// <summary>
         /// 绩效合计 考核前(需计算)
         /// </summary>
         public Nullable<decimal> PerforSumFee { get; set; }

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

@@ -387,7 +387,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                         OtherManagePerfor = empolyee.OtherManagePerfor ?? 0,
                         Number = resAccount.Number,
                         PerforTotal = resAccount.PerforTotal,
-                        Avg = avg,
+                        Avg = avg * (empolyee.Basics ?? 0) * (empolyee.Attendance ?? 0),
                         Efficiency = effAvg * (empolyee.Efficiency ?? 0),
                         Scale = resAccount.PerforTotal * (empolyee.Scale ?? 0),
                         Adjust = (isBudget ? adjust : empolyee.Adjust) ?? 1m,
@@ -405,8 +405,10 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                             && w.JobNumber == empolyee.JobNumber && w.EmployeeName == empolyee.DoctorName)?.TotelValue;
 
                     compute.Punishment = extra ?? 0;
-                    //应发管理绩效
-                    compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale + compute.OtherManagePerfor) * compute.Grant ?? 0);
+                    // 考核前管理绩效
+                    compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale) * compute.Grant + compute.OtherManagePerfor ?? 0);
+                    // 考核后管理绩效
+                    compute.AssessLaterManagementFee = Math.Round(compute.ShouldGiveFee * compute.ScoreAverageRate * compute.Attendance + compute.Punishment ?? 0);
                     //绩效合计
                     compute.PerforSumFee = Math.Round((compute.Avg * (empolyee.Basics ?? 0)) + compute.ShouldGiveFee + compute.AssessBeforeOtherFee ?? 0);
                     //应发绩效