Merge branch '青白江' into v2020morge

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -230,7 +230,13 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                     //        && (!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;
-                    var avg = (group.Number == 0 ? 0 : (sumValue / group.Number));
+                    //var avg = (group.Number == 0 ? 0 : (sumValue / group.Number));
+
+                    // 优先取 实际人均绩效
+                    var avg = (empolyee.FitPeopleValue.HasValue)
+                        ? empolyee.FitPeopleValue
+                        : group.Number == 0 ? 0 : sumValue / group.Number;
+
                     var empolyeeAdjust = isBudget ? adjust : empolyee.Adjust;
                     var compute = new ComputeResult
                     {

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

@@ -360,7 +360,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                     if (basicRule == null) continue;
 
                     // 优先取 实际人均绩效
-                    var avg = (empolyee.FitPeopleValue.HasValue && empolyee.FitPeopleValue > 0)
+                    var avg = (empolyee.FitPeopleValue.HasValue)
                         ? empolyee.FitPeopleValue
                         : resAccount.Number == 0 ? 0 : resAccount.PerforTotal / resAccount.Number;
                     var effAvg = empolyee.PermanentStaff == 0 ? 0 : resAccount.PerforTotal / empolyee.PermanentStaff;
@@ -417,7 +417,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                     // 参考基数专用绩效合计
                     compute.BaiscNormPerforTotal = compute.PerforSumFee;
                     // 实发绩效
-                    compute.RealGiveFee = Math.Round(((compute.Avg ?? 0) + (compute.AssessLaterManagementFee ?? 0)) * compute.Adjust + (compute.AdjustLaterOtherFee??0) ?? 0);
+                    compute.RealGiveFee = Math.Round(((compute.Avg ?? 0) + (compute.AssessLaterManagementFee ?? 0)) * compute.Adjust + (compute.AdjustLaterOtherFee ?? 0) ?? 0);
 
                     ////绩效合计
                     //compute.PerforSumFee = Math.Round((compute.Avg * (empolyee.Basics ?? 0)) + compute.ShouldGiveFee + compute.AssessBeforeOtherFee ?? 0);