diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index 98169aa..83d30e9 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -2,8 +2,8 @@
 
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
-    use Modules\Lpj\Models\CustomField;
-    use Modules\Lpj\Models\HolidayCalendar;
+use Modules\Lpj\Models\CustomField;
+use Modules\Lpj\Models\HolidayCalendar;
 use Modules\Lpj\Models\PenawaranDetailTender;
 use Modules\Lpj\Models\PenawaranTender;
 use Modules\Lpj\Models\Penilaian;
@@ -30,7 +30,7 @@ function formatTanggalIndonesia($date, $time = false)
 function formatRupiah($number)
 {
     $number = (float) $number;
-    return 'Rp ' . number_format($number, 2, ',', '.');
+    return 'Rp ' . number_format($number, 0, ',', '.');
 }
 
 
@@ -357,7 +357,8 @@ function checkRegionUserName($userId)
     }
 }
 
-function getNomorLaporan($permohonanId, $documentId){
+function getNomorLaporan($permohonanId, $documentId)
+{
     $laporan = Laporan::where([
         'permohonan_id' => $permohonanId,
         'dokumen_jaminan_id' => $documentId,
@@ -365,13 +366,14 @@ function getNomorLaporan($permohonanId, $documentId){
     return $laporan->nomor_laporan ?? null;
 }
 
-function getCustomField($param){
-    if(is_numeric($param)){
+function getCustomField($param)
+{
+    if (is_numeric($param)) {
         $field = CustomField::find($param);
     } else {
         $field = CustomField::where(['name' => $param])->first();
     }
-    if($field){
+    if ($field) {
         return $field;
     } else {
         return null;
diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 02b983b..6094c5e 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -55,6 +55,7 @@ class PenilaiController extends Controller
         $basicData =  $this->surveyorController->getCommonData();
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
         $inpeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
+        $penilai = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
 
         $formFoto = null;
         if ($inpeksi) {
@@ -62,7 +63,7 @@ class PenilaiController extends Controller
             $forminspeksi = json_decode($inpeksi->data_form, true);
         }
 
-        return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto', 'forminspeksi','basicData'));
+        return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto', 'forminspeksi','basicData', 'penilai'));
     }
 
     public function create()
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 3f1b3c1..c16e361 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -724,6 +724,7 @@ class PenilaianController extends Controller
             ->where('dokument_id', $documentId)
             ->where('inspeksi_id', $inspeksi->id)
             ->first();
+        $penilai = $lpj;
 
         $forminspeksi = null;
         $lpjData = null;
@@ -765,7 +766,7 @@ class PenilaianController extends Controller
             return redirect()->back()->with('error', 'Laporan belum dibuat');
         }
 
-        return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan'));
+        return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan', 'penilai'));
     }
 
     private function getViewLaporan($tipe)
diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php
index 8aa6765..59b4832 100644
--- a/resources/views/component/form-penilai.blade.php
+++ b/resources/views/component/form-penilai.blade.php
@@ -353,8 +353,7 @@
                             class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
-
-                    @elseif (Auth::user()->hasAnyRole(['administrator','surveyor']) && Route::currentRouteName('penilai.show'))
+                    @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
                         <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
@@ -678,14 +677,14 @@
                             <div class="w-full">
                                 <label class="input">
 
-                                <input type="text" id="likuidasi" name="likuidasi"
-                                    class=" w-full currency"
-                                    value="{{ old('likuidasi', $lpjData['likuidasi'] ?? null) }}"
-                                    oninput="calculateTotal()">
+                                    <input type="text" id="likuidasi" name="likuidasi" class=" w-full currency"
+                                        value="{{ old('likuidasi', $lpjData['likuidasi'] ?? null) }}"
+                                        oninput="calculateTotal()">
                                     <i class="">%
                                     </i>
                                 </label>
-                                    <span class="text-xs"> <span class="text-xs text-danger">*</span> Masukkan Angka Saja </span>
+                                <span class="text-xs"> <span class="text-xs text-danger">*</span> Masukkan Angka Saja
+                                </span>
                             </div>
                         </div>
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
@@ -800,9 +799,8 @@
 
 </div>
 <script type="text/javascript">
-
-const datas = @json($forminspeksi);
-console.log(datas);
+    const datas = @json($forminspeksi);
+    console.log(datas);
 
     document.addEventListener('DOMContentLoaded', function() {
 
@@ -981,32 +979,33 @@ console.log(datas);
     });
 
     function formatPercentage(value) {
-    // Hapus semua karakter kecuali angka dan koma
-    let numericValue = value.replace(/[^0-9,]/g, '');
+        // Hapus semua karakter kecuali angka dan koma
+        let numericValue = value.replace(/[^0-9,]/g, '');
 
-    // Pastikan hanya satu koma yang ada
-    let parts = numericValue.split(',');
-    if (parts.length > 2) {
-        numericValue = parts[0] + ',' + parts[1]; // Pertahankan hanya bagian pertama dan kedua
+        // Pastikan hanya satu koma yang ada
+        let parts = numericValue.split(',');
+        if (parts.length > 2) {
+            numericValue = parts[0] + ',' + parts[1]; // Pertahankan hanya bagian pertama dan kedua
+        }
+
+        // Jika nilai melebihi 100, batasi menjadi 100
+        let numericFloat = parseFloat(numericValue.replace(',', '.')) || 0;
+        if (numericFloat > 100) {
+            numericFloat = 100;
+            numericValue = '100';
+        }
+
+        // Kembalikan nilai dengan simbol %
+        return numericValue;
     }
 
-    // Jika nilai melebihi 100, batasi menjadi 100
-    let numericFloat = parseFloat(numericValue.replace(',', '.')) || 0;
-    if (numericFloat > 100) {
-        numericFloat = 100;
-        numericValue = '100';
-    }
-
-    // Kembalikan nilai dengan simbol %
-    return numericValue;
-}
     function calculateTotal() {
         const parseInput = (value) => parseFloat(value.replace(/[^0-9]/g, '')) || 0;
 
         // Bagian Likuidasi
         let persentaseLikuidasiInput = document.getElementById('likuidasi');
-    let persentaseLikuidasi = parseInput(persentaseLikuidasiInput.value);
-    persentaseLikuidasiInput.value = formatPercentage(persentaseLikuidasiInput.value);
+        let persentaseLikuidasi = parseInput(persentaseLikuidasiInput.value);
+        persentaseLikuidasiInput.value = formatPercentage(persentaseLikuidasiInput.value);
 
         let totalNilaiPasarLikuidasi = document.querySelector('input[name="likuidasi_nilai_1"]');
         let totalLikuidasi = document.querySelector('input[name="likuidasi_nilai_2"]');
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index 8f87ac2..122d4c7 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -14,9 +14,20 @@
                         Memo Antar Kantor
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ url()->previous() }}" class="btn btn-xs btn-info">
-                            <i class="ki-filled ki-exit-left"></i> Back
-                        </a>
+                        @php
+                            use Illuminate\Support\Facades\Route;
+                        @endphp
+                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) &&
+                                Route::currentRouteName('otorisator.show'))
+                            <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => 'Pelaporan']) }}"
+                                class="btn btn-xs btn-info">
+                                <i class="ki-filled ki-exit-left"></i> Back
+                            </a>
+                        @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
+                            <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
+                                <i class="ki-filled ki-exit-left"></i> Back
+                            </a>
+                        @endif
                     </div>
                 </div>
                 <div class="card-body grid gap-5">
@@ -290,8 +301,8 @@
                         href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
                         LAMPIRAN FOTO DAN DOKUMEN
                     </a>
-                    <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
-                        >
+                    <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
+                        class="btn btn-light">
                         <i class="ki-filled ki-printer"></i> Hasil Inspeksi
                     </a>
                     <a class="btn btn-success"
diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php
index 55342c9..8ef56e2 100644
--- a/resources/views/penilai/components/print-resume.blade.php
+++ b/resources/views/penilai/components/print-resume.blade.php
@@ -1,394 +1,424 @@
 @include('lpj::penilai.components.header')
-    @php
-        $data = '';
-        foreach ($permohonan->documents as $dokumen) {
-            $data .= $dokumen->jenisJaminan->name . ', ';
+@php
+    $data = '';
+    foreach ($permohonan->documents as $dokumen) {
+        $data .= $dokumen->jenisJaminan->name . ', ';
 
-            $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
-            $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
-            $teams = $permohonan->region->teams;
+        $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
+        $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
+        $teams = $permohonan->region->teams;
 
-            if ($teams) {
-                foreach ($teams as $team) {
-                    $team_users = $team->teamsUsers;
-                    // print_r($team_users);
-                    if ($team_users) {
-                        foreach ($team_users as $team_user) {
-                            $user = $team_user->user;
+        if ($teams) {
+            foreach ($teams as $team) {
+                $team_users = $team->teamsUsers;
+                // print_r($team_users);
+                if ($team_users) {
+                    foreach ($team_users as $team_user) {
+                        $user = $team_user->user;
 
-                            if ($user && $user->hasRole('senior-officer')) {
-                                $senior_officer = $user;
-                                break 3;
-                            }
+                        if ($user && $user->hasRole('senior-officer')) {
+                            $senior_officer = $user;
+                            break 3;
                         }
                     }
                 }
             }
         }
-        $data = rtrim($data, ', ');
-    @endphp
+    }
+    $data = rtrim($data, ', ');
+@endphp
 
-    <main class="content">
-        <table style="width: 100%">
-            <tr>
-                <td style="text-align: center; margin-top: 5px;">
-                    <h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;">
-                        Resume
-                        Penilaian
-                    </h2>
-                    <p style="font-size: 12px;  margin: 0;">NO: {{ $nomorLaporan }}</p>
-                </td>
-            </tr>
-        </table>
+<main class="content">
+    <table style="width: 100%">
+        <tr>
+            <td style="text-align: center; margin-top: 5px;">
+                <h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;">
+                    Resume
+                    Penilaian
+                </h2>
+                <p style="font-size: 12px;  margin: 0;">NO: {{ $nomorLaporan }}</p>
+            </td>
+        </tr>
+    </table>
 
-        <table>
+    <table>
 
-            <tr>
-                <td style="width: 20%">Pemohon</td>
-                <td style="width: 1%">:</td>
-                <td style="width: 100%">{{ $permohonan->user->name ?? '' }} -
-                    {{ $permohonan->debiture->branch->name ?? '' }}</td>
-            </tr>
+        <tr>
+            <td style="width: 20%">Pemohon</td>
+            <td style="width: 1%">:</td>
+            <td style="width: 100%">{{ $permohonan->user->name ?? '' }} -
+                {{ $permohonan->debiture->branch->name ?? '' }}</td>
+        </tr>
 
-            <tr>
-                <td>Atas Nama Cadeb</td>
-                <td>:</td>
-                <td>{{ $permohonan->debiture->name ?? '' }}</td>
-            </tr>
-            <tr>
-                <td idth="25%">Aset</td>
-                <td width="1%">:</td>
-                <td >{{ $data ?? '' }}</td>
-            </tr>
-            
-           
-            <tr>
-                <td style="vertical-align: top;">Legalitas</td>
-                <td style="vertical-align: top;">:</td>
-                <td style="vertical-align: top;">
-                    <table style="margin: 0; padding: 0;">
-                        @if (isset($dokumen))
-                            @foreach ($dokumen->detail as $detail)
-                                <tr>
-                                    @if (isset($detail->dokumen_jaminan))
-                                        <td style="padding: 0; margin: 0;">
-                                            @php
-                                                $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
-                                                    ? json_decode($detail->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] : []);
-                                            @endphp
+        <tr>
+            <td>Atas Nama Cadeb</td>
+            <td>:</td>
+            <td>{{ $permohonan->debiture->name ?? '' }}</td>
+        </tr>
+        <tr>
+            <td idth="25%">Aset</td>
+            <td width="1%">:</td>
+            <td>{{ $data ?? '' }}</td>
+        </tr>
 
-                                            @foreach ($dokumen_jaminan as $index => $dokumen)
-                                                @if (!empty($dokumen_nomor[$index]))
-                                                    <span>{{ $dokumen_nomor[$index] }}</span>
-                                                @endif
-                                            @endforeach
-                                        </td>
-                                    @endif
-                                </tr>
-                            @endforeach
-                        @endif
-                    </table>
-                </td>
-            </tr>
 
-            <tr>
-                @if (isset($permohonan->documents))
-                    @foreach ($permohonan->documents as $document)
-                        @foreach ($document->detail as $detail)
-                            @if (isset($detail->details))
-                                @php
-                                    $details = json_decode($detail->details, true);
-                                @endphp
-                                @if ($details)
-                                    @foreach ($details as $key => $value)
-                                        @if (!is_null($value) && $value !== '')
-                                            <tr>
-                                                <td style="">{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
-                                                <td style=" padding: 2px;">:</td>
-                                                <td style="">{{ $value }}
-                                                    @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                                        <sup>m2</sup>
-                                                    @endif
-                                                </td>
-                                            </tr>
-                                        @endif
-                                    @endforeach
+        <tr>
+            <td style="vertical-align: top;">Legalitas</td>
+            <td style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
+                <table style="margin: 0; padding: 0;">
+                    @if (isset($dokumen))
+                        @foreach ($dokumen->detail as $detail)
+                            <tr>
+                                @if (isset($detail->dokumen_jaminan))
+                                    <td style="padding: 0; margin: 0;">
+                                        @php
+                                            $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
+                                                ? json_decode($detail->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]
+                                                    : []);
+                                        @endphp
+
+                                        @foreach ($dokumen_jaminan as $index => $dokumen)
+                                            @if (!empty($dokumen_nomor[$index]))
+                                                <span>{{ $dokumen_nomor[$index] }}</span>
+                                            @endif
+                                        @endforeach
+                                    </td>
                                 @endif
-                            @endif
+                            </tr>
                         @endforeach
-                    @endforeach
+                    @endif
+                </table>
+            </td>
+        </tr>
+
+        <tr>
+            @if (isset($permohonan->documents))
+                @foreach ($permohonan->documents as $document)
+                    @foreach ($document->detail as $detail)
+                        @if (isset($detail->details))
+                            @php
+                                $details = json_decode($detail->details, true);
+                            @endphp
+                            @if ($details)
+                                @foreach ($details as $key => $value)
+                                    @if (!is_null($value) && $value !== '')
+        <tr>
+            <td style="">{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
+            <td style=" padding: 2px;">:</td>
+            <td style="">{{ $value }}
+                @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                    <sup>m2</sup>
                 @endif
-            </tr>
-            <tr>
-                <td width="25%">Terletak di</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td> {{ $alamat['address'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Desa/Kelurahan</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['village_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Kecamatan</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['district_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Kabupaten/Kota</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td> {{ $alamat['city_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Provinsi</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['province_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Tanggal Survey</td>
-                <td>:</td>
-                <td>{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}</td>
-            </tr>
-            <tr>
-                <td>Surveyor</td>
-                <td>:</td>
-                <td>{{ $surveyor->userPenilaiTeam->name ?? '' }}</td>
-            </tr>
+            </td>
+        </tr>
+        @endif
+        @endforeach
+        @endif
+        @endif
+        @endforeach
+        @endforeach
+        @endif
+        </tr>
+        <tr>
+            <td width="25%">Terletak di</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $alamat['address'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Desa/Kelurahan</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['village_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kecamatan</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['district_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kabupaten/Kota</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $alamat['city_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Provinsi</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['province_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Tanggal Survey</td>
+            <td>:</td>
+            <td>{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
+            </td>
+        </tr>
+        <tr>
+            <td>Surveyor</td>
+            <td>:</td>
+            <td>{{ $surveyor->userPenilaiTeam->name ?? '' }}</td>
+        </tr>
 
+        <tr>
+            <td>Tanggal Resume</td>
+            <td>:</td>
+            <td>{{ optional($resumeData)['tanggal_resume'] ? formatTanggalIndonesia($resumeData['tanggal_resume']) : '' }}
+            </td>
+        </tr>
+
+    </table>
+
+    <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
+        <tr>
+            <td style="">
+                <h6 style="text-transform: uppercase; margin: 0; ">Faktor Positif</h2>
+            </td>
+        </tr>
+        <tr>
+            @isset($resumeData['fakta']['fakta_positif'])
+                @foreach ($resumeData['fakta']['fakta_positif'] as $key => $item)
             <tr>
-                <td>Tanggal Resume</td>
-                <td>:</td>
-                <td>{{ optional($resumeData)['tanggal_resume'] ? formatTanggalIndonesia($resumeData['tanggal_resume']) : '' }}
+                <td>{!! nl2br(e($item)) !!}</td>
+            </tr>
+            @endforeach
+        @endisset
+        </tr>
+    </table>
+
+    <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
+        <tr>
+            <td style="">
+                <h6 style="text-transform: uppercase; margin: 0; ">Faktor negatif</h2>
+            </td>
+        </tr>
+        <tr>
+            @isset($resumeData['fakta']['fakta_negatif'])
+                @foreach ($resumeData['fakta']['fakta_negatif'] as $key => $item)
+            <tr>
+                <td>{!! nl2br(e($item)) !!}</td>
+            </tr>
+            @endforeach
+        @endisset
+        </tr>
+    </table>
+
+    <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
+        <tr>
+            <td style="">
+                <h3 style="text-transform: uppercase; margin: 0; ">Kesimpulan Nilai Pasar Wajar</h2>
+            </td>
+            <td>:</td>
+            <td></td>
+        </tr>
+    </table>
+
+    <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
+        <tr>
+            <td style="">
+                <h6 style="text-transform: uppercase; margin: 0; ">1. Sesuai Fisik</h6>
+            </td>
+        </tr>
+    </table>
+
+    <table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 10px;">
+
+        @foreach ($resumeData['fisik'] as $item)
+        <tr>
+            <td style="border: 1px solid #000; padding: 4px; text-align: center">Sertifikat</td>
+            <td style="border: 1px solid #000; padding: 4px; text-align: center">Luas Tanah</td>
+            <td style="border: 1px solid #000; padding: 4px; text-align: center">Luas Bangunan</td>
+            <td style="border: 1px solid #000; padding: 4px; text-align: center">Nilai Pasar Wajar</td>
+            <td style="border: 1px solid #000; padding: 4px; text-align: center">Nilai Likuidasi {{ isset($item['likuidasi']) ? '('. $item['likuidasi'] . ' %)' : '-' }}</td>
+        </tr>
+            <tr>
+                <td style="border: 1px solid #000; padding: 4px; text-align: center">{{ $item['sertifikat'] ?? '' }}
                 </td>
+                <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                    {{ isset($item['luas_tanah']) ? $item['luas_tanah'] . ' m²' : '-' }}</td>
+                <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                    {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td>
+                <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                    {{ formatRupiah($item['nilai']) ?? '' }}</td>
+
+                <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                    {{ formatRupiah($item['total_likuidasi']) ?? '' }}</td>
             </tr>
+        @endforeach
+    </table>
 
-        </table>
-
+    @if (!empty($resumeData['sesuai_imb']))
         <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
             <tr>
                 <td style="">
-                    <h6 style="text-transform: uppercase; margin: 0; ">Faktor Positif</h2>
-                </td>
-            </tr>
-            <tr>
-                @isset($resumeData['fakta']['fakta_positif'])
-                    @foreach ($resumeData['fakta']['fakta_positif'] as $key => $item)
-                <tr>
-                    <td>{!! nl2br(e($item)) !!}</td>
-                </tr>
-                @endforeach
-            @endisset
-            </tr>
-        </table>
-
-        <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
-            <tr>
-                <td style="">
-                    <h6 style="text-transform: uppercase; margin: 0; ">Faktor negatif</h2>
-                </td>
-            </tr>
-            <tr>
-                @isset($resumeData['fakta']['fakta_negatif'])
-                    @foreach ($resumeData['fakta']['fakta_negatif'] as $key => $item)
-                <tr>
-                    <td>{!! nl2br(e($item)) !!}</td>
-                </tr>
-                @endforeach
-            @endisset
-            </tr>
-        </table>
-
-        <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
-            <tr>
-                <td style="">
-                    <h3 style="text-transform: uppercase; margin: 0; ">Kesimpulan Nilai Pasar Wajar</h2>
-                </td>
-                <td>:</td>
-                <td></td>
-            </tr>
-        </table>
-
-        <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
-            <tr>
-                <td style="">
-                    <h6 style="text-transform: uppercase; margin: 0; ">1. Sesuai Fisik</h6>
+                    <h6 style="text-transform: uppercase; margin: 0; ">2. Sesuai IMB</h6>
                 </td>
             </tr>
         </table>
 
         <table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 10px;">
-            <tr>
-                <td style="border: 1px solid #000; padding: 4px;">Sertifikat</td>
-                <td style="border: 1px solid #000; padding: 4px;">Luas Tanah (m²)</td>
-                <td style="border: 1px solid #000; padding: 4px;">Luas Bangunan (m²)</td>
-                <td style="border: 1px solid #000; padding: 4px;">Nilai Pasar Wajar (Rp)</td>
-            </tr>
-            @foreach ($resumeData['fisik'] as $item)
+
+            @foreach ($resumeData['sesuai_imb'] as $item)
                 <tr>
-                    <td style="border: 1px solid #000; padding: 4px;">{{ $item['sertifikat'] ?? '' }}</td>
-                    <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_tanah'] ?? '' }}</td>
-                    <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_bangunan'] ?? '' }}</td>
-                    <td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($item['nilai']) ?? '' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Sertifikat</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Luas Tanah</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Luas Bangunan</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Nilai Pasar Wajar</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Nilai Likuidasi {{ isset($item['likuidasi']) ? '('. $item['likuidasi'] . ' %)' : '-' }}</td>
+
+                </tr>
+                <tr>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ $item['sertifikat'] ?? '' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ isset($item['luas_tanah']) ? $item['luas_tanah'] . ' m²' : '-' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ formatRupiah($item['nilai']) ?? '' }}</td>
+
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ formatRupiah($item['total_likuidasi']) ?? '' }}</td>
                 </tr>
             @endforeach
         </table>
-
-        @if (!empty($resumeData['sesuai_imb']))
+    @endif
+    @if (!empty($resumeData['tambahan']))
+        @foreach ($resumeData['tambahan'] as $index => $item)
             <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
                 <tr>
                     <td style="">
-                        <h6 style="text-transform: uppercase; margin: 0; ">2. Sesuai IMB</h6>
+                        <h6 style="text-transform: uppercase; margin: 0; ">
+                            {{ $index + 3 }}. {{ $item['tambahan_nama_kesimpulan'] ?? '-' }}
+                        </h6>
                     </td>
                 </tr>
             </table>
 
-            <table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 10px;">
+            <table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 1px;">
                 <tr>
-                    <td style="border: 1px solid #000; padding: 4px;">Sertifikat</td>
-                    <td style="border: 1px solid #000; padding: 4px;">Luas Tanah (m²)</td>
-                    <td style="border: 1px solid #000; padding: 4px;">Luas Bangunan (m²)</td>
-                    <td style="border: 1px solid #000; padding: 4px;">Nilai Pasar Wajar (Rp)</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Sertifikat</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Luas Tanah</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Luas Bangunan</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Nilai Pasar Wajar</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">Nilai Likuidasi {{ isset($item['likuidasi']) ? '('. $item['likuidasi'] . ' %)' : '' }}</td>
+                </tr>
+                <tr>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ $item['sertifikat'] ?? '-' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ isset($item['luas_tanah']) ? $item['luas_tanah'] . ' m²' : '-' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ formatRupiah($item['nilai']) ?? '-' }}
+                    </td>
+
+                    <td style="border: 1px solid #000; padding: 4px; text-align: center">
+                        {{ formatRupiah($item['total_likuidasi']) ?? '' }}</td>
                 </tr>
-                @foreach ($resumeData['sesuai_imb'] as $item)
-                    <tr>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['sertifikat'] ?? '' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_tanah'] ?? '' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_bangunan'] ?? '' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($item['nilai']) ?? '' }}</td>
-                    </tr>
-                @endforeach
             </table>
-        @endif
-        @if (!empty($resumeData['tambahan']))
-            @foreach ($resumeData['tambahan'] as $index => $item)
-                <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
-                    <tr>
-                        <td style="">
-                            <h6 style="text-transform: uppercase; margin: 0; ">
-                                {{ $index + 3 }}. {{ $item['tambahan_nama_kesimpulan'] ?? '-' }}
-                            </h6>
-                        </td>
-                    </tr>
-                </table>
-
-                <table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 1px;">
-                    <tr>
-                        <td style="border: 1px solid #000; padding: 4px;">Sertifikat</td>
-                        <td style="border: 1px solid #000; padding: 4px;">Luas Tanah (m²)</td>
-                        <td style="border: 1px solid #000; padding: 4px;">Luas Bangunan (m²)</td>
-                        <td style="border: 1px solid #000; padding: 4px;">Nilai Pasar Wajar (Rp)</td>
-                    </tr>
-                    <tr>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['sertifikat'] ?? '-' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_tanah'] ?? '-' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_bangunan'] ?? '-' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($item['nilai']) ?? '-' }}
-                        </td>
-                    </tr>
-                </table>
-            @endforeach
-        @endif
+        @endforeach
+    @endif
 
 
-        <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
-            <tr>
-                <td style="">
-                    <h6 style="text-transform: uppercase; margin: 0; ">lain lain</h2>
-                </td>
-            </tr>
-            <tr>
-                <td>{!! nl2br(e($resumeData['keterangan'] ?? '' )) !!}</td>
-            </tr>
-        </table>
+    <table style="margin: 5px 0; border-collapse: collapse; width: 100%;">
+        <tr>
+            <td style="">
+                <h6 style="text-transform: uppercase; margin: 0; ">lain lain</h2>
+            </td>
+        </tr>
+        <tr>
+            <td>{!! nl2br(e($resumeData['keterangan'] ?? '')) !!}</td>
+        </tr>
+    </table>
 
-        <table style="width: 100%">
-            <tr>
-                <td>
-                    <table>
-                        <div style="margin-top: 20px;">
-                            <label style="font-weight: bold;">DISCLAIMER</label>
-                            <div>
-                                <ol style="padding-left: 20px; list-style-type: decimal; margin-top: 0;">
-                                    <li style="margin-bottom: 5px; ">LAPORAN RESUME INI DIKELUARKAN DIKARENAKAN BELUM
-                                        DILAKUKANNYA PEMBAYARAN BIAYA PENILAIAN JAMINAN</li>
-                                    <li style="margin-bottom: 5px;">LAPORAN RESUME INI TIDAK BISA DIJADIKAN SEBAGAI
-                                        DASAR PENGAJUAN DAN ATAU PENCAIRAN KREDIT, LAPORAN YANG DIGUNAKAN TETAP WAJIB
-                                        BERUPA LAPORAN PENILAIAN JAMINAN (LPJ)</li>
-                                    <li style="margin-bottom: 5px;">DETAIL PER METER TANAH DAN BANGUNAN, SARANA
-                                        PELENGKAP DLL AKAN TERCATAT DI LAPORAN PENILAIAN JAMINAN (LPJ) NANTI</li>
-                                    <li style="margin-bottom: 5px;">LAPORAN RESUME INI HANYA DIGUNAKAN UNTUK KEPENTINGAN
-                                        INTERNAL BAGI</li>
-                                    <li style="margin-bottom: 5px;">LAPORAN RESUME INI HANYA BERLAKU <span
-                                            style="color:red;">14 HARI KALENDER </span>
-                                        TERHITUNG DARI TANGGAL RESUME INI DIBUAT SESUAI ATURAN YANG BERLAKU, APABILA
-                                        LEWAT MAKA HARUS DILAKUKAN ORDER ULANG SESUAI PROSEDUR YANG BERLAKU</li>
-                                    <li style="margin-bottom: 5px; text-transform: uppercase;">Apabila sudah melewati 6
-                                        bulan, maka harus penilaian
-                                        ulang kembali</li>
-                                </ol>
-                            </div>
+    <table style="width: 100%">
+        <tr>
+            <td>
+                <table>
+                    <div style="margin-top: 20px;">
+                        <label style="font-weight: bold;">DISCLAIMER</label>
+                        <div>
+                            <ol style="padding-left: 20px; list-style-type: decimal; margin-top: 0;">
+                                <li style="margin-bottom: 5px; ">LAPORAN RESUME INI DIKELUARKAN DIKARENAKAN BELUM
+                                    DILAKUKANNYA PEMBAYARAN BIAYA PENILAIAN JAMINAN</li>
+                                <li style="margin-bottom: 5px;">LAPORAN RESUME INI TIDAK BISA DIJADIKAN SEBAGAI
+                                    DASAR PENGAJUAN DAN ATAU PENCAIRAN KREDIT, LAPORAN YANG DIGUNAKAN TETAP WAJIB
+                                    BERUPA LAPORAN PENILAIAN JAMINAN (LPJ)</li>
+                                <li style="margin-bottom: 5px;">DETAIL PER METER TANAH DAN BANGUNAN, SARANA
+                                    PELENGKAP DLL AKAN TERCATAT DI LAPORAN PENILAIAN JAMINAN (LPJ) NANTI</li>
+                                <li style="margin-bottom: 5px;">LAPORAN RESUME INI HANYA DIGUNAKAN UNTUK KEPENTINGAN
+                                    INTERNAL BAGI</li>
+                                <li style="margin-bottom: 5px;">LAPORAN RESUME INI HANYA BERLAKU <span
+                                        style="color:red;">14 HARI KALENDER </span>
+                                    TERHITUNG DARI TANGGAL RESUME INI DIBUAT SESUAI ATURAN YANG BERLAKU, APABILA
+                                    LEWAT MAKA HARUS DILAKUKAN ORDER ULANG SESUAI PROSEDUR YANG BERLAKU</li>
+                                <li style="margin-bottom: 5px; text-transform: uppercase;">Apabila sudah melewati 6
+                                    bulan, maka harus penilaian
+                                    ulang kembali</li>
+                            </ol>
                         </div>
+                    </div>
 
-                    </table>
-                </td>
-            </tr>
-            <tr>
-                <td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td>
-            </tr>
-            <tr>
-                <table style="width: 100%; text-align: center;">
-                    <tr>
-                        <td style="height: 50px"></td>
-                        <td style="height: 50px"></td>
-
-                    </tr>
-                    <tr>
-                        <td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                            {{ ucwords(strtolower('PENILAI')) }}
-                        </td>
-
-
-                        <td>
-                            @if ($permohonan->approval_so)
-                                {{ $senior_officer->name ?? '' }}</br>
-                                {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                            @endif
-                        </td>
-
-                        @php
-                            use Modules\Usermanagement\Models\User;
-                        @endphp
-                        <td>
-                            @if ($permohonan->approval_eo != null)
-                                {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                                {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
-                            @endif
-                        </td>
-                        <td>
-                            @if ($permohonan->approval_eo != null)
-                                {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                                {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                            @endif
-                        </td>
-
-                    </tr>
                 </table>
-            </tr>
-        </table>
+            </td>
+        </tr>
+        <tr>
+            <td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td>
+        </tr>
+        <tr>
+            <table style="width: 100%; text-align: center;">
+                <tr>
+                    <td style="height: 50px"></td>
+                    <td style="height: 50px"></td>
 
-        <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')
+                </tr>
+                <tr>
+                    <td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                        {{ ucwords(strtolower('PENILAI')) }}
+                    </td>
+
+
+                    <td>
+                        @if ($permohonan->approval_so)
+                            {{ $senior_officer->name ?? '' }}</br>
+                            {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                        @endif
+                    </td>
+
+                    @php
+                        use Modules\Usermanagement\Models\User;
+                    @endphp
+                    <td>
+                        @if ($permohonan->approval_eo != null)
+                            {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+                        @endif
+                    </td>
+                    <td>
+                        @if ($permohonan->approval_eo != null)
+                            {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                            {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                        @endif
+                    </td>
+
+                </tr>
+            </table>
+        </tr>
+    </table>
+
+    <div class="page-break"></div>
+    <div class="section">
+        <div class="judul">
+            <h6 class="border" style="text-align: center">
+                FOTO JAMINAN
+            </h6>
         </div>
-    </main>
+        @include('lpj::penilai.components.foto-jaminan')
+    </div>
+</main>
 
-    @include('lpj::penilai.components.footer')
\ No newline at end of file
+@include('lpj::penilai.components.footer')
diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php
index 0d03500..15f91a1 100644
--- a/resources/views/penilai/components/resume.blade.php
+++ b/resources/views/penilai/components/resume.blade.php
@@ -29,10 +29,23 @@
                     <h3 class="card-title uppercase">
                         Data Jaminan
                     </h3>
+                    @php
+                        use Illuminate\Support\Facades\Route;
+                    @endphp
                     <div class="flex items-center gap-2">
-                        <a href="{{ url()->previous() }}" class="btn btn-xs btn-info">
-                            <i class="ki-filled ki-exit-left"></i> Back
-                        </a>
+
+                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) &&
+                                Route::currentRouteName('otorisator.show'))
+                            <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => 'Pelaporan']) }}"
+                                class="btn btn-xs btn-info">
+                                <i class="ki-filled ki-exit-left"></i> Back
+                            </a>
+                        @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
+                            <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
+                                <i class="ki-filled ki-exit-left"></i> Back
+                            </a>
+                        @endif
+
                     </div>
                 </div>
                 <div class="card-body grid gap-5 grid-cols-2">
@@ -181,7 +194,8 @@
                                         <th class="text-center">Luas Tanah</th>
                                         <th class="text-center">Luas Bangunan</th>
                                         <th class="text-center">Nilai Pasar Wajar</th>
-
+                                        <th class="text-center">Nilai Likuidasi</th>
+                                        <th class="text-center">Total Nilai Likuidasi</th>
                                     </tr>
                                 </thead>
                                 </thead>
@@ -202,7 +216,18 @@
                                                         class="input number-format"></td>
                                                 <td class="text-center">
                                                     <input type="text" name="fisik_nilai[]"
-                                                        class="input currency-format" value="{{ $item['nilai'] }}">
+                                                        class="input currency-format nilai-pasar"
+                                                        value="{{ $item['nilai'] }}" onkeyup="calculateTotal(this)">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="likuidasi[]" class="input likuidasi"
+                                                        value="{{ $item['likuidasi'] ?? 0 }}"
+                                                        onkeyup="calculateTotal(this)">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="total_nilai_likuidasi[]"
+                                                        class="input currency-format total-likuidasi"
+                                                        value="{{ $item['total_likuidasi'] ?? 0 }}" readonly>
                                                 </td>
                                             </tr>
                                         @endforeach
@@ -250,7 +275,17 @@
                                             <td class="text-center"> <input type="text" name="fisik_luas_bangunan[]"
                                                     class="input number-format" value="{{ $luas_bangunan }}"></td>
                                             <td class="text-center">
-                                                <input type="text" name="fisik_nilai[]" class="input currency-format">
+                                                <input type="text" name="fisik_nilai[]"
+                                                    class="input currency-format nilai-pasar"
+                                                    onkeyup="calculateTotal(this)">
+                                            </td>
+                                            <td class="text-center">
+                                                <input type="text" name="likuidasi[]" class="input likuidasi"
+                                                    onkeyup="calculateTotal(this)">
+                                            </td>
+                                            <td class="text-center">
+                                                <input type="text" name="total_nilai_likuidasi[]"
+                                                    class="input currency-format total-likuidasi" readonly>
                                             </td>
                                         </tr>
                                     @endif
@@ -271,7 +306,8 @@
                                         <th class="text-center">Luas Tanah</th>
                                         <th class="text-center">Luas Bangunan</th>
                                         <th class="text-center">Nilai Pasar Wajar</th>
-
+                                        <th class="text-center">Likuidasi</th>
+                                        <th class="text-center">Total Nilai Likuidasi</th>
                                     </tr>
                                 </thead>
                                 </thead>
@@ -293,7 +329,18 @@
                                                 </td>
                                                 <td class="text-center">
                                                     <input type="text" name="sesuai_nilai[]"
-                                                        class="input currency-format" value="{{ $item['nilai'] }}">
+                                                        class="input currency-format nilai-pasar"
+                                                        value="{{ $item['nilai'] }}" onkeyup="calculateTotal(this)">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="sesuai_likuidasi[]"
+                                                        class="input likuidasi" value="{{ $item['likuidasi'] ?? '' }}"
+                                                        onkeyup="calculateTotal(this)">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="sesuai_total_likuidasi[]"
+                                                        class="input currency-format total-likuidasi"
+                                                        value="{{ $item['total_likuidasi'] ?? 0 }}">
                                                 </td>
                                             </tr>
                                         @endforeach
@@ -312,8 +359,17 @@
                                                     class="input number-format">
                                             </td>
                                             <td class="text-center">
-                                                <input type="text" name="sesuai_nilai[]"
-                                                    class="input currency-format">
+                                                <input type="text" name="sesuai_nilai[]" class="input currency-format"
+                                                    onkeyup="calculateTotal(this)">
+                                            </td>
+                                            <td class="text-center">
+                                                <input type="text" name="sesuai_likuidasi[]" class="input likuidasi"
+                                                    value="{{ $item['likuidasi'] ?? 0 }}" onkeyup="calculateTotal(this)">
+                                            </td>
+                                            <td class="text-center">
+                                                <input type="text" name="sesuai_total_likuidasi[]"
+                                                    class="input currency-format total-likudasi"
+                                                    value="{{ $item['total_likuidasi'] ?? 0 }}">
                                             </td>
                                         </tr>
                                     @endif
@@ -323,7 +379,7 @@
                     </div>
 
                     @if (!empty($resumeData['tambahan']))
-                        @foreach ($resumeData['tambahan'] as $item)
+                        @foreach ($resumeData['tambahan'] as $counter => $item)
                             <div id="kesimpulan" class="gird gap-5">
 
                                 <div class="flex flex-wrap items-baseline w-full">
@@ -342,44 +398,50 @@
                                                 <th class="text-center">Luas Tanah</th>
                                                 <th class="text-center">Luas Bangunan</th>
                                                 <th class="text-center">Nilai Pasar Wajar</th>
-
+                                                <th class="text-center"> Likuidasi</th>
+                                                <th class="text-center">Total Nilai Likuidasi</th>
                                             </tr>
                                         </thead>
                                         </thead>
                                         <tbody>
-                                            @if (!empty($resumeData['tambahan']))
-                                                @foreach ($resumeData['tambahan'] as $item)
 
-                                                <tr>
-                                                    <td class="text-center">
-                                                        <input type="text" name="tambahan_sertifikat[]"
-                                                            class="input number-format"
-                                                            value="{{ $item['sertifikat'] }}">
-                                                    </td>
-                                                    <td class="text-center">
-                                                        <input type="text" name="tambahan_luas_tanah[]"
-                                                            class="input number-format"
-                                                            value="{{ $item['luas_tanah'] }}">
-                                                    </td>
-                                                    <td class="text-center">
-                                                        <input type="text" name="tambahan_luas_bangunan[]"
-                                                            class="input number-format"
-                                                            value="{{ $item['luas_bangunan'] }}">
-                                                    </td>
-                                                    <td class="text-center">
-                                                        <input type="text" name="tambahan_nilai[]"
-                                                            class="input  currency-format" value="{{ $item['nilai'] }}">
-                                                    </td>
-                                                </tr>
-                                                @endforeach
-                                            @endif
+                                            <tr>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_sertifikat[]"
+                                                        class="input number-format" value="{{ $item['sertifikat'] }}">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_luas_tanah[]"
+                                                        class="input number-format" value="{{ $item['luas_tanah'] }}">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_luas_bangunan[]"
+                                                        class="input number-format" value="{{ $item['luas_bangunan'] }}">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_nilai[]"
+                                                        class="input  currency-format nilai-pasar"
+                                                        value="{{ $item['nilai'] }}" onkeyup="calculateTotal(this)">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_nilai_likuidasi[]"
+                                                        class="input likuidasi " value="{{ $item['likuidasi'] ?? 0 }}"
+                                                        onkeyup="calculateTotal(this)">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_total_likuidasi[]"
+                                                        class="input  currency-format total-likuidasi"
+                                                        value="{{ $item['total_likuidasi'] ?? 0 }}">
+                                                </td>
+                                            </tr>
+
                                         </tbody>
                                     </table>
                                 </div>
                             </div>
                         @endforeach
                     @endif
-
+                    <div id="kesimpulans" class="grid gap-5 w-full"></div>
                     <div>
                         <button type="button" class="btn btn-primary btn-sm mt-5" onclick="tambahKesimpulanNilai()">
                             <i class="ki-outline ki-plus"></i>
@@ -387,7 +449,7 @@
                         </button>
                     </div>
 
-                    <div id="kesimpulan" class="grid gap-5 w-full"></div>
+
 
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5" style="margin-top: 20px">
 
@@ -452,14 +514,15 @@
 @endsection
 @include('lpj::surveyor.js.utils')
 <script type="text/javascript">
-
+    let data = @json($resumeData ?? 0);
+    console.log(data);
     let counter = 3;
 
     function tambahKesimpulanNilai() {
-        const kesimpulan = document.getElementById('kesimpulan');
+        const kesimpulan = document.getElementById('kesimpulans');
 
         kesimpulan.innerHTML += `
-        <div class="grid gap-5 w-full" id="kesimpulan-${counter}">
+        <div class="grid gap-5 w-full mt-5" id="kesimpulan-${counter}">
 
 
             <div class="flex flex-wrap items-baseline w-full">
@@ -467,7 +530,9 @@
                     <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm mt-5">
 
                                     <input type="text" name="tambahan_nama_kesimpulan[]"
-                                        class="input number-format">
+                                        class="input number-format"
+                                        placeholder="Masukkan Nama Kesimpulan.."
+                                        >
 
                         <thead>
 
@@ -476,6 +541,8 @@
                                 <th class="text-center">Luas Tanah</th>
                                 <th class="text-center">Luas Bangunan</th>
                                 <th class="text-center">Nilai Pasar Wajar</th>
+                                <th class="text-center">Likuidasi</th>
+                                <th class="text-center">Total Nilai Likuidasi</th>
                                 <th class="text-center">Aksi</th>
                             </tr>
                         </thead>
@@ -495,8 +562,17 @@
                                 </td>
                                 <td class="text-center">
                                     <input type="text" name="tambahan_nilai[]"
-                                        class="input currency-format">
+                                        class="input currency-format nilai-pasar">
                                 </td>
+                                 <td class="text-center">
+                                                        <input type="text" name="tambahan_nilai_likuidasi[]"
+                                                            class="input  likuidasi"
+                                                            onkeyup="calculateTotal(this)">
+                                                    </td>
+                                                    <td class="text-center">
+                                                        <input type="text" name="tambahan_total_likuidasi[]"
+                                                            class="input  currency-format total-likuidasi" >
+                                                    </td>
                                 <td class="text-center">
                                     <button type="button" class="btn btn-danger" onclick="deleteRow(this)">Delete</button>
                                 </td>
@@ -508,17 +584,17 @@
         </div>
     `;
 
-    const newCurrencyInputs = kesimpulan.querySelectorAll(`#kesimpulan-${counter} .currency-format`);
-    newCurrencyInputs.forEach(input => {
-        input.addEventListener('input', function() {
-            handleCurrencyInput(this);
-        });
+        const newCurrencyInputs = kesimpulan.querySelectorAll(`#kesimpulan-${counter} .currency-format`);
+        newCurrencyInputs.forEach(input => {
+            input.addEventListener('input', function() {
+                handleCurrencyInput(this);
+            });
 
-        // Format initial value jika ada
-        if (input.value) {
-            input.value = formatCurrency(input.value);
-        }
-    });
+            // Format initial value jika ada
+            if (input.value) {
+                input.value = formatCurrency(input.value);
+            }
+        });
         counter++;
     }
 
@@ -638,7 +714,10 @@
                 sertifikat: row.querySelector('input[name="fisik_sertifikat[]"]')?.value || "",
                 luas_tanah: row.querySelector('input[name="fisik_luas_tanah[]"]')?.value || "",
                 luas_bangunan: row.querySelector('input[name="fisik_luas_bangunan[]"]')?.value || "",
-                nilai: cleanCurrencyValue(row.querySelector('input[name="fisik_nilai[]"]')?.value || "")
+                nilai: cleanCurrencyValue(row.querySelector('input[name="fisik_nilai[]"]')?.value || ""),
+                likuidasi: row.querySelector('input[name="likuidasi[]"]')?.value || "",
+                total_likuidasi: cleanCurrencyValue(row.querySelector(
+                    'input[name="total_nilai_likuidasi[]"]')?.value || "")
             };
             if (fisikData.sertifikat) {
                 jsonData.fisik.push(fisikData);
@@ -651,7 +730,10 @@
                 sertifikat: row.querySelector('input[name="sesuai_sertifikat[]"]')?.value || "",
                 luas_tanah: row.querySelector('input[name="sesuai_luas_tanah[]"]')?.value || "",
                 luas_bangunan: row.querySelector('input[name="sesuai_luas_bangunan[]"]')?.value || "",
-                nilai: cleanCurrencyValue(row.querySelector('input[name="sesuai_nilai[]"]')?.value || "")
+                nilai: cleanCurrencyValue(row.querySelector('input[name="sesuai_nilai[]"]')?.value || ""),
+                likuidasi: row.querySelector('input[name="sesuai_likuidasi[]"]')?.value || "",
+                total_likuidasi: cleanCurrencyValue(row.querySelector(
+                    'input[name="sesuai_total_likuidasi[]"]')?.value || "")
             };
             if (imbData.sertifikat) {
                 jsonData.sesuai_imb.push(imbData);
@@ -665,13 +747,16 @@
                 sertifikat: row.querySelector('input[name="tambahan_sertifikat[]"]')?.value || "",
                 luas_tanah: row.querySelector('input[name="tambahan_luas_tanah[]"]')?.value || "",
                 luas_bangunan: row.querySelector('input[name="tambahan_luas_bangunan[]"]')?.value || "",
-                nilai: cleanCurrencyValue(row.querySelector('input[name="tambahan_nilai[]"]')?.value || "")
+                nilai: cleanCurrencyValue(row.querySelector('input[name="tambahan_nilai[]"]')?.value || ""),
+                likuidasi: row.querySelector('input[name="tambahan_nilai_likuidasi[]"]')?.value || "",
+                total_likuidasi: cleanCurrencyValue(row.querySelector(
+                    'input[name="tambahan_total_likuidasi[]"]')?.value || "")
             };
             console.log(imbData);
             if (imbData.sertifikat) {
                 jsonData.tambahan.push(imbData);
             }
-         });
+        });
 
         // Ambil keterangan
         const keterangan = formElement.querySelector('textarea[name="keterangan"]')?.value || "";
@@ -684,27 +769,81 @@
     }
 
     document.addEventListener('DOMContentLoaded', function() {
-            // Initialize currency format for existing inputs
-            document.querySelectorAll('.currency-format').forEach(input => {
-                input.addEventListener('input', function() {
-                    handleCurrencyInput(this);
-                });
-
-                // Format initial values if they exist
-                if (input.value) {
-                    input.value = formatCurrency(input.value);
-                }
+        // Initialize currency format for existing inputs
+        document.querySelectorAll('.currency-format').forEach(input => {
+            input.addEventListener('input', function() {
+                handleCurrencyInput(this);
             });
+
+            // Format initial values if they exist
+            if (input.value) {
+                input.value = formatCurrency(input.value);
+            }
         });
+    });
 
     function handleCurrencyInput(input) {
-            const value = input.value.replace(/[^\d]/g, '');
-            input.value = formatCurrency(value);
+        const value = input.value.replace(/[^\d]/g, '');
+        input.value = formatCurrency(value);
+    }
+
+    function cleanCurrencyValue(value) {
+        return value.replace(/[^\d]/g, '');
+    }
+
+    function calculateTotal(element) {
+
+
+        const row = element.closest('tr');
+
+        const nilaiPasarInput = row.querySelector('.nilai-pasar');
+        let likuidasiInput = row.querySelector('.likuidasi');
+
+        const totalLikuidasiInput = row.querySelector('.total-likuidasi');
+
+        // Bersihkan nilai dari karakter non-digit
+        const cleanNilaiPasar = cleanCurrencyValue(nilaiPasarInput.value);
+        const cleanLikuidasi = cleanCurrencyValue(likuidasiInput.value);
+        likuidasiInput.value = formatPercentages(likuidasiInput.value);
+        // Konversi ke angka
+        const nilaiPasar = parseFloat(cleanNilaiPasar) || 0;
+        let likuidasi = parseFloat(cleanLikuidasi) || 0;
+
+        // Jika nilai likuidasi lebih dari 100, reset ke nilai awal yang diinputkan
+        if (likuidasi > 100) {
+            likuidasi = parseFloat(cleanLikuidasi) || 0; // Reset ke nilai awal
+            likuidasiInput.value = likuidasi
         }
-        function cleanCurrencyValue(value) {
-    return value.replace(/[^\d]/g, '');
-}
 
+        // Pastikan nilai likuidasi tidak melebihi 100
+        likuidasi = Math.min(likuidasi, 100);
 
+        // Hitung total likuidasi
+        const totalLikuidasi = nilaiPasar - (nilaiPasar * (likuidasi / 100));
+
+        // Tampilkan hasil dengan format yang benar
+        totalLikuidasiInput.value = formatCurrency(totalLikuidasi.toString());
+    }
+
+    function formatPercentages(value) {
+        // Hapus semua karakter kecuali angka dan koma
+        let numericValue = value.replace(/[^0-9,]/g, '');
+
+        // Pastikan hanya satu koma yang ada
+        let parts = numericValue.split(',');
+        if (parts.length > 2) {
+            numericValue = parts[0] + ',' + parts[1]; // Pertahankan hanya bagian pertama dan kedua
+        }
+
+        // Jika nilai melebihi 100, batasi menjadi 100
+        let numericFloat = parseFloat(numericValue.replace(',', '.')) || 0;
+        if (numericFloat > 100) {
+            numericFloat = 100;
+            numericValue = '100';
+        }
+
+        // Kembalikan nilai dengan simbol %
+        return numericValue;
+    }
 
 </script>
diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php
index 44c22a7..fcc8b8f 100644
--- a/resources/views/penilai/lampiran.blade.php
+++ b/resources/views/penilai/lampiran.blade.php
@@ -7,19 +7,17 @@
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
         @if (Auth::user()->hasAnyRole(['senior-officer']))
-        @include('lpj::component.detail-jaminan', [
-            'backLink' => 'otorisator.view-laporan',
-            'queryParams' => [
-                'permohonanId' => request()->query('permohonanId'),
-                'documentId' => request()->query('documentId'),
-                'inspeksiId' => request()->query('inspeksiId'),
-                'jaminanId' => request()->query('jaminanId'),
-                'statusLpj' => 1,
-            ],
-            'title' => 'Paparan dokument',
-        ])
-
-
+            @include('lpj::component.detail-jaminan', [
+                'backLink' => 'otorisator.view-laporan',
+                'queryParams' => [
+                    'permohonanId' => request()->query('permohonanId'),
+                    'documentId' => request()->query('documentId'),
+                    'inspeksiId' => request()->query('inspeksiId'),
+                    'jaminanId' => request()->query('jaminanId'),
+                    'statusLpj' => 1,
+                ],
+                'title' => 'Paparan dokument',
+            ])
         @else
             @include('lpj::component.detail-jaminan', [
                 'backLink' => 'penilai.show',
@@ -29,5 +27,31 @@
         @endif
 
         @include('lpj::penilai.components.foto-lampiran')
+
+        <div class="card">
+            <div class="card-header bg-agi-50 uppercase">
+                Kertas Kerja
+            </div>
+            <div class="card-body flex items-center justify-between">
+                @php
+                    $url = '';
+                    $fileName = '';
+                    if ($penilai && $penilai->kertas_kerja) {
+                        $url = asset('storage/' . $penilai->kertas_kerja);
+                        $fileName = basename($penilai->kertas_kerja);
+                    }
+                @endphp
+
+                @if ($penilai && $penilai->kertas_kerja)
+                    <button type="button" class="btn btn-primary" onclick="window.open('{{ $url }}', '_blank')">
+                        <i class="ki-outline ki-cloud-download"></i>
+                        Lihat Kertas Kerja</button>
+
+                    <p class="text-2sm text-gray-700">{{ $fileName }}</p>
+                @else
+                    <p class="text-2sm text-gray-700">Belum ada kertas kerja</p>
+                @endif
+            </div>
+        </div>
     </div>
 @endsection
diff --git a/resources/views/penilaian/paparan-so.blade.php b/resources/views/penilaian/paparan-so.blade.php
index fe74d84..4b4cbc1 100644
--- a/resources/views/penilaian/paparan-so.blade.php
+++ b/resources/views/penilaian/paparan-so.blade.php
@@ -245,8 +245,8 @@
                 approval_so: {
                     title: 'Approval SO',
                     render: (item, data) => {
-                        if(data.authorization.approve_so) {
-                            return `${data.authorization.approve_so.name} | ${window.formatTanggalIndonesia(data.authorization.approve_so_at)}`;
+                        if(data?.authorization?.approve_so) {
+                            return `${data?.authorization?.approve_so?.name} | ${window.formatTanggalIndonesia(data?.authorization?.approve_so_at)}`;
                         }
                         return '';
                     },
@@ -254,8 +254,8 @@
                 approval_dd: {
                     title: 'Approval DD',
                     render: (item, data) => {
-                        if(data.authorization.approve_dd) {
-                            return `${data.authorization.approve_dd.name} | ${window.formatTanggalIndonesia(data.authorization.approve_dd_at)}`;
+                        if(data?.authorization?.approve_dd) {
+                            return `${data?.authorization?.approve_dd?.name} | ${window.formatTanggalIndonesia(data?.authorization?.approve_dd_at)}`;
                         }
                         return '';
                     },
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 0173111..70455f8 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -12,9 +12,20 @@
                     <i class="ki-filled ki-exit-left"></i> Back
                 </a>
             @else
-                <a href="{{ url()->previous() }}" class="btn btn-xs btn-info">
-                    <i class="ki-filled ki-exit-left"></i> Back
-                </a>
+                @php
+                    use Illuminate\Support\Facades\Route;
+                @endphp
+                @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) &&
+                        Route::currentRouteName('otorisator.show'))
+                    <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => 'Pelaporan']) }}"
+                        class="btn btn-xs btn-info">
+                        <i class="ki-filled ki-exit-left"></i> Back
+                    </a>
+                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
+                    <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
+                        <i class="ki-filled ki-exit-left"></i> Back
+                    </a>
+                @endif
             @endif
             {{-- <a href="{{ route('surveyor.show', ['id' => request('inspeksi')]) }}" class="btn btn-xs btn-info">
                 <i class="ki-filled ki-exit-left"></i> Back
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index 1de2703..2e74dfa 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -527,17 +527,16 @@
 
     <tr>
         @php
+            $hubCadebPenghuni = $forminspeksi['asset']['hub_cadeb_penghuni'] ?? null;
 
-            $cekHub =
-                isset($forminspeksi['asset']['hub_cadeb_penghuni']) &&
-                $forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai'
-                    ? 'sesuai'
-                    : 'tidak sesuai';
+            $cekHub = $hubCadebPenghuni === 'sesuai' ? 'sesuai' : 'tidak sesuai';
 
-            $hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub])
-                ? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai']
-                : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'];
+            $hubCadeb =
+                is_array($hubCadebPenghuni) && isset($hubCadebPenghuni[$cekHub])
+                    ? $hubCadebPenghuni[$cekHub]
+                    : $hubCadebPenghuni[$cekHub] ?? null;
         @endphp
+
         <td><strong>Hubungan Penghuni Jaminan dengan Debitur</strong></td>
         <td>
             @if (isset($basicData['hubPenghuni']))