Merge branch 'v20201230yubei' into v2020morge-graphql

performance/Performance.Services/ComputeService.cs

@@ -483,7 +483,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
                 })?.GroupBy(t => new { t.AccountingUnit, t.UnitType }).Select(t => new
                 {
                     AccountingUnit = t.Key.AccountingUnit,
-                    UnitType = t.Key.UnitType,
+                    UnitType = t.Key.UnitType == "行政后勤" ? "行政工勤" : t.Key.UnitType,
                     Amount = t.Sum(s => s.Amount)
                 });
 
@@ -810,7 +810,7 @@ private List<ComputeResponse> GetAllotPerformance(int allotId, int hospitalId, i
                         comp.PerforSumFee = t.Avg;
                 }
                 // 行政工勤
-                if (types3.Contains(t.AccountType) && t.NeedSecondAllot?.Trim() == "是")
+                if (types3.Contains(t.AccountType) && t.NeedSecondAllot?.Trim() == "否")
                 {
                     comp.PerforSumFee = t.GiveFee;
                     comp.AdjustLaterOtherFee = 0;