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;