diff --git a/app/Services/PreviewLaporanService.php b/app/Services/PreviewLaporanService.php
index 014f9d2..f7e2acb 100644
--- a/app/Services/PreviewLaporanService.php
+++ b/app/Services/PreviewLaporanService.php
@@ -306,7 +306,7 @@ class PreviewLaporanService
 
         // Ambil data berdasarkan ID
         $statusLpj = Penilai::where('permohonan_id', $permohonan_id)
-            ->where('dokument_id', $dokumen_id)
+            //->where('dokument_id', $dokumen_id)
             ->first();
 
 
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php
index bd748f2..685cd39 100644
--- a/resources/views/penilai/components/signature-approval.blade.php
+++ b/resources/views/penilai/components/signature-approval.blade.php
@@ -54,10 +54,13 @@
                         </td>
                     @endif
                 @endif
-                @if ($permohonan->approval_dd != null)
-                    <td style=" padding: 4px;height: 25px">
-                        <b>Menyetujui</b>
-                    </td>
+
+                @if($permohonan->approval_dd!==$permohonan->approval_eo)
+                    @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;height: 25px">
+                            <b>Menyetujui</b>
+                        </td>
+                    @endif
                 @endif
             </tr>
 
@@ -91,12 +94,14 @@
                         </td>
                     @endif
                 @endif
-                @if ($permohonan->approval_dd != null)
-                    <td style=" padding: 4px;height: 75px">
-                        @if (file_exists($imagePathDD))
-                            <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
-                        @endif
-                    </td>
+                @if($permohonan->approval_dd!==$permohonan->approval_eo)
+                    @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;height: 75px">
+                            @if (file_exists($imagePathDD))
+                                <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
+                            @endif
+                        </td>
+                    @endif
                 @endif
             </tr>
             <tr>
@@ -106,19 +111,19 @@
                     </span>
                 </br>
                     <span>
-                        {{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
+                        {{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia(\Carbon\Carbon::createFromFormat('d/m/Y H:i:s', $permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : '' }}
                     </span>
                 </td>
                 @if($soUser->name==$eoUser->name)
-                    @if ($permohonan->approval_eo != null)
+                    @if ($permohonan->approval_so != null)
                         <td style=" padding: 4px;">
-                            {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            {{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
                             <span>
                                 <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
                             </span>
-                        </br>
+                            </br>
                             <span>
-                                {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
+                                {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
                             </span>
                         </td>
                     @endif
@@ -149,19 +154,21 @@
                         </td>
                     @endif
                 @endif
-                @if ($permohonan->approval_dd != null)
-                    <td style=" padding: 4px;">
-                        {{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                        <span>
-                            <b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
-                        </span>
-                         </br>
-                        <span>
-                            {{
-                                isset($permohonan->approval_dd_at) ?
-                                formatTanggalIndonesia($permohonan->approval_dd_at) : '' }}
-                        </span>
-                    </td>
+                @if($permohonan->approval_dd!==$permohonan->approval_eo)
+                    @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;">
+                            {{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                            <span>
+                                <b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
+                            </span>
+                            </br>
+                            <span>
+                                {{
+                                    isset($permohonan->approval_dd_at) ?
+                                    formatTanggalIndonesia($permohonan->approval_dd_at) : '' }}
+                            </span>
+                        </td>
+                    @endif
                 @endif
             </tr>
         </table>