diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php index 1bd5c14..26374a5 100644 --- a/app/Controllers/API_Dashboard.php +++ b/app/Controllers/API_Dashboard.php @@ -20,7 +20,7 @@ class API_Dashboard extends ResourceController { $date1 = $this->request->getPost('date1'); $date2 = $this->request->getPost('date2'); $sql = "SELECT - sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, sr.HOSTORDERNUMBER as REFFID, tr.REQNUMBER as HOSTORDERNUMBER, tr.REQSTATUS, p.PATNUMBER, concat(p.FIRSTNAMESK, ' ', p.NAME) as NAME, + sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, sr.HOSTORDERNUMBER as REFFID, tr.REQNUMBER as HOSTORDERNUMBER, tr.REQSTATUS, tp.PATNUMBER, concat(tp.FIRSTNAME, ' ', tp.LASTNAME) as NAME, TESTS=stuff(( select ', '+'('+T.SP_TESTCODE+')' from ( select T.SP_TESTCODE from SP_TESTS T where T.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER @@ -59,9 +59,9 @@ class API_Dashboard extends ResourceController { else 'Pend' end STATS 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 + left join cmod.dbo.CM_TM_PATIENTS tp on tr.PATID = tp.PATID where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59'" .$filter_query. "order by sr.COLLECTIONDATE desc";