细节调整

performance/Performance.Services/ComputeService.cs

@@ -559,7 +559,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
 
             var officeResult = computes.GroupBy(t => new { t.AccountingUnit, t.AccountType, t.UnitType }).Select(t => new DeptResponse
             {
-                UnitName = t.Key.AccountType == "行政工勤" ? "行政后勤" : t.Key.AccountType,
+                UnitName = t.Key.AccountType == "行政后勤" ? "行政工勤" : t.Key.AccountType,
                 AccountingUnit = t.Key.AccountingUnit,
                 Department = t.Key.AccountingUnit,
                 PerforFee = 0,
@@ -577,16 +577,12 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
                 RealGiveFee = t.Sum(w => w.RealGiveFee),
             }); ;
             result.AddRange(officeResult);
-
+            // 医院其他绩效、科主任护士长管理绩效、合并实发
             foreach (var item in result)
             {
                 item.AprPerforAmount = otherPerformances?.Where(w => w.AccountingUnit == item.AccountingUnit && w.UnitType == item.UnitName)?.Sum(w => w.Amount) ?? 0;
                 item.AssessLaterManagementFee = item.AssessLaterManagementFee ?? 0;
                 item.RealGiveFee = (item.RealGiveFee ?? 0) + item.AssessLaterManagementFee + item.AprPerforAmount;
-                if (item.RealGiveFee <= 0)
-                {
-
-                }
             }
 
             var enumItems = EnumHelper.GetItems<AccountUnitType>();
@@ -1143,7 +1139,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             if (pairs.Contains((SheetType)sheet.SheetType))
             {
                 sheettype = 5;
-                amount = basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0;
+                amount = basicData?.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0;
                 if (sheet.SheetType != (int)SheetType.BudgetRatio)
                     amount = Math.Round(amount, 0);
             }