From f09de297cd8d0137706781c8019daf9d7d31250c Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Thu, 28 May 2026 14:44:39 +0700 Subject: [PATCH] FDQPV5 - add sample only fields --- .../Patient.php | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/application/controllers/mockup/patientlistbarcode-vv-7-cpone-promise/Patient.php b/application/controllers/mockup/patientlistbarcode-vv-7-cpone-promise/Patient.php index 302d9b0..613ebcb 100644 --- a/application/controllers/mockup/patientlistbarcode-vv-7-cpone-promise/Patient.php +++ b/application/controllers/mockup/patientlistbarcode-vv-7-cpone-promise/Patient.php @@ -248,14 +248,17 @@ class Patient extends MY_Controller 'N' as not_sampled, '' as username, '' as status_coming, - '' as date_coming, - '' as date_coming_ina, - '' as order_datetime - FROM t_orderheader + '' as date_coming, + '' as date_coming_ina, + '' as order_datetime, + IFNULL(T_OrderHeaderAddOnReceiveSample, 'N') as flagSampleOnly, + IFNULL(T_OrderHeaderAddOnReceiveSampleTime, '') as sampleOnlyTime + FROM t_orderheader JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID JOIN corporate ON T_OrderHeaderCorporateID = CorporateID LEFT JOIN last_statuspayment ON Last_StatusPaymentT_OrderHeaderID = T_OrderHeaderID AND Last_StatusPaymentIsActive = 'Y' + LEFT JOIN t_orderheaderaddon ON T_OrderHeaderAddOnT_OrderHeaderID = T_OrderHeaderID AND T_OrderHeaderAddOnIsActive = 'Y' left JOIN m_title ON M_PatientM_TitleID = M_TitleID LEFT JOIN mgm_mcu ON T_OrderHeaderMgm_McuID = Mgm_McuID AND Mgm_McuIsActive = 'Y' @@ -348,11 +351,13 @@ class Patient extends MY_Controller FormRiwayatPasienUUID as form_riwayat_pasien_uuid, IFNULL(T_OrderHeaderAddOnID,0) as order_header_addon_id, IFNULL(T_OrderHeaderAddOnOrderType,'ONSITE') as order_header_addon_order_type, - IFNULL(CorporateCorporateTypeID,0) as corporate_type_id, - IFNULL(CorporateTypeName,'') as corporate_type_name, - IFNULL(M_OrderTypeName, '-') as order_type_name, - IFNULL(M_OrderTypeCode, '-') as order_type_code - FROM t_orderheader + IFNULL(CorporateCorporateTypeID,0) as corporate_type_id, + IFNULL(CorporateTypeName,'') as corporate_type_name, + IFNULL(M_OrderTypeName, '-') as order_type_name, + IFNULL(M_OrderTypeCode, '-') as order_type_code, + IFNULL(T_OrderHeaderAddOnReceiveSample, 'N') as flagSampleOnly, + IFNULL(T_OrderHeaderAddOnReceiveSampleTime, '') as sampleOnlyTime + FROM t_orderheader JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID JOIN corporate ON T_OrderHeaderCorporateID = CorporateID LEFT JOIN corporate_type ON CorporateCorporateTypeID = CorporateTypeID AND CorporateTypeIsActive = 'Y'