diff --git a/app/Controllers/Equipment.php b/app/Controllers/Equipment.php
index 785bfed..b47ea7c 100644
--- a/app/Controllers/Equipment.php
+++ b/app/Controllers/Equipment.php
@@ -56,30 +56,50 @@ class Equipment extends BaseController {
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$data['testcount'] = $results[0]['testcount'];
+
+		$timezone = 7;
+		if ($timezone == 7) {
+			$data['timezone'] = "WIB";
+		} else if ($timezone == 8) {
+			$data['timezone'] = "WITA";
+		} else if ($timezone == 9) {
+			$data['timezone'] = "WIT";
+		} else {
+			$data['timezone'] = "";
+		}
 		
-		$sql = "SELECT DATEDIFF(
-				MAX(ResultDateTime), 
-				MIN(ResultDateTime)) as days, 
-				MIN(ResultDateTime) as firstdate, 
-				MAX(ResultDateTime) as lastdate 
-				FROM patres 
-				WHERE EquipmentID='$EquipmentID';";
+		$sql = "SELECT 
+					DATEDIFF(
+						MAX(ResultDateTime + INTERVAL $timezone HOUR), 
+						MIN(ResultDateTime + INTERVAL $timezone HOUR)
+					) AS days,
+					MIN(ResultDateTime + INTERVAL $timezone HOUR) AS firstdate,
+					MAX(ResultDateTime + INTERVAL $timezone HOUR) AS lastdate
+				FROM patres
+				WHERE EquipmentID = '$EquipmentID'";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$data['days'] = $results[0]['days'];
 		$data['firstdate'] = $results[0]['firstdate'];
 		$data['lastdate'] = $results[0]['lastdate'];
 
-		$sql = "SELECT YEAR(ResultDateTime) AS year, MONTH(ResultDateTime) AS month, COUNT(*) AS count 
-		FROM patres 
-		WHERE EquipmentID = '$EquipmentID' 
-		GROUP BY YEAR(ResultDateTime), MONTH(ResultDateTime) 
-		ORDER BY YEAR(ResultDateTime), MONTH(ResultDateTime);";
+		$sql = "SELECT 
+					YEAR(ResultDateTime + INTERVAL 7 HOUR) AS year,
+					MONTH(ResultDateTime + INTERVAL 7 HOUR) AS month,
+					COUNT(*) AS count
+				FROM patres
+				WHERE EquipmentID = '$EquipmentID'
+				GROUP BY 
+					YEAR(ResultDateTime + INTERVAL 7 HOUR),
+					MONTH(ResultDateTime + INTERVAL 7 HOUR)
+				ORDER BY 
+					YEAR(ResultDateTime + INTERVAL 7 HOUR),
+					MONTH(ResultDateTime + INTERVAL 7 HOUR)";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
 		$data['counts'] = $results;
 		
-		$sql = "SELECT SampleID,TestTechCode,Result,ResultDateTime,CreateDate FROM patres 
+		$sql = "SELECT ResultDateTime + INTERVAL $timezone HOUR AS ResultDateTime, CreateDate + INTERVAL $timezone HOUR AS CreateDate FROM patres 
 				WHERE EquipmentID='$EquipmentID' 
 				ORDER BY ResultID DESC
 				LIMIT 3000";
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index 65d345a..155581a 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -39,37 +39,50 @@ class Home extends BaseController {
 				];
 
 			// Mengelompokkan Data Khusus 1024i
-			} else if ($item["productaliasid"] == 18) {
-				$productList1024i[] = [
-					"productaliasid" => $item["productaliasid"], 
-					"productnumber" => $item["productnumber"], 
-					"sitename" => $item["sitename"]
-				];
+			} 
+			// else if ($item["productaliasid"] == 18) {
+			// 	$productList1024i[] = [
+			// 		"productaliasid" => $item["productaliasid"], 
+			// 		"productnumber" => $item["productnumber"], 
+			// 		"sitename" => $item["sitename"]
+			// 	];
 
-			// Mengelompokkan Data Khusus 24i
-			} else if ($item["productaliasid"] == 19) {
-				$productList24i[] = [
-					"productaliasid" => $item["productaliasid"], 
-					"productnumber" => $item["productnumber"], 
-					"sitename" => $item["sitename"]
-				];
+			// // Mengelompokkan Data Khusus 24i
+			// } else if ($item["productaliasid"] == 19) {
+			// 	$productList24i[] = [
+			// 		"productaliasid" => $item["productaliasid"], 
+			// 		"productnumber" => $item["productnumber"], 
+			// 		"sitename" => $item["sitename"]
+			// 	];
 			
-			// Mengelompokkan Data Khusus 50i
-			} else if ($item["productaliasid"] == 21) {
-				$productList50i[] = [
-					"productaliasid" => $item["productaliasid"], 
-					"productnumber" => $item["productnumber"], 
-					"sitename" => $item["sitename"]
-				];
-			} else {
-				$productList30i = null;
-				$productList1024i = null;
-				$productList24i = null;
-				$productList50i = null;
-			}
+			// // Mengelompokkan Data Khusus 50i
+			// } else if ($item["productaliasid"] == 21) {
+			// 	$productList50i[] = [
+			// 		"productaliasid" => $item["productaliasid"], 
+			// 		"productnumber" => $item["productnumber"], 
+			// 		"sitename" => $item["sitename"]
+			// 	];
+			// } else {
+			// 	$productList30i = null;
+			// 	$productList1024i = null;
+			// 	$productList24i = null;
+			// 	$productList50i = null;
+			// }
 		}
 
-		$sql = "SELECT EquipmentID, COUNT(*) AS patresCount, MAX(ResultDateTime) AS lastResultDate 
+		$timezone = 7;
+		if ($timezone == 7) {
+			$data['timezone'] = "WIB";
+		} else if ($timezone == 8) {
+			$data['timezone'] = "WITA";
+		} else if ($timezone == 9) {
+			$data['timezone'] = "WIT";
+		} else {
+			$data['timezone'] = "";
+		}
+
+		$sql = "SELECT EquipmentID, COUNT(*) AS patresCount,
+						DATE_ADD(MAX(ResultDateTime), INTERVAL $timezone HOUR) AS lastResultDate
 				FROM patres
 				GROUP BY EquipmentID
 				ORDER BY patresCount DESC";
@@ -107,7 +120,6 @@ class Home extends BaseController {
 		}
 
 		// kalau tidak ada data, $tms30i akan tetap berupa array kosong []
-		// $data['tms30i'] = $tms30i;
 		$data['tms30i'] = $tms30i ?? [];
 
 		return view('home_dashboard.php', $data);
diff --git a/app/Views/equipment_detail_test.php b/app/Views/equipment_detail_test.php
index a480081..f3d3112 100644
--- a/app/Views/equipment_detail_test.php
+++ b/app/Views/equipment_detail_test.php
@@ -48,19 +48,7 @@
 	<div class="card shadow-none">
 		
 		<div class="card-header">
-			<?php if ($EquipmentID == '6011310722') : ?>
-				<div class="fw-bold">National Hospital Surabaya<span class="float-end p-0">TMS 30i &nbsp;<i class="bi bi-pc-display-horizontal"></i></span></div>
-			<?php elseif ($EquipmentID == '6015090124') : ?>
-				<div class="fw-bold">Persada Hospital</div>
-			<?php elseif ($EquipmentID == '6011320722') : ?>
-				<div class="fw-bold">RS Mardi Rahayu Kudus</div>
-			<?php elseif ($EquipmentID == '6005840519') : ?>
-				<div class="fw-bold">RS dr. Oen Kandang Sapi Solo</div>
-			<?php elseif ($EquipmentID == '6006100619') : ?>
-				<div class="fw-bold">RS Permata Cibubur</div>
-			<?php elseif ($EquipmentID == '6015560324') : ?>
-				<div class="fw-bold">ScanMe Labs Jakarta Kelapa Gading</div>
-			<?php endif; ?>
+			-
 		</div>
 
 		<div class="card-body p-4">
@@ -149,10 +137,10 @@
 					<div class="col-12 mb-3">
 						<div class="row text-center p-2 mt-1">
 							<div class="col-12 col-md-6">
-								Tanggal Awal : <span class="fw-bold"><?=$formatedFirstDate;?></span>
+								Tanggal Awal : <span class="fw-bold"><?=$formatedFirstDate;?> (<?=$timezone;?>)</span>
 							</div>
 							<div class="col-12 col-md-6">
-								Tanggal Akhir : <span class="fw-bold"><?=$formatedLastDate;?></span>
+								Tanggal Akhir : <span class="fw-bold"><?=$formatedLastDate;?> (<?=$timezone;?>)</span>
 							</div>
 						</div>
 					</div>
@@ -176,8 +164,8 @@
 								<th scope="col">Sample ID</th>
 								<th scope="col">Test Code</th>
 								<th scope="col">Result</th>
-								<th scope="col">Result Date</th>
-								<th scope="col">Create Date</th>
+								<th scope="col">Result Date (<?=$timezone;?>)</th>
+								<th scope="col">Create Date (<?=$timezone;?>)</th>
 							</thead>
 							<tbody>
 
diff --git a/app/Views/home_dashboard.php b/app/Views/home_dashboard.php
index 27a21bd..c88af71 100644
--- a/app/Views/home_dashboard.php
+++ b/app/Views/home_dashboard.php
@@ -219,7 +219,7 @@
 																	<?php
 																		$dateObject = new DateTime($value['lastResultDate']);
 																		$formattedDate = $dateObject->format('D, d M Y - H:i:s.v');
-																		echo($formattedDate); 
+																		echo($formattedDate." (". $timezone .")"); 
 																	?>
 																</em>
 															</footer>