diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
index d900e5ed..d7677d88 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@@ -839,8 +839,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -1049,8 +1049,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -1256,8 +1256,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                             p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
                                             p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -1461,8 +1461,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        ReportingDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -1677,8 +1677,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index bef98cec..94d07fee 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -1655,8 +1655,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                               (p.child2 == null ? "" : $"{p.child2}\n") +
                                               (p.child1 == null ? "" : $"{p.child1}\n") +
                                               (p.root == null ? "" : $"{p.root}"),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -2004,8 +2004,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        PositionCandidate = p.PositionCandidate,
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -2370,8 +2370,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -2602,8 +2602,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -2821,8 +2821,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                             p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "-",
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index 0eecf85d..b8cd149b 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -619,8 +619,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(),
                                        EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Reason = p.Reason == null ? "" : p.Reason.ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index 459673a7..1db1b52d 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -968,8 +968,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
index 7e35d753..d02665d2 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
@@ -815,8 +815,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        ActiveDate = p.Date == null ? "-" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Reason = p.Reason ?? "-",
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index dad02dc7..aa442d0b 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -744,8 +744,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -971,8 +971,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index b4f4d608..f7b088f9 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -2263,8 +2263,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Remark = p.Reason ?? "-",
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -2456,8 +2456,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Remark = p.Reason ?? "-",
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 7b87e143..1aa792ef 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -1703,8 +1703,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Remark = p.Reason ?? "",
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();
@@ -1893,8 +1893,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                        ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Remark = p.Reason ?? "-",
-                                       RemarkHorizontal = r.RemarkHorizontal,
-                                       RemarkVertical = r.RemarkVertical,
+                                       RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
+                                       RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
                                    }).ToList();
 
                 var result = new List<dynamic>();