diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php index e80bad1..f44d062 100644 --- a/app/Controllers/API_Dashboard.php +++ b/app/Controllers/API_Dashboard.php @@ -11,15 +11,16 @@ class API_Dashboard extends ResourceController { // Mengetahui Apakah User Login adalah Bali atau Surabaya $cityid = session()->get('usercityid'); if ($cityid == 1) { - $filter_query = " AND (sr.HOSTORDERNUMBER LIKE 'B%' OR sr.HOSTORDERNUMBER LIKE 'Z%')"; + $filter_query = " AND (tr.REQNUMBER LIKE 'B%' OR tr.REQNUMBER LIKE 'Z%')"; } elseif ($cityid == 2) { - $filter_query = " AND (sr.HOSTORDERNUMBER LIKE 'S%' OR sr.HOSTORDERNUMBER LIKE 'X%')"; + $filter_query = " AND (tr.REQNUMBER LIKE 'S%' OR tr.REQNUMBER LIKE 'X%')"; } else { $filter_query = " "; } $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.FIRSTNAMESK, ' ', p.NAME) as NAME, + $sql = "SELECT + sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, tr.REQNUMBER as 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 @@ -60,6 +61,7 @@ class API_Dashboard extends ResourceController { from SP_REQUESTS sr left join PATIENTS p on p.PATID=sr.PATID left join REQUESTS r on r.ACCESSNUMBER=sr.SP_ACCESSNUMBER + left join cmod.dbo.CM_TM_REQUESTS tr on tr.REFFID = sr.HOSTORDERNUMBER where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59'" .$filter_query. "order by sr.COLLECTIONDATE desc"; diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index f0f189e..0043ee7 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -962,7 +962,7 @@ class PrintResult extends BaseController { p.FIRSTNAMESK AS FIRSTNAME, p.NAME, p.BIRTHDATE, - sr.HOSTORDERNUMBER, + ctr.REQNUMBER as HOSTORDERNUMBER, sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, p.SEX, diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php index 79d4612..08ee331 100644 --- a/app/Views/admin/dashboard.php +++ b/app/Views/admin/dashboard.php @@ -33,7 +33,7 @@