diff --git a/app/Config/Routes.php b/app/Config/Routes.php index bf5c5db..9f3adec 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -23,10 +23,8 @@ $routes->get('/api/results_preview/(:any)', 'API_TM::results_preview/$1'); // send oc // send new master -$routes->get('/admin', 'AdminPages::LISRequests'); -$routes->get('/admin/LISRequests', 'AdminPages::LISRequests'); +$routes->get('/admin', 'AdminPages::HISRequests'); $routes->get('/admin/HISRequests', 'AdminPages::HISRequests'); $routes->get('/admin/HISMessages', 'AdminPages::HISMessages'); -$routes->post('/admin/api/LISRequests', 'API_Admin::LISRequests_index'); $routes->post('/admin/api/HISRequests', 'API_Admin::HISRequests_index'); $routes->post('/admin/api/HISMessages', 'API_Admin::HISMessages_index'); diff --git a/app/Controllers/API_Admin.php b/app/Controllers/API_Admin.php index e27794c..f3b1081 100644 --- a/app/Controllers/API_Admin.php +++ b/app/Controllers/API_Admin.php @@ -9,30 +9,42 @@ class API_Admin extends ResourceController { } - public function LISRequests_index() { + public function HISRequests_index() { $db = \Config\Database::connect(); $date1 = $this->request->getPost('date1'); $date2 = $this->request->getPost('date2'); - $sql = "select r.SP_ACCESSNUMBER, r.HOSTORDERNUMBER, r.SP_HOSPNUMBER, r.SP_LOCCODE, p.PATNUMBER, p.FIRSTNAME, p.NAME from SP_REQUESTS r + $sql = "select r.SP_ACCESSNUMBER, r.HOSTORDERNUMBER, PATNUMBER=right(p.PATNUMBER,8), p.FIRSTNAME, p.NAME, tr.*, + STUFF( + ( select ', '+ SP_TESTCODE from SP_TESTS + where SP_ACCESSNUMBER=r.SP_ACCESSNUMBER and DEPTH=0 + FOR XML PATH('') + ), 1, 1, '' + ) AS TESTS + from cmod.dbo.CM_TM_REQUESTS tr + left join SP_REQUESTS r on r.HOSTORDERNUMBER=tr.REFFID left join PATIENTS p on p.PATID=r.PATID - where r.COLLECTIONDATE between '2025-03-17 00:00' and '2025-03-17 23:59'"; + where tr.REQDATE between '".$date1."T00:00' and '".$date2."T23:59' + order by tr.REQDATE"; $query = $db->query($sql); $results = $query->getResultArray(); - /* - $response = [ - 'status' => 200, - 'error' => null, - 'message' => 'Data received successfully!', - 'data' => [ - 'date1' => $date1, - 'date2' => $date2, - ], - ]; - */ + + return $this->respond([ + 'data' => $results + ]); + } + + public function HISMessages_index() { + $db = \Config\Database::connect(); + $date1 = $this->request->getPost('date1'); + $date2 = $this->request->getPost('date2'); + + $sql = "select LOGID, BODY, LOGDATE from cmod.dbo.CM_TM_LOGS where LOGDATE between '$date1 00:00' and '$date2 23:59'"; + $query = $db->query($sql); + $results = $query->getResultArray(); + return $this->respond([ 'data' => $results ]); } - } diff --git a/app/Controllers/AdminPages.php b/app/Controllers/AdminPages.php index 37ba545..73c646f 100644 --- a/app/Controllers/AdminPages.php +++ b/app/Controllers/AdminPages.php @@ -4,8 +4,11 @@ namespace App\Controllers; class AdminPages extends BaseController { - public function LISRequests() { - return view('admin/LISRequests'); + public function HISRequests() { + return view('admin/HISRequests'); } + public function HISMessages() { + return view('admin/HISMessages'); + } } diff --git a/app/Views/admin/HISMessages.php b/app/Views/admin/HISMessages.php new file mode 100644 index 0000000..3e7206d --- /dev/null +++ b/app/Views/admin/HISMessages.php @@ -0,0 +1,99 @@ += $this->extend('admin/layout') ?> + += $this->section('content') ?> +
| # | Messages | Action | +
|---|