From 220ad53286a858f59f21309613e6288d0a087ae1 Mon Sep 17 00:00:00 2001 From: mikael-zakaria Date: Tue, 11 Feb 2025 10:38:27 +0800 Subject: [PATCH] 20251102 auth n result update --- app/Controllers/API_Results.php | 8 ++++---- app/Controllers/Auths.php | 2 +- public/tokens/pbmc_sby.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Controllers/API_Results.php b/app/Controllers/API_Results.php index ea4b6bf..90e57ac 100644 --- a/app/Controllers/API_Results.php +++ b/app/Controllers/API_Results.php @@ -88,7 +88,7 @@ left join cmod.dbo.CM_DICT_MAPPINGS m on m.LISCODE=cr.TESTCODE left join cmod.dbo.CM_TM_REQUESTS cq on cq.REFFID=r.EXTERNALORDERNUMBER left join cmod.dbo.CM_TM_TESTS ct on ct.HISCODE=m.HISCODE and ct.REQID=cq.REQID left join cmod.dbo.CM_DICT_TUBES tub on tub.TUBEID=m.TUBEID -where r.ACCESSNUMBER='$accessnumber' ORDER BY t.TESTORDER"; +where r.ACCESSNUMBER='$accessnumber' and t.NOTPRINTABLE is null ORDER BY t.TESTORDER"; $query = $db->query($sql); $test_results = $query->getResultArray(); $d0=-1; $d1=-1; $d2=-1; $d3=-1; @@ -107,8 +107,8 @@ where r.ACCESSNUMBER='$accessnumber' ORDER BY t.TESTORDER"; $testresult = $result['RESULT']; $unit = $result['UNITS']; $unittext = $result['UNITTEXT']; - if($unittext != '') { $testunit = $unit; } - else { $testunit = $unittext; } + $testunit = $unit; + if($unittext != '') { $testunit = $unittext; } $refrange = $result['REFRANGE']; $refftext = $result['REFFTEXT']; $resstatus = $result['RESSTATUS']; @@ -172,7 +172,7 @@ WHERE tu.SP_ACCESSNUMBER = '$accessnumber';"; public function results_send($accessnumber) { //$TM_url = "https://api-transmedic1.transmedic.co.id/api/webhook/lis"; - $TM_url = "http://10.10.12.90:8001/api/webhook/lis"; + $TM_url = "http://10.10.4.123:8001/api/webhook/lis"; $TMBali_bearerToken = file_get_contents('tokens/pbmc_dps.txt'); $TMSby_bearerToken = file_get_contents('tokens/pbmc_sby.txt'); diff --git a/app/Controllers/Auths.php b/app/Controllers/Auths.php index faa4693..4f2b5af 100644 --- a/app/Controllers/Auths.php +++ b/app/Controllers/Auths.php @@ -5,7 +5,7 @@ class Auths extends BaseController { public function login() { //$TM_url = "https://api-transmedic1.transmedic.co.id/api/token/create"; - $TM_url = "http://10.10.12.90:8001/api/token/create"; + $TM_url = "http://10.10.4.123:8001/api/token/create"; //$TM_url = "http://cmod-rest.local/tests"; $fileSBY = "tokens/pbmc_sby.txt"; $fileDPS = "tokens/pbmc_dps.txt"; diff --git a/public/tokens/pbmc_sby.txt b/public/tokens/pbmc_sby.txt index 9389a4a..e426556 100644 --- a/public/tokens/pbmc_sby.txt +++ b/public/tokens/pbmc_sby.txt @@ -1 +1 @@ -3637|eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOm51bGwsImF1ZCI6IjEwLjEwLjEyLjkwOjgwMDEiLCJpYXQiOjE3Mzg3Nzc0OTAsImV4cCI6MTczODg2Mzg5MCwic3ViIjpudWxsLCJqdGkiOiJmZjE5YmY0MS05ZmY4LTRiZTYtYjBjYS0xMjk5OWQ2NGJiMzMiLCJkYXRhIjp7InVzZXJuYW1lIjoicGJtY19zdXJhYmF5YSIsInBhc3N3b3JkIjoicGdjV2Zkd1gzcUV0OXphQyJ9fQ.pgE6ehnVn8kF9LxnnAW_OAXHyT-RVTMajHySvgJ7al0 \ No newline at end of file +3882|eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOm51bGwsImF1ZCI6ImludGVncmF0aW9uLmVrbGluaWsucGJtY2dyb3VwLmNvbSIsImlhdCI6MTczODg5MTQ0MiwiZXhwIjoxNzM4OTc3ODQyLCJzdWIiOm51bGwsImp0aSI6IjY2Zjk3ZTE4LTMwYmYtNDMxNC1iODU1LTllYjBlMmZlZWM4MCIsImRhdGEiOnsidXNlcm5hbWUiOiJwYm1jX3N1cmFiYXlhIiwicGFzc3dvcmQiOiJwZ2NXZmR3WDNxRXQ5emFDIn19.rOWSOg_TQ4x0uWsH3fA-inoN_ysq9zUm7-MOF2L58dI \ No newline at end of file