diff --git a/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs b/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs
index 6dd2da7..0b8eb60 100644
--- a/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs
@@ -192,15 +192,30 @@ namespace Shentun.Peis.OccupationalDiseaseReports
public string OcCheckTypeName { get; set; }
- /////
- ///// 体检日期
- /////
- //public string MedicalStartDate { get; set; }
-
- /////
- ///// 总检医生
- /////
- //public string SummaryDoctorName { get; set; }
+ ///
+ /// 身份证号码
+ ///
+ public string IdNo { get; set; }
+
+ ///
+ /// 性别
+ ///
+ public string SexName { get; set; }
+
+ ///
+ /// 年龄
+ ///
+ public string Age { get; set; }
+
+ ///
+ /// 体检日期
+ ///
+ public string MedicalStartDate { get; set; }
+
+ ///
+ /// 总检医生
+ ///
+ public string SummaryDoctorName { get; set; }
///
/// 排序
diff --git a/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs b/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
index c581020..e3d71b1 100644
--- a/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
+++ b/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
@@ -305,6 +305,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports
#region 人员信息
var query = from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+ join patient in await _patientRepository.GetQueryableAsync() on patientRegister.PatientId equals patient.Id
join patientOccupationalDisease in await _patientOccupationalDiseaseRepository.GetQueryableAsync() on patientRegister.Id equals patientOccupationalDisease.PatientRegisterId
join patientPoison in await _patientPoisonRepository.GetQueryableAsync() on patientRegister.Id equals patientPoison.PatientRegisterId into patientPoisonTemp
from patientPoisonHaveEmpty in patientPoisonTemp.DefaultIfEmpty()
@@ -321,6 +322,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports
select new
{
patientRegister,
+ patient,
patientOccupationalDisease,
posionHaveEmpty,
patientPoisonHaveEmpty,
@@ -457,7 +459,12 @@ namespace Shentun.Peis.OccupationalDiseaseReports
PoisonNames = string.Join(",", s.Select(ss => ss.posionHaveEmpty.DisplayName).Distinct()),
PoisonWorkTime = s.Key.PoisonWorkTime,
MedicalConclusion = s.Key.OccupationalAbnormal,
- OcCheckTypeName = s.FirstOrDefault().ocCheckTypeHaveEmpty.DisplayName
+ OcCheckTypeName = s.FirstOrDefault().ocCheckTypeHaveEmpty.DisplayName,
+ Age = s.FirstOrDefault().patientRegister.Age == null ? "" : s.FirstOrDefault().patientRegister.Age.ToString(),
+ IdNo = s.FirstOrDefault().patient.IdNo,
+ SexName = _cacheService.GetSexNameAsync(s.FirstOrDefault().patientRegister.SexId).GetAwaiter().GetResult(),
+ MedicalStartDate = DataHelper.ConversionDateShortToString(s.FirstOrDefault().patientRegister.MedicalStartDate),
+ SummaryDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().patientRegister.AuditDoctorId).GetAwaiter().GetResult()
}).ToList();
msg.MedicalResultDetails = medicalResultDetails;
#endregion