diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php
index 0832f79b..9690188b 100644
--- a/Modules/Internal/Transformers/ReportLogResource.php
+++ b/Modules/Internal/Transformers/ReportLogResource.php
@@ -40,7 +40,7 @@ class ReportLogResource extends JsonResource
             $created_final_at = null;
         }
 
-        $durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date);
+        $durationGl = Helper::differenceTime($formattedDateTime, $this->approved_at);
         $approveByFgl = '-';
         if ($this->import_system) {
             $approveByFgl = 'Import By Excel';
@@ -55,8 +55,8 @@ class ReportLogResource extends JsonResource
             'code' => $this->code,
             'created_at' => $formattedDateTime,
             'created_final_at' => $created_final_at,
-            'submission_date' => $this->approved_at ?  $this->approved_at : null,
-            'approved_by' => Helper::userName($this->approved_by),
+            'submission_date' => $this->approved_at,
+            'approved_by' => $this->approved_by ? Helper::userName($this->approved_by) : '-',
             'approved_final_log_at' => $this->approved_final_log_at,
             'approved_final_log_by' => $approveByFgl,
             'service_name' => $this->service ? $this->service->name : '',