diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs
index c508aaa9..311a9479 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs
@@ -61,11 +61,15 @@ public class BalanceSummaryController : ControllerBase
{
return await _balanceSummaryService.BalanceRecordShiftAnalysisAmountAndCountAsync(request);
}
- /// 用餐分析(餐次)
+
+ ///
+ /// 餐次用餐分析,统计金额和人数
///
- [HttpGet("analysis/shift")]
- public async Task BalanceRecordAnalysisByShiftAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request)
+ ///
+ ///
+ [HttpGet("shift/analysis/amountAndCount")]
+ public async Task BalanceRecordShiftAnalysisAmountAndCountAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request)
{
- return await _balanceSummaryService.BalanceRecordAnalysisByShiftAsync(request);
+ return await _balanceSummaryService.BalanceRecordShiftAnalysisAmountAndCountAsync(request);
}
}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs
index 0fac698c..455d7d59 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs
@@ -14,4 +14,7 @@ public interface IBalanceSummaryService : IScopeDependency
Task BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request);
+ Task BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request);
+
+ Task BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request);
}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
index cad9e16d..5a76b686 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
@@ -99,7 +99,6 @@ public class BalanceSummaryService : IBalanceSummaryService
var amount = await queryable.SumAsync(x => SqlFunc.Abs(x.Amount));
-
var count = typeof(ShiftEnumType).GetFields(BindingFlags.Public | BindingFlags.Static).Length;
var result = await queryable.GroupBy(x => new { x.CostDate, x.ShiftType })