diff --git a/htdocs/.env b/htdocs/.env
index 5c606699..107fa236 100644
--- a/htdocs/.env
+++ b/htdocs/.env
@@ -65,4 +65,6 @@ VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 VITE_PUSHER_HOST="${PUSHER_HOST}"
 VITE_PUSHER_PORT="${PUSHER_PORT}"
 VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
\ No newline at end of file
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+GETPASIEN_API=https://gomed.rssa.my.id/api/account/pasien
diff --git a/htdocs/app/Http/Controllers/PasienController.php b/htdocs/app/Http/Controllers/PasienController.php
index 92f670e0..02620521 100644
--- a/htdocs/app/Http/Controllers/PasienController.php
+++ b/htdocs/app/Http/Controllers/PasienController.php
@@ -105,48 +105,39 @@ class PasienController extends Controller
 			]);
 		} else {
 			try {
-				$client 		= new Client();
-				$res 			= $client->request('GET', 'http://10.10.123.51:8000/mr/'.$norm);
-				$response_data 	= json_decode($res->getBody()->getContents());
-				if (isset($response_data[0])) {
-					$hasil 		= $response_data[0];
-					$nama 		= $hasil->Nama;
-					$alamat 	= $hasil->Alamat;
-					$telpon 	= $hasil->Telp;
-					$kota 		= $hasil->Kota;
-					$kelamin 	= $hasil->JenisKelamin;
-					$tgllahir 	= $hasil->tanggal_lahir;
-					$nik 		= $hasil->nik;
-					$bpjs 		= $hasil->bpjs;
-					if ($kelamin == 'WANITA'){
-						$kelamin = 'P';
-					} else { $kelamin = 'L'; }
-					return response()->json([
-						'id' 		=> 'new', 
-						'norm' 		=> $norm,
-						'telpon' 	=> $telpon,
-						'nama'      => $nama,     
-						'tgl_lahir' => $tgllahir,
-						'jk'    	=> $kelamin,
-						'alamat'    => $alamat,
-						'kota'		=> $kota,
-						'nik'		=> $nik,
-						'bpjs'		=> $bpjs,
-					]);
-				} else {
-					return response()->json([
-						'id' 		=> '', 
-						'telpon' 	=> '000000000',
-						'norm' 		=> $norm,
-						'nama'      => '', 
-						'tgl_lahir' => date("d-m-Y"),
-						'jk'    	=> 'L',
-						'alamat'    => 'Malang',
-						'kota'		=> 'Malang',
-						'nik'		=> '',
-						'bpjs'		=> '',
-					]);
-				}
+				$client         = new Client();
+                $res            = $client->request('GET', env('GETPASIEN_API'), ['query' => ['limit' => 10, 'nomedis' => $norm]]);
+                $response_data  = json_decode($res->getBody()->getContents());
+                if (isset($response_data->response[0])) {
+                    $hasil      = $response_data->response[0];
+                    $nama       = $hasil->Nama;
+                    $alamat     = $hasil->Alamat;
+                    $telpon     = $hasil->Telp;
+                    $kota       = $hasil->Kota;
+                    $kelamin    = $hasil->JenisKelamin;
+                    $tgllahir   = $hasil->tanggal_lahir;
+                    return response()->json([
+                        'id'        => 'new',
+                        'norm'      => $norm,
+                        'telpon'    => $telpon,
+                        'nama'      => $nama,
+                        'tgl_lahir' => date('d-m-Y', strtotime($tgllahir)),
+                        'jk'        => $kelamin,
+                        'alamat'    => $alamat,
+                        'kota'      => $kota,
+                    ]);
+                } else {
+                    return response()->json([
+                        'id'            => '',
+                        'telpon'        => '000000000',
+                        'norm'          => $norm,
+                        'nama'          => '',
+                        'tgl_lahir'     => date("d-m-Y"),
+                        'jk'            => 'L',
+                        'alamat'        => 'Malang',
+                        'kota'          => 'Malang',
+                    ]);
+                }
 			}catch (Exception $e) {
 				return response()->json([
 					'id' 		=> '',