From 865e4c606cba15a0c6c9d2431eff157e6e5e92d4 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Tue, 12 May 2026 16:20:51 +0700 Subject: [PATCH] Add IsActive filter for t_samplingso_additional_fisik_bw in search queries Co-Authored-By: Claude Sonnet 4.6 --- .../Additional.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/controllers/mockup/cpone-so-template-additional-be-v5/Additional.php b/application/controllers/mockup/cpone-so-template-additional-be-v5/Additional.php index 4b96922..44a4461 100644 --- a/application/controllers/mockup/cpone-so-template-additional-be-v5/Additional.php +++ b/application/controllers/mockup/cpone-so-template-additional-be-v5/Additional.php @@ -157,8 +157,8 @@ T_OrderHeaderIsActive as isactive, ON T_OrderHeaderID = Mcu_ResumeT_OrderHeaderID AND Mcu_ResumeIsActive = 'Y' LEFT JOIN t_samplingso_additional_fisik_bbtb ON T_SamplingAdditionalFisikBBTBT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikBBTBIsActive = 'Y' - LEFT JOIN t_samplingso_additional_fisik_bw ON T_SamplingAdditionalFisikBWT_OrderHeaderID = T_OrderHeaderID - LEFT JOIN t_samplingso_additional_fisik_visus ON T_SamplingAdditionalFisikVisusT_OrderHeaderID = T_OrderHeaderID AND + LEFT JOIN t_samplingso_additional_fisik_bw ON T_SamplingAdditionalFisikBWT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikBWIsActive = 'Y' + LEFT JOIN t_samplingso_additional_fisik_visus ON T_SamplingAdditionalFisikVisusT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikVisusIsActive = 'Y' WHERE (DATE_FORMAT(T_OrderHeaderDate, '%Y-%m-%d') BETWEEN ? AND ?) @@ -319,8 +319,8 @@ GROUP_CONCAT(CONCAT(OrderGlucoseID,'^',Nat_TestID,'^',Nat_TestName,'^',OrderGluc ON T_OrderHeaderID = Mcu_ResumeT_OrderHeaderID AND Mcu_ResumeIsActive = 'Y' LEFT JOIN t_samplingso_additional_fisik_bbtb ON T_SamplingAdditionalFisikBBTBT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikBBTBIsActive = 'Y' - LEFT JOIN t_samplingso_additional_fisik_bw ON T_SamplingAdditionalFisikBWT_OrderHeaderID = T_OrderHeaderID - LEFT JOIN t_samplingso_additional_fisik_visus ON T_SamplingAdditionalFisikVisusT_OrderHeaderID = T_OrderHeaderID AND + LEFT JOIN t_samplingso_additional_fisik_bw ON T_SamplingAdditionalFisikBWT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikBWIsActive = 'Y' + LEFT JOIN t_samplingso_additional_fisik_visus ON T_SamplingAdditionalFisikVisusT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikVisusIsActive = 'Y' LEFT JOIN order_glucose ON OrderGlucoseT_OrderHeaderID = T_OrderHeaderID AND OrderGlucoseIsActive = 'Y' LEFT JOIN nat_test ON OrderGlucoseNat_TestID = Nat_TestID @@ -382,8 +382,8 @@ GROUP_CONCAT(CONCAT(OrderGlucoseID,'^',Nat_TestID,'^',Nat_TestName,'^',OrderGluc FROM t_orderheader LEFT JOIN t_samplingso_additional_fisik_bbtb ON T_SamplingAdditionalFisikBBTBT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikBBTBIsActive = 'Y' - LEFT JOIN t_samplingso_additional_fisik_bw ON T_SamplingAdditionalFisikBWT_OrderHeaderID = T_OrderHeaderID - LEFT JOIN t_samplingso_additional_fisik_visus ON T_SamplingAdditionalFisikVisusT_OrderHeaderID = T_OrderHeaderID AND + LEFT JOIN t_samplingso_additional_fisik_bw ON T_SamplingAdditionalFisikBWT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikBWIsActive = 'Y' + LEFT JOIN t_samplingso_additional_fisik_visus ON T_SamplingAdditionalFisikVisusT_OrderHeaderID = T_OrderHeaderID AND T_SamplingAdditionalFisikVisusIsActive = 'Y' LEFT JOIN order_glucose ON OrderGlucoseT_OrderHeaderID = T_OrderHeaderID AND OrderGlucoseIsActive = 'Y' LEFT JOIN nat_test ON OrderGlucoseNat_TestID = Nat_TestID