From 5eb7d3fefa9a71941b423b0d0fcf2160df77c964 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 11 Jun 2025 10:13:52 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=BA=E9=80=80=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0Arrived=E5=92=8CWait=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AppointmentService.cs | 12 +++++++----- .../Services/Implements/GainfoService.cs | 5 ++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index 5f26d944..56f10e8c 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -186,14 +186,16 @@ public class AppointmentService : IAppointmentService detail.ThrowIfNull("数据不存在"); if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived) - { detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave; - } + + if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait) + detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Obsolete; if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived) - { detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave; - } + + if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait) + detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Obsolete; detail.FocusLeaveDateTime = DateTime.Now; detail.Remark += "强制离场原因:" + reason; @@ -401,7 +403,7 @@ public class AppointmentService : IAppointmentService { var gainfo = await _dbContext.Queryable().Where(x => x.IdNo == detail.IdNo || x.Code == detail.IdNo).SingleAsync(); gainfo.ThrowIfNull("人员信息不存在"); - + var areaCodes = GetValidAreaCodes(detail, withWorkplace).ToList(); if (areaCodes.IsEmpty()) return; diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 7725311b..3f8874e6 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -269,7 +269,10 @@ public class GainfoService : IGainfoService { var visitorAppointmentDetails = await _dbContext.Queryable() .Where(x => x.UserNo == gainfo.No) - .Where(x => x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait || x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait) + .Where(x => x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait + || x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait + || x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived + || x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived) .ToListAsync();