diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index 6d0d02d..4f41f12 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -3,32 +3,67 @@ namespace App\Controllers;
 
 class PrintResult extends BaseController {
 
+	function checkRange($input, $normal_range) {
+		// Ekstrak angka dari input dan default menggunakan regex
+		if (!preg_match('/^(\d+)\s*-\s*(\d+)$/', $input, $inputMatches) ||
+			!preg_match('/^(\d+)\s*-\s*(\d+)$/', $normal_range, $defaultMatches)) {
+			return false; // Jika format tidak sesuai, return false
+		}
+	
+		// Konversi ke integer
+		$inputMin = (int) $inputMatches[1];
+		$inputMax = (int) $inputMatches[2];
+		$defaultMin = (int) $defaultMatches[1];
+		$defaultMax = (int) $defaultMatches[2];
+	
+		// Cek apakah input berada dalam batas default
+		if ($inputMin < $defaultMin || $inputMax > $defaultMax) {
+			return ($inputMin < $defaultMin) ? "lebih kecil" : "lebih besar";
+		}
+	
+		return true;
+	}
+
 	public function otherTests($resultData, $data, $note) {
 
 		// Mengetahui Apakah User Login adalah Bali atau Surabaya
 		$cityid = session()->get('usercityid');
+
+		// Digunakan untuk mengetahui user yang melakukan Validasi khusus analis surabaya
+		foreach($resultData as $result) {
+			$uservalidator = $result['validator'];
+			break;
+		}
+
 		if ($cityid == 1) {
-			$doctor = "dr. I Komang Parwata Sp.PK";
-			$analyst = "Mrs. Gusti Ayu Riska Mastari";
-			$noreg = "Reg. No: 570/SIPDS/0001/I/DPMPTSP/2023";
-			$signature = "<img src='http://cmod.id/assets/img/ttd_dr_komang.png' alt=''>";
-		
+
+			if ($uservalidator != null){
+				$doctor = "dr. I Komang Parwata Sp.PK";
+				$analyst = "Mrs. Gusti Ayu Riska Mastari";
+				$noreg = "Reg. No: 570/SIPDS/0001/I/DPMPTSP/2023";
+				$signature = "<img src='http://cmod.id/assets/img/ttd_dr_komang.png' alt=''>";
+			} else {
+				$doctor = "Waiting for Validation";
+				$analyst = "Waiting for Validation";
+				$noreg = "Waiting for Validation";
+				$signature = "Waiting for Validation";
+			}
+			
 		} elseif ($cityid == 2) {
+
 			$doctor = "dr. I.G.A.A Putri Sri Rejeki, Sp.PK";
 			$noreg = "SIP : 503.446/1091/B/IP.DS/436.7.15/2022";
 			$signature = "<img id='ttd_p' src='http://cmod.id/assets/img/ttd_dr_putri.jpg' alt=''>";
 
-			// Digunakan untuk mengetahui user yang melakukan Validasi khusus analis surabaya
-			foreach($resultData as $result) {
-				$uservalidator = $result['validator'];
-				break;
-			}
 			if ($uservalidator == "MG") {
 				$analyst = "Mrs. Mega Rahayu Ningsih";
 			} else if ($uservalidator == "ACP") {
 				$analyst = "Mrs. Afrita Catur Pratiwi";
 			} else {
-				$analyst = "-";
+				$doctor = "Waiting for Validation";
+				$analyst = "Waiting for Validation";
+				$noreg = "Waiting for Validation";
+				$signature = "Waiting for Validation";
 			}
 
 		} else { //Jika Login Adalah Sistem dan tidak punya city id
diff --git a/app/Views/orders_edit.php b/app/Views/orders_edit.php
index b0c9411..fa7ed17 100644
--- a/app/Views/orders_edit.php
+++ b/app/Views/orders_edit.php
@@ -8,6 +8,8 @@ if ($usercityid == 1) {
 	date_default_timezone_set('Asia/Makassar');
 } else if ($usercityid == 2) {
 	date_default_timezone_set('Asia/Jakarta');
+} else {
+	date_default_timezone_set('Asia/Makassar');
 }
 $now = date('Y-m-d H:i');
 $visitdate = $now;