From cf83a9645fc955cd8558df903ea6a5414b3ee46b Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Tue, 19 Nov 2024 11:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PrintReports/MedicalReportDto.cs                         | 5 +++++
 .../PrintReports/PrintReportAppService.cs                    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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
         /// </summary>
         public char PictureFileType { get; set; }
 
+        /// <summary>
+        /// 项目类别名称
+        /// </summary>
+        public string ItemTypeName { get; set; }
+
         /// <summary>
         /// 显示顺序
         /// </summary>
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);