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 /// public string RegisterDate { get; set; } + /// + /// 体检日期 1999-01-01 + /// + public string MedicalStartDate { get; set; } + + + /// + /// 总检医生 + /// + public string SummaryDoctorName { get; set; } + + + /// + /// 总检时间 1999-01-01 + /// + 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 }); }