From b42ee2067ceebc1391499652bbaba0fb1608cc69 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Thu, 2 Jul 2026 10:18:49 +0700 Subject: [PATCH] GG7SYT - add labeling to lis --- application/controllers/ais/Transactionv2.php | 20 ++++++++--------- application/controllers/ais/Transactionv3.php | 20 ++++++++--------- application/controllers/ais/Transactionv4.php | 20 ++++++++--------- application/controllers/ais/Transactionv5.php | 20 ++++++++--------- application/libraries/Apilis.php | 22 +++++++++---------- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/application/controllers/ais/Transactionv2.php b/application/controllers/ais/Transactionv2.php index 4f86557..9e755ee 100644 --- a/application/controllers/ais/Transactionv2.php +++ b/application/controllers/ais/Transactionv2.php @@ -683,7 +683,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -700,7 +700,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1222,7 +1222,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1239,7 +1239,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2018,7 +2018,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2035,7 +2035,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2517,7 +2517,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2534,7 +2534,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3014,7 +3014,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3031,7 +3031,7 @@ class Transactionv2 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); diff --git a/application/controllers/ais/Transactionv3.php b/application/controllers/ais/Transactionv3.php index 822b333..679c239 100644 --- a/application/controllers/ais/Transactionv3.php +++ b/application/controllers/ais/Transactionv3.php @@ -683,7 +683,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -700,7 +700,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1227,7 +1227,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1244,7 +1244,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2023,7 +2023,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2040,7 +2040,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2522,7 +2522,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2539,7 +2539,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3019,7 +3019,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3036,7 +3036,7 @@ class Transactionv3 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); diff --git a/application/controllers/ais/Transactionv4.php b/application/controllers/ais/Transactionv4.php index 15d65c0..809b0df 100644 --- a/application/controllers/ais/Transactionv4.php +++ b/application/controllers/ais/Transactionv4.php @@ -715,7 +715,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -732,7 +732,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1280,7 +1280,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1297,7 +1297,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2077,7 +2077,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2094,7 +2094,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2598,7 +2598,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2615,7 +2615,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3090,7 +3090,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3107,7 +3107,7 @@ class Transactionv4 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); diff --git a/application/controllers/ais/Transactionv5.php b/application/controllers/ais/Transactionv5.php index 8c0a7d9..2158571 100644 --- a/application/controllers/ais/Transactionv5.php +++ b/application/controllers/ais/Transactionv5.php @@ -715,7 +715,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -732,7 +732,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1280,7 +1280,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -1297,7 +1297,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2077,7 +2077,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2094,7 +2094,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2601,7 +2601,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -2618,7 +2618,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3111,7 +3111,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID = 3 + Nat_GroupID IN (2,3) WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); @@ -3128,7 +3128,7 @@ class Transactionv5 extends MY_Controller JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' AND T_TestIsPrice = 'Y' JOIN nat_test ON T_TestNat_TestID = Nat_TestID AND Nat_TestIsActive = 'Y' JOIN nat_group ON Nat_GroupID = Nat_TestNat_GroupID AND Nat_GroupIsActive = 'Y' AND - Nat_GroupID NOT IN (1,3) + Nat_GroupID = 4 WHERE T_OrderDetailT_OrderHeaderID = ? AND T_OrderDetailIsActive = 'Y' "; $qry = $this->db_onedev->query($sql, array($row['T_OrderHeaderID'])); diff --git a/application/libraries/Apilis.php b/application/libraries/Apilis.php index ac9d005..98cd176 100644 --- a/application/libraries/Apilis.php +++ b/application/libraries/Apilis.php @@ -62,8 +62,8 @@ class Apilis T_OrderHeaderLabNumber AS visitNumber, M_PatientNoreg AS patientId, M_PatientName AS patientName, - IF(LOWER(M_PatientGender) = 'male', 'L', 'P') AS sexId, - IF(LOWER(M_PatientGender) = 'male', 'Male', 'Female') AS sexName, + IF(LOWER(M_PatientGender) = 'male', 'L', IF(LOWER(M_PatientGender) = 'female', 'P', 'O')) AS sexId, + IF(LOWER(M_PatientGender) = 'male', 'Male', IF(LOWER(M_PatientGender) = 'female', 'Female', 'Other')) AS sexName, REPLACE(M_PatientDOB, '-', '/') AS dob, IFNULL(M_TitleName,'') as titleName, '' AS pob, @@ -86,8 +86,8 @@ class Apilis M_BranchName AS guarantorName, 'Cp1' AS agreementId, 'CpOne' AS agreementName, - '' as serviceUnitId, - '' as serviceUnitName, + 'MCU' as serviceUnitId, + 'MCU Onsite' as serviceUnitName, '' as wardPoliId, '' as wardPoliName, '' as roomId, @@ -124,7 +124,7 @@ class Apilis JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsPrice = 'Y' - AND T_TestNat_GroupID = 1 + AND ( T_TestNat_GroupID = 1 OR T_TestNat_GroupID = 7) LEFT JOIN nat_testrefer ON Nat_TestReferNat_TestID = T_TestNat_TestID AND Nat_TestReferIsActive = 'Y' AND Nat_TestReferM_BranchID = M_BranchID LEFT JOIN nat_testmap ON T_TestNat_TestID = Nat_TestMapNat_TestID AND Nat_TestMapIsActive = 'Y' @@ -143,8 +143,8 @@ class Apilis T_OrderHeaderLabNumber AS visitNumber, M_PatientNoreg AS patientId, M_PatientName AS patientName, - IF(LOWER(M_PatientGender) = 'male', 'L', 'P') AS sexId, - IF(LOWER(M_PatientGender) = 'male', 'Male', 'Female') AS sexName, + IF(LOWER(M_PatientGender) = 'male', 'L', IF(LOWER(M_PatientGender) = 'female', 'P', 'O')) AS sexId, + IF(LOWER(M_PatientGender) = 'male', 'Male', IF(LOWER(M_PatientGender) = 'female', 'Female', 'Other')) AS sexName, REPLACE(M_PatientDOB, '-', '/') AS dob, IFNULL(M_TitleName,'') as titleName, '' AS pob, @@ -159,7 +159,7 @@ class Apilis '' as idSIM, '' as idPassport, M_DoctorCode AS physicianId, - M_DoctorName AS physicianName, + CONCAT(IFNULL(M_DoctorPrefix,''),IFNULL(M_DoctorPrefix2,''),' ',M_DoctorName,' ',IFNULL(M_DoctorSuffix,''),IFNULL(M_DoctorSuffix2,'')) AS physicianName, '' as isCito, '' as diagnoseId, T_OrderHeaderDiagnose as diagnoseName, @@ -167,8 +167,8 @@ class Apilis CorporateName AS guarantorName, 'Cp1' AS agreementId, 'CpOne' AS agreementName, - '' as serviceUnitId, - '' as serviceUnitName, + 'WI' as serviceUnitId, + 'Walk In' as serviceUnitName, '' as wardPoliId, '' as wardPoliName, '' as roomId, @@ -209,7 +209,7 @@ class Apilis JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsPrice = 'Y' - AND T_TestNat_GroupID = 1 + AND T_TestNat_GroupID IN (1,6,7) LEFT JOIN nat_testrefer ON Nat_TestReferNat_TestID = T_TestNat_TestID AND Nat_TestReferIsActive = 'Y' AND Nat_TestReferM_BranchID = M_BranchID LEFT JOIN nat_testmap ON T_TestNat_TestID = Nat_TestMapNat_TestID AND Nat_TestMapIsActive = 'Y' -- 2.49.1