From 6c2b12327a027c1c8922c5c169b1b0d65a0f6900 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Thu, 25 Jun 2026 16:52:57 +0700 Subject: [PATCH 1/3] 3Z4LPN - tambah field is_stemcell di monitoring_transaction Transactionv4 --- application/controllers/ais/Transactionv4.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/ais/Transactionv4.php b/application/controllers/ais/Transactionv4.php index dab78f6..f3a4584 100644 --- a/application/controllers/ais/Transactionv4.php +++ b/application/controllers/ais/Transactionv4.php @@ -3671,6 +3671,7 @@ class Transactionv4 extends MY_Controller b.M_BranchCode AS branch_code, b.M_BranchName AS branch_name, b.M_BranchCodeLab AS branch_code_lab, + b.M_BranchIsSteemCell AS is_stemcell, oh.T_OrderHeaderTotal AS total, at.Ais_TransactionStatus AS Ais_TransactionStatus, c.CorporateID AS corporate_id, -- 2.49.1 From 128ec0876259ae1f1c36f5b800729836d2c66896 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Fri, 26 Jun 2026 10:56:31 +0700 Subject: [PATCH 2/3] 3Z4LPN - tambah debug AIS dan filter monitoring transaction --- application/controllers/ais/Transactionv4.php | 169 +++++++++++++-- application/controllers/ais/Transactionv5.php | 201 ++++++++++++++++-- 2 files changed, 333 insertions(+), 37 deletions(-) diff --git a/application/controllers/ais/Transactionv4.php b/application/controllers/ais/Transactionv4.php index f3a4584..0f6303b 100644 --- a/application/controllers/ais/Transactionv4.php +++ b/application/controllers/ais/Transactionv4.php @@ -3,6 +3,7 @@ class Transactionv4 extends MY_Controller { var $db_onedev; + private $force_debug_ais_payload = false; public function index() { echo "Transaction API"; @@ -63,6 +64,26 @@ class Transactionv4 extends MY_Controller return implode(' ', $parts); } + private function should_debug_ais_payload() + { + return $this->force_debug_ais_payload === true; + } + + private function debug_ais_payload_response($sourceEndpoint, $method, $url, $headers, $payload) + { + $this->sys_ok(array( + 'status' => 'debug', + 'message' => 'Debug payload only, request not sent to AIS', + 'source_endpoint' => $sourceEndpoint, + 'target_method' => $method, + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $payload, + 'curl_command' => $this->build_curl_command($url, $payload, $headers, $method) + )); + exit; + } + /** * Generic POST request function * @param string $url API endpoint URL @@ -313,6 +334,16 @@ class Transactionv4 extends MY_Controller public function post_auth() { $dt_config = $this->get_config(); + if ($this->should_debug_ais_payload()) { + return array( + 'success' => true, + 'debug' => true, + 'message' => 'Debug payload only, auth request not sent to AIS', + 'data' => array( + 'token' => $dt_config['AisConfigAuthToken'] ?? null + ) + ); + } $baseUrl = $dt_config['AisConfigBaseUrl']; $url = $baseUrl . '/api/auth/auth.php'; $headers = array( @@ -378,8 +409,9 @@ class Transactionv4 extends MY_Controller function post_transaction_daily_by_date($min_date = null, $max_date = null) { //echo "post_transaction_daily_by_date"; + $debugPayload = $this->should_debug_ais_payload(); // Auth Login - $login = $this->post_auth(); + $login = $debugPayload ? array('success' => true) : $this->post_auth(); //echo json_encode($login); //exit; @@ -542,7 +574,7 @@ class Transactionv4 extends MY_Controller } $raw_data = $qry->result_array(); if (count($raw_data) == 0) { - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan', 'query' => $this->db_onedev->last_query()); + $errors = array('status' => 'error', 'message' => 'Data reguler tidak ditemukan', 'query' => $this->db_onedev->last_query()); echo json_encode($errors); exit; } @@ -821,6 +853,28 @@ class Transactionv4 extends MY_Controller $get_transaction = $this->get_transaction_by_labnumber($row['RegID']); // echo json_encode($get_transaction); + if ($debugPayload) { + $method = ($get_transaction && count($get_transaction) > 0) ? 'PUT' : 'POST'; + $step = $method === 'PUT' ? 'put_transaction' : 'post_transaction'; + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv4/post_transaction_daily_by_date', + 'transactions' => array( + array( + 'RegID' => $row['RegID'], + 'step' => $step, + 'target_method' => $method, + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, $method) + ) + ) + )); + exit; + } + if ($get_transaction && count($get_transaction) > 0) { $result = $this->put_request($url, $raw_data[$key], $headers); } else { @@ -1085,7 +1139,7 @@ class Transactionv4 extends MY_Controller } $raw_data = $qry->result_array(); if (count($raw_data) == 0) { - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan'); + $errors = array('status' => 'error', 'message' => 'Data reguler tidak ditemukan'); echo json_encode($errors); exit; } @@ -1736,9 +1790,20 @@ class Transactionv4 extends MY_Controller { $prm = $this->sys_input; $labnum = $prm['labnumber']; + $debugPayload = $this->should_debug_ais_payload(); + $dt_config = $this->get_config(); + $baseUrl = $dt_config['AisConfigBaseUrl']; + $authUrl = $baseUrl . '/api/auth/auth.php'; + $authHeaders = array( + 'Header-Token: ' . $dt_config['AisConfigHeaderToken'] + ); + $authPayload = array( + 'username' => $dt_config['AisConfigUsername'], + 'password' => $dt_config['AisConfigPassword'] + ); // Auth Login - $login = $this->post_auth(); + $login = $debugPayload ? array('success' => true) : $this->post_auth(); if (!$login['success']) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 555); @@ -1746,9 +1811,6 @@ class Transactionv4 extends MY_Controller echo json_encode($errors); exit; } - // Get config - $dt_config = $this->get_config(); - $baseUrl = $dt_config['AisConfigBaseUrl']; $url = $baseUrl . '/api/transaction_full/transaksi.php'; $headers = array( @@ -1881,7 +1943,7 @@ class Transactionv4 extends MY_Controller $raw_data = $qry->result_array(); if (count($raw_data) == 0) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 't_orderheader select', 'query' => $this->db_onedev->last_query(), 'json' => ''), 999); - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan'); + $errors = array('status' => 'error', 'message' => 'Data reguler tidak ditemukan'); echo json_encode($errors); exit; } @@ -2149,6 +2211,24 @@ class Transactionv4 extends MY_Controller $raw_data[$key]['PaketDispenser'] = null; $errors = []; //exit; + if ($debugPayload) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv4/post_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'post_transaction', + 'target_method' => 'POST', + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, 'POST') + ) + ) + )); + exit; + } $result = $this->post_request($url, $raw_data[$key], $headers); @@ -2238,17 +2318,25 @@ class Transactionv4 extends MY_Controller { $prm = $this->sys_input; $labnum = $prm['labnumber']; + $debugPayload = $this->should_debug_ais_payload(); + $dt_config = $this->get_config(); + $baseUrl = $dt_config['AisConfigBaseUrl']; + $authUrl = $baseUrl . '/api/auth/auth.php'; + $authHeaders = array( + 'Header-Token: ' . $dt_config['AisConfigHeaderToken'] + ); + $authPayload = array( + 'username' => $dt_config['AisConfigUsername'], + 'password' => $dt_config['AisConfigPassword'] + ); // Auth Login - $login = $this->post_auth(); + $login = $debugPayload ? array('success' => true) : $this->post_auth(); if (!$login['success']) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 555); $errors = array('status' => 'error', 'message' => 'Gagal Login'); echo json_encode($errors); exit; } - // Get config - $dt_config = $this->get_config(); - $baseUrl = $dt_config['AisConfigBaseUrl']; $url = $baseUrl . '/api/transaction_full/transaksi.php'; $headers = array( @@ -2378,7 +2466,7 @@ class Transactionv4 extends MY_Controller $raw_data = $qry->result_array(); if (count($raw_data) == 0) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 't_orderheader select', 'query' => $this->db_onedev->last_query(), 'json' => ''), 999); - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan'); + $errors = array('status' => 'error', 'message' => 'Data reguler tidak ditemukan'); echo json_encode($errors); exit; } @@ -3138,7 +3226,25 @@ class Transactionv4 extends MY_Controller //echo json_encode($raw_data[$key]); //exit; - $result = $this->post_request($url, $raw_data[$key], $headers); + if ($debugPayload) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv4/re_post_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'put_transaction', + 'target_method' => 'PUT', + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, 'PUT') + ) + ) + )); + exit; + } + $result = $this->put_request($url, $raw_data[$key], $headers); if ($result['error'] != null) { @@ -3603,6 +3709,32 @@ class Transactionv4 extends MY_Controller 'Authorization: Bearer ' . $dt_config['AisConfigAuthToken'] ); + $authUrl = $baseUrl . '/api/auth/auth.php'; + $authHeaders = array( + 'Header-Token: ' . $dt_config['AisConfigHeaderToken'] + ); + $authPayload = array( + 'username' => $dt_config['AisConfigUsername'], + 'password' => $dt_config['AisConfigPassword'] + ); + if ($this->should_debug_ais_payload()) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv4/delete_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'delete_transaction', + 'target_method' => 'DELETE', + 'target_url' => $baseUrl . '/api/transaction_full/transaksi.php', + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => array('RegID' => $labnumber), + 'curl_command' => $this->build_curl_command($baseUrl . '/api/transaction_full/transaksi.php', array('RegID' => $labnumber), $headers, 'DELETE') + ) + ) + )); + exit; + } $login = $this->post_auth(); if (!$login['success']) { $this->error_log(array('fn_name' => 'get_transaction_auth', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 999); @@ -3612,8 +3744,6 @@ class Transactionv4 extends MY_Controller } $url = $baseUrl . '/api/transaction_full/transaksi.php'; - - $result = $this->delete_request($url, ['RegID' => $labnumber], $headers); //response {"success":true} @@ -3698,6 +3828,7 @@ class Transactionv4 extends MY_Controller $corporate_id = $this->input->get('corporate_id'); $lab_number = $this->input->get('lab_number'); $patient_name = $this->input->get('patient_name'); + $is_stemcell = $this->input->get('is_stemcell'); // Pagination $page = $this->input->get('page') ? intval($this->input->get('page')) : 1; @@ -3734,6 +3865,11 @@ class Transactionv4 extends MY_Controller $params[] = "%$patient_name%"; } + if ($is_stemcell !== null && $is_stemcell !== '' && $is_stemcell !== 'A') { + $where_clauses[] = "b.M_BranchIsSteemCell = ?"; + $params[] = $is_stemcell; + } + // Build WHERE $where_sql = ""; if (!empty($where_clauses)) { @@ -3744,6 +3880,7 @@ class Transactionv4 extends MY_Controller $count_sql = "SELECT COUNT(DISTINCT oh.T_OrderHeaderID) as total FROM t_orderheader oh JOIN m_patient p ON p.M_PatientID = oh.T_OrderHeaderM_PatientID + JOIN m_branch b ON b.M_BranchID = oh.T_OrderHeaderM_BranchID LEFT JOIN " . $this->db_log->database . ".ais_transaction at ON at.Ais_TransactionOrderHeaderLabNumber = oh.T_OrderHeaderLabNumber LEFT JOIN corporate c ON c.CorporateID = oh.T_OrderHeaderCorporateID diff --git a/application/controllers/ais/Transactionv5.php b/application/controllers/ais/Transactionv5.php index d4632cc..d13d8cd 100644 --- a/application/controllers/ais/Transactionv5.php +++ b/application/controllers/ais/Transactionv5.php @@ -3,6 +3,7 @@ class Transactionv5 extends MY_Controller { var $db_onedev; + private $force_debug_ais_payload = false; public function index() { echo "Transaction API"; @@ -63,6 +64,26 @@ class Transactionv5 extends MY_Controller return implode(' ', $parts); } + private function should_debug_ais_payload() + { + return $this->force_debug_ais_payload === true; + } + + private function debug_ais_payload_response($sourceEndpoint, $method, $url, $headers, $payload) + { + $this->sys_ok(array( + 'status' => 'debug', + 'message' => 'Debug payload only, request not sent to AIS', + 'source_endpoint' => $sourceEndpoint, + 'target_method' => $method, + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $payload, + 'curl_command' => $this->build_curl_command($url, $payload, $headers, $method) + )); + exit; + } + /** * Generic POST request function * @param string $url API endpoint URL @@ -313,6 +334,16 @@ class Transactionv5 extends MY_Controller public function post_auth() { $dt_config = $this->get_config(); + if ($this->should_debug_ais_payload()) { + return array( + 'success' => true, + 'debug' => true, + 'message' => 'Debug payload only, auth request not sent to AIS', + 'data' => array( + 'token' => $dt_config['AisConfigAuthToken'] ?? null + ) + ); + } $baseUrl = $dt_config['AisConfigBaseUrl']; $url = $baseUrl . '/api/auth/auth.php'; $headers = array( @@ -378,8 +409,9 @@ class Transactionv5 extends MY_Controller function post_transaction_daily_by_date($min_date = null, $max_date = null) { //echo "post_transaction_daily_by_date"; + $debugPayload = $this->should_debug_ais_payload(); // Auth Login - $login = $this->post_auth(); + $login = $debugPayload ? array('success' => true) : $this->post_auth(); //echo json_encode($login); //exit; @@ -542,7 +574,7 @@ class Transactionv5 extends MY_Controller } $raw_data = $qry->result_array(); if (count($raw_data) == 0) { - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan', 'query' => $this->db_onedev->last_query()); + $errors = array('status' => 'error', 'message' => 'Data stem cell tidak ditemukan', 'query' => $this->db_onedev->last_query()); echo json_encode($errors); exit; } @@ -821,6 +853,28 @@ class Transactionv5 extends MY_Controller $get_transaction = $this->get_transaction_by_labnumber($row['RegID']); // echo json_encode($get_transaction); + if ($debugPayload) { + $method = ($get_transaction && count($get_transaction) > 0) ? 'PUT' : 'POST'; + $step = $method === 'PUT' ? 'put_transaction' : 'post_transaction'; + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv5/post_transaction_daily_by_date', + 'transactions' => array( + array( + 'RegID' => $row['RegID'], + 'step' => $step, + 'target_method' => $method, + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, $method) + ) + ) + )); + exit; + } + if ($get_transaction && count($get_transaction) > 0) { $result = $this->put_request($url, $raw_data[$key], $headers); } else { @@ -1085,7 +1139,7 @@ class Transactionv5 extends MY_Controller } $raw_data = $qry->result_array(); if (count($raw_data) == 0) { - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan'); + $errors = array('status' => 'error', 'message' => 'Data stem cell tidak ditemukan'); echo json_encode($errors); exit; } @@ -1736,9 +1790,20 @@ class Transactionv5 extends MY_Controller { $prm = $this->sys_input; $labnum = $prm['labnumber']; + $debugPayload = $this->should_debug_ais_payload(); + $dt_config = $this->get_config(); + $baseUrl = $dt_config['AisConfigBaseUrl']; + $authUrl = $baseUrl . '/api/auth/auth.php'; + $authHeaders = array( + 'Header-Token: ' . $dt_config['AisConfigHeaderToken'] + ); + $authPayload = array( + 'username' => $dt_config['AisConfigUsername'], + 'password' => $dt_config['AisConfigPassword'] + ); // Auth Login - $login = $this->post_auth(); + $login = $debugPayload ? array('success' => true) : $this->post_auth(); if (!$login['success']) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 555); @@ -1746,9 +1811,6 @@ class Transactionv5 extends MY_Controller echo json_encode($errors); exit; } - // Get config - $dt_config = $this->get_config(); - $baseUrl = $dt_config['AisConfigBaseUrl']; $url = $baseUrl . '/api/transaction_full/transaksi.php'; $headers = array( @@ -1881,7 +1943,7 @@ class Transactionv5 extends MY_Controller $raw_data = $qry->result_array(); if (count($raw_data) == 0) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 't_orderheader select', 'query' => $this->db_onedev->last_query(), 'json' => ''), 999); - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan'); + $errors = array('status' => 'error', 'message' => 'Data stem cell tidak ditemukan'); echo json_encode($errors); exit; } @@ -2149,6 +2211,24 @@ class Transactionv5 extends MY_Controller $raw_data[$key]['PaketDispenser'] = null; $errors = []; //exit; + if ($debugPayload) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv5/post_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'post_transaction', + 'target_method' => 'POST', + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, 'POST') + ) + ) + )); + exit; + } $result = $this->post_request($url, $raw_data[$key], $headers); @@ -2238,17 +2318,28 @@ class Transactionv5 extends MY_Controller { $prm = $this->sys_input; $labnum = $prm['labnumber']; - // Auth Login - $login = $this->post_auth(); - if (!$login['success']) { - $this->error_log(array('fn_name' => 'post_transaction', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 555); - $errors = array('status' => 'error', 'message' => 'Gagal Login'); - echo json_encode($errors); - exit; - } - // Get config + $debugPayload = true; $dt_config = $this->get_config(); $baseUrl = $dt_config['AisConfigBaseUrl']; + $authUrl = $baseUrl . '/api/auth/auth.php'; + $authHeaders = array( + 'Header-Token: ' . $dt_config['AisConfigHeaderToken'] + ); + $authPayload = array( + 'username' => $dt_config['AisConfigUsername'], + 'password' => $dt_config['AisConfigPassword'] + ); + // Auth Login + if (!$debugPayload) { + $login = $this->post_auth(); + if (!$login['success']) { + $this->error_log(array('fn_name' => 'post_transaction', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 555); + $errors = array('status' => 'error', 'message' => 'Gagal Login'); + echo json_encode($errors); + exit; + } + } + $url = $baseUrl . '/api/transaction_full/transaksi.php'; $headers = array( @@ -2378,7 +2469,7 @@ class Transactionv5 extends MY_Controller $raw_data = $qry->result_array(); if (count($raw_data) == 0) { $this->error_log(array('fn_name' => 'post_transaction', 'message' => 't_orderheader select', 'query' => $this->db_onedev->last_query(), 'json' => ''), 999); - $errors = array('status' => 'error', 'message' => 'Data tidak ditemukan'); + $errors = array('status' => 'error', 'message' => 'Data stem cell tidak ditemukan'); echo json_encode($errors); exit; } @@ -2647,7 +2738,25 @@ class Transactionv5 extends MY_Controller $errors = []; //echo json_encode($raw_data[$key]); - //exit; + //exit; + if ($debugPayload) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv5/re_post_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'put_transaction', + 'target_method' => 'PUT', + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, 'PUT') + ) + ) + )); + exit; + } $result = $this->put_request($url, $raw_data[$key], $headers); @@ -3138,6 +3247,32 @@ class Transactionv5 extends MY_Controller //echo json_encode($raw_data[$key]); //exit; + if ($debugPayload) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv5/re_post_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'auth_login', + 'target_method' => 'POST', + 'target_url' => $authUrl, + 'target_headers' => array_merge(array('Content-Type: application/json'), $authHeaders), + 'target_payload' => $authPayload, + 'curl_command' => $this->build_curl_command($authUrl, $authPayload, $authHeaders, 'POST') + ), + array( + 'step' => 'post_transaction', + 'target_method' => 'POST', + 'target_url' => $url, + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => $raw_data[$key], + 'curl_command' => $this->build_curl_command($url, $raw_data[$key], $headers, 'POST') + ) + ) + )); + exit; + } $result = $this->post_request($url, $raw_data[$key], $headers); @@ -3603,6 +3738,32 @@ class Transactionv5 extends MY_Controller 'Authorization: Bearer ' . $dt_config['AisConfigAuthToken'] ); + $authUrl = $baseUrl . '/api/auth/auth.php'; + $authHeaders = array( + 'Header-Token: ' . $dt_config['AisConfigHeaderToken'] + ); + $authPayload = array( + 'username' => $dt_config['AisConfigUsername'], + 'password' => $dt_config['AisConfigPassword'] + ); + if ($this->should_debug_ais_payload()) { + echo json_encode(array( + 'status' => 'debug', + 'message' => 'Debug outbound AIS requests only, nothing sent', + 'source_endpoint' => 'transactionv5/delete_transaction_by_labnumber', + 'debug_steps' => array( + array( + 'step' => 'delete_transaction', + 'target_method' => 'DELETE', + 'target_url' => $baseUrl . '/api/transaction_full/transaksi.php', + 'target_headers' => array_merge(array('Content-Type: application/json'), $headers), + 'target_payload' => array('RegID' => $labnumber), + 'curl_command' => $this->build_curl_command($baseUrl . '/api/transaction_full/transaksi.php', array('RegID' => $labnumber), $headers, 'DELETE') + ) + ) + )); + exit; + } $login = $this->post_auth(); if (!$login['success']) { $this->error_log(array('fn_name' => 'get_transaction_auth', 'message' => 'failed auth', 'query' => '', 'json' => json_encode($login)), 999); @@ -3612,8 +3773,6 @@ class Transactionv5 extends MY_Controller } $url = $baseUrl . '/api/transaction_full/transaksi.php'; - - $result = $this->delete_request($url, ['RegID' => $labnumber], $headers); //response {"success":true} -- 2.49.1 From e6a1be02efb98a3c25cfb13ee5eebdaa3cd526f7 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Mon, 29 Jun 2026 09:58:19 +0700 Subject: [PATCH 3/3] 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) -- 2.49.1