From 57ec12a1d3688eb902f46ddcfe271ca397f5bc2b Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 11 Sep 2024 10:40:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5IsEnt?=
 =?UTF-8?q?erDoorArea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Visitor/Entity/VisitorAppointmentDetailEntity.cs        | 5 +++++
 .../Appointment/Dto/AppointmentReceiveItemDto.cs            | 6 +++++-
 .../Appointment/Services/Implements/AppointmentService.cs   | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs b/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
index ee427536..a73e98aa 100644
--- a/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
+++ b/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
@@ -51,6 +51,11 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
     [SugarColumn(ColumnDescription = "车牌")]
     public string LicensePlate { get; set; }
 
+    /// <summary>
+    /// 进入门岗
+    /// </summary>
+    public bool IsEnterDoorArea { get; set; }
+
     /// <summary>
     /// 预约门禁区域
     /// </summary>
diff --git a/Src/Dlhis.External/Appointment/Dto/AppointmentReceiveItemDto.cs b/Src/Dlhis.External/Appointment/Dto/AppointmentReceiveItemDto.cs
index bd0fd1b5..8710a565 100644
--- a/Src/Dlhis.External/Appointment/Dto/AppointmentReceiveItemDto.cs
+++ b/Src/Dlhis.External/Appointment/Dto/AppointmentReceiveItemDto.cs
@@ -45,6 +45,10 @@ public class AppointmentReceiveItemDto : IValidatableObject
     /// </summary>
     public string ImageUrl { get; set; }
 
+    /// <summary>
+    /// 进入门岗
+    /// </summary>
+    public bool IsEnterDoorArea { get; set; }
 
     /// <summary>
     /// 预约门岗区域
@@ -63,7 +67,7 @@ public class AppointmentReceiveItemDto : IValidatableObject
     public DateTime DoorEnd { get; set; }
 
     /// <summary>
-    /// 是否进入车间
+    /// 进入车间
     /// </summary>
     public bool IsEnterWorkplace { get; set; }
 
diff --git a/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs
index dcc8bbd8..ff689b9f 100644
--- a/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs
+++ b/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs
@@ -88,12 +88,13 @@ public class AppointmentService : IAppointmentService
                 Name = item.Name,
                 Phone = item.Phone,
                 Remark = item.Remark,
-                DoorStatus = areas.Where(x => x.Type == AppointmentAreaEnumType.Door)
+                DoorStatus = item.IsEnterDoorArea && areas.Where(x => x.Type == AppointmentAreaEnumType.Door)
                     .Select(x => x.CustomCode)
                     .Contains(item.ApplyDoorArea)
                     ? VisitorAppointmentDetailStatusEnumType.Wait
                     : VisitorAppointmentDetailStatusEnumType.Obsolete,
                 LicensePlate = item.LicensePlate,
+                IsEnterDoorArea = item.IsEnterDoorArea,
                 ApplyDoorArea = item.ApplyDoorArea,
                 DoorStart = item.DoorStart,
                 DoorEnd = item.DoorEnd,