diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index 1c5face..5b034e6 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -26,6 +26,8 @@ class PrintResult extends BaseController {
 
 	public function otherTests($resultData, $data, $note) {
 
+		
+
 		// Mengetahui Apakah User Login adalah Bali atau Surabaya
 		$cityid = session()->get('usercityid');
 
@@ -118,7 +120,8 @@ class PrintResult extends BaseController {
 				$collection_date = $dateTimeCol->format('d-m-Y H:i');
 			}
 
-			$result_date = $data[0]['RESULTDATE'];
+			$result_date = end($resultData);
+			$result_date = $result_date["RESDATE_FIX"];
 			$dateTimeRes = \DateTime::createFromFormat('Y-m-d H:i:s.u', $result_date);
 			if ($dateTimeRes) {
 				$result_date = $dateTimeRes->format('d-m-Y H:i');
@@ -549,6 +552,15 @@ class PrintResult extends BaseController {
 		$collection = $results;
 		$data = [$header, $collection];
 
+		// Memisahkan Waktu yang ditampilkan pada laporan hasil
+		$filter_query_resdate="";
+		if ($cityid == 1) {
+			$filter_query_resdate = " cr.RESDATE as RESDATE_FIX, ";
+		} elseif ($cityid == 2) {
+			$filter_query_resdate = " FORMAT(DATEADD(HOUR, -1, cr.RESDATE), 'yyyy-MM-dd HH:mm:ss.fff') AS RESDATE_FIX, ";
+		} else {
+			$filter_query_resdate = " cr.RESDATE as RESDATE_FIX, ";
+		}
 		$sql = "SELECT 
 				dc.CHAPID, 
 				dc.FULLTEXT as chap_eng, 
@@ -565,7 +577,8 @@ class PrintResult extends BaseController {
 				t.VALIDATIONINITIALS  as validator,
 				dt.SHORTTEXT,
 				RESULT = case when t.RESVALUE is null then tx.FULLTEXT else t.RESVALUE end,
-				cr.* 
+				" . $filter_query_resdate . "
+				cr.*
 				from REQUESTS r 
 				left join TESTS t on t.REQUESTID = r.REQUESTID 
 				left join DICT_TESTS dt on dt.ENDVALIDDATE is null and t.TESTID=dt.TESTID
@@ -579,6 +592,8 @@ class PrintResult extends BaseController {
 				ORDER BY t.TESTORDER";
         $query = $db->query($sql);
         $results = $query->getResultArray();
+
+		// var_dump($results);die();
 		
 		$data_pregnancy = array_filter($results, function($item) {
             $serum_type = $item["serum_type"];
@@ -595,6 +610,7 @@ class PrintResult extends BaseController {
 			$printable = $item['NOTPRINTABLE'];
             return $serum_type == 'Urine' && $tesscode != 'PPT' && $test_eng != "Pregnancy Test" && $chap_eng != "MICROBIOLOGY" && $printable !=1;
         });
+
 		$data_urine_kultur = array_filter($results, function($item) {
             $serum_type = $item["serum_type"];
 			$chap_eng = $item["chap_eng"];