From 748b668a804c80eafc758fe5c014e0202330c8b9 Mon Sep 17 00:00:00 2001 From: mikael-zakaria Date: Fri, 7 Feb 2025 12:42:51 +0700 Subject: [PATCH] Update Dashboard View Description & Dashboard Visit diganti menjadi Reffid --- app/Controllers/FoController.php | 18 +++++++++++------- app/Controllers/SamplingController.php | 18 +++++++++++------- app/Controllers/UserController.php | 18 +++++++++++------- app/Views/admin/dashboard.php | 2 +- app/Views/fo/dashboard.php | 2 +- app/Views/fo/dashboard_viewAccess.php | 2 +- app/Views/sampling/dashboard.php | 2 +- app/Views/sampling/dashboard_viewAccess.php | 2 +- app/Views/user/dashboard.php | 2 +- app/Views/user/dashboard_viewAccess.php | 2 +- 10 files changed, 40 insertions(+), 28 deletions(-) diff --git a/app/Controllers/FoController.php b/app/Controllers/FoController.php index 7f4b967..ca91800 100644 --- a/app/Controllers/FoController.php +++ b/app/Controllers/FoController.php @@ -14,7 +14,7 @@ class FoController extends BaseController { $data['usercityid'] = session()->get('usercityid'); $db = \Config\Database::connect(); - $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu + $sql = "SELECT sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER @@ -24,23 +24,27 @@ class FoController extends BaseController { $visit_number = $results[0]['HOSTORDERNUMBER']; $data['data'] = $results; - $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC - from cmod.dbo.CM_HIS_ORDERS ho - left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID - WHERE ho.VISITNUMBER='$visit_number'"; + // $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC + // from cmod.dbo.CM_HIS_ORDERS ho + // left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID + // WHERE ho.VISITNUMBER='$visit_number'"; + $sql = "SELECT ctp.PATNUMBER, CONCAT(ctp.FIRSTNAME, ' ', ctp.LASTNAME) as PATNAME, ctr.AGENT as PAYERNAME, ctr.DOC as TREATDOC, ctr.VISITTYPE + from cmod.dbo.CM_TM_REQUESTS ctr + left join cmod.dbo.CM_TM_PATIENTS ctp on ctr.PATID = ctp.PATID + where ctr.REFFID='$visit_number'"; $query = $db->query($sql); $results = $query->getResultArray(); if($results != null) { $data['patnumber'] = $results[0]['PATNUMBER']; $data['patient_fullname'] = $results[0]['PATNAME']; - // $data['visit_description'] = $results[0]['Visit Description']; + $data['visit_description'] = $results[0]['VISITTYPE']; $data['treating_doctor'] = $results[0]['TREATDOC']; $data['payer_name'] = $results[0]['PAYERNAME']; } else { $data['patnumber'] = ""; $data['patient_fullname'] = ""; - // $data['visit_description'] = ""; + $data['visit_description'] = ""; $data['treating_doctor'] = ""; $data['payer_name'] = ""; } diff --git a/app/Controllers/SamplingController.php b/app/Controllers/SamplingController.php index 97024e8..704764d 100644 --- a/app/Controllers/SamplingController.php +++ b/app/Controllers/SamplingController.php @@ -14,7 +14,7 @@ class SamplingController extends BaseController { $data['usercityid'] = session()->get('usercityid'); $db = \Config\Database::connect(); - $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu + $sql = "SELECT sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER @@ -24,23 +24,27 @@ class SamplingController extends BaseController { $visit_number = $results[0]['HOSTORDERNUMBER']; $data['data'] = $results; - $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC - from cmod.dbo.CM_HIS_ORDERS ho - left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID - WHERE ho.VISITNUMBER='$visit_number'"; + // $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC + // from cmod.dbo.CM_HIS_ORDERS ho + // left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID + // WHERE ho.VISITNUMBER='$visit_number'"; + $sql = "SELECT ctp.PATNUMBER, CONCAT(ctp.FIRSTNAME, ' ', ctp.LASTNAME) as PATNAME, ctr.AGENT as PAYERNAME, ctr.DOC as TREATDOC, ctr.VISITTYPE + from cmod.dbo.CM_TM_REQUESTS ctr + left join cmod.dbo.CM_TM_PATIENTS ctp on ctr.PATID = ctp.PATID + where ctr.REFFID='$visit_number'"; $query = $db->query($sql); $results = $query->getResultArray(); if($results != null) { $data['patnumber'] = $results[0]['PATNUMBER']; $data['patient_fullname'] = $results[0]['PATNAME']; - // $data['visit_description'] = $results[0]['Visit Description']; + $data['visit_description'] = $results[0]['VISITTYPE']; $data['treating_doctor'] = $results[0]['TREATDOC']; $data['payer_name'] = $results[0]['PAYERNAME']; } else { $data['patnumber'] = ""; $data['patient_fullname'] = ""; - // $data['visit_description'] = ""; + $data['visit_description'] = ""; $data['treating_doctor'] = ""; $data['payer_name'] = ""; } diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index f9ed76d..2834823 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -14,7 +14,7 @@ class UserController extends BaseController { $data['usercityid'] = session()->get('usercityid'); $db = \Config\Database::connect(); - $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu + $sql = "SELECT sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER @@ -24,23 +24,27 @@ class UserController extends BaseController { $visit_number = $results[0]['HOSTORDERNUMBER']; $data['data'] = $results; - $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC - from cmod.dbo.CM_HIS_ORDERS ho - left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID - WHERE ho.VISITNUMBER='$visit_number'"; + // $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC + // from cmod.dbo.CM_HIS_ORDERS ho + // left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID + // WHERE ho.VISITNUMBER='$visit_number'"; + $sql = "SELECT ctp.PATNUMBER, CONCAT(ctp.FIRSTNAME, ' ', ctp.LASTNAME) as PATNAME, ctr.AGENT as PAYERNAME, ctr.DOC as TREATDOC, ctr.VISITTYPE + from cmod.dbo.CM_TM_REQUESTS ctr + left join cmod.dbo.CM_TM_PATIENTS ctp on ctr.PATID = ctp.PATID + where ctr.REFFID='$visit_number'"; $query = $db->query($sql); $results = $query->getResultArray(); if($results != null) { $data['patnumber'] = $results[0]['PATNUMBER']; $data['patient_fullname'] = $results[0]['PATNAME']; - // $data['visit_description'] = $results[0]['Visit Description']; + $data['visit_description'] = $results[0]['VISITTYPE']; $data['treating_doctor'] = $results[0]['TREATDOC']; $data['payer_name'] = $results[0]['PAYERNAME']; } else { $data['patnumber'] = ""; $data['patient_fullname'] = ""; - // $data['visit_description'] = ""; + $data['visit_description'] = ""; $data['treating_doctor'] = ""; $data['payer_name'] = ""; } diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php index fb5d099..6c1610c 100644 --- a/app/Views/admin/dashboard.php +++ b/app/Views/admin/dashboard.php @@ -33,7 +33,7 @@ Patient# Patient Name Access# - Visit# + Reffid# Test Status diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php index 5906d3e..a15d309 100644 --- a/app/Views/fo/dashboard.php +++ b/app/Views/fo/dashboard.php @@ -33,7 +33,7 @@ Patient# Patient Name Access# - Visit# + Reffid# Test Status diff --git a/app/Views/fo/dashboard_viewAccess.php b/app/Views/fo/dashboard_viewAccess.php index c904d3e..3877010 100644 --- a/app/Views/fo/dashboard_viewAccess.php +++ b/app/Views/fo/dashboard_viewAccess.php @@ -22,7 +22,7 @@ if(isset($data[0])) { Visit Description : - + diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php index ef62ea2..f538914 100644 --- a/app/Views/sampling/dashboard.php +++ b/app/Views/sampling/dashboard.php @@ -33,7 +33,7 @@ Patient# Patient Name Access# - Visit# + Reffid# Test Status diff --git a/app/Views/sampling/dashboard_viewAccess.php b/app/Views/sampling/dashboard_viewAccess.php index c904d3e..3877010 100644 --- a/app/Views/sampling/dashboard_viewAccess.php +++ b/app/Views/sampling/dashboard_viewAccess.php @@ -22,7 +22,7 @@ if(isset($data[0])) { Visit Description : - + diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php index 2681d8c..d72cd9f 100644 --- a/app/Views/user/dashboard.php +++ b/app/Views/user/dashboard.php @@ -33,7 +33,7 @@ Patient# Patient Name Access# - Visit# + Reffid# Test Status diff --git a/app/Views/user/dashboard_viewAccess.php b/app/Views/user/dashboard_viewAccess.php index c904d3e..3877010 100644 --- a/app/Views/user/dashboard_viewAccess.php +++ b/app/Views/user/dashboard_viewAccess.php @@ -22,7 +22,7 @@ if(isset($data[0])) { Visit Description : - +