diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index e520bf7..1f5f6d5 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -23,6 +23,7 @@ use Illuminate\Support\Facades\App;
 use App\Helpers\Lpj;
 use Modules\Lpj\Http\Requests\FormSurveyorRequest;
 use Modules\Lpj\Models\Authorization;
+use Modules\Lpj\Models\Debiture;
 
 class PenilaiController extends Controller
 {
@@ -345,6 +346,12 @@ class PenilaiController extends Controller
             $forminspeksi = json_decode($inspeksi->data_form, true);
             $rap = json_decode($resume->rap, true);
         }
+        // Default: gunakan data dari debitur
+        $debitur = Debiture::find($permohonan->debiture_id);
+
+        $provinceCode = $debitur->province_code;
+        $cityCode     = $debitur->city_code;
+        $districtCode = $debitur->district_code;
 
         $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null;
 
@@ -352,8 +359,6 @@ class PenilaiController extends Controller
             $provinceCode = $cekAlamat['province_code'] ?? $provinceCode;
             $cityCode     = $cekAlamat['city_code'] ?? $cityCode;
             $districtCode = $cekAlamat['district_code'] ?? $districtCode;
-            // Ambil data menggunakan kode yang telah ditentukan
-
         }
 
         $cities    = City::where('province_code', $provinceCode)->get();
diff --git a/resources/views/laporan/show.blade.php b/resources/views/laporan/show.blade.php
index a586c96..277fe59 100644
--- a/resources/views/laporan/show.blade.php
+++ b/resources/views/laporan/show.blade.php
@@ -59,7 +59,7 @@
                             Liquidasi (%)
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="text" name="liquidasi" max="100" min="0" id="liquidasi" class="persen input w-full @error('liquidasi') border-danger bg-danger-light @enderror" value="{{ old('liquidasi', $lpj->liquidasi ?? '') }}" placeholder="Masukkan Persentase Liquidasi">
+                            <input type="text" name="liquidasi" max="100" min="0" id="liquidasi" class="persen input w-full @error('liquidasi') border-danger bg-danger-light @enderror" value="{{ old('liquidasi', $lpj->likuidasi ?? '') }}" placeholder="Masukkan Persentase Liquidasi">
                             @error('liquidasi')
                             <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
@@ -71,7 +71,7 @@
                             Nilai Liquidasi
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="text" name="nilai_liquidasi" id="nilai_liquidasi" class="currency input w-full @error('nilai_liquidasi') border-danger bg-danger-light @enderror" placeholder="Nilai Liquidasi">
+                            <input type="text" name="nilai_liquidasi" id="nilai_liquidasi" class="currency input w-full @error('nilai_liquidasi') border-danger bg-danger-light @enderror" placeholder="Nilai Liquidasi" value="{{ old('nilai_liquidasi', $lpj->likuidasi_nilai_2 ?? '') }}">
                             @error('nilai_liquidasi')
                             <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index c94e0f4..a45a709 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -27,8 +27,8 @@
         }
 
         #header {
-            /* position: fixed; */
-            /* top: -100px; */
+            position: fixed;
+            top: -100px;
             /* Posisi header di luar konten */
             left: 0;
             right: 0;
@@ -65,18 +65,22 @@
         }
 
         .content {
-            margin-top: 20px;
+            margin-top: 10px;
         }
 
         .page-break {
             page-break-after: always;
         }
 
