From a2a8aee819a3e5c5ef432fe35719f5607d9d37c3 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 16 Jul 2024 16:19:11 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=A2=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=88=E0=B8=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Commands/CommandReportRepository.cs | 3 ++- BMA.EHR.Application/Repositories/Commands/CommandRepository.cs | 2 +- BMA.EHR.Application/Responses/Reports/CommandType22Response.cs | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 59d45c32..fe4c60f7 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -1320,7 +1320,8 @@ namespace BMA.EHR.Application.Repositories.Commands Seq = r.Sequence.ToString().ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Organization = p.OrganizationPositionOld, - OldPositionName = p.OrganizationPositionOld, + OldOrganization = p.OrganizationOld, + OldPositionName = p.positionOld, OldPositionLevel = p.PositionLevelOld, OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 4dffc876..f4d357d2 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -7078,7 +7078,7 @@ namespace BMA.EHR.Application.Repositories.Commands } var baseAPIOrg = _configuration["API"]; - var apiUrlOrg = $"{baseAPIOrg}/org/pos/report/current"; + var apiUrlOrg = $"{baseAPIOrg}/org/employee/pos/report/current"; using (var client = new HttpClient()) { client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); diff --git a/BMA.EHR.Application/Responses/Reports/CommandType22Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType22Response.cs index 1134fdca..71986e39 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType22Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType22Response.cs @@ -6,6 +6,7 @@ // public string CitizenId { get; set; } = string.Empty; public string? FullName { get; set; } = string.Empty; public string? Organization { get; set; } = string.Empty; + public string? OldOrganization { get; set; } = string.Empty; public string? OldPositionName { get; set; } = string.Empty; public string? OldPositionLevel { get; set; } = string.Empty; public string? OldPositionNumber { get; set; } = string.Empty;