From ae44159ccde51cbb3fab907e3e4b25beaac93b14 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Sun, 8 Dec 2024 16:06:11 +0800
Subject: [PATCH] update NOTE pada Hasil Test -zaka edisi salah commit

---
 app/Controllers/PrinterController.php | 46 +++++++++++++++++++++------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/PrinterController.php b/app/Controllers/PrinterController.php
index e9f141b..5c4d753 100644
--- a/app/Controllers/PrinterController.php
+++ b/app/Controllers/PrinterController.php
@@ -442,13 +442,18 @@ P1
             }
 
             $i++;
+            if ($item['RESTYPE'] == "CE"){
+                $resvalue = $item['RESULT'];
+            } else {
+                $resvalue = $item['RESVALUE'];
+            }
             $resultTest .= "
                 <tr>
                     <td colspan='1' class=''>
                         <pre> ".$item["test_eng"]."</pre>
                         <pre>  <small>".$item["test_ind"]."</small></pre>
                     </td>
-                    <td class=''>" . $item["RESVALUE"] . "</td>
+                    <td class=''>" . $resvalue . "</td>
                     <td class=''>" . $item["UNIT"] . "</td>
                     <td class=''>" . $item["REFRANGE"] . "</td>
                     <td class=''>" . " " . "</td>
@@ -478,15 +483,36 @@ P1
 
     public function printResultTest($access) {
         $db = \Config\Database::connect();
-        $sql = "select dc.CHAPID, dc.FULLTEXT as chap_eng,dc.FULLTEXT as chap_ind, cr.*, cdt.TEXT1 as test_eng, cdt.TEXT2 as test_ind 
-			from cmod.dbo.CM_RESULTS cr 
-			left join REQUESTS r on r.ACCESSNUMBER=cr.ACCESSNUMBER
-			left join cmod.dbo.CM_DICT_TESTS cdt on cr.TESTCODE=cdt.TESTCODE
-			left join DICT_TESTS dt on dt.TESTCODE=cr.TESTCODE and dt.ENDVALIDDATE is null
-			left join TESTS t on t.REQUESTID = r.REQUESTID and t.TESTID=dt.TESTID
-			left join DICT_CHAPTERS	dc on dc.CHAPID=dt.CHAPID and dc.ENDVALIDDATE is null
-			left join cmod.dbo.CM_DICT_CHAPTERS cdc on cdc.CHAPCODE=dc.CHAPCODE
-			where cr.ACCESSNUMBER='$access' order by t.TESTORDER";
+        $sql = "SELECT 
+                dc.CHAPID, 
+                dc.FULLTEXT AS chap_eng,
+                dc.FULLTEXT AS chap_ind, 
+                cr.*, 
+                cdt.TEXT1 AS test_eng, 
+                cdt.TEXT2 AS test_ind 
+            FROM 
+                cmod.dbo.CM_RESULTS cr 
+            LEFT JOIN REQUESTS r 
+                ON r.ACCESSNUMBER = cr.ACCESSNUMBER
+            LEFT JOIN cmod.dbo.CM_DICT_TESTS cdt 
+                ON cr.TESTCODE = cdt.TESTCODE
+            LEFT JOIN DICT_TESTS dt 
+                ON dt.TESTCODE = cr.TESTCODE AND dt.ENDVALIDDATE IS NULL
+            LEFT JOIN TESTS t 
+                ON t.REQUESTID = r.REQUESTID AND t.TESTID = dt.TESTID
+            LEFT JOIN DICT_CHAPTERS dc 
+                ON dc.CHAPID = dt.CHAPID AND dc.ENDVALIDDATE IS NULL
+            LEFT JOIN cmod.dbo.CM_DICT_CHAPTERS cdc 
+                ON cdc.CHAPCODE = dc.CHAPCODE
+            WHERE 
+                cr.ACCESSNUMBER = '$access' 
+            ORDER BY 
+                CASE 
+                    WHEN cr.TESTCODE = 'NOTE' THEN 1
+                    ELSE 0
+                END, 
+                t.TESTORDER;
+            ";
 
         $query = $db->query($sql);
         $results = $query->getResultArray();