From 3fb064375bbe2059dafd673834d1cdac37c2eea3 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Mon, 17 Mar 2025 14:29:39 +0800
Subject: [PATCH] Update Nama Pasien Pada Laporan Hasil, Dashboard dan
 Viewaccess PatNumber

---
 app/Controllers/PrintResult.php             | 12 ++++++------
 app/Views/admin/dashboard_viewAccess.php    |  6 +++---
 app/Views/fo/dashboard_viewAccess.php       |  6 +++---
 app/Views/sampling/dashboard_viewAccess.php |  6 +++---
 app/Views/user/dashboard_viewAccess.php     |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index f0052c9..8a08aa8 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -551,8 +551,8 @@ class PrintResult extends BaseController {
 			$rm_number = $data[0]['PATNUMBER'];
 			$rm_number = \ltrim($rm_number, "0");
 
-			$first_name = $data[0]['FIRSTNAME'];
-			$last_name = $data[0]['NAME'];
+			$first_name = strtoupper($data[0]['FIRSTNAME']);
+			$last_name = strtoupper($data[0]['NAME']);
 			
 			$birth_date = $data[0]['BIRTHDATE'];
 			$birth_date = \DateTime::createFromFormat('Y-m-d H:i:s.u', $birth_date);
@@ -974,9 +974,9 @@ class PrintResult extends BaseController {
 		}
 		// Untuk Header
 		$sql = "SELECT 
-					p.PATNUMBER, 
-					p.FIRSTNAMESK AS FIRSTNAME, 
-					p.NAME,  
+					ctp.PATNUMBER,
+					ctp.FIRSTNAME,
+					ctp.LASTNAME AS NAME,
 					p.BIRTHDATE, 
 					ctr.REQNUMBER as HOSTORDERNUMBER,
 					sr.COLLECTIONDATE, 
@@ -989,7 +989,7 @@ class PrintResult extends BaseController {
 				FROM PATIENTS p
 				LEFT JOIN SP_REQUESTS sr ON p.PATID = sr.PATID
 				LEFT JOIN cmod.dbo.CM_TM_REQUESTS ctr ON ctr.REFFID = sr.HOSTORDERNUMBER
-				
+				LEFT JOIN cmod.dbo.CM_TM_PATIENTS ctp ON ctp.PATID = ctr.PATID
 				LEFT JOIN 
 					(
 						SELECT 
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index e21a0ff..ea91643 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -3,9 +3,9 @@
 if(isset($data[0])) {
 	$row = $data[0];
 
-	if (strlen($patnumber) < 10) {
-		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
-	}
+	// if (strlen($patnumber) < 10) {
+	// 	$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	// }
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
diff --git a/app/Views/fo/dashboard_viewAccess.php b/app/Views/fo/dashboard_viewAccess.php
index 3877010..f402387 100644
--- a/app/Views/fo/dashboard_viewAccess.php
+++ b/app/Views/fo/dashboard_viewAccess.php
@@ -3,9 +3,9 @@
 if(isset($data[0])) {
 	$row = $data[0];
 
-	if (strlen($patnumber) < 10) {
-		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
-	}
+	// if (strlen($patnumber) < 10) {
+	// 	$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	// }
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
diff --git a/app/Views/sampling/dashboard_viewAccess.php b/app/Views/sampling/dashboard_viewAccess.php
index 1a2e365..3e4b526 100644
--- a/app/Views/sampling/dashboard_viewAccess.php
+++ b/app/Views/sampling/dashboard_viewAccess.php
@@ -3,9 +3,9 @@
 if(isset($data[0])) {
 	$row = $data[0];
 
-	if (strlen($patnumber) < 10) {
-		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
-	}
+	// if (strlen($patnumber) < 10) {
+	// 	$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	// }
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
diff --git a/app/Views/user/dashboard_viewAccess.php b/app/Views/user/dashboard_viewAccess.php
index c7a8f55..6f65e56 100644
--- a/app/Views/user/dashboard_viewAccess.php
+++ b/app/Views/user/dashboard_viewAccess.php
@@ -3,9 +3,9 @@
 if(isset($data[0])) {
 	$row = $data[0];
 
-	if (strlen($patnumber) < 10) {
-		$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
-	}
+	// if (strlen($patnumber) < 10) {
+	// 	$patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
+	// }
 ?>
 <div class="modal-header bg-soft-green text-white">
 	<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>