Merge branch 'v20201230yubei' into v2020morge-graphql

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -411,10 +411,11 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                 //dept.MedicineExtra = 0;// (drugExtra ?? 0);
                 //dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
 
-
+                
                 dept.PerforFee = empolyees.Sum(w => w.PerforTotal ?? 0);
                 dept.PerforTotal = Math.Round(empolyees.Sum(w => w.GiveFee ?? 0));
-                dept.RealGiveFee = Math.Round(((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra) * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0);
+                dept.AssessLaterPerforTotal = Math.Round((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra) ?? 0);
+                dept.RealGiveFee = Math.Round((dept.AssessLaterPerforTotal * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0);
                 //dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);
                 dept.Avg = dept.Number == 0 ? 0 : dept.PerforTotal / dept.Number;