diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index 3861aff4..d91a32dd 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -797,7 +797,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                                            r.Command.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
                                        StartDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber(),
                                        ActiveDate = p.DateRepatriation == null ? "" : p.DateRepatriation.Value.ToThaiFullDate3().ToThaiNumber(),
-                                       FullName = $"{p.Profile.Prefix!.Name}{p.Profile.FirstName!} {p.Profile.LastName!}"
+                                       FullName = $"{p.Profile.Prefix!.Name}{p.Profile.FirstName!} {p.Profile.LastName!}",
+                                       Subject = $"เรื่อง {r.Command.CommandSubject}",
                                    })
                                    .ToList();
 
diff --git a/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs
index 8208cab2..d0c3de11 100644
--- a/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs
+++ b/BMA.EHR.Application/Responses/Reports/CommandType16Response.cs
@@ -28,6 +28,7 @@ namespace BMA.EHR.Application.Responses.Reports
 
         public string ActiveDate { get; set; } = string.Empty;
 
-        public string FullName { get; set;} = string.Empty;
+        public string FullName { get; set; } = string.Empty;
+        public string Subject { get; set; } = string.Empty;
     }
 }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
index 959cd00e..9baa469f 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
@@ -18,7 +18,7 @@ namespace BMA.EHR.Placement.Service.Controllers
     [ApiController]
     [Produces("application/json")]
     [Authorize]
-    [SwaggerTag("ระบบแต่งตั้ง-เลื่อน")]
+    [SwaggerTag("ระบบแต่งตั้งลูกจ้างประจำ")]
     public class PlacementAppointmentEmployeeController : BaseController
     {
         private readonly PlacementRepository _repository;
diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
index aacdd0a1..6ed92f56 100644
--- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs
@@ -78,6 +78,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-1.trdp");
@@ -196,6 +197,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-3.trdp");
@@ -314,6 +316,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"03-คำสั่งแต่งตั้งผู้สอบแข่งขัน-Head.trdp");
@@ -432,6 +435,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"04-คำสั่งย้ายผู้สอบแข่งขัน-Head.trdp");
@@ -549,6 +553,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"05-06-คำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp");
@@ -668,7 +673,8 @@ namespace BMA.EHR.Report.Service.Controllers
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
                     ConclusionMeetingNo = raw_data.ConclusionMeetingNo.ToThaiNumber(),
-                    ConclusionMeetingDate = raw_data.ConclusionMeetingDate == null ? "" : raw_data.ConclusionMeetingDate.Value.ToThaiFullDate3().ToThaiNumber()
+                    ConclusionMeetingDate = raw_data.ConclusionMeetingDate == null ? "" : raw_data.ConclusionMeetingDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"05-06-คำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp");
@@ -787,6 +793,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"07-คำสั่งย้าย.trdp");
@@ -907,6 +914,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     AuthorizedPosition = raw_data.AuthorizedPosition,
                     ConclusionReturnNo = raw_data.ConclusionReturnNo.ToThaiNumber(),
                     ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-5.trdp");
@@ -1029,7 +1037,8 @@ namespace BMA.EHR.Report.Service.Controllers
                     ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     SourceOrganizationName = raw_data.SourceOrganizationName,
                     MilitaryCommandNo = raw_data.MilitaryCommandNo.ToThaiNumber(),
-                    MilitaryCommanDate = raw_data.MilitaryCommanDate == null ? "" : raw_data.MilitaryCommanDate.Value.ToThaiFullDate3().ToThaiNumber()
+                    MilitaryCommanDate = raw_data.MilitaryCommanDate == null ? "" : raw_data.MilitaryCommanDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-7.trdp");
@@ -1159,7 +1168,8 @@ namespace BMA.EHR.Report.Service.Controllers
                     ChairManFullName = raw_data.ChairManFullName,
                     Member1FullName = raw_data.Member1FullName,
                     Member2FullName = raw_data.Member2FullName,
-                    Duration = raw_data.ProbationStartDate == null || raw_data.ProbationEndDate == null ? "" : raw_data.ProbationStartDate.Value.CalculateBetweenDateV2(raw_data.ProbationEndDate.Value).ToThaiNumber()
+                    Duration = raw_data.ProbationStartDate == null || raw_data.ProbationEndDate == null ? "" : raw_data.ProbationStartDate.Value.CalculateBetweenDateV2(raw_data.ProbationEndDate.Value).ToThaiNumber(),
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"10-แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ.trdp");
@@ -1321,8 +1331,8 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
-
                     ReceiveOrganizationName = raw_data.ReceiveOrganizationName,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-1.trdp");
@@ -1441,10 +1451,10 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
-
                     TransferOrganizationName = raw_data.TransferOrganizationName,
                     ConclusionReceiveNo = raw_data.ConclusionReceiveNo.ToThaiNumber(),
                     ConclusionReceiveDate = raw_data.ConclusionReceiveDate == null ? "" : raw_data.ConclusionReceiveDate.Value.ToThaiFullDate3().ToThaiNumber(),
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp");
@@ -1563,6 +1573,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"29-คำสั่งให้ช่วยราชการ-1.trdp");
@@ -1752,6 +1763,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };
 
                 var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-4.trdp");
@@ -2011,6 +2023,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
                     AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
                     AuthorizedPosition = raw_data.AuthorizedPosition,
+                    Subject = $"เรื่อง {raw_data.CommandSubject}",
                 };