From 14b5c0d3a94a2a59348f40273b7acfc704ecb767 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 22 May 2024 18:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E7=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OccupationalDiseaseWithDetailInputDto.cs     |  8 ++++----
 .../PeisApplicationAutoMapperProfile.cs          | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/OccupationalDiseases/OccupationalDiseaseWithDetailInputDto.cs b/src/Shentun.Peis.Application.Contracts/OccupationalDiseases/OccupationalDiseaseWithDetailInputDto.cs
index d1209ec..3b1e91e 100644
--- a/src/Shentun.Peis.Application.Contracts/OccupationalDiseases/OccupationalDiseaseWithDetailInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/OccupationalDiseases/OccupationalDiseaseWithDetailInputDto.cs
@@ -73,7 +73,7 @@ namespace Shentun.Peis.OccupationalDiseases
         /// <summary>
         /// 诊断日期
         /// </summary>
-        public DateTime? DiagnosisDate { get; set; }
+        public string? DiagnosisDate { get; set; }
 
         /// <summary>
         /// 诊断单位
@@ -89,7 +89,7 @@ namespace Shentun.Peis.OccupationalDiseases
         /// <summary>
         /// 末次月经日期
         /// </summary>
-        public DateTime? LastMenstrualPeriodDate { get; set; }
+        public string? LastMenstrualPeriodDate { get; set; }
 
         /// <summary>
         /// 初潮多少岁
@@ -220,12 +220,12 @@ namespace Shentun.Peis.OccupationalDiseases
         /// <summary>
         /// 开始日期
         /// </summary>
-        public DateTime? BeginDate { get; set; }
+        public string? BeginDate { get; set; }
 
         /// <summary>
         /// 结束日期
         /// </summary>
-        public DateTime? EndDate { get; set; }
+        public string? EndDate { get; set; }
 
         /// <summary>
         /// 车间
diff --git a/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs b/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs
index 478b4d5..a66742d 100644
--- a/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs
+++ b/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs
@@ -284,7 +284,7 @@ public class PeisApplicationAutoMapperProfile : Profile
         CreateMap<AsbitemDetail, AsbitemDetailDto>();
         CreateMap<CreateAsbitemDetailDto, AsbitemDetail>();
         CreateMap<CreateAsbitemDetail_Detail, AsbitemDetail>();
-        
+
 
 
         CreateMap<AsbitemGuide, AsbitemGuideDto>();
@@ -298,7 +298,7 @@ public class PeisApplicationAutoMapperProfile : Profile
 
         CreateMap<MedicalPackageDetail, MedicalPackageDetailDto>();
         CreateMap<CreateMedicalPackageDetailMany_Detail, MedicalPackageDetail>();
-        
+
 
         CreateMap<CustomerOrg, CustomerOrgDto>();
         CreateMap<CreateCustomerOrgDto, CustomerOrg>();
@@ -326,7 +326,7 @@ public class PeisApplicationAutoMapperProfile : Profile
         CreateMap<CreateCustomerOrgGroupDetail_Detail, CustomerOrgGroupDetail>();
         CreateMap<CreateCustomerOrgGroupDetailDto, CustomerOrgGroupDetail>();
         CreateMap<CustomerOrgGroupDetailOrAsbitemEntity, CustomerOrgGroupDetailOrAsbitemDto>();
-        
+
 
         CreateMap<Patient, PatientDto>();
         CreateMap<CreatePatientDto, Patient>().ForMember(d => d.BirthDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.BirthDate)));
@@ -503,12 +503,16 @@ public class PeisApplicationAutoMapperProfile : Profile
         CreateMap<CreateOcCheckTypeDto, OcCheckType>();
         CreateMap<UpdateOcCheckTypeDto, OcCheckType>();
 
-        CreateMap<PatientOccupationalDiseaseInputDto, PatientOccupationalDisease>();
+        CreateMap<PatientOccupationalDiseaseInputDto, PatientOccupationalDisease>()
+            .ForMember(d => d.DiagnosisDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.DiagnosisDate)))
+            .ForMember(d => d.LastMenstrualPeriodDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.LastMenstrualPeriodDate)));
         CreateMap<PatientPoisonInputDto, PatientPoison>();
-        CreateMap<PatientOccupationalHistoryInputDto, PatientOccupationalHistory>();
+        CreateMap<PatientOccupationalHistoryInputDto, PatientOccupationalHistory>()
+            .ForMember(d => d.BeginDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.BeginDate)))
+            .ForMember(d => d.EndDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.EndDate)));
         CreateMap<PatientSymptomInputDto, PatientSymptom>();
 
-       
+
 
 
     }