diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index b5f620c0..9f88401b 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -935,7 +935,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 //    if (list.Count > 0)
                 //        approver = list.First().Name;
                 //}
-
+                var approveResult = await GetApproverData(data.Approvers);
                 var result = new
                 {
                     template = "แบบใบขอยกเลิกวันลา",
@@ -956,6 +956,22 @@ namespace BMA.EHR.Leave.Service.Controllers
                         profileType = data.ProfileType,
                         leaveReasonDelete = data.LeaveCancelComment == null ? "" : data.LeaveCancelComment!.ToThaiNumber(),
                         leaveDetail = data.LeaveDetail.ToThaiNumber(),
+
+                        Type1 = profile.ProfileType == "OFFICER" ? "🗹" : "☐",
+                        Type2 = profile.ProfileType != "OFFICER" ? "🗹" : "☐",
+                        Type3 = "☐",
+                        approve = approveResult,
+                        approverComment = !string.IsNullOrEmpty(data.LeaveDirectorComment)
+                                        ? data.LeaveDirectorComment.Replace("\r", "").Replace("\n", "").Trim() 
+                                        : "......................",
+                        approverUpdatedAt = data.LastUpdatedAt.HasValue 
+                                        ? data.LastUpdatedAt.Value.ToThaiShortDate().ToThaiNumber() 
+                                        : "...... /...... /......",
+                        leaveStatus = data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "APPROVE"
+                                        ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
+                                        : data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "REJECT"
+                                            ? "☐ อนุญาต  🗹 ไม่อนุญาต"
+                                            : "☐ อนุญาต  ☐ ไม่อนุญาต"
                     }
                 };