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
///
public string HandlingSuggestions { get; set; }
- /////
- ///// 体检结论
- /////
- //public string MedicalConclusion { get; set; }
+ ///
+ /// 体检结论
+ ///
+ public string MedicalConclusion { get; set; }
- /////
- ///// 职业病检查类别
- /////
- //public string OcCheckTypeName { get; set; }
+ ///
+ /// 职业病检查类别
+ ///
+ public string OcCheckTypeName { get; set; }
/////
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