diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index c480e94..f58acc6 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -563,7 +563,7 @@ class PrintResult extends BaseController { } elseif ($hostordernumber[0] == 'S' || $hostordernumber[0] == 'X') { $branch = "PMG Surabaya"; } else { - $branch = "Unknown"; + $branch = "Testing"; } $collection_date = $data[0]['COLLECTIONDATE']; @@ -1091,10 +1091,11 @@ class PrintResult extends BaseController { left join DICT_TEST_SAMPLES ts on ts.TESTID=t.TESTID and dt.TESTID=ts.TESTID left join DICT_SAMPLES_TYPES st on st.SAMPTYPEID=ts.SAMPTYPEID left join cmod.dbo.CM_DICT_TESTS cdt on dt.TESTCODE=cdt.TESTCODE - left join cmod.dbo.CM_RESULTS cr on cr.ACCESSNUMBER=r.ACCESSNUMBER and cr.TESTCODE=cdt.TESTCODE and cr.TESTCODE=dt.TESTCODE and t.RESUPDDATE = cr.RESDATE + left join cmod.dbo.CM_RESULTS cr on cr.ACCESSNUMBER=r.ACCESSNUMBER and cr.TESTCODE=cdt.TESTCODE and cr.TESTCODE=dt.TESTCODE + -- and t.RESUPDDATE = cr.RESDATE + -- and dt.SHORTTEXT <> 'EGFR' where r.ACCESSNUMBER='$access' and t.NOTPRINTABLE is null - -- and dt.SHORTTEXT <> 'EGFR' ORDER BY t.TESTORDER"; $query = $db->query($sql); $results = $query->getResultArray();