diff --git a/Src/Dlhis.Canteen/Order/Response/ShiftAndBusinessPlaceAnalysisResponse.cs b/Src/Dlhis.Canteen/Order/Response/ShiftAndBusinessPlaceAnalysisResponse.cs
index f0208130..0cead12d 100644
--- a/Src/Dlhis.Canteen/Order/Response/ShiftAndBusinessPlaceAnalysisResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/ShiftAndBusinessPlaceAnalysisResponse.cs
@@ -11,8 +11,14 @@ public class ShiftAndBusinessPlaceAnalysisResponse
///
/// 消费总金额
///
- public decimal Amount { get; set; }
+ [JsonIgnore]
+ public decimal CurrentAmount { get; set; }
+ ///
+ /// 消费总金额
+ ///
+ public string Amount => Math.Abs(CurrentAmount).ToString("F2");
+
///
/// 消费人数
///
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
index be4e8140..877bdff2 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
@@ -196,7 +196,7 @@ public class BalanceSummaryService : IBalanceSummaryService
return new ShiftAndBusinessPlaceAnalysisResponse
{
- Amount = data?.Amount ?? 0,
+ CurrentAmount = data?.Amount ?? 0,
UserCount = data?.UserCount ?? 0,
CostCount = data?.CostCount ?? 0,
Pagination = page,
@@ -211,6 +211,7 @@ public class BalanceSummaryService : IBalanceSummaryService
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.WhereIF(internalRequest.Search.IsPresent(), (record, bPlace) => bPlace.Name.Contains(internalRequest.Search))
.Where(record => record.BusinessPlaceCode.HasValue)
+ .WhereIF(internalRequest.BusinessplaceCodes.IsPresent(), record => internalRequest.BusinessplaceCodes.Contains(record.BusinessPlaceCode.Value))
;
}
}