diff --git a/app/Controllers/AdminController.php b/app/Controllers/AdminController.php index 3e1e49a..0d47b0d 100644 --- a/app/Controllers/AdminController.php +++ b/app/Controllers/AdminController.php @@ -18,7 +18,7 @@ class AdminController 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 @@ -28,10 +28,14 @@ class AdminController 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 + 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();