diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index a63fd7c..61c1f6e 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -775,7 +775,7 @@ class PrintResult extends BaseController { $i++; // Melebihi batas Kertas - if($i % 23 == 0) { + if($i % 21 == 0) { $resultTest .= ""; $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv; $i=0; @@ -815,7 +815,7 @@ class PrintResult extends BaseController { } // Melebihi batas Kertas - if($i % 23 == 0 && $i!=0) { + if($i % 21 == 0 && $i!=0) { $resultTest .= ""; $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv; $i=0; @@ -830,7 +830,8 @@ class PrintResult extends BaseController { } else { $resvalue = $item['RESVALUE']; } - $reff = $item["REFRANGE"]; + + $reff = $item["FIX_REFRANGE"]; $refftext = $item["REFFTEXT"]; if($refftext !='') {$reff = $refftext;} $unit = $item['UNIT']; @@ -881,7 +882,6 @@ class PrintResult extends BaseController { $rescomment = ""; } - $test = ""; // Untuk Nama Test Apakah lebih dari 25 karaktera if ( strlen($item['test_eng']) > 25 || strlen($item['test_ind']) > 25) { @@ -912,19 +912,19 @@ class PrintResult extends BaseController { } else { $resultTest .= " - + ".$test." - " . $resflag ." ". $resvalue . $rescomment ." - " . "
" .$unit. "
" . "
-						" . "
" .$reff. "
" . "
-						" . $serum_type . "
+						" . $resflag ." ". $resvalue .  $rescomment ."
+						" . "
" .$unit. "
" . "
+						" . "
" .$reff. "
" . "
+						" . $serum_type . "
 					
 				";
 			}
 			
             // Melebihi batas Kertas
-            if($i % 23 == 0 && $i != 0) {
+            if($i % 21 == 0 && $i != 0) {
                 $resultTest .= "";
                 $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
                 $i=0;
@@ -1047,6 +1047,15 @@ class PrintResult extends BaseController {
 				t.VALIDATIONINITIALS  as validator,
 				dt.SHORTTEXT,
 				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 . "
 				cr.*
 				from REQUESTS r