Merge branch 'v20201230yubei' into v2020morge-graphql

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -140,7 +140,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
 
             List<res_specialunit> resDataList = new List<res_specialunit>();
 
-            var groupSpeList = dataList.GroupBy(t => t.AccountingUnit).Select(t => new { AccountingUnit = t.Key, Number = t.Max(p => p.Number), });
+            var groupSpeList = dataList.GroupBy(t => t.AccountingUnit).Select(t => new { AccountingUnit = t.Key, Number = t.OrderBy(w => w.RowNumber).FirstOrDefault().Number, });
 
             var empolyeeList = perforImemployeeclinicRepository.GetEntities(t => t.AllotID == allot.ID && t.UnitType == UnitType.特殊核算组.ToString());
             List<ComputeEmployee> computeEmployees = Mapper.Map<List<ComputeEmployee>>(empolyeeList);
@@ -214,11 +214,12 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         AdjustLaterOtherFee = dept?.AdjustLaterOtherFee ?? 0,
                         NightShiftWorkPerforFee = nightShift,
                     };
-                    res.PerforTotal = (sumValue ?? 0) + res.AssessBeforeOtherFee;
+                    res.ResultsTotalFee = Math.Round((sumValue * (dept?.BasicFactor ?? 1m)) ?? 0);
+                    res.PerforTotal = res.ResultsTotalFee + res.AssessBeforeOtherFee;
                     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);
+
 
                     resDataList.Add(res);
                 }