From 999529a15f41b9abf18046f437345676a408e1ba Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Fri, 7 Feb 2025 06:37:40 +0800
Subject: [PATCH] 202502070537 state

---
 app/Controllers/API_Requests.php |  8 +++++---
 app/Controllers/API_Results.php  | 29 ++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/API_Requests.php b/app/Controllers/API_Requests.php
index 79885b3..e142598 100644
--- a/app/Controllers/API_Requests.php
+++ b/app/Controllers/API_Requests.php
@@ -159,7 +159,8 @@ class API_Requests extends ResourceController {
 		}
 		
 		$orm = "MSH|^~\&|PBMC|TM|TDNL||||ORM^O01^|||2.3||||\r";
-		$orm .= "PID|1||$patnumber^^^^PATNUMBER||$firstname^$lastname^^^^^L||$dob|$sex||^|^^||$phone^^TELEPHON||||^||||||||||||||||\r";
+		$orm .= "PID|1||$patnumber^^^^PATNUMBER||$lastname^$firstname^^^^^L||$dob|$sex||^|^^||$phone^^TELEPHON||||^||||||||||||||||\r";
+		//$orm .= "PV1|||$loc^^^||||$doc|$doc|||||||||||$hosp|||||||||||||||||||||||||$reqdate||||||||||\r";
 		$orm .= "PV1|||$loc^^^||||$doc|$doc||||||||||||||||||||||||||||||||||||$reqdate||||||||||\r";
 		
 		$sql = "select t.TESTSTATUS, m.LISCODE from cmod.dbo.CM_TM_TESTS t
@@ -172,9 +173,10 @@ class API_Requests extends ResourceController {
 			$liscode = $qdata['LISCODE'];
 			$status = $qdata['TESTSTATUS'];
 			if($liscode != '') {
-				if($status!=1 || $status !=2) {$status="NW";} else {$status="CA";}
+				//if($status!=1 || $status !=2) {$status="NW";} else {$status="CA";}
+				if($status!='CANCEL') {$status="NW";} else {$status="CA";}
 				$orm .= "ORC|$status|$reffid||$reffid|||^^^$reqdate|||||$doc|$loc||$reqdate|||||||||\r";
-				if($i==1) { $orm .= "NTE|0||$hosp|\r"; }
+				if($i==1) { $orm .= "NTE|1||$hosp|\r"; }
 				$orm .= "OBR|$i|||$liscode|||||||R|||||$doc|||||||||||||||||||||||||\r";
 				$i++;
 				if($liscode=="EGFR") {
diff --git a/app/Controllers/API_Results.php b/app/Controllers/API_Results.php
index 1c58cd0..ea4b6bf 100644
--- a/app/Controllers/API_Results.php
+++ b/app/Controllers/API_Results.php
@@ -24,8 +24,8 @@ where r.SP_ACCESSNUMBER='$accessnumber'";
 		$company = $results[0]['COMPANY'];
 		$createdt = gmdate('Y-m-d\TH:i:s.v\Z');
 		$patnumber = substr($results[0]['PATNUMBER'],-9);
-		$firstname = $results[0]['FIRSTNAME'];
-		$lastname = $results[0]['NAME'];
+		$firstname = $results[0]['NAME'];
+		$lastname = $results[0]['FIRSTNAME'];
 		$dob = $results[0]['BIRTHDATE'];
 		$sex = $results[0]['SEX'];
 		$phone = $results[0]['TELEPHON'];
@@ -65,7 +65,9 @@ where r.SP_ACCESSNUMBER='$accessnumber'";
 					"height" => $bh, 
 				],
 			],
-			"test_results" => []
+			"test_results" => [],
+			"collects" => [],
+			"receives" => []
 		];
 
 		$sql = "select dc.CHAPID, t.DEPTH as depth_test, dc.FULLTEXT as chap_eng, dc.FULLTEXT as chap_ind, st.FULLTEXT as serum_type, 
@@ -144,6 +146,27 @@ where r.ACCESSNUMBER='$accessnumber' ORDER BY t.TESTORDER";
 				$json['test_results'][$d0]['subtest_results'][$d1]['subtest_results'][] = $data;
 			}
 		}
+		
+		$sql = "SELECT ds.SHORTTEXT, 
+	FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS RECVDATE, 
+	FORMAT(tu.COLLECTIONDATE, 'HH:mm') AS RECVTIME, 
+	FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS COLLDATE,
+	FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS COLLTIME
+FROM SP_TUBES tu
+LEFT JOIN DICT_SAMPLES_TYPES ds ON ds.SAMPCODE = tu.SAMPLETYPE
+LEFT JOIN cmod.dbo.CM_TUBES ct ON ct.SAMPLETYPE = tu.SAMPLETYPE AND ct.ACCESSNUMBER = tu.SP_ACCESSNUMBER
+WHERE tu.SP_ACCESSNUMBER = '$accessnumber';";
+        $query = $db->query($sql);
+        $samples = $query->getResultArray();
+		foreach ($samples as $data) {
+			$sample = $data['SHORTTEXT'];
+			$recvdate = $data['RECVDATE'];
+			$recvtime = $data['RECVTIME'];
+			$colldate = $data['COLLDATE'];
+			$colltime = $data['COLLTIME'];
+			$json['collects'][] = [ "sample" => "$sample", "colldate" => "$colldate", "colltime" => "$colltime" ];
+			$json['receives'][] = [ "sample" => "$sample", "recvdate" => "$recvdate", "recvtime" => "$recvtime" ];
+		}
 		return $json;
 	}