mahdahar/pbmc-cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into zakaria

Browse Source 
ok
This commit is contained in:
mikael-zakaria 2024-12-18 09:31:44 +08:00
commit ad0d06ced7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/PrintResult.php
View File

@ -226,6 +226,9 @@ class PrintResult extends BaseController {
} else { } else {
$resvalue = $item['RESVALUE']; $resvalue = $item['RESVALUE'];
} }
$reff = $item["REFRANGE"];
$refftext = $item["REFFTEXT"];
if($refftext !='') {$reff = $refftext;}
$resultTest .= " $resultTest .= "
<tr> <tr>
<td colspan='1' class=''> <td colspan='1' class=''>
@ -235,7 +238,7 @@ class PrintResult extends BaseController {
<td class=''>" . $resflag . "</td> <td class=''>" . $resflag . "</td>
<td class=''>" . $resvalue . "</td> <td class=''>" . $resvalue . "</td>
<td class=''>" . $item["UNIT"] . "</td> <td class=''>" . $item["UNIT"] . "</td>
<td class=''>" . $item["REFRANGE"] . "</td> <td class=''>" . $reff . "</td>
<td class=''>" . $item["serum_type"] . "</td> <td class=''>" . $item["serum_type"] . "</td>
</tr> </tr>
"; ";
@ -321,9 +324,8 @@ class PrintResult extends BaseController {
t.TESTORDER, t.TESTORDER,
dt.SHORTTEXT, dt.SHORTTEXT,
RESULT = case when t.RESVALUE is null then tx.FULLTEXT else t.RESVALUE end, RESULT = case when t.RESVALUE is null then tx.FULLTEXT else t.RESVALUE end,
cr.* cr.*, cdt.REFFTEXT
from REQUESTS r from REQUESTS r
left join TESTS t on t.REQUESTID = r.REQUESTID 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_TESTS dt on dt.ENDVALIDDATE is null and t.TESTID=dt.TESTID
left join DICT_TEXTS tx on tx.TEXTID=t.CODEDRESULTID left join DICT_TEXTS tx on tx.TEXTID=t.CODEDRESULTID