diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index fb6ba89..ea1c261 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -67,7 +67,13 @@ class PenilaianController extends Controller
                 } else {
                     $permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi)->first();
                     $teams_ids[] = $validatedData['teams_id'];
-                    $user_ids[] = $validatedData['surveyor_id'];
+
+                    if (isset($validatedData['penilai_surveyor_id'])) {
+                        $user_ids[] = $validatedData['penilai_surveyor_id'];
+                    } else {
+                        $user_ids[] = $validatedData['surveyor_id'];
+                    }
+
                     $roles[] = 'surveyor';
 
                 }
@@ -89,7 +95,13 @@ class PenilaianController extends Controller
                 } else {
                     $permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi)->first();
                     $teams_ids[] = $validatedData['teams_id'];
-                    $user_ids[] = $validatedData['penilai_id'];
+
+                    if (isset($validatedData['penilai_surveyor_id'])) {
+                        $user_ids[] = $validatedData['penilai_surveyor_id'];
+                    }else {
+                        $user_ids[] = $validatedData['penilai_id'];
+                    }
+
                     $roles[] = 'penilai';
 
                 }
diff --git a/app/Http/Requests/PenilaianRequest.php b/app/Http/Requests/PenilaianRequest.php
index af33782..a3c1db0 100644
--- a/app/Http/Requests/PenilaianRequest.php
+++ b/app/Http/Requests/PenilaianRequest.php
@@ -33,14 +33,16 @@ class PenilaianRequest extends FormRequest
             'tanggal_kunjungan'  => 'required|max:255',
             'status'             => 'required|string',
             'nomor_registrasi'   => 'required|string',
-            'surveyor_id'        => 'nullable|  required_without:penilai_surveyor_id',
-            'penilai_id'       => 'nullable|required_without:penilai_surveyor_id',
-            'penilai_surveyor_id' => 'nullable|required_without_all:surveyor_id,penilai_id',
-            'surveyor_region_id'  => 'nullable|required_without:surveyor_id',
-            'penilai_region_id'  => 'nullable|required_without:penilai_id',
+
+            'surveyor_id'        => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_region_id,penilai_id',
+            'penilai_id'         => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_region_id,surveyor_id',
+            'penilai_surveyor_id' => 'nullable',
+            'surveyor_region_id' => 'nullable|required_without_all:penilai_surveyor_id,penilai_region_id,penilai_id,surveyor_id',
+            'penilai_region_id'  => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_id,surveyor_id',
 
             'keterangan'         => 'nullable',
         ];
+
     }