From bfa38c9c3b7725ddb7b8d1c14a72144fb23a05cb Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 22 Nov 2024 10:53:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=80=80=E6=AC=BE=E9=87=8D=E7=AE=97,?= =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Appointment/Services/Implements/AppointmentService.cs | 5 ++++- .../Order/Services/Implements/BalanceService.cs | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index 3a6bdb4d..26abef70 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -210,7 +210,10 @@ public class AppointmentService : IAppointmentService { return await _dbContext.Queryable() .LeftJoin((x, ga) => ga.IdNo == x.IdNo) - .Where(x => SqlFunc.Subqueryable().Where(p => p.Factory == factory).Any()) + .Where(x => SqlFunc.Subqueryable() + .Where(p => p.No == x.No) + .Where(p => p.Factory == factory).Any() + ) .Where(x => x.IsEnterDoorArea) .WhereIF(status.HasValue, x => x.DoorStatus == status) .Where(x => x.DoorStart >= start && x.DoorEnd <= end) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 88601a8a..4253b7ff 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -145,6 +145,10 @@ public class BalanceService : IBalanceService .ExecuteCommandThrowVersionAsync(); }, 5); } + else + { + await _balanceRepository.CalculateBalanceAsync(balanceRecord.UserCode); + } } } }