Browse Source

单位报告、总检体检结论

bjmzak
wxd 2 years ago
parent
commit
132ff3b6b6
  1. 3
      src/Shentun.Peis.Application.Contracts/PatientRegisters/UpdatePatientRegisterSummarySuggestionDto.cs
  2. 2
      src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs
  3. 14
      src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs

3
src/Shentun.Peis.Application.Contracts/PatientRegisters/UpdatePatientRegisterSummarySuggestionDto.cs

@ -26,8 +26,7 @@ namespace Shentun.Peis.PatientRegisters
/// <summary> /// <summary>
/// 体检结论ID /// 体检结论ID
/// </summary> /// </summary>
[Required(ErrorMessage ="体检结论不能为空")]
public Guid MedicalConclusionId { get; set; }
public Guid? MedicalConclusionId { get; set; }
public List<UpdateSumSummaryDto> SumSummarys { get; set; } public List<UpdateSumSummaryDto> SumSummarys { get; set; }
public List<UpdateSumSuggestionDto> SumSuggestions { get; set; } public List<UpdateSumSuggestionDto> SumSuggestions { get; set; }

2
src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs

@ -275,7 +275,7 @@ namespace Shentun.Peis.LisRequests
var config = configurationBuilder.Build(); var config = configurationBuilder.Build();
var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value; var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value;
var className = config.GetSection("Interface").GetSection("ClassName").Value; var className = config.GetSection("Interface").GetSection("ClassName").Value;
object[] objects = [lisRequestPluginsInput];
object[] objects = new object[] { lisRequestPluginsInput };
var LisRequestPluginsOut = await InvokeAsync(assemblyName, className, parmValue, "SendRequest", objects); var LisRequestPluginsOut = await InvokeAsync(assemblyName, className, parmValue, "SendRequest", objects);
} }
} }

14
src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs

@ -821,18 +821,18 @@ namespace Shentun.Peis.ReportTemplates
Header header = template.Headers.Odd; Header header = template.Headers.Odd;
// Insert Paragraph in header // Insert Paragraph in header
Paragraph paragraph = header.InsertParagraph(); Paragraph paragraph = header.InsertParagraph();
Xceed.Document.NET.Image logo = template.AddImage(DirectoryName + @"\CustomerOrgTemplate\header.jpg");
Xceed.Document.NET.Image logo = template.AddImage(DirectoryName + @"\CustomerOrgTemplate\logo.jpg");
var pic = logo.CreatePicture(); var pic = logo.CreatePicture();
pic.Width = 41.59f;
pic.Height = 30.3f;
pic.Width = 40f;
pic.Height = 40f;
paragraph.AppendPicture(pic); paragraph.AppendPicture(pic);
paragraph.Append("\t\t\t\t健康体检中心"); paragraph.Append("\t\t\t\t健康体检中心");
template.AddFooters(); template.AddFooters();
Footer footer = template.Footers.Odd; Footer footer = template.Footers.Odd;
// Insert Paragraph in header // Insert Paragraph in header
Paragraph paragraph1 = footer.InsertParagraph();
paragraph1.Append("File Format Develoer Guide");
//Paragraph paragraph1 = footer.InsertParagraph();
//paragraph1.Append("File Format Develoer Guide");
#region 封面 #region 封面
template.ReplaceText(new StringReplaceTextOptions template.ReplaceText(new StringReplaceTextOptions
@ -1132,9 +1132,9 @@ namespace Shentun.Peis.ReportTemplates
List<Row> rows = p1Titletable.Rows; List<Row> rows = p1Titletable.Rows;
Row row0 = rows[0]; Row row0 = rows[0];
row0.Height = 65f;
row0.Height = 50f;
row0.Cells[0].Width = 50f; row0.Cells[0].Width = 50f;
Xceed.Document.NET.Image logo = document.AddImage(DirectoryName + @"\CustomerOrgTemplate\logo_template.jpg");
Xceed.Document.NET.Image logo = document.AddImage(DirectoryName + @"\CustomerOrgTemplate\logo.jpg");
Formatting p1TitleFormatting = new Formatting(); Formatting p1TitleFormatting = new Formatting();
p1TitleFormatting.FontFamily = new Xceed.Document.NET.Font("宋体"); p1TitleFormatting.FontFamily = new Xceed.Document.NET.Font("宋体");
p1TitleFormatting.FontColor = Color.FromArgb(0, 128, 0); p1TitleFormatting.FontColor = Color.FromArgb(0, 128, 0);

Loading…
Cancel
Save