Merge branch '青白江' into v2020morge

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -247,7 +247,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         EmployeeName = empolyee.DoctorName,
                         FitPeople = empolyee.FitPeople,
                         JobTitle = empolyee.JobTitle,
-
+                        JobNumber = empolyee.JobNumber,
                         ScoreAverageRate = empolyee.ScoreAverageRate,
                         Punishment = 0,
                         //OtherPerfor = empolyee.OtherPerfor,
@@ -265,7 +265,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         Scale = sumValue * (empolyee.Scale ?? 0),
                     };
 
-                    compute.Avg = (group.Number == 0 ? 0 : (sumValue / group.Number)) * (empolyee.Basics ?? 0) * compute.Attendance;
+                    compute.Avg = avg * (empolyee.Basics ?? 0) * compute.Attendance;
                     // 考核前管理绩效
                     compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale) * compute.Grant + compute.OtherManagePerfor ?? 0);
                     // 考核后管理绩效