From a0caeb58e6240239a4db283c12b4bbb9616e062c Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Thu, 1 Aug 2024 17:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=8A=A5=E5=91=8A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=80=BB=E6=A3=80=E8=B7=9F=E4=BD=93=E6=A3=80=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PeisReports/GetPatientRegisterReportDto.cs | 18 ++++++++++++++++++
 .../PeisReports/PeisReportAppService.cs        |  8 ++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs b/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs
index 456a6c1..ecfa781 100644
--- a/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs
@@ -146,6 +146,24 @@ namespace Shentun.Peis.PeisReports
         /// </summary>
         public string RegisterDate { get; set; }
 
+        /// <summary>
+        /// 体检日期  1999-01-01
+        /// </summary>
+        public string MedicalStartDate { get; set; }
+
+
+        /// <summary>
+        /// 总检医生   
+        /// </summary>
+        public string SummaryDoctorName { get; set; }
+
+
+        /// <summary>
+        /// 总检时间   1999-01-01
+        /// </summary>
+        public string SummaryDate { get; set; }
+
 
+ 
     }
 }
diff --git a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
index a74d71a..005ac8a 100644
--- a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
+++ b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
@@ -115,7 +115,8 @@ namespace Shentun.Peis.PeisReports
                                 a.SexId,
                                 a.CreatorId,
                                 a.MaritalStatusId,
-                                a.IsUploadAppoint
+                                a.IsUploadAppoint,
+                                a.SummaryDoctorId
                             },
                             RegisterCheckCompleteFlag = registerCheck.CompleteFlag,
                             IsCheck = asbitem.IsCheck,
@@ -347,7 +348,10 @@ namespace Shentun.Peis.PeisReports
                         RegisterDate = DataHelper.ConversionDateToString(s.FirstOrDefault().a.CreationTime),
                         IsUpload = s.FirstOrDefault().a.IsUpload,
                         IsUploadAppoint = s.FirstOrDefault().a.IsUploadAppoint,
-                        IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(s.FirstOrDefault().a.Id).Result
+                        IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(s.FirstOrDefault().a.Id).Result,
+                        MedicalStartDate = DataHelper.ConversionDateShortToString(s.FirstOrDefault().a.MedicalStartDate),
+                        SummaryDate = DataHelper.ConversionDateShortToString(s.FirstOrDefault().a.SummaryDate),
+                        SummaryDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().a.SummaryDoctorId).Result
                     });
                 }