diff --git a/Modules/Internal/Http/Controllers/Api/ClaimController.php b/Modules/Internal/Http/Controllers/Api/ClaimController.php
index 1f7776ec..a7b81b15 100644
--- a/Modules/Internal/Http/Controllers/Api/ClaimController.php
+++ b/Modules/Internal/Http/Controllers/Api/ClaimController.php
@@ -322,6 +322,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(
@@ -348,6 +356,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(
@@ -374,6 +390,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(
@@ -576,6 +600,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')
@@ -670,6 +702,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')
@@ -725,10 +765,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,
@@ -754,7 +804,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,
@@ -794,6 +844,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');
@@ -802,7 +861,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,
@@ -813,7 +872,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,
@@ -824,7 +883,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,