From b890f85c789500d0ac748c16ce1373906aba4cc5 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Mon, 18 Nov 2024 14:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=8A=A5=E5=91=8A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
index 1fbf410..d657377 100644
--- a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
@@ -5,6 +5,8 @@ using Shentun.Peis.SumSummaryHeaders;
 using Shentun.Peis.SumSummaryReports;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace Shentun.Peis.PrintReports
@@ -362,6 +364,12 @@ namespace Shentun.Peis.PrintReports
         /// 图片base64码
         /// </summary>
         public string PictureBase64 { get; set; }
+
+        /// <summary>
+        /// 图片文件类型  0-仪器图片，1-报告文件，默认是0
+        /// </summary>
+        public char PictureFileType { get; set; }
+
         /// <summary>
         /// 显示顺序
         /// </summary>
diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
index 3ddd5c1..7abcda3 100644
--- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
+++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
@@ -1265,7 +1265,8 @@ namespace Shentun.Peis.PrintReports
                     .Select(o => new
                     {
                         PictureFilename = o.registerCheckPictureHaveEmpty.PictureFilename,
-                        DisplayOrder = o.registerCheckPictureHaveEmpty.DisplayOrder
+                        DisplayOrder = o.registerCheckPictureHaveEmpty.DisplayOrder,
+                        PictureFileType = o.registerCheckPictureHaveEmpty.PictureFileType
                     }).OrderBy(o => o.DisplayOrder).Distinct().ToList();
                 foreach (var registerCheckPicture in registerCheckPictures)
                 {
@@ -1274,6 +1275,7 @@ namespace Shentun.Peis.PrintReports
                     //medicalReportCheckPictureDto.PictureBase64 =
                     //    Shentun.Utilities.FileHelper.ToBase64(registerCheckPicture.PictureFilename);
                     medicalReportCheckPictureDto.DisplayOrder = registerCheckPicture.DisplayOrder;
+                    medicalReportCheckPictureDto.PictureFileType = registerCheckPicture.PictureFileType;
                     medicalReportRegisterCheckDto.Pictures.Add(medicalReportCheckPictureDto);
                 }
                 medicalReportDto.RegisterChecks.Add(medicalReportRegisterCheckDto);