From f508aa0df551de796cfec4fe8eef66f9bba096c1 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 18 Oct 2024 17:55:36 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Appointment/Response/AppointmentDetailResponse.cs | 3 ++- .../Appointment/Services/Implements/AppointmentService.cs | 2 +- .../Appointment/Services/Implements/AppointmentService.cs | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs index 43240e8f..2473187e 100644 --- a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs +++ b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs @@ -1,5 +1,6 @@ using Dlhis.Entity.Visitor.Enums; using Kurisu.AspNetCore.Utils.Extensions; +using Newtonsoft.Json; namespace Dlhis.Basic.Appointment.Response; @@ -82,7 +83,7 @@ public class AppointmentDetailResponse } } - + [JsonIgnore] public string ApplyWorkplaceAreasString { get; set; } /// diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index ff3cae07..48d156a8 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -68,7 +68,7 @@ public class AppointmentService : IAppointmentService ApplyDoorArea = x.ApplyDoorArea, DoorStart = x.DoorStart, DoorEnd = x.DoorEnd, - IsEnterWorkplace = false, + IsEnterWorkplace = x.IsEnterWorkplace, ApplyWorkplaceAreasString = x.ApplyWorkplaceAreas.ToString(), WorkplaceStart = x.WorkplaceStart, WorkplaceEnd = x.WorkplaceEnd, diff --git a/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs index 5e5a516b..35055588 100644 --- a/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.External/Appointment/Services/Implements/AppointmentService.cs @@ -30,11 +30,6 @@ public class AppointmentService : IAppointmentService var mst = new VisitorAppointmentEntity { - Id = 0, - CreatedBy = 0, - CreateTime = default, - ModifiedBy = 0, - ModifiedTime = default, No = request.No, Title = request.Title, Code = request.Code,