From 00ba79f331e82acbaaf8afacf399c3ba5a14194f Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Sun, 2 Jun 2024 20:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateAppointScheduleTemplateDto.cs           |  8 ++++----
 .../UpdateAppointScheduleTemplateDto.cs           |  8 ++++----
 .../WebPeisApplicationAutoMapperProfile.cs        | 15 +++++++++++++++
 src/Shentun.WebPeis.Domain/DataHelper.cs          | 12 ++++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/CreateAppointScheduleTemplateDto.cs b/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/CreateAppointScheduleTemplateDto.cs
index 473ddb6..fe97455 100644
--- a/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/CreateAppointScheduleTemplateDto.cs
+++ b/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/CreateAppointScheduleTemplateDto.cs
@@ -29,22 +29,22 @@ namespace Shentun.WebPeis.AppointScheduleTemplates
         /// 上午上班时间
         /// </summary>
 
-        public string? AmStartTime { get; set; }
+        public string AmStartTime { get; set; }
         /// <summary>
         /// 上午下班时间
         /// </summary>
 
-        public string? AmStopTime { get; set; }
+        public string AmStopTime { get; set; }
         /// <summary>
         /// 下午上班时间
         /// </summary>
 
-        public string? PmStartTime { get; set; }
+        public string PmStartTime { get; set; }
         /// <summary>
         /// 下午下班时间
         /// </summary>
 
-        public string? PmStopTime { get; set; }
+        public string PmStopTime { get; set; }
  
     }
 }
diff --git a/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/UpdateAppointScheduleTemplateDto.cs b/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/UpdateAppointScheduleTemplateDto.cs
index 89a1e83..9fe7367 100644
--- a/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/UpdateAppointScheduleTemplateDto.cs
+++ b/src/Shentun.WebPeis.Application.Contracts/AppointScheduleTemplates/UpdateAppointScheduleTemplateDto.cs
@@ -35,21 +35,21 @@ namespace Shentun.WebPeis.AppointScheduleTemplates
         /// 上午上班时间
         /// </summary>
 
-        public string? AmStartTime { get; set; }
+        public string AmStartTime { get; set; }
         /// <summary>
         /// 上午下班时间
         /// </summary>
 
-        public string? AmStopTime { get; set; }
+        public string AmStopTime { get; set; }
         /// <summary>
         /// 下午上班时间
         /// </summary>
 
-        public string? PmStartTime { get; set; }
+        public string PmStartTime { get; set; }
         /// <summary>
         /// 下午下班时间
         /// </summary>
 
-        public string? PmStopTime { get; set; }
+        public string PmStopTime { get; set; }
     }
 }
diff --git a/src/Shentun.WebPeis.Application/WebPeisApplicationAutoMapperProfile.cs b/src/Shentun.WebPeis.Application/WebPeisApplicationAutoMapperProfile.cs
index 9eb6d86..5921f55 100644
--- a/src/Shentun.WebPeis.Application/WebPeisApplicationAutoMapperProfile.cs
+++ b/src/Shentun.WebPeis.Application/WebPeisApplicationAutoMapperProfile.cs
@@ -1,6 +1,9 @@
 using AutoMapper;
+using Microsoft.Extensions.Configuration.UserSecrets;
+using NPOI.SS.Formula.Functions;
 using Shentun.Peis.MaritalStatuss;
 using Shentun.WebPeis.AppointPatientRegisters;
+using Shentun.WebPeis.AppointScheduleTemplates;
 using Shentun.WebPeis.Kinships;
 using Shentun.WebPeis.MaritalStatuss;
 using Shentun.WebPeis.MedicalPackages;
@@ -59,5 +62,17 @@ public class WebPeisApplicationAutoMapperProfile : Profile
         CreateMap<CreateAppointPatientRegisterDto, Kinship>();
         CreateMap<Kinship, AppointPatientRegisterDto>();
 
+        CreateMap<AppointScheduleTemplate, AppointScheduleTemplateDto>();
+        CreateMap<CreateAppointScheduleTemplateDto, AppointScheduleTemplate>()
+            .ForMember(d => d.AmStartTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.AmStartTime)))
+            .ForMember(d => d.AmStopTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.AmStopTime)))
+            .ForMember(d => d.PmStartTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.PmStartTime)))
+            .ForMember(d => d.PmStopTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.PmStopTime)));
+        CreateMap<UpdateAppointScheduleTemplateDto, AppointScheduleTemplate>()
+             .ForMember(d => d.AmStartTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.AmStartTime)))
+             .ForMember(d => d.AmStopTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.AmStopTime)))
+             .ForMember(d => d.PmStartTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.PmStartTime)))
+             .ForMember(d => d.PmStopTime, opt => opt.MapFrom(src => DataHelper.ConvertStringToTimeOnly(src.PmStopTime)));
+
     }
 }
diff --git a/src/Shentun.WebPeis.Domain/DataHelper.cs b/src/Shentun.WebPeis.Domain/DataHelper.cs
index d0c845d..059c598 100644
--- a/src/Shentun.WebPeis.Domain/DataHelper.cs
+++ b/src/Shentun.WebPeis.Domain/DataHelper.cs
@@ -10,6 +10,18 @@ namespace Shentun.WebPeis
     public class DataHelper
     {
 
+        public static TimeOnly? ConvertStringToTimeOnly(string timeOnlyString)
+        {
+            if (string.IsNullOrWhiteSpace(timeOnlyString))
+            {
+                return null;
+            }
+            else
+            {
+                return TimeOnly.Parse(timeOnlyString);
+            }
+        }
+
         /// <summary>
         /// 统一转换日期为字符串格式
         /// </summary>