From d469a71db2b7978b7f9944030449b128d2ceff93 Mon Sep 17 00:00:00 2001 From: mikael-zakaria Date: Fri, 7 Feb 2025 10:07:18 +0700 Subject: [PATCH] update tampilan nama pasien di dashboard --- app/Controllers/API_Dashboard.php | 2 +- app/Controllers/PrintLabelSby.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php index 6002583..7383bc1 100644 --- a/app/Controllers/API_Dashboard.php +++ b/app/Controllers/API_Dashboard.php @@ -19,7 +19,7 @@ class API_Dashboard extends ResourceController { $db = \Config\Database::connect(); $date1 = $this->request->getPost('date1'); $date2 = $this->request->getPost('date2'); - $sql = "select sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, sr.HOSTORDERNUMBER, p.PATNUMBER, concat(p.NAME, ' ', p.FIRSTNAMESK) as NAME, + $sql = "select sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, sr.HOSTORDERNUMBER, p.PATNUMBER, concat(p.FIRSTNAMESK, ' ', p.NAME) as NAME, TESTS=stuff(( select ', '+'('+T.SP_TESTCODE+')' from ( select T.SP_TESTCODE from SP_TESTS T where T.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER diff --git a/app/Controllers/PrintLabelSby.php b/app/Controllers/PrintLabelSby.php index cd159d3..a9ce9c5 100644 --- a/app/Controllers/PrintLabelSby.php +++ b/app/Controllers/PrintLabelSby.php @@ -41,7 +41,7 @@ class PrintLabelSby extends BaseController { $networkPath = ""; $db = \Config\Database::connect(); - $sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, concat (p.FIRSTNAME, ' ', p.NAME) as NAME, p.SEX, + $sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, concat (p.FIRSTNAMESK, ' ', p.NAME) as NAME, p.SEX, DATEDIFF(YEAR, BirthDate, GETDATE()) - CASE WHEN MONTH(BirthDate) > MONTH(GETDATE()) OR (MONTH(BirthDate) = MONTH(GETDATE()) AND DAY(BirthDate) > DAY(GETDATE())) THEN 1 ELSE 0 END AS AGE, sr.COLLECTIONDATE, p.BIRTHDATE @@ -176,7 +176,7 @@ class PrintLabelSby extends BaseController { $networkPath = ""; $db = \Config\Database::connect(); - $sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, concat (p.FIRSTNAME, ' ',p.NAME) as NAME, p.SEX, + $sql = "select p.PATNUMBER as UHID, sr.HOSTORDERNUMBER as BV, concat (p.FIRSTNAMESK, ' ',p.NAME) as NAME, p.SEX, DATEDIFF(YEAR, BirthDate, GETDATE()) - CASE WHEN MONTH(BirthDate) > MONTH(GETDATE()) OR (MONTH(BirthDate) = MONTH(GETDATE()) AND DAY(BirthDate) > DAY(GETDATE())) THEN 1 ELSE 0 END AS AGE,