diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 546a6cd..d040145 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -730,6 +730,7 @@ class SurveyorController extends Controller
                 'lingkungan' => 'validateLingkungan',
                 'fakta' => 'validateFactData',
                 'rap' => 'validateRapData',
+                'apartemen-kantor' => 'validateUnitData',
             ];
 
             // Ambil data inspeksi
diff --git a/app/Services/PermohonanHistoryService.php b/app/Services/PermohonanHistoryService.php
index 3b9e60c..05bf609 100644
--- a/app/Services/PermohonanHistoryService.php
+++ b/app/Services/PermohonanHistoryService.php
@@ -10,6 +10,7 @@ class PermohonanHistoryService
     public function createHistory(Permohonan $permohonan, string $status, ?string $keterangan, array $beforeRequest, array $afterRequest, ?string $filePath = null)
     {
         try {
+
             $history = PermohonanHistory::create([
                 'permohonan_id' => $permohonan->id,
                 'status' => $status,
diff --git a/app/Services/SurveyorValidateService.php b/app/Services/SurveyorValidateService.php
index 8ee8506..04631e5 100644
--- a/app/Services/SurveyorValidateService.php
+++ b/app/Services/SurveyorValidateService.php
@@ -388,5 +388,47 @@ class SurveyorValidateService
     }
 
 
+    public function validateUnitData(array $data): array
+{
+    $invalidFields = [];
+
+    // Validasi action
+    if (empty($data['action'])) {
+        $invalidFields[] = 'Action harus diisi';
+    }
+
+    // Validasi luas_unit
+    if (empty($data['luas_unit'])) {
+        $invalidFields[] = 'Luas unit harus diisi';
+    }
+
+    // Validasi kondisi_unit
+    if (empty($data['kondisi_unit'])) {
+        $invalidFields[] = 'Kondisi unit harus diisi';
+    }
+
+    // Validasi posisi_unit
+    if (empty($data['posisi_unit'])) {
+        $invalidFields[] = 'Posisi unit harus diisi';
+    }
+
+    // Validasi lantai
+    if (empty($data['lantai'])) {
+        $invalidFields[] = 'Lantai harus diisi';
+    }
+
+    // Validasi view
+    if (empty($data['view'])) {
+        $invalidFields[] = 'View harus diisi';
+    }
+
+    // Validasi bentuk_unit
+    if (empty($data['bentuk_unit'])) {
+        $invalidFields[] = 'Bentuk unit harus diisi';
+    }
+
+    return $invalidFields;
+}
+
 
 }
diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php
index c45ddf4..6934bab 100644
--- a/resources/views/component/form-penilai.blade.php
+++ b/resources/views/component/form-penilai.blade.php
@@ -60,7 +60,7 @@
                         $labelNilai = [
                             'bangunan' => 'Luas Bangunan',
                             'tanah' => 'Luas Tanah',
-                            'apartement-kantor' => 'Luas Apartemen/Kantor',
+                            'apartemen-kantor' => 'Luas Unit',
                             'alat-berat' => 'Luas Alat Berat',
                             'mesin' => 'Luas Mesin',
                             'kendaraan' => 'Luas Kendaraan',
@@ -85,6 +85,8 @@
                                 $luas =
                                     $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ??
                                     ($forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null);
+                            } else if ($item === 'apartemen-kantor') {
+                                $luas = $forminspeksi['luas_unit']['sesuai'] ?? ($forminspeksi['luas_unit']['tidak sesuai'] ?? null);
                             } else {
                                 $luas = null;
                             }
@@ -234,7 +236,7 @@
 
 </div>
 <script type="text/javascript">
-    const datas = @json($forminspeksi);
+    const datas = @json($lpjData);
     console.log(datas);
 
     document.addEventListener('DOMContentLoaded', function() {
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index e39dc9b..fbb0b38 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -205,17 +205,16 @@
                     <tr>
                         @php
 
-                            $cekHub =
-                                isset($forminspeksi['asset']['hub_cadeb']) &&
-                                $forminspeksi['asset']['hub_cadeb'] === 'sesuai'
-                                    ? 'sesuai'
-                                    : 'tidak sesuai';
+                        $cekHub =
+                            isset($forminspeksi['asset']['hub_cadeb']) && $forminspeksi['asset']['hub_cadeb'] === 'sesuai'
+                                ? 'sesuai'
+                                : 'tidak sesuai';
 
-                            $hubCadeb = isset($forminspeksi['asset']['hub_cadeb'][$cekHub])
-                                ? $forminspeksi['asset']['hub_cadeb']['tidak sesuai']
-                                : $forminspeksi['asset']['hub_cadeb']['sesuai'];
-                        @endphp
-                        <td style=" padding: 2px; vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitu</td>
+                                $hubCadeb = $cekHub === 'sesuai'
+        ? ($forminspeksi['asset']['hub_cadeb']['sesuai'] ?? null)
+        : ($forminspeksi['asset']['hub_cadeb']['tidak sesuai'] ?? null);
+                    @endphp
+                        <td style=" padding: 2px; vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitur</td>
                         <td style=" padding: 2px; vertical-align: top;">:</td>
                         <td style=" padding: 2px; vertical-align: top;">{{ $hubCadeb ?? '' }}</td>
                     </tr>
@@ -483,15 +482,15 @@
                                     <table>
                                         <tr>
                                             @php
-                                                $cekLuas = isset($forminspeksi['luas_unit']['tidak sesuai'])
-                                                    ? 'tidak sesuai'
-                                                    : 'sesuai';
+            $cekLuas = isset($forminspeksi['luas_unit']['tidak sesuai'])
+                ? 'tidak sesuai'
+                : 'sesuai';
 
-                                                $luas = $forminspeksi['luas_unit'][$cekLuas] ?? null;
-                                            @endphp
+            $luas = $forminspeksi['luas_unit'][$cekLuas] ?? null;
+        @endphp
                                             <td style="padding: 2px; vertical-align: top;">Luas Unit</td>
                                             <td style="padding: 2px; vertical-align: top;">:</td>
-                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }}</td>
+                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} m<sup>2</sup> </td>
                                         </tr>
                                         <tr>
                                             <td style="padding: 2px; vertical-align: top;">Bentuk Unit</td>
@@ -724,7 +723,7 @@
                             $labelNilai = [
                                 'bangunan' => 'Luas Bangunan',
                                 'tanah' => 'Luas Tanah',
-                                'apartement-kantor' => 'Luas Apartemen/Kantor',
+                                'apartemen-kantor' => 'Luas Unit',
                                 'alat-berat' => 'Luas Alat Berat',
                                 'mesin' => 'Luas Mesin',
                                 'kendaraan' => 'Luas Kendaraan',
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
index e284caa..791fdf8 100644
--- a/resources/views/penilai/components/print-out-standar.blade.php
+++ b/resources/views/penilai/components/print-out-standar.blade.php
@@ -185,9 +185,10 @@
                             ? 'sesuai'
                             : 'tidak sesuai';
 
-                    $hubCadeb = isset($forminspeksi['asset']['hub_cadeb'][$cekHub])
-                        ? $forminspeksi['asset']['hub_cadeb']['tidak sesuai']
-                        : $forminspeksi['asset']['hub_cadeb']['sesuai'];
+
+                            $hubCadeb = $cekHub === 'sesuai'
+        ? ($forminspeksi['asset']['hub_cadeb']['sesuai'] ?? null)
+        : ($forminspeksi['asset']['hub_cadeb']['tidak sesuai'] ?? null);
                 @endphp
                 <td style="width:25%; padding: 2px; vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitur</td>
                 <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
@@ -203,8 +204,8 @@
                             : 'tidak sesuai';
 
                     $hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub])
-                        ? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai']
-                        : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'];
+                        ? ($forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'] ?? null)
+                        : ($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'] ?? null);
                 @endphp
                 <td style=" padding: 2px; vertical-align: top;">Hubungan Penghuni Jaminan dengan Debitur</td>
                 <td style=" padding: 2px; vertical-align: top;">:</td>
@@ -262,7 +263,7 @@
                 $labelNilai = [
                     'bangunan' => 'Luas Bangunan',
                     'tanah' => 'Luas Tanah',
-                    'apartement-kantor' => 'Luas Apartemen/Kantor',
+                    'apartemen-kantor' => 'Luas Unit',
                     'alat-berat' => 'Luas Alat Berat',
                     'mesin' => 'Luas Mesin',
                     'kendaraan' => 'Luas Kendaraan',