diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 309e14a0..e5c46c3b 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -235,7 +235,7 @@ namespace BMA.EHR.Application.Repositories.Commands var report_data = (from r in raw_data join p in _dbContext.Set() - .Include(x => x.PlacementEducations) + .Include(x => x.PlacementEducations) .Include(x => x.OrganizationPosition) .ThenInclude(x => x.Organization) .Include(x => x.PositionPath) @@ -644,10 +644,11 @@ namespace BMA.EHR.Application.Repositories.Commands PositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, PositionType = pf.PositionType == null ? "" : pf.PositionType.Name, PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(), - ReceiveOrganizationName = r.Command!.ReceiveOrganizationName + ReceiveOrganizationName = r.Command!.ReceiveOrganizationName, + Reason = p.Reason ?? "" }) .ToList(); @@ -824,7 +825,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionType = p.PositionTypeOld, PositionNumber = p.PositionNumberOld.ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), - Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Remark = p.Reason ?? "" }) diff --git a/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs index 93b0e921..f8e58468 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs @@ -23,5 +23,7 @@ public string ReceiveOrganizationName { get; set; } = string.Empty; public string ActiveDate { get; set; } = string.Empty; + + public string Reason { get; set; } = string.Empty; } } diff --git a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp index 2bd12d36..a49c754d 100644 Binary files a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp and b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp differ