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码
///
public string PictureBase64 { get; set; }
+
+ ///
+ /// 图片文件类型 0-仪器图片,1-报告文件,默认是0
+ ///
+ public char PictureFileType { get; set; }
+
///
/// 显示顺序
///
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);