Merge branch 'v20201230yubei' into v2020morge-graphql

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -215,7 +215,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         NightShiftWorkPerforFee = nightShift,
                     };
                     res.PerforTotal = (sumValue ?? 0) + res.AssessBeforeOtherFee;
-                    res.GiveFee = Math.Round((res.PerforTotal * res.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + res.Punishment + res.AssessLaterOtherFee) ?? 0);
+                    res.GiveFee = Math.Round((res.PerforTotal * res.ScoringAverage + res.MedicineExtra + res.MaterialsExtra + res.Punishment + res.AssessLaterOtherFee) ?? 0);
                     res.RealGiveFee = Math.Round(res.GiveFee * res.Adjust + res.AdjustLaterOtherFee ?? 0);
                     res.Avg = Math.Round((res.Number != 0 ? res.PerforTotal / res.Number : null) ?? 0);
                     res.ResultsTotalFee = Math.Round(sumValue ?? 0);