From cdd3e73636ec8dbc0c2d5def2d9243c979c20aa6 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 14 Nov 2024 14:59:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Organization/Response/GainfoMealResponse.cs        | 10 ++++++++--
 .../Services/Implements/GainfoMealService.cs           |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoMealResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoMealResponse.cs
index f2bc5509..6ef96e89 100644
--- a/Src/Dlhis.Basic/Organization/Response/GainfoMealResponse.cs
+++ b/Src/Dlhis.Basic/Organization/Response/GainfoMealResponse.cs
@@ -1,5 +1,6 @@
 using Dlhis.Entity.Basic.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
+using Newtonsoft.Json;
 
 namespace Dlhis.Basic.Organization.Response;
 
@@ -20,7 +21,10 @@ public class GainfoMealResponse
     /// <summary>
     /// 余额
     /// </summary>
-    public decimal Balance { get; set; }
+    public string Balance => CurrentBalance.ToString("F2");
+
+    [JsonIgnore]
+    public decimal CurrentBalance { get; set; }
 
     // /// <summary>
     // /// 余额(充值)
@@ -41,7 +45,9 @@ public class GainfoMealResponse
     /// <summary>
     /// 餐补总额
     /// </summary>
-    public decimal MealSupplementAmount { get; set; }
+    public string MealSupplementAmount => CurrentMealSupplementAmount.ToString("F2");
+
+    public decimal CurrentMealSupplementAmount { get; set; }
 
     /// <summary>
     /// 档案状态
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs
index a52cd610..743abed2 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs
@@ -45,12 +45,12 @@ public class GainfoMealService : IGainfoMealService
                 Status = request.IsLeave
                     ? GainfoStatusEnumType.Leave
                     : GainfoStatusEnumType.Working,
-                MealSupplementAmount = SqlFunc.Subqueryable<MealSupplementRecordEntity>()
+                CurrentMealSupplementAmount = SqlFunc.Subqueryable<MealSupplementRecordEntity>()
                     .Where(p => p.Code == x.Code)
                     .Where(p => factories.Contains(p.Factory))
                     .WhereIF(request.SearchDateTimePeriod.HasValue(), p => p.Date >= request.SearchDateTimePeriod.Start && p.Date <= request.SearchDateTimePeriod.End)
                     .Sum(p => p.Amount),
-                Balance = SqlFunc.Subqueryable<BalanceRecordEntity>()
+                CurrentBalance = SqlFunc.Subqueryable<BalanceRecordEntity>()
                     .Where(p => factories.Contains(p.TenantId))
                     .Where(p => p.UserCode == x.Code && p.Status == BalanceRecordStatusEnumType.Valid && p.IsDeleted == false)
                     .Where(p => p.Source != BalanceRecordSourceEnumType.EMealVoucher)