diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index 9d5888a0..619df85c 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -2935,7 +2935,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionType = placementProfile.posTypeName == null ? string.Empty : placementProfile.posTypeName,
                             positionLevel = placementProfile.posLevelName == null ? string.Empty : placementProfile.posLevelName,
                             refCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}",
-                            templateDoc = string.Empty,
+                            templateDoc = "คำสั่งแต่งตั้ง คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}",
                         });
                         var _result = await _res.Content.ReadAsStringAsync();
                     }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
index 8ebbe4f9..1f46a81e 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
@@ -778,9 +778,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     child4 = x.child4,
                                     child4Id = x.child4Id,
                                     position = x.position,
-                                    positionType = x.posTypeName,
-                                    positionLevel = x.posLevelName,
-                                    positionExecutive = x.posExecutiveName,
+                                    posTypeName = x.posTypeName,
+                                    posLevelName = x.posLevelName,
+                                    posExecutiveName = x.posExecutiveName,
                                     posNo = x.posNo,
                                     // positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name,
                                     // positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name,