From 441a061f782002bca07b7b32f26cb9905d303cf0 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 29 Nov 2024 12:04:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=BF=E5=AE=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Appointment/Services/Implements/AppointmentService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index 516e1005..313aef9e 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -216,7 +216,9 @@ public class AppointmentService : IAppointmentService ) .Where(x => x.IsEnterDoorArea) .WhereIF(status.HasValue, x => x.DoorStatus == status) - .Where(x => x.DoorStart >= start && x.DoorEnd <= end) + .WhereIF(status.HasValue && status == VisitorAppointmentDetailStatusEnumType.Wait, x => x.DoorStart >= start && x.DoorStart <= end) + .WhereIF(status.HasValue && status == VisitorAppointmentDetailStatusEnumType.Arrived, x => x.DoorStart >= start && x.DoorStart <= end) + .WhereIF(!status.HasValue, x => x.DoorStart >= start && x.DoorEnd <= end) .WhereIF(search.IsPresent(), x => x.Name.Contains(search) || x.No == search || x.IdNo == search) .Select(x => new AppointmentDetailResponse {