diff --git a/Modules/Linksehat/Http/Controllers/Api/ProfileController.php b/Modules/Linksehat/Http/Controllers/Api/ProfileController.php
index e7134448..8e33befd 100644
--- a/Modules/Linksehat/Http/Controllers/Api/ProfileController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/ProfileController.php
@@ -79,7 +79,7 @@ class ProfileController extends Controller
             'first_name' => 'required',
             'last_name' => 'required',
             'date_of_birth' => 'required',
-            'email' => 'required',
+            // 'email' => 'required',
         ]);
     
 
diff --git a/Modules/Linksehat/Transformers/User/ShowProfileResource.php b/Modules/Linksehat/Transformers/User/ShowProfileResource.php
index eb4299ef..1d0b5433 100644
--- a/Modules/Linksehat/Transformers/User/ShowProfileResource.php
+++ b/Modules/Linksehat/Transformers/User/ShowProfileResource.php
@@ -47,51 +47,11 @@ class ShowProfileResource extends JsonResource
         }
 
         // Marital Status
-        switch ($this->detail->sMartialStatus) {
-            case "1":
-                $maritalStatus = 'Single';
-                break;
-            case "2": 
-                $maritalStatus = 'Married';
-                break;
-            case "3":
-                $maritalStatus = 'Widowed';
-                break;            
-            default:
-               $maritalStatus = '-';
-                break;
-        }
+        $maritalStatus = DB::connection('oldlms')->table('tm_status_pernikahan')->where('nID', $this->detail->sMartialStatus)->first('sStatusPernikahan');
 
         // Hubungan Keluarga
-        switch ($this->detail->nIDHubunganKeluarga) {
-            case 1:
-                $relationship = 'Father';
-                break;
-            case 2: 
-                $relationship = 'Mother';
-                break;
-            case 3:
-                $relationship = 'Husband';  
-                break;          
-            case 4:
-                $relationship = 'Wife';  
-                break;          
-            case 5:
-                $relationship = 'Child';  
-                break;          
-            case 6:
-                $relationship = 'Grandmother';  
-                break;          
-            case 7:
-                $relationship = 'Grandfather';  
-                break;          
-            case 8:
-                $relationship = 'Sibling';  
-                break;          
-            default:
-               $relationship = '-';
-                break;
-        }
+        $relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $this->nIDHubunganKeluarga)->first('sHubunganKeluarga');
+        // dd( $this->detail->nIDGolonganDarah);
 
         return [
             'id' => $this->nID,
@@ -103,8 +63,8 @@ class ShowProfileResource extends JsonResource
             'phone' => $this->sPhone,
             'email' => $this->sEmail,
             'blood_type' => $goldar,
-            'marital_status' => $maritalStatus,
-            'relationship' => $relationship,
+            'marital_status' => $maritalStatus ? $maritalStatus->sStatusPernikahan : '-',
+            'relationship' => $relationship ?  $relationship->sHubunganKeluarga : '-',
             'weight' => $this->detail->sWeight,
             'height' => $this->detail->sHeight,
         ];
diff --git a/Modules/Linksehat/Transformers/User/UserProfileResource.php b/Modules/Linksehat/Transformers/User/UserProfileResource.php
index a7f80f0c..3bc07332 100644
--- a/Modules/Linksehat/Transformers/User/UserProfileResource.php
+++ b/Modules/Linksehat/Transformers/User/UserProfileResource.php
@@ -43,13 +43,12 @@ class UserProfileResource extends JsonResource
                 $urlAvatarDefault = $m['detail']['nIDJenisKelamin'] == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/male-avatar.png';
                 $avatarMember = $m['detail']['sImage'] ?? $urlAvatarDefault;
                 $relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $m['nIDHubunganKeluarga'])->first('sHubunganKeluarga');
-       
+               
                 $data = [
                     'id' => $m['nID'],
                     'name' => $m['full_name'],
-                    'relationship' => $relationship->sHubunganKeluarga,
+                    'relationship' => $relationship ? $relationship->sHubunganKeluarga : '-',
                     'avatar' => $avatarMember,
-                    
                 ];
 
                 array_push( $dataMemberProfile, $data);