Browse Source

报告加项目列表名称

master
wxd 1 year ago
parent
commit
cf83a9645f
  1. 5
      src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
  2. 4
      src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

5
src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs

@ -370,6 +370,11 @@ namespace Shentun.Peis.PrintReports
/// </summary> /// </summary>
public char PictureFileType { get; set; } public char PictureFileType { get; set; }
/// <summary>
/// 项目类别名称
/// </summary>
public string ItemTypeName { get; set; }
/// <summary> /// <summary>
/// 显示顺序 /// 显示顺序
/// </summary> /// </summary>

4
src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@ -1266,7 +1266,8 @@ namespace Shentun.Peis.PrintReports
{ {
PictureFilename = o.registerCheckPictureHaveEmpty.PictureFilename, PictureFilename = o.registerCheckPictureHaveEmpty.PictureFilename,
DisplayOrder = o.registerCheckPictureHaveEmpty.DisplayOrder, DisplayOrder = o.registerCheckPictureHaveEmpty.DisplayOrder,
PictureFileType = o.registerCheckPictureHaveEmpty.PictureFileType
PictureFileType = o.registerCheckPictureHaveEmpty.PictureFileType,
ItemTypeName = o.itemType.DisplayName
}).OrderBy(o => o.DisplayOrder).Distinct().ToList(); }).OrderBy(o => o.DisplayOrder).Distinct().ToList();
foreach (var registerCheckPicture in registerCheckPictures) foreach (var registerCheckPicture in registerCheckPictures)
{ {
@ -1276,6 +1277,7 @@ namespace Shentun.Peis.PrintReports
// Shentun.Utilities.FileHelper.ToBase64(registerCheckPicture.PictureFilename); // Shentun.Utilities.FileHelper.ToBase64(registerCheckPicture.PictureFilename);
medicalReportCheckPictureDto.DisplayOrder = registerCheckPicture.DisplayOrder; medicalReportCheckPictureDto.DisplayOrder = registerCheckPicture.DisplayOrder;
medicalReportCheckPictureDto.PictureFileType = registerCheckPicture.PictureFileType; medicalReportCheckPictureDto.PictureFileType = registerCheckPicture.PictureFileType;
medicalReportCheckPictureDto.ItemTypeName = registerCheckPicture.ItemTypeName;
medicalReportRegisterCheckDto.Pictures.Add(medicalReportCheckPictureDto); medicalReportRegisterCheckDto.Pictures.Add(medicalReportCheckPictureDto);
} }
medicalReportDto.RegisterChecks.Add(medicalReportRegisterCheckDto); medicalReportDto.RegisterChecks.Add(medicalReportRegisterCheckDto);

Loading…
Cancel
Save