diff --git a/Modules/Client/Http/Controllers/Api/ClaimReportController.php b/Modules/Client/Http/Controllers/Api/ClaimReportController.php
index e8b3967e..ce59455f 100644
--- a/Modules/Client/Http/Controllers/Api/ClaimReportController.php
+++ b/Modules/Client/Http/Controllers/Api/ClaimReportController.php
@@ -94,6 +94,7 @@ class ClaimReportController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "Request"
                                     WHEN claim_logs.status = "reviewed" THEN "Review"
                                     WHEN claim_logs.status = "approved" THEN "Approval"
+                                    WHEN claim_logs.status = "declined" THEN "Decline"
                                     ELSE "-"
                                 END AS txt_status
                             '),
@@ -102,6 +103,7 @@ class ClaimReportController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "#159C9C"
                                     WHEN claim_logs.status = "reviewed" THEN "#0C53B7"
                                     WHEN claim_logs.status = "approved" THEN "#229A16"
+                                    WHEN claim_logs.status = "declined" THEN "#FF4842"
                                     ELSE "-"
                                 END AS txt_status_color
                             '),
@@ -110,6 +112,7 @@ class ClaimReportController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "#00AB5529"
                                     WHEN claim_logs.status = "reviewed" THEN "#1890FF29"
                                     WHEN claim_logs.status = "approved" THEN "#54D62C29"
+                                    WHEN claim_logs.status = "declined" THEN "#FF48427A"
                                     ELSE "-"
                                 END AS txt_status_backgroundColor
                             '),
diff --git a/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php b/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php
index d0b95cb5..d71baae5 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php
@@ -306,6 +306,7 @@ class ClaimRequestController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "Request"
                                     WHEN claim_logs.status = "reviewed" THEN "Review"
                                     WHEN claim_logs.status = "approved" THEN "Approval"
+                                    WHEN claim_logs.status = "declined" THEN "Decline"
                                     ELSE "-"
                                 END AS txt_status
                             '),
@@ -314,6 +315,7 @@ class ClaimRequestController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "#159C9C"
                                     WHEN claim_logs.status = "reviewed" THEN "#0C53B7"
                                     WHEN claim_logs.status = "approved" THEN "#229A16"
+                                    WHEN claim_logs.status = "declined" THEN "#FF4842"
                                     ELSE "-"
                                 END AS txt_status_color
                             '),
@@ -322,6 +324,7 @@ class ClaimRequestController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "#00AB5529"
                                     WHEN claim_logs.status = "reviewed" THEN "#1890FF29"
                                     WHEN claim_logs.status = "approved" THEN "#54D62C29"
+                                    WHEN claim_logs.status = "declined" THEN "#FF48427A"
                                     ELSE "-"
                                 END AS txt_status_backgroundColor
                             '),
diff --git a/Modules/Internal/Http/Controllers/Api/ClaimController.php b/Modules/Internal/Http/Controllers/Api/ClaimController.php
index 0bada4df..8b5d8400 100644
--- a/Modules/Internal/Http/Controllers/Api/ClaimController.php
+++ b/Modules/Internal/Http/Controllers/Api/ClaimController.php
@@ -329,6 +329,14 @@ class ClaimController extends Controller
 
     public function decline($id)
     {
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $id)
+        ->select('claim_requests.id')
+        ->first();
+        $id = $data_claim_requests->id;
+
         DB::table('claims')
         ->where('claim_request_id', $id)
         ->update(
@@ -355,6 +363,14 @@ class ClaimController extends Controller
 
     public function approve($id)
     {
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $id)
+        ->select('claim_requests.id')
+        ->first();
+        $id = $data_claim_requests->id;
+
         DB::table('claims')
         ->where('claim_request_id', $id)
         ->update(
@@ -381,6 +397,14 @@ class ClaimController extends Controller
 
     public function reOpen($id)
     {
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $id)
+        ->select('claim_requests.id')
+        ->first();
+        $id = $data_claim_requests->id;
+
         DB::table('claims')
         ->where('claim_request_id', $id)
         ->update(
@@ -392,6 +416,10 @@ class ClaimController extends Controller
         // Claim Log
         DB::table('claim_logs')
         ->where('claim_request_id', $id)
+        ->where(function ($query) {
+            $query->where('status', 'declined')
+                ->orWhere('status', 'approved');
+        })
         ->delete();
 
         return Helper::responseJson([], message: "Claim berhasil di re-open");
@@ -583,6 +611,14 @@ class ClaimController extends Controller
 
     public function getDetailClaims($claim_id)
     {
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $claim_id)
+        ->select('claim_requests.id')
+        ->first();
+        $claim_id = $data_claim_requests->id;
+        
         $customer_data = DB::table('claim_requests')
                     ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
                     ->leftJoin('members', 'claim_requests.member_id', '=', 'members.id')
@@ -677,6 +713,14 @@ class ClaimController extends Controller
 
     public function getServices($claim_id)
     {
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $claim_id)
+        ->select('claim_requests.id')
+        ->first();
+        $claim_id = $data_claim_requests->id;
+
         //Corporate_id
         $corporate_id = DB::table('claim_requests')
         ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
@@ -732,10 +776,20 @@ class ClaimController extends Controller
             'hospital' => 'required',
             'benefitName' => 'required',
         ]);
+
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $request->claim_request_id)
+        ->select('claim_requests.id')
+        ->first();
+        $claim_id = $data_claim_requests->id;
+
+
         if($request->flagAddService === 'add')
         {
             $data = [
-                'claim_request_id' => $request->claim_request_id,
+                'claim_request_id' => $claim_id,
                 'service_id' => $request->serviceType,
                 'hospital_id' => $request->hospital,
                 'addmission_date' => $request->dateAdd,
@@ -761,7 +815,7 @@ class ClaimController extends Controller
         else if($request->flagAddService === 'edit')
         {
             $data = [
-                'claim_request_id' => $request->claim_request_id,
+                'claim_request_id' => $claim_id,
                 'service_id' => $request->serviceType,
                 'hospital_id' => $request->hospital,
                 'addmission_date' => $request->dateAdd,
@@ -801,6 +855,15 @@ class ClaimController extends Controller
             'note' => 'required',
         ]);
 
+        //Get claim request id
+        $data_claim_requests = DB::table('claim_requests')
+        ->leftJoin('claims', 'claim_requests.id', '=', 'claims.claim_request_id')
+        ->where('claims.id', $request->claim_id)
+        ->select('claim_requests.id')
+        ->first();
+
+        $claim_id = $data_claim_requests->id;
+
         $condition = $request->input('condition');
         $diagnosis = $request->input('diagnosis');
         $result = $request->input('result');
@@ -809,7 +872,7 @@ class ClaimController extends Controller
         $dataToInsert = [];
         if ($condition) {
             $dataToInsert[] = [
-                'claim_request_id' => $request->claim_id,
+                'claim_request_id' => $claim_id,
                 'date' => date('Y-m-d H:i:s'),
                 'type' => 'claim-kondisi',
                 'description' => $note,
@@ -820,7 +883,7 @@ class ClaimController extends Controller
         }
         if ($diagnosis) {
             $dataToInsert[] = [
-                'claim_request_id' => $request->claim_id,
+                'claim_request_id' => $claim_id,
                 'date' => date('Y-m-d H:i:s'),
                 'type' => 'claim-diagnosis',
                 'description' => $note,
@@ -831,7 +894,7 @@ class ClaimController extends Controller
         }
         if ($result) {
             $dataToInsert[] = [
-                'claim_request_id' => $request->claim_id,
+                'claim_request_id' => $claim_id,
                 'date' => date('Y-m-d H:i:s'),
                 'type' => 'claim-result',
                 'description' => $note,
diff --git a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
index 1d70f809..921ed0d0 100644
--- a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
+++ b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
@@ -403,6 +403,7 @@ class ClaimRequestController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "Request"
                                     WHEN claim_logs.status = "reviewed" THEN "Review"
                                     WHEN claim_logs.status = "approved" THEN "Approval"
+                                    WHEN claim_logs.status = "declined" THEN "Decline"
                                     ELSE "-"
                                 END AS txt_status
                             '),
@@ -411,6 +412,7 @@ class ClaimRequestController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "#159C9C"
                                     WHEN claim_logs.status = "reviewed" THEN "#0C53B7"
                                     WHEN claim_logs.status = "approved" THEN "#229A16"
+                                    WHEN claim_logs.status = "declined" THEN "#FF4842"
                                     ELSE "-"
                                 END AS txt_status_color
                             '),
@@ -419,6 +421,7 @@ class ClaimRequestController extends Controller
                                     WHEN claim_logs.status = "requested" THEN "#00AB5529"
                                     WHEN claim_logs.status = "reviewed" THEN "#1890FF29"
                                     WHEN claim_logs.status = "approved" THEN "#54D62C29"
+                                    WHEN claim_logs.status = "declined" THEN "#FF48427A"
                                     ELSE "-"
                                 END AS txt_status_backgroundColor
                             '),