From d1596d1dc88622c3cea2a33c3674e3c241d30a3e Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Mon, 21 Oct 2024 17:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E7=97=85=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...mpanyOccupationalDiseaseDetailReportDto.cs | 33 ++++++++++++++-----
 .../OccupationalDiseaseReportAppService.cs    |  9 ++++-
 2 files changed, 32 insertions(+), 10 deletions(-)

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; }
 
 
-        ///// <summary>
-        ///// 体检日期  
-        ///// </summary>
-        //public string MedicalStartDate { get; set; }
-
-        ///// <summary>
-        ///// 总检医生  
-        ///// </summary>
-        //public string SummaryDoctorName { get; set; }
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IdNo { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string SexName { get; set; }
+
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public string Age { get; set; }
+
+        /// <summary>
+        /// 体检日期  
+        /// </summary>
+        public string MedicalStartDate { get; set; }
+
+        /// <summary>
+        /// 总检医生  
+        /// </summary>
+        public string SummaryDoctorName { get; set; }
 
         /// <summary>
         /// 排序
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