diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php
index f4966ce..f4e86a2 100644
--- a/app/Http/Controllers/DokumenJaminanController.php
+++ b/app/Http/Controllers/DokumenJaminanController.php
@@ -118,13 +118,13 @@
                     }
 
                     DB::commit();
-                    return redirect()->route('debitur.jaminan.index', $id)->with(
+                    return redirect()->route('debitur.jaminan.index',['id'=>$id,'pemrohonan_id' => $validate['permohonan_id'] ])->with(
                         'success',
                         'Dokumen Jaminan berhasil ditambahkan',
                     );
                 } catch (Exception $e) {
                     DB::rollBack();
-                    return redirect()->route('debitur.jaminan.index', $id)->with('error', 'ggl' . $e->getMessage());
+                    return redirect()->route('debitur.jaminan.create',['id'=>$id,'pemrohonan_id' => $validate['permohonan_id'] ])->with('error', $e->getMessage());
                 }
             }
         }
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index cd84f0f..9ee18bb 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -123,7 +123,7 @@ class LaporanController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'debiture.documents.inspeksi','penilai'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $size);
diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index e76da06..59cf330 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -537,7 +537,7 @@
                                 ${field.label}
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                ${getCustomFieldInput(field.type, field.name, item.details, item.id)}
+                                ${getCustomFieldInput(field.type, field.name, item.details, item.jenis_legalitas_jaminan_id)}
                             </div>
                         </div>
                         `).join('') : ""}
diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php
index f07bf16..de09784 100644
--- a/resources/views/laporan/index.blade.php
+++ b/resources/views/laporan/index.blade.php
@@ -186,9 +186,9 @@
                 actions: {
                     title: 'Actions',
                     render: (item, data) => {
-                        const inspeksiId = data.debiture?.documents[0]?.inspeksi[0]?.id || '-';
-                        const dokumenID = data.debiture?.documents[0]?.id || '-';
-                        const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-';
+                        const inspeksiId = data.documents[0]?.inspeksi[0]?.id || '-';
+                        const dokumenID = data.documents[0]?.id || '-';
+                        const jenisJaminanID = data.documents[0]?.jenis_jaminan_id || '-';
                         const typePenilaian = data.penilai?.type_penilai || '';
                         const type = data.penilai?.type || '';
                         let laporanButton = '';
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index 7bf297e..1f77129 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -206,9 +206,9 @@
 
                         if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') {
                             actionHtml += `
-            <a onclick="surveyorRescheduleJadwalSurvey(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture.name}', '${data.penilaian.waktu_penilaian}', '${data.penilaian.rejected_note}')" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey">
-                <i class="ki-filled ki-calendar-remove"></i>
-            </a>`;
+            <a onclick="surveyorRescheduleJadwalSurvey(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture.name}', '${data.penilaian.waktu_penilaian}', ${JSON.stringify(data.penilaian.rejected_note)})" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey">
+    <i class="ki-filled ki-calendar-remove"></i>
+</a>`;
                         }
 
                         if (data && data.penilaian && data.penilaian.waktu_penilaian !== null && data.status !==
@@ -312,6 +312,7 @@
 
 
         function surveyorRescheduleJadwalSurvey(permohonanId, idPenilaian, noReg, debitur, waktuPenilaian, rejectedNote) {
+            rejectedNote = JSON.parse(rejectedNote);
     Swal.fire({
         title: 'Reschedule Jadwal Kunjungan',
         html: `