-        footer {
+        #footer {
             position: fixed;
-            bottom: 0cm;
-            left: 0cm;
-            right: 0cm;
+            bottom: -50px;
+            left: 0;
+            right: 0;
+            height: 50px;
+            text-align: left;
+            border-top: 1px solid #ddd;
+            padding-top: 10px;
         }
 
         body {
@@ -114,6 +118,13 @@
                 <td style="width: 20%; text-align: left;" class="header-left">
                     @include('lpj::component.logo-bag')
                 </td>
+                <td style="text-align: right;">
+                    <div style="">
+                        <p>Tanggal: {{ date('Y-m-d') }}</p>
+                        <p>Waktu: {{ date('H:i:s') }}</p>
+                        <p>User: {{ Auth::user()->name }}</p>
+                    </div>
+                </td>
             </tr>
         </table>
     </header>
@@ -198,14 +209,19 @@
                             <td style="width: 79%;  padding: 2px;">
                                 @if (isset($detail->dokumen_jaminan))
                                     @php
-                                        $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
-                                            ? json_decode($detail->dokumen_jaminan)
+                                        $dokumen_jaminan = is_string($detail->dokumen_jaminan)
+                                            ? json_decode($detail->dokumen_jaminan, true)
+                                            : [];
+                                        $dokumen_jaminan = is_array($dokumen_jaminan)
+                                            ? $dokumen_jaminan
                                             : [$detail->dokumen_jaminan];
-                                        $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
-                                            ? json_decode($detail->dokumen_nomor)
-                                            : ($detail->dokumen_nomor
-                                                ? [$detail->dokumen_nomor]
-                                                : []);
+
+                                        $dokumen_nomor = is_string($detail->dokumen_nomor)
+                                            ? json_decode($detail->dokumen_nomor, true)
+                                            : [];
+                                        $dokumen_nomor = is_array($dokumen_nomor)
+                                            ? $dokumen_nomor
+                                            : [$detail->dokumen_nomor];
                                     @endphp
 
                                     @foreach ($dokumen_jaminan as $index => $dokumen)
@@ -241,7 +257,7 @@
                 @endforeach
             @endif
 
-            @if (isset($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0)
+            @if (isset($forminspeksi['perizinan']) && is_array($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0)
                 @foreach ($forminspeksi['perizinan'] as $perizinan)
                     <tr>
                         <td style="width: 20%;  padding: 2px;">Perizinan</td>
@@ -252,14 +268,14 @@
             @endif
 
             @if (isset($forminspeksi['brosur_price_list']) && count($forminspeksi['brosur_price_list']) > 0)
-            @foreach ($forminspeksi['brosur_price_list'] as $perizinan)
-                <tr>
-                    <td style="width: 20%;  padding: 2px;">Brosur & Pricelist</td>
-                    <td style="width: 1%;  padding: 2px;">:</td>
-                    <td style="width: 79%;  padding: 2px;">{{ $perizinan['jenis'] }}</td>
-                </tr>
-            @endforeach
-        @endif
+                @foreach ($forminspeksi['brosur_price_list'] as $perizinan)
+                    <tr>
+                        <td style="width: 20%;  padding: 2px;">Brosur & Pricelist</td>
+                        <td style="width: 1%;  padding: 2px;">:</td>
+                        <td style="width: 79%;  padding: 2px;">{{ $perizinan['jenis'] }}</td>
+                    </tr>
+                @endforeach
+            @endif
 
         </table>
 
@@ -331,23 +347,27 @@
 
         </table>
 
-        <h2 style="text-transform: uppercase;">PARTISI BANGUNAN</h2>
-        <table>
-            @isset($forminspeksi['partisi'])
-                @foreach ($forminspeksi['partisi'] as $key => $item)
-                    <tr>
-                        <td>
-                            {{ $item['nama'] }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            {{ $item['value'] }}
-                        </td>
-                    </tr>
-                @endforeach
-            @endisset
-        </table>
+        @isset($forminspeksi['partisi'])
+            <h2 style="text-transform: uppercase;">PARTISI BANGUNAN</h2>
+            <table>
+                @if (is_array($forminspeksi['partisi']))
+                    @foreach ($forminspeksi['partisi'] as $key => $item)
+                        @if (is_array($item))
+                            <tr>
+                                <td>
+                                    {{ $item['nama'] ?? '' }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    {{ $item['value'] ?? '' }}
+                                </td>
+                            </tr>
+                        @endif
+                    @endforeach
+                @endif
+            </table>
+        @endisset
 
         <h2 style="text-transform: uppercase;">JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN</h2>
         <table>
@@ -459,103 +479,106 @@
                 ];
             @endphp
 
-            @foreach ($informasi as $key)
-                @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
-                    <p> - {{ ucfirst(str_replace('_', ' ', $key)) }}:
-                        {{ $forminspeksi['fakta'][$key] }}</p>
-                @endif
+            @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
+                @foreach ($informasi as $key)
+                    @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
+                        <p> - {{ ucfirst(str_replace('_', ' ', $key)) }}:
+                            {{ $forminspeksi['fakta'][$key] }}</p>
+                    @endif
+                @endforeach
+            @endif
+        </table>
+
+        <h2 style="text-transform: uppercase;">CATATAN LAINNYA</h2>
+        <table>
+            @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
+                <tr>
+                    <td>
+                        <p>{!! nl2br(e($keterangan)) !!}</p>
+                    </td>
+                </tr>
             @endforeach
 
 
 
-            <h2 style="text-transform: uppercase;">CATATAN LAINNYA</h2>
-            <table>
-                @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
-                    <tr>
-                        <td>
-                            <p>{!! nl2br(e($keterangan)) !!}</p>
-                        </td>
-                    </tr>
-                @endforeach
 
+        </table>
 
+        <p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p>
 
+        <table style="width: 100%; text-align: center;">
+            @php
+                use Modules\Usermanagement\Models\User;
+                $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
+                $imagePathPenilai = storage_path(
+                    'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
+                );
+                $soUser = User::where('id', $senior_officer->id)->first();
+                $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
 
-            </table>
+                $imagePathDD = storage_path(
+                    'app/public/signatures/' .
+                        User::role('DD Appraisal')->first()->id .
+                        '/' .
+                        User::role('DD Appraisal')->first()->sign,
+                );
+            @endphp
+            <tr>
+                <td style="height: 50px;"></td>
+                <td style="height: 50px;">
+                    @if (file_exists($imagePathDD))
+                        <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
+                    @endif
+                </td>
+                <td style="height: 50px;">
+                    @if (file_exists($imagePathSo))
+                        <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
+                    @endif
+                </td>
+                <td style="height: 50px;">
+                    @if (file_exists($imagePathPenilai))
+                        <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
+                    @endif
+                </td>
 
-            <p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p>
+            </tr>
 
-            <table style="width: 100%; text-align: center;">
-                @php
-                    use Modules\Usermanagement\Models\User;
-                    $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
-                    $imagePathPenilai = storage_path(
-                        'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
-                    );
-                    $soUser = User::where('id', $senior_officer->id)->first();
-                    $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
+            <tr>
+                <td></td>
+                <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
+                    <br>{{ ucwords(strtolower('PENILAI')) }}
+                </td>
+                <td>
+                    @if ($permohonan->approval_eo != null)
+                        {{ $senior_officer->name ?? '' }}
+                        <br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                    @endif
+                </td>
 
-                    $imagePathDD = storage_path(
-                        'app/public/signatures/' .
-                            User::role('DD Appraisal')->first()->id .
-                            '/' .
-                            User::role('DD Appraisal')->first()->sign,
-                    );
-                @endphp
-                <tr>
-                    <td style="height: 50px;"></td>
-                    <td style="height: 50px;">
-                        @if (file_exists($imagePathDD))
-                            <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
-                        @endif
-                    </td>
-                    <td style="height: 50px;">
-                        @if (file_exists($imagePathSo))
-                            <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
-                        @endif
-                    </td>
-                    <td style="height: 50px;">
-                        @if (file_exists($imagePathPenilai))
-                            <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
-                        @endif
-                    </td>
+                <td>
+                    @if ($permohonan->approval_dd != null)
+                        {{ User::role('DD Appraisal')->first()->name ?? '' }}
+                        <br>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                    @endif
+                </td>
+            </tr>
+        </table>
 
-                </tr>
+        <div class="page-break"></div>
 
-                <tr>
-                    <td></td>
-                    <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
-                        <br>{{ ucwords(strtolower('PENILAI')) }}
-                    </td>
-                    <td>
-                        @if ($permohonan->approval_eo != null)
-                            {{ $senior_officer->name ?? '' }}
-                            <br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                        @endif
-                    </td>
-
-                    <td>
-                        @if ($permohonan->approval_dd != null)
-                            {{ User::role('DD Appraisal')->first()->name ?? '' }}
-                            <br>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                        @endif
-                    </td>
-                </tr>
-            </table>
-
-            <div class="page-break"></div>
-
-            <div class="section">
-                <div class="judul">
-                    <h6 class="border" style="text-align: center">
-                        FOTO JAMINAN
-                    </h6>
-                </div>
-                @include('lpj::penilai.components.foto-jaminan')
+        <div class="section">
+            <div class="judul">
+                <h6 class="border" style="text-align: center">
+                    FOTO JAMINAN
+                </h6>
             </div>
+            @include('lpj::penilai.components.foto-jaminan')
+        </div>
     </main>
 
-    <footer></footer>
+    <footer id="footer">
+        Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
+    </footer>
 
     <script>
         const data = @json($forminspeksi);
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 1d3a882..543d18b 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -328,15 +328,16 @@
                                     @if (isset($detail->details))
                                         @if (json_decode($detail->details))
                                             @foreach (json_decode($detail->details) as $key => $value)
-                                            @if (!is_null($value) && $value !== '')
-                                            <td style=" padding: 2px;">{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
-                                            <td style=" padding: 2px;">:</td>
-                                            <td style=" padding: 2px;">{{ $value }}
-                                                @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                                    <sup>m2</sup>
+                                                @if (!is_null($value) && $value !== '')
+                                                    <td style=" padding: 2px;">
+                                                        {{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
+                                                    <td style=" padding: 2px;">:</td>
+                                                    <td style=" padding: 2px;">{{ $value }}
+                                                        @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                                            <sup>m2</sup>
+                                                        @endif
+                                                    </td>
                                                 @endif
-                                            </td>
-                                            @endif
                                             @endforeach
                                         @endif
                                     @endif
@@ -344,11 +345,13 @@
                             @endforeach
                         @endif
 
-                        <tr>
-                            <td style=" padding: 2px;">Nomor NIB</td>
-                            <td style=" padding: 2px;">:</td>
-                            <td style=" padding: 2px;">{{ $forminspeksi['asset']['nomor_nib']}}</td>
-                        </tr>
+                        @if (isset($forminspeksi['asset']['nomor_nib']))
+                            <tr>
+                                <td style=" padding: 2px;">Nomor NIB</td>
+                                <td style=" padding: 2px;">:</td>
+                                <td style=" padding: 2px;">{{ $forminspeksi['asset']['nomor_nib'] ?? '' }}</td>
+                            </tr>
+                        @endif
                         <tr>
                             <td style=" padding: 2px;">Atas Nama</td>
                             <td style=" padding: 2px;">:</td>