From aaeb565f846537fdc3ccac9df6d1b38b66eb2fb9 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sun, 1 Dec 2024 14:29:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BD=BF=E7=94=A8ArrivedTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Appointment/Services/Implements/AppointmentService.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index e1327149..4fc51e33 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -256,11 +256,7 @@ public class AppointmentService : IAppointmentService .CountAsync(); var @in = await _dbContext.Queryable() - .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, start)) - // || (x.IsEnterWorkplace && ((x.WorkplaceStart >= start && x.WorkplaceStart <= end) || (x.WorkplaceEnd >= start && x.WorkplaceEnd <= end))) - .Where(x => (x.IsEnterDoorArea && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived) - //|| (x.IsEnterWorkplace && x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived) - ) + .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.ArrivedTime, start) && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived) .Where(x => SqlFunc.Subqueryable().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any()) .CountAsync();