diff --git a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
index 420ba8a4..35932f9b 100644
--- a/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
@@ -164,12 +164,17 @@ namespace BMA.EHR.Application.Repositories.Reports
             if (data == null)
                 return null;
 
+            string Prefix = string.IsNullOrEmpty(data.Prefix.ToString()) ? string.Empty : data.Prefix.ToString();
+            string FirstName = string.IsNullOrEmpty(data.FirstName.ToString()) ? string.Empty : data.FirstName.ToString();
+            string LastName = string.IsNullOrEmpty(data.LastName.ToString()) ? string.Empty : data.LastName.ToString();
+            string FullName = $"{Prefix} {FirstName} {LastName}";
             string Date = string.IsNullOrEmpty(data.Date.ToString()) ? "วันที่ - เดือน - พ.ศ. -" : DateTime.Parse(data.Date.ToString()).ToThaiFullDate().ToString().ToThaiNumber();
+            string CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate().ToString().ToThaiNumber();
             return new
             {
-                data.Prefix,
-                data.FirstName,
-                data.LastName,
+                FullName,
+                Date,
+                CurrentDate,
                 data.Position,
                 data.PositionExecutive,
                 data.PositionType,
@@ -183,7 +188,6 @@ namespace BMA.EHR.Application.Repositories.Reports
                 data.PositionLevelId,
                 data.OrganizationId,
                 data.Number,
-                Date,
                 data.Location,
                 data.Reason,
             };
diff --git a/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs b/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs
index 635bcab1..71aa2855 100644
--- a/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs
+++ b/BMA.EHR.Report.Service/Controllers/DeceasedReportController.cs
@@ -57,7 +57,7 @@ namespace BMA.EHR.Report.Service.Controllers
         /// <summary>
         /// 36-บันทึกเวียนแจ้งการถึงแก่กรรม
         /// </summary>
-        /// <param name="id">id </param>
+        /// <param name="id">Id รายการบันทึกเวียนแจ้งการถึงแก่กรรม</param>
         /// <param name="exportType">pdf, docx หรือ xlsx</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
@@ -68,9 +68,25 @@ namespace BMA.EHR.Report.Service.Controllers
         {
             try
             {
+                var head = await _repository.GetHeadRetirementDeceasedAsync(id);
                 var data = await _repository.GetRetirementDeceasedAsync(id);
-                if (data != null)
+                if (data != null || head != null)
                 {
+                    var mergeData = new
+                    {
+                        Oc = head.GetType().GetProperty("Oc").GetValue(head),
+                        Number = head.GetType().GetProperty("Number").GetValue(head),
+                        Date = head.GetType().GetProperty("Date").GetValue(head),
+                        Subject = head.GetType().GetProperty("Subject").GetValue(head),
+                        Send = head.GetType().GetProperty("Send").GetValue(head),
+                        FullName = data.GetType().GetProperty("FullName").GetValue(data),
+                        Position = data.GetType().GetProperty("Position").GetValue(data),
+                        Reason = data.GetType().GetProperty("Reason").GetValue(data),
+                        DeceasedDate = data.GetType().GetProperty("Date").GetValue(data),
+                        CurrentDate = data.GetType().GetProperty("CurrentDate").GetValue(data),
+                        DeceasedNumber = data.GetType().GetProperty("Number").GetValue(data),
+                        Location = data.GetType().GetProperty("Location").GetValue(data),
+                    };
                     var mimeType = "";
                     switch (exportType.Trim().ToLower())
                     {
@@ -86,7 +102,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     {
                         report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream);
                     }
-                    report.DataSource = data;
+                    report.DataSource = mergeData;
                     System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
                     InstanceReportSource instanceReportSource = new InstanceReportSource()
                     {
@@ -94,7 +110,7 @@ namespace BMA.EHR.Report.Service.Controllers
                     };
                     ReportProcessor reportProcessor = new ReportProcessor(_configuration);
                     RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo);
-                    return File(result.DocumentBytes, mimeType, $"deceased.{exportType.Trim().ToLower()}");
+                    return File(result.DocumentBytes, mimeType, $"รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม.{exportType.Trim().ToLower()}");
                 }
                 else
                 {
diff --git a/BMA.EHR.Report.Service/Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp b/BMA.EHR.Report.Service/Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp
index 1ddb6506..4657c011 100644
Binary files a/BMA.EHR.Report.Service/Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp and b/BMA.EHR.Report.Service/Reports/36-บันทึกเวียนแจ้งการถึงแก่กรรม.trdp differ