diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
index c917b448..14e27b2f 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@@ -477,7 +477,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                         (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                         (org.result.root == null ? "" : org.result.root);
-                placementAppointment.OrganizationPositionOld = org.result.position + "\n" + (placementAppointment.PositionExecutiveOld == null ? "" : placementAppointment.PositionExecutiveOld + "\n") + placementAppointment.OrganizationOld;
+                placementAppointment.OrganizationPositionOld = org.result.position + "\n" + 
+                    (placementAppointment.PositionExecutiveOld == null ? "" : (placementAppointment.positionExecutiveField == null ? placementAppointment.PositionExecutiveOld + "\n": placementAppointment.PositionExecutiveOld + "(" + placementAppointment.positionExecutiveField + ")" + "\n")) 
+                    + placementAppointment.OrganizationOld;
                 placementAppointment.AmountOld = org.result.salary;
             }
             await _context.PlacementAppointments.AddAsync(placementAppointment);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index 4886f587..5b1e24d8 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -421,7 +421,10 @@ namespace BMA.EHR.Placement.Service.Controllers
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                         (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                         (org.result.root == null ? "" : org.result.root);
-                placementOfficer.OrganizationPositionOld = org.result.position + "\n" + (placementOfficer.PositionExecutiveOld == null ? "" : placementOfficer.PositionExecutiveOld + "\n") + placementOfficer.OrganizationOld;
+                placementOfficer.OrganizationPositionOld =  org.result.position + "\n" +
+                    (placementOfficer.PositionExecutiveOld == null ? "" : (placementOfficer.positionExecutiveField == null ? placementOfficer.PositionExecutiveOld + "\n" : placementOfficer.PositionExecutiveOld + "(" + placementOfficer.positionExecutiveField + ")" + "\n"))
+                    + placementOfficer.OrganizationOld;
+
             }
             await _context.PlacementOfficers.AddAsync(placementOfficer);
             await _context.SaveChangesAsync();
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index 993df51b..f36ee09e 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -514,7 +514,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                                                             (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                             (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                             (org.result.root == null ? "" : org.result.root);
-                    placementReceive.OrganizationPositionOld = org.result.position + "\n" + (placementReceive.PositionExecutiveOld == null ? "" : placementReceive.PositionExecutiveOld + "\n") + placementReceive.OrganizationOld;
+                    placementReceive.OrganizationPositionOld = org.result.position + "\n" +
+                        (placementReceive.PositionExecutiveOld == null ? "" : (placementReceive.positionExecutiveField == null ? placementReceive.PositionExecutiveOld + "\n" : placementReceive.PositionExecutiveOld + "(" + placementReceive.positionExecutiveField + ")" + "\n"))
+                        + placementReceive.OrganizationOld;
                 }
             }
             await _context.PlacementReceives.AddAsync(placementReceive);
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
index bd839917..cd24d0f0 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
@@ -303,7 +303,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                         (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                         (org.result.root == null ? "" : org.result.root);
-                placementRepatriation.OrganizationPositionOld = org.result.position + "\n" + (placementRepatriation.PositionExecutiveOld == null ? "" : placementRepatriation.PositionExecutiveOld + "\n") + placementRepatriation.OrganizationOld;
+                placementRepatriation.OrganizationPositionOld = org.result.position + "\n" +
+                    (placementRepatriation.PositionExecutiveOld == null ? "" : (placementRepatriation.positionExecutiveField == null ? placementRepatriation.PositionExecutiveOld + "\n" : placementRepatriation.PositionExecutiveOld + "(" + placementRepatriation.positionExecutiveField + ")" + "\n"))
+                    + placementRepatriation.OrganizationOld;
             }
 
             var baseAPIOrg = _configuration["API"];
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
index 8689339a..1440f49a 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
@@ -558,7 +558,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                         (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                         (org.result.root == null ? "" : org.result.root);
-                placementTransfer.OrganizationPositionOld = org.result.position + "\n" + (placementTransfer.PositionExecutiveOld == null ? "" : placementTransfer.PositionExecutiveOld + "\n") + placementTransfer.OrganizationOld;
+                placementTransfer.OrganizationPositionOld = org.result.position + "\n" +
+                    (placementTransfer.PositionExecutiveOld == null ? "" : (placementTransfer.positionExecutiveField == null ? placementTransfer.PositionExecutiveOld + "\n" : placementTransfer.PositionExecutiveOld + "(" + placementTransfer.positionExecutiveField + ")" + "\n"))
+                    + placementTransfer.OrganizationOld;
             }
             await _context.PlacementTransfers.AddAsync(placementTransfer);
             await _context.SaveChangesAsync();
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index 83398c89..91413ff4 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -416,7 +416,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                         (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                         (org.result.root == null ? "" : org.result.root);
-                retirementOther.OrganizationPositionOld = org.result.position + "\n" + (retirementOther.PositionExecutiveOld == null ? "" : retirementOther.PositionExecutiveOld + "\n") + retirementOther.OrganizationOld;
+                retirementOther.OrganizationPositionOld = org.result.position + "\n" +
+                (retirementOther.PositionExecutiveOld == null ? "" : (retirementOther.positionExecutiveField == null ? retirementOther.PositionExecutiveOld + "\n" : retirementOther.PositionExecutiveOld + "(" + retirementOther.positionExecutiveField + ")" + "\n"))
+                + retirementOther.OrganizationOld;
                 retirementOther.EducationOld = org.result.education;
                 retirementOther.AmountOld = org.result.salary;
             }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index 6e6fb9ae..ae943e50 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -2,6 +2,7 @@
 using BMA.EHR.Application.Repositories.MessageQueue;
 using BMA.EHR.Domain.Common;
 using BMA.EHR.Domain.Extensions;
+using BMA.EHR.Domain.Models.Placement;
 using BMA.EHR.Domain.Models.Retirement;
 using BMA.EHR.Domain.Shared;
 using BMA.EHR.Infrastructure.Persistence;
@@ -310,7 +311,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                                             (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                             (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                             (org.result.root == null ? "" : org.result.root);
-                    retirementOut.OrganizationPositionOld = org.result.position + "\n" + (retirementOut.PositionExecutiveOld == null ? "" : retirementOut.PositionExecutiveOld + "\n") + retirementOut.OrganizationOld;
+                    retirementOut.OrganizationPositionOld = org.result.position + "\n" +
+                        (retirementOut.PositionExecutiveOld == null ? "" : (retirementOut.positionExecutiveField == null ? retirementOut.PositionExecutiveOld + "\n" : retirementOut.PositionExecutiveOld + "(" + retirementOut.positionExecutiveField + ")" + "\n"))
+                        + retirementOut.OrganizationOld;
                     retirementOut.AmountOld = org.result.salary;
                 }
             }
@@ -324,9 +327,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
                     var _res = await client.SendAsync(_req);
                     var _result = await _res.Content.ReadAsStringAsync();
-
                     var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
-
                     if (org == null || org.result == null)
                         return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
 
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 9dd5189a..763ac48b 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -1311,7 +1311,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +
                                                         (org.result.child1 == null ? "" : org.result.child1 + "\n") +
                                                         (org.result.root == null ? "" : org.result.root);
-                retirementResign.OrganizationPositionOld = org.result.position + "\n" + (retirementResign.PositionExecutiveOld == null ? "" : retirementResign.PositionExecutiveOld + "\n") + retirementResign.OrganizationOld;
+                retirementResign.OrganizationPositionOld = org.result.position + "\n" +
+                    (retirementResign.PositionExecutiveOld == null ? "" : (retirementResign.positionExecutiveField == null ? retirementResign.PositionExecutiveOld + "\n" : retirementResign.PositionExecutiveOld + "(" + retirementResign.positionExecutiveField + ")" + "\n"))
+                    + retirementResign.OrganizationOld;
 
                 if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ชำนาญงาน") || (retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ปฏิบัติงาน") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ปฏิบัติการ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ชำนาญการ"))
                 {