diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index 3d4d62fb..150af523 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
@@ -224,7 +224,8 @@ class RequestLogController extends Controller
                         DB::raw('
                             (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider
                         '),
-                        'request_logs.submission_date')
+                        'request_logs.submission_date',
+                        'request_logs.approved_at')
                     ->paginate($limit);
         return response()->json(Helper::paginateResources($results));
     }
@@ -297,6 +298,7 @@ class RequestLogController extends Controller
                             END AS status
                         '),
                         'request_logs.submission_date',
+                        'request_logs.approved_final_log_at',
                         'request_logs.discharge_date',
                         DB::raw('
                             (SELECT services.name FROM services WHERE services.code = request_logs.service_code LIMIT 1) AS service_type
diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
index 1fbe673c..63365102 100644
--- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
+++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
@@ -38,15 +38,14 @@ export default function TableListFinalLog() {
   const [data, setData] = useState([]);
 
   // Download LOG
-  async function handleDownloadLog(request_log_id: any, service_code:any, no_polis:any, full_name:any, provider:any) {
+  async function handleDownloadLog(request_log_id: any, service_code:any, no_polis:any, full_name:any, provider:any, approved_fina_log_at:any) {
     return axios
       .get(`download-final-log/${request_log_id}`, {
         responseType: 'blob',
       })
       .then((response) => {
-        console.log(response);
         // GL Akhir-010124-OP-00001234 Ratih-LinkSehat
-        const namaFile = 'GL Akhir-'+provider+'-'+getFormattedToday()+'-'+service_code+'-'+no_polis+'-'+full_name+'-LinkSehat.pdf';
+        const namaFile = 'GL Akhir-'+provider+'-'+getFormattedDate(approved_fina_log_at)+'-'+service_code+'-'+no_polis+'-'+full_name+'-LinkSehat.pdf';
         const url = URL.createObjectURL(response.data);
         const link = document.createElement('a');
         link.href = url;
@@ -60,14 +59,13 @@ export default function TableListFinalLog() {
       });
   }
 
-  function getFormattedToday() {
-    const today = new Date();
-  
-    const day = String(today.getDate()).padStart(2, '0');
-    const month = String(today.getMonth() + 1).padStart(2, '0'); // Bulan dimulai dari 0 (Januari = 0)
-    const year = String(today.getFullYear()).substring(2, 4);
-  
-    return `${day}${month}${year}`;
+  function getFormattedDate(approved_fina_log_at:any) {
+      const approvedDate = new Date(approved_fina_log_at.replace(/-/g, '/')); // Mengatasi masalah format pada Safari
+      const day = String(approvedDate.getDate()).padStart(2, '0');
+      const month = String(approvedDate.getMonth() + 1).padStart(2, '0'); // Bulan dimulai dari 0 (Januari = 0)
+      const year = String(approvedDate.getFullYear()).substring(2, 4);
+
+      return `${day}${month}${year}`;
   }
 
   /* -------------------------------------------------------------------------- */
@@ -384,7 +382,7 @@ export default function TableListFinalLog() {
                         View
                       </MenuItem>
                       {obj.status === 'approved' ? (
-                      <MenuItem onClick={() => handleDownloadLog(obj.id, obj.service_code, obj.no_polis, obj.full_name, obj.provider)}>
+                      <MenuItem onClick={() => handleDownloadLog(obj.id, obj.service_code, obj.no_polis, obj.full_name, obj.provider, obj.approved_final_log_at)}>
                       <Iconify icon="eva:download-fill" />
                         Download Final LOG
                       </MenuItem>
diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
index f19e0b52..0b0c8729 100644
--- a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
+++ b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
@@ -42,14 +42,14 @@ export default function TableList() {
   const [data, setData] = useState([]);
 
   // Download LOG
-  async function handleDownloadLog(request_log_id: any, service_code:any, no_polis:any, full_name:any, provider:any) {
+  async function handleDownloadLog(request_log_id: any, service_code:any, no_polis:any, full_name:any, provider:any, approved_at:any) {
     return axios
       .get(`download-log/${request_log_id}`, {
         responseType: 'blob',
       })
       .then((response) => {
         // GL Awal-010124-OP-00001234 Ratih-LinkSehat
-        const namaFile = 'GL Awal-'+provider+'-'+getFormattedToday()+'-'+service_code+'-'+no_polis+'-'+full_name+'-LinkSehat.pdf';
+        const namaFile = 'GL Awal-'+provider+'-'+getFormattedDate(approved_at)+'-'+service_code+'-'+no_polis+'-'+full_name+'-LinkSehat.pdf';
         const url = URL.createObjectURL(response.data);
         const link = document.createElement('a');
         link.href = url;
@@ -63,15 +63,14 @@ export default function TableList() {
       });
   }
 
-  function getFormattedToday() {
-    const today = new Date();
-  
-    const day = String(today.getDate()).padStart(2, '0');
-    const month = String(today.getMonth() + 1).padStart(2, '0'); // Bulan dimulai dari 0 (Januari = 0)
-    const year = String(today.getFullYear()).substring(2, 4);
-  
+  function getFormattedDate(approved_at:any) {
+    const approvedDate = new Date(approved_at.replace(/-/g, '/')); // Mengatasi masalah format pada Safari
+    const day = String(approvedDate.getDate()).padStart(2, '0');
+    const month = String(approvedDate.getMonth() + 1).padStart(2, '0'); // Bulan dimulai dari 0 (Januari = 0)
+    const year = String(approvedDate.getFullYear()).substring(2, 4);
+
     return `${day}${month}${year}`;
-  }
+}
 
   /* -------------------------------------------------------------------------- */
   /*                          setting up for the table                          */
@@ -369,7 +368,7 @@ export default function TableList() {
                       View
                     </MenuItem>
                     {obj.status === 'approved' ? (
-                    <MenuItem onClick={() => handleDownloadLog(obj.id, obj.service_code, obj.no_polis, obj.full_name, obj.provider)}>
+                    <MenuItem onClick={() => handleDownloadLog(obj.id, obj.service_code, obj.no_polis, obj.full_name, obj.provider, obj.approved_at)}>
                      <Iconify icon="eva:download-fill" />
                       Download LOG
                     </MenuItem>
diff --git a/resources/views/pdf/final_log_page_2.blade.php b/resources/views/pdf/final_log_page_2.blade.php
index 261ae74e..2289cae4 100644
--- a/resources/views/pdf/final_log_page_2.blade.php
+++ b/resources/views/pdf/final_log_page_2.blade.php
@@ -292,7 +292,7 @@
            <br><b>Offsite Medical Treatment</b>
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-1-<?php echo now()->timestamp; ?> ">
-                {{ \Carbon\Carbon::parse(now())->format('d M Y') }},<br>
+                {{ \Carbon\Carbon::parse($request_logs->approved_final_log_at)->format('d M Y') }},<br>
                 Petugas Alarm Center
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-2-<?php echo now()->timestamp; ?> ">
diff --git a/resources/views/pdf/req_log_page_1.blade.php b/resources/views/pdf/req_log_page_1.blade.php
index 1ab70686..7156e715 100644
--- a/resources/views/pdf/req_log_page_1.blade.php
+++ b/resources/views/pdf/req_log_page_1.blade.php
@@ -465,7 +465,7 @@
            <br><b>Offsite Medical Treatment</b>
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-1-<?php echo now()->timestamp; ?> ">
-                {{ \Carbon\Carbon::parse(now())->format('d M Y') }},<br>
+                {{ \Carbon\Carbon::parse($request_logs->approved_at)->format('d M Y') }},<br>
                 Petugas Alarm Center
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-2-<?php echo now()->timestamp; ?> ">