diff --git a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs index d657377..c8b8ea9 100644 --- a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs @@ -370,6 +370,11 @@ namespace Shentun.Peis.PrintReports /// public char PictureFileType { get; set; } + /// + /// 项目类别名称 + /// + public string ItemTypeName { get; set; } + /// /// 显示顺序 /// diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index 7abcda3..03dcd76 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -1266,7 +1266,8 @@ namespace Shentun.Peis.PrintReports { PictureFilename = o.registerCheckPictureHaveEmpty.PictureFilename, DisplayOrder = o.registerCheckPictureHaveEmpty.DisplayOrder, - PictureFileType = o.registerCheckPictureHaveEmpty.PictureFileType + PictureFileType = o.registerCheckPictureHaveEmpty.PictureFileType, + ItemTypeName = o.itemType.DisplayName }).OrderBy(o => o.DisplayOrder).Distinct().ToList(); foreach (var registerCheckPicture in registerCheckPictures) { @@ -1276,6 +1277,7 @@ namespace Shentun.Peis.PrintReports // Shentun.Utilities.FileHelper.ToBase64(registerCheckPicture.PictureFilename); medicalReportCheckPictureDto.DisplayOrder = registerCheckPicture.DisplayOrder; medicalReportCheckPictureDto.PictureFileType = registerCheckPicture.PictureFileType; + medicalReportCheckPictureDto.ItemTypeName = registerCheckPicture.ItemTypeName; medicalReportRegisterCheckDto.Pictures.Add(medicalReportCheckPictureDto); } medicalReportDto.RegisterChecks.Add(medicalReportRegisterCheckDto);