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

Update Menampilkan Nilai Normal Pada Laporan Hasil

Browse Source
This commit is contained in:
mikael-zakaria 2025-03-10 14:02:56 +07:00
parent 1ef987c7c6
commit 4fc51b8250
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Controllers/PrintResult.php
View File

@ -775,7 +775,7 @@ class PrintResult extends BaseController {
$i++; $i++;
// Melebihi batas Kertas // Melebihi batas Kertas
if($i % 23 == 0) { if($i % 21 == 0) {
$resultTest .= "</table></div>"; $resultTest .= "</table></div>";
$fullPage .= $headPage.$resultTest.$footerPage.$lastDiv; $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
$i=0; $i=0;
@ -815,7 +815,7 @@ class PrintResult extends BaseController {
} }
// Melebihi batas Kertas // Melebihi batas Kertas
if($i % 23 == 0 && $i!=0) { if($i % 21 == 0 && $i!=0) {
$resultTest .= "</table></div>"; $resultTest .= "</table></div>";
$fullPage .= $headPage.$resultTest.$footerPage.$lastDiv; $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
$i=0; $i=0;
@ -830,7 +830,8 @@ class PrintResult extends BaseController {
} else { } else {
$resvalue = $item['RESVALUE']; $resvalue = $item['RESVALUE'];
} }
$reff = $item["REFRANGE"];
$reff = $item["FIX_REFRANGE"];
$refftext = $item["REFFTEXT"]; $refftext = $item["REFFTEXT"];
if($refftext !='') {$reff = $refftext;} if($refftext !='') {$reff = $refftext;}
$unit = $item['UNIT']; $unit = $item['UNIT'];
@ -881,7 +882,6 @@ class PrintResult extends BaseController {
$rescomment = ""; $rescomment = "";
} }
$test = ""; $test = "";
// Untuk Nama Test Apakah lebih dari 25 karaktera // Untuk Nama Test Apakah lebih dari 25 karaktera
if ( strlen($item['test_eng']) > 25 || strlen($item['test_ind']) > 25) { if ( strlen($item['test_eng']) > 25 || strlen($item['test_ind']) > 25) {
@ -912,19 +912,19 @@ class PrintResult extends BaseController {
} else { } else {
$resultTest .= " $resultTest .= "
<tr> <tr>
<td colspan='1' class=''> <td style='width: 35%;' colspan='1' class=''>
".$test." ".$test."
</td> </td>
<td class='left-pad ".$color."'>" . $resflag ." ". $resvalue . $rescomment ."</td> <td style='width: 20%;' class='left-pad ".$color."'>" . $resflag ." ". $resvalue . $rescomment ."</td>
<td class='left-pad'>" . "<pre>" .$unit. "<pre>" . "</td> <td style='width: 13%;' class='left-pad'>" . "<pre>" .$unit. "<pre>" . "</td>
<td class='left-pad'>" . "<pre>" .$reff. "<pre>" . "</td> <td style='width: 20%;' class='left-pad'>" . "<pre>" .$reff. "<pre>" . "</td>
<td class='left-pad'>" . $serum_type . "</td> <td style='width: 12%;' class='left-pad'>" . $serum_type . "</td>
</tr> </tr>
"; ";
} }
// Melebihi batas Kertas // Melebihi batas Kertas
if($i % 23 == 0 && $i != 0) { if($i % 21 == 0 && $i != 0) {
$resultTest .= "</table></div>"; $resultTest .= "</table></div>";
$fullPage .= $headPage.$resultTest.$footerPage.$lastDiv; $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
$i=0; $i=0;
@ -1047,6 +1047,15 @@ class PrintResult extends BaseController {
t.VALIDATIONINITIALS as validator, t.VALIDATIONINITIALS as validator,
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,
COALESCE(
cr.refrange,
CASE
WHEN t.MINIMUM IS NOT NULL AND t.MAXIMUM IS NOT NULL THEN CONCAT(t.MINIMUM, ' - ', t.MAXIMUM)
WHEN t.MINIMUM IS NOT NULL AND t.MAXIMUM IS NULL THEN CONCAT('>= ', t.MINIMUM)
WHEN t.MAXIMUM IS NOT NULL AND t.MINIMUM IS NULL THEN CONCAT('<= ', t.MAXIMUM)
ELSE ''
END
) AS FIX_REFRANGE,
" . $filter_query_resdate . " " . $filter_query_resdate . "
cr.* cr.*
from REQUESTS r from REQUESTS r