diff --git a/application/controllers/ais/Transactionv2.php b/application/controllers/ais/Transactionv2.php
index 5e3bbb1..4f86557 100644
--- a/application/controllers/ais/Transactionv2.php
+++ b/application/controllers/ais/Transactionv2.php
@@ -608,7 +608,7 @@ class Transactionv2 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 Transactionv2 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 Transactionv2 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 Transactionv2 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)
@@ -1147,7 +1147,7 @@ class Transactionv2 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'
@@ -1199,7 +1199,7 @@ class Transactionv2 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
@@ -1219,7 +1219,7 @@ class Transactionv2 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
@@ -1236,7 +1236,7 @@ class Transactionv2 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)
@@ -1943,7 +1943,7 @@ class Transactionv2 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'
@@ -1995,7 +1995,7 @@ class Transactionv2 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
@@ -2015,7 +2015,7 @@ class Transactionv2 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
@@ -2032,7 +2032,7 @@ class Transactionv2 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)
@@ -2442,7 +2442,7 @@ class Transactionv2 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'
@@ -2494,7 +2494,7 @@ class Transactionv2 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
@@ -2514,7 +2514,7 @@ class Transactionv2 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
@@ -2531,7 +2531,7 @@ class Transactionv2 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)
@@ -2887,7 +2887,7 @@ class Transactionv2 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
@@ -2943,7 +2943,7 @@ class Transactionv2 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
@@ -2991,7 +2991,7 @@ class Transactionv2 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
@@ -3011,7 +3011,7 @@ class Transactionv2 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
@@ -3028,7 +3028,7 @@ class Transactionv2 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)