diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index fa1330dc..18c794f7 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -725,6 +725,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionNumber = p.PositionNumberOld, ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiFullDate3(), Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + Remark = p.Reason ?? "" }) .ToList(); diff --git a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs index cf743393..99335098 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs @@ -1,4 +1,6 @@ -namespace BMA.EHR.Application.Responses.Reports +using System.Diagnostics.Contracts; + +namespace BMA.EHR.Application.Responses.Reports { public class CommandType03Response { diff --git a/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs index f154c95f..d1fa5811 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs @@ -19,5 +19,7 @@ public double Salary { get; set; } = 0; public string ActiveDate { get; set; } = string.Empty; + + public string Remark { get; set; } = string.Empty; } } diff --git a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp index fdba2137..492282fa 100644 Binary files a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp and b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp differ