科室收入、额外收入 核算金额汇总

performance/Performance.Services/ComputeService.cs

@@ -729,7 +729,11 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
                     var sheettype = 1; //特殊核算科室 4
                     var amount = 0m;
-                    if (sheet.SheetType == (int)SheetType.Expend)
+                    if (sheet.SheetType == (int)SheetType.Income || sheet.SheetType == (int)SheetType.OtherIncome)
+                    {
+                        amount = sheetData?.Sum(t => t.IsFactor == 1 ? t.CellValue * (t.FactorValue ?? 0) : t.CellValue) ?? 0;
+                    }
+                    else if (sheet.SheetType == (int)SheetType.Expend)
                     {
                         sheettype = 2;
                         amount = economic.FirstOrDefault(t => t.ItemName.Contains(sheetName) && t.UnitType == type)?.ItemValue ?? 0m;
@@ -769,7 +773,6 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                         CellValue = t.CellValue,
                         Factor = sheet.SheetType == (int)SheetType.Workload ? t.FactorValue : t.FactorValue * 100,
                         ItemValue = t.IsFactor == 1 ? (t.CellValue * (t.FactorValue ?? 0)) : t.CellValue,
-
                     }).ToList();
 
                     if (items != null && items.Any())
@@ -891,7 +894,7 @@ private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details
                     ItemName = data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1) is null ? data.First().ItemName :
                     data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1).ItemName?.Replace("执行", "开单/执行"),
                     IncomeType = data.First().IncomeType,
-                    Amount = data.First().Amount,
+                    Amount = data.Sum(w => w.Amount),
                     GroupBasis = groupbasis,
                     Items = items
                 });