体检报告增加总检跟体检日期

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; }
+
+
  
     }
 }

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
                     });
                 }