From e6a1be02efb98a3c25cfb13ee5eebdaa3cd526f7 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Mon, 29 Jun 2026 09:58:19 +0700 Subject: [PATCH] FHM290626CPONE01 - fix filter T_TestIsPrice --- application/controllers/ais/Transactionv3.php | 42 +++++++++---------- application/controllers/ais/Transactionv4.php | 42 +++++++++---------- application/controllers/ais/Transactionv5.php | 42 +++++++++---------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/application/controllers/ais/Transactionv3.php b/application/controllers/ais/Transactionv3.php index 0f04b1d..822b333 100644 --- a/application/controllers/ais/Transactionv3.php +++ b/application/controllers/ais/Transactionv3.php @@ -608,7 +608,7 @@ class Transactionv3 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -660,7 +660,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -680,7 +680,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -697,7 +697,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -1152,7 +1152,7 @@ class Transactionv3 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -1204,7 +1204,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -1224,7 +1224,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -1241,7 +1241,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -1948,7 +1948,7 @@ class Transactionv3 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -2000,7 +2000,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -2020,7 +2020,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -2037,7 +2037,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2447,7 +2447,7 @@ class Transactionv3 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -2499,7 +2499,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -2519,7 +2519,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -2536,7 +2536,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2892,7 +2892,7 @@ class Transactionv3 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND @@ -2948,7 +2948,7 @@ class Transactionv3 extends MY_Controller FROM `t_orderdetailorder` JOIN t_orderdetail ON T_OrderdetailT_OrderHeaderID = T_OrderDetailOrderT_OrderHeaderID AND T_OrderDetailIsActive = 'Y' AND T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderheader ON T_OrderHeaderID = T_OrderDetailOrderT_OrderHeaderID @@ -2996,7 +2996,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -3016,7 +3016,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -3033,7 +3033,7 @@ class Transactionv3 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) diff --git a/application/controllers/ais/Transactionv4.php b/application/controllers/ais/Transactionv4.php index 0f6303b..ba28a4f 100644 --- a/application/controllers/ais/Transactionv4.php +++ b/application/controllers/ais/Transactionv4.php @@ -640,7 +640,7 @@ class Transactionv4 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -692,7 +692,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -712,7 +712,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -729,7 +729,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -1205,7 +1205,7 @@ class Transactionv4 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -1257,7 +1257,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -1277,7 +1277,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -1294,7 +1294,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2002,7 +2002,7 @@ class Transactionv4 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -2054,7 +2054,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -2074,7 +2074,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -2091,7 +2091,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2523,7 +2523,7 @@ class Transactionv4 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -2575,7 +2575,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -2595,7 +2595,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -2612,7 +2612,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2963,7 +2963,7 @@ class Transactionv4 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND @@ -3019,7 +3019,7 @@ class Transactionv4 extends MY_Controller FROM `t_orderdetailorder` JOIN t_orderdetail ON T_OrderdetailT_OrderHeaderID = T_OrderDetailOrderT_OrderHeaderID AND T_OrderDetailIsActive = 'Y' AND T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderheader ON T_OrderHeaderID = T_OrderDetailOrderT_OrderHeaderID @@ -3067,7 +3067,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -3087,7 +3087,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -3104,7 +3104,7 @@ class Transactionv4 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) diff --git a/application/controllers/ais/Transactionv5.php b/application/controllers/ais/Transactionv5.php index d13d8cd..ab667e5 100644 --- a/application/controllers/ais/Transactionv5.php +++ b/application/controllers/ais/Transactionv5.php @@ -640,7 +640,7 @@ class Transactionv5 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -692,7 +692,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -712,7 +712,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -729,7 +729,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -1205,7 +1205,7 @@ class Transactionv5 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -1257,7 +1257,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -1277,7 +1277,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -1294,7 +1294,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2002,7 +2002,7 @@ class Transactionv5 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -2054,7 +2054,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -2074,7 +2074,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -2091,7 +2091,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2526,7 +2526,7 @@ class Transactionv5 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND T_OrderDetailOrderIsActive = 'Y' @@ -2578,7 +2578,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -2598,7 +2598,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -2615,7 +2615,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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) @@ -2984,7 +2984,7 @@ class Transactionv5 extends MY_Controller '' as TrxLayananDetail, 'Y' as Tagihkan FROM t_orderdetail - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderdetailorder ON T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID AND @@ -3040,7 +3040,7 @@ class Transactionv5 extends MY_Controller FROM `t_orderdetailorder` JOIN t_orderdetail ON T_OrderdetailT_OrderHeaderID = T_OrderDetailOrderT_OrderHeaderID AND T_OrderDetailIsActive = 'Y' AND T_OrderDetailT_OrderDetailOrderID = T_OrderDetailOrderID - JOIN t_test ON T_TestID = T_OrderDetailT_TestID AND T_TestIsActive = 'Y' + JOIN t_test ON T_TestID = T_OrderDetailT_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' JOIN t_orderheader ON T_OrderHeaderID = T_OrderDetailOrderT_OrderHeaderID @@ -3088,7 +3088,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lab = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lab FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 = 1 @@ -3108,7 +3108,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_radiologi = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_radiologi FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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 @@ -3125,7 +3125,7 @@ class Transactionv5 extends MY_Controller $jumlah_layanan_lain = 0; $sql = "SELECT IFNULL(SUM(T_OrderDetailTotal),0) as total_layanan_lain FROM t_orderdetail - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + 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)