diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index af6b6af..652530f 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -226,6 +226,9 @@ class PrintResult extends BaseController { } else { $resvalue = $item['RESVALUE']; } + $reff = $item["REFRANGE"]; + $refftext = $item["REFFTEXT"]; + if($refftext !='') {$reff = $refftext;} $resultTest .= " @@ -235,7 +238,7 @@ class PrintResult extends BaseController { " . $resflag . " " . $resvalue . " " . $item["UNIT"] . " - " . $item["REFRANGE"] . " + " . $reff . " " . $item["serum_type"] . " "; @@ -321,9 +324,8 @@ class PrintResult extends BaseController { t.TESTORDER, dt.SHORTTEXT, RESULT = case when t.RESVALUE is null then tx.FULLTEXT else t.RESVALUE end, - cr.* + cr.*, cdt.REFFTEXT from REQUESTS r - left join TESTS t on t.REQUESTID = r.REQUESTID left join DICT_TESTS dt on dt.ENDVALIDDATE is null and t.TESTID=dt.TESTID left join DICT_TEXTS tx on tx.TEXTID=t.CODEDRESULTID