From bcf0c0bfdbad416ce506d6a620c3fdc29712a21a Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 17 Jul 2024 16:37:15 +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=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B8=87=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
 =?UTF-8?q?=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       | 7 ++++---
 .../Repositories/Commands/CommandRepository.cs             | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index fe4c60f7..51563b69 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -1187,13 +1187,14 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        Seq = r.Sequence.ToString().ToThaiNumber(),
                                        FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
                                        Organization = p.rootOld,
-                                       OldPositionName = p.OrganizationPositionOld,
-                                       OldPositionLevel = p.PositionLevelOld,
+                                       OldOrganization = p.OrganizationOld,
+                                       OldPositionName = p.positionOld,
+                                       OldPositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld.ToThaiNumber(),
                                        OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(),
                                        OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        NewOc = p.root == null ? "" : p.root,
                                        NewPositionName = p.position == null ? "" : p.position,
-                                       NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
+                                       NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName.ToThaiNumber(),
                                        //    NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
                                                             p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index f4d357d2..6d5f9f65 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -6743,7 +6743,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 ", ""));