From a81325cbd6327631384ae5b74de40602c41bf79e Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 16 Oct 2024 16:43:21 +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

---
 ...tCompanyOccupationalDiseaseDetailReportDto.cs | 16 ++++++++--------
 .../OccupationalDiseaseReportAppService.cs       | 11 +++++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs b/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs
index c03832d..6dd2da7 100644
--- a/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/OccupationalDiseaseReports/GetCompanyOccupationalDiseaseDetailReportDto.cs
@@ -181,15 +181,15 @@ namespace Shentun.Peis.OccupationalDiseaseReports
         /// </summary>
         public string HandlingSuggestions { get; set; }
 
-        ///// <summary>
-        ///// 体检结论
-        ///// </summary>
-        //public string MedicalConclusion { get; set; }
+        /// <summary>
+        /// 体检结论
+        /// </summary>
+        public string MedicalConclusion { get; set; }
 
-        ///// <summary>
-        ///// 职业病检查类别
-        ///// </summary>
-        //public string OcCheckTypeName { get; set; }
+        /// <summary>
+        /// 职业病检查类别
+        /// </summary>
+        public string OcCheckTypeName { get; set; }
 
 
         ///// <summary>
diff --git a/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs b/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
index cd92f58..c581020 100644
--- a/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
+++ b/src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs
@@ -445,9 +445,10 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                 var medicalResultDetails = patientRegisterList.GroupBy(g => g.patientOccupationalDisease)
                     .Select((s, index) => new GetCompanyOccupationalDiseaseDetailReportMedicalResultDetailDto
                     {
-                        AnomalyIndex = !string.IsNullOrWhiteSpace(s.Key.OccupationalAbnormal)
-                        ? $"{SetSumSummarys(s.Select(ss => ss.sumSummaryHeaderHaveEmpty).Distinct().ToList())}\n结论：{s.Key.OccupationalAbnormal}"
-                        : $"{SetSumSummarys(s.Select(ss => ss.sumSummaryHeaderHaveEmpty).Distinct().ToList())}",
+                        //AnomalyIndex = !string.IsNullOrWhiteSpace(s.Key.OccupationalAbnormal)
+                        //? $"{SetSumSummarys(s.Select(ss => ss.sumSummaryHeaderHaveEmpty).Distinct().ToList())}\n结论：{s.Key.OccupationalAbnormal}"
+                        //: $"{SetSumSummarys(s.Select(ss => ss.sumSummaryHeaderHaveEmpty).Distinct().ToList())}",
+                        AnomalyIndex = $"{SetSumSummarys(s.Select(ss => ss.sumSummaryHeaderHaveEmpty).Distinct().ToList())}",
                         DisplayOrder = index + 1,
                         HandlingSuggestions = s.Key.OccupationalAbSuggestion,
                         JobType = s.Key.JobType,
@@ -455,6 +456,8 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                         PatientRegisterNo = s.FirstOrDefault().patientRegister.PatientRegisterNo,
                         PoisonNames = string.Join(",", s.Select(ss => ss.posionHaveEmpty.DisplayName).Distinct()),
                         PoisonWorkTime = s.Key.PoisonWorkTime,
+                        MedicalConclusion = s.Key.OccupationalAbnormal,
+                        OcCheckTypeName = s.FirstOrDefault().ocCheckTypeHaveEmpty.DisplayName
                     }).ToList();
                 msg.MedicalResultDetails = medicalResultDetails;
                 #endregion
@@ -765,7 +768,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                         PoisonNames = string.Join(",", s.Select(ss => ss.posionHaveEmpty.DisplayName).Distinct()),
                         PoisonWorkTime = s.Key.PoisonWorkTime,
                         MedicalStartDate = DataHelper.ConversionDateShortToString(s.FirstOrDefault().patientRegister.MedicalStartDate),
-                        SummaryDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().patientRegister.SummaryDoctorId).GetAwaiter().GetResult()
+                        SummaryDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().patientRegister.AuditDoctorId).GetAwaiter().GetResult()
                     }).OrderBy(o => o.MedicalConclusion).ToList();
                 msg = medicalResultDetails;
                 #endregion