diff --git a/app/Controllers/AdminController.php b/app/Controllers/AdminController.php index 3bef219..23673d2 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.FULLTEXT as 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 diff --git a/app/Controllers/FoController.php b/app/Controllers/FoController.php index ca91800..a2c7d11 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.FULLTEXT as 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 diff --git a/app/Controllers/PrintLabel.php b/app/Controllers/PrintLabel.php index 9e6689c..28e8b48 100644 --- a/app/Controllers/PrintLabel.php +++ b/app/Controllers/PrintLabel.php @@ -261,7 +261,7 @@ P1 DATEDIFF(YEAR, BirthDate, GETDATE()) - CASE WHEN MONTH(BirthDate) > MONTH(GETDATE()) OR (MONTH(BirthDate) = MONTH(GETDATE()) AND DAY(BirthDate) > DAY(GETDATE())) THEN 1 ELSE 0 END AS AGE, - ds.FULLTEXT, st.SAMPLETYPE+right(sr.SP_ACCESSNUMBER,5) as BARCODE, sr.COLLECTIONDATE, p.BIRTHDATE + ds.SHORTTEXT AS FULLTEXT, st.SAMPLETYPE+right(sr.SP_ACCESSNUMBER,5) as BARCODE, sr.COLLECTIONDATE, p.BIRTHDATE from SP_TUBES st left join SP_REQUESTS sr on st.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join PATIENTS p on p.PATID=sr.PATID diff --git a/app/Controllers/PrintLabelSby.php b/app/Controllers/PrintLabelSby.php index 1cdce59..eb8d613 100644 --- a/app/Controllers/PrintLabelSby.php +++ b/app/Controllers/PrintLabelSby.php @@ -181,7 +181,7 @@ class PrintLabelSby extends BaseController { DATEDIFF(YEAR, BirthDate, GETDATE()) - CASE WHEN MONTH(BirthDate) > MONTH(GETDATE()) OR (MONTH(BirthDate) = MONTH(GETDATE()) AND DAY(BirthDate) > DAY(GETDATE())) THEN 1 ELSE 0 END AS AGE, - ds.FULLTEXT, st.SAMPLETYPE+right(sr.SP_ACCESSNUMBER,5) as BARCODE, sr.COLLECTIONDATE, p.BIRTHDATE + ds.SHORTTEXT AS FULLTEXT, st.SAMPLETYPE+right(sr.SP_ACCESSNUMBER,5) as BARCODE, sr.COLLECTIONDATE, p.BIRTHDATE from SP_TUBES st left join SP_REQUESTS sr on st.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join PATIENTS p on p.PATID=sr.PATID diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index 649b3ae..293dd6d 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -1042,7 +1042,7 @@ class PrintResult extends BaseController { dc.CHAPID, dc.FULLTEXT as chap_eng, dc.FULLTEXT as chap_ind, - st.FULLTEXT as serum_type, + st.SHORTTEXT as serum_type, cdt.TEXT1 as test_eng, cdt.TEXT2 as test_ind, COALESCE(dt.UNITS, cdt.UNIT) as UNITTEXT, diff --git a/app/Controllers/SamplingController.php b/app/Controllers/SamplingController.php index 704764d..3cb0e53 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.FULLTEXT as 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 diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 2834823..96e5b8b 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.FULLTEXT as 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