From ef98be6480372b9e2b1ef8e00404ed8da7ea6ec4 Mon Sep 17 00:00:00 2001 From: Hanan Askarim Date: Thu, 21 May 2026 11:23:32 +0700 Subject: [PATCH] fix PID report --- .../Resultentry.php | 69 +++++++++--------- .../resultentrysoxray-westone/Resultentry.php | 70 +++++++++---------- 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/application/controllers/mockup/resultentrysoelectromedis-westone/Resultentry.php b/application/controllers/mockup/resultentrysoelectromedis-westone/Resultentry.php index 732e1186..c41b0ad6 100644 --- a/application/controllers/mockup/resultentrysoelectromedis-westone/Resultentry.php +++ b/application/controllers/mockup/resultentrysoelectromedis-westone/Resultentry.php @@ -1554,49 +1554,49 @@ class Resultentry extends MY_Controller $act = "UPDATE_ACT"; if ($prm['act'] === 'val1') { $act = "VALIDATION"; - $sql = "SELECT so_resultentrydetail.*, IF(NonlabTemplateMcuID IS NULL,'N','Y') as is_kesimpulan, T_TestID, T_TestName, So_ResultEntryT_OrderHeaderID, Group_ResultID - FROM so_resultentrydetail - JOIN so_resultentry ON So_ResultEntryDetailSo_ResultEntryID = So_ResultEntryID AND So_ResultEntryIsActive = 'Y' - JOIN t_orderdetail ON So_ResultEntryT_OrderDetailID = T_OrderDetailID AND T_OrderDetailIsActive = 'Y' - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' - JOIN group_resultdetail ON Group_ResultDetailT_TestID = T_TestID AND Group_ResultDetailIsActive = 'Y' - JOIN group_result ON Group_ResultDetailGroup_ResultID = Group_ResultID AND Group_ResultIsActive = 'Y' - LEFT JOIN nonlab_template_mcu ON NonlabTemplateMcuNat_TestID = T_TestNat_TestID AND NonlabTemplateMcuIsActive = 'Y' AND - NonlabTemplateMcuNonlabTemplateDetailID = So_ResultEntryDetailNonlab_TemplateDetailID - WHERE + $sql = "SELECT so_resultentrydetail.*, IF(NonlabTemplateMcuID IS NULL,'N','Y') as is_kesimpulan, T_TestID, T_TestName, So_ResultEntryT_OrderHeaderID, Group_ResultID + FROM so_resultentrydetail + JOIN so_resultentry ON So_ResultEntryDetailSo_ResultEntryID = So_ResultEntryID AND So_ResultEntryIsActive = 'Y' + JOIN t_orderdetail ON So_ResultEntryT_OrderDetailID = T_OrderDetailID AND T_OrderDetailIsActive = 'Y' + JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + JOIN group_resultdetail ON Group_ResultDetailT_TestID = T_TestID AND Group_ResultDetailIsActive = 'Y' + JOIN group_result ON Group_ResultDetailGroup_ResultID = Group_ResultID AND Group_ResultIsActive = 'Y' + LEFT JOIN nonlab_template_mcu ON NonlabTemplateMcuNat_TestID = T_TestNat_TestID AND NonlabTemplateMcuIsActive = 'Y' AND + NonlabTemplateMcuNonlabTemplateDetailID = So_ResultEntryDetailNonlab_TemplateDetailID + WHERE So_ResultEntryDetailSo_ResultEntryID = {$last_id} AND So_ResultEntryDetailIsActive = 'Y'"; $qry = $this->db_onedev->query($sql); $data_result_details = $qry->result_array(); - if (count($data_result_details) > 0) { - $group_result_id = $data_result_details[0]['Group_ResultID']; - $test_id = $data_result_details[0]['T_TestID']; - $test_name = $data_result_details[0]['T_TestName']; - $order_id = $data_result_details[0]['So_ResultEntryT_OrderHeaderID']; - $data_result_details = json_encode($data_result_details); - $sql = "UPDATE mcu_resume_results SET Mcu_ResumeResultsIsActive = 'N' - WHERE Mcu_ResumeResultsT_OrderHeaderID = ? AND - Mcu_ResumeResultsGroupResultID = ? AND - Mcu_ResumeResultsT_TestID = ? AND - Mcu_ResumeResultsIsActive = 'Y'"; - $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id)); + if (count($data_result_details) > 0) { + $group_result_id = $data_result_details[0]['Group_ResultID']; + $test_id = $data_result_details[0]['T_TestID']; + $test_name = $data_result_details[0]['T_TestName']; + $order_id = $data_result_details[0]['So_ResultEntryT_OrderHeaderID']; + $data_result_details = json_encode($data_result_details); + $sql = "UPDATE mcu_resume_results SET Mcu_ResumeResultsIsActive = 'N' + WHERE Mcu_ResumeResultsT_OrderHeaderID = ? AND + Mcu_ResumeResultsGroupResultID = ? AND + Mcu_ResumeResultsT_TestID = ? AND + Mcu_ResumeResultsIsActive = 'Y'"; + $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id)); if (!$qry) { echo json_encode( array("status" => "ERR", "message" => "Error: " . $this->db_onedev->error()) ); exit; } - $sql = "INSERT INTO mcu_resume_results( - Mcu_ResumeResultsType, - Mcu_ResumeResultsT_OrderHeaderID, - Mcu_ResumeResultsGroupResultID, - Mcu_ResumeResultsT_TestID, - Mcu_ResumeResultsName, - Mcu_ResumeResultsJSON, - Mcu_ResumeResultsCreated, - Mcu_ResumeResultsUserID) - VALUES('KHUSUS',?,?,?,?,?,NOW(),?)"; - $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id, $test_name, $data_result_details, $userid)); + $sql = "INSERT INTO mcu_resume_results( + Mcu_ResumeResultsType, + Mcu_ResumeResultsT_OrderHeaderID, + Mcu_ResumeResultsGroupResultID, + Mcu_ResumeResultsT_TestID, + Mcu_ResumeResultsName, + Mcu_ResumeResultsJSON, + Mcu_ResumeResultsCreated, + Mcu_ResumeResultsUserID) + VALUES('KHUSUS',?,?,?,?,?,NOW(),?)"; + $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id, $test_name, $data_result_details, $userid)); if (!$qry) { echo json_encode( array("status" => "ERR", "message" => "Error: " . $this->db_onedev->error()) @@ -1699,6 +1699,7 @@ class Resultentry extends MY_Controller // mapping test kode print $map = [ + 'Treadmill' => 'ECG-RESULT-P-01', 'ECG' => 'ECG-RESULT-P-01', 'Spirometri' => 'SPIRO-RESULT-P-01', 'Audiometri' => 'AUDIO-RESULT-P-01' @@ -1779,7 +1780,7 @@ class Resultentry extends MY_Controller ['PUsername', 'PT_OrderHeaderID', 'TS'], [ trim($this->sys_user['M_UserUsername']), - $prm['trx']['orderid'], + $prm['trx']['trx_id'], time() ], $full_url diff --git a/application/controllers/mockup/resultentrysoxray-westone/Resultentry.php b/application/controllers/mockup/resultentrysoxray-westone/Resultentry.php index 4762235e..14d75e8a 100644 --- a/application/controllers/mockup/resultentrysoxray-westone/Resultentry.php +++ b/application/controllers/mockup/resultentrysoxray-westone/Resultentry.php @@ -952,33 +952,33 @@ class Resultentry extends MY_Controller if ($prm['act'] == 'val1') { $status_verif = 'Y'; $act = "VALIDATION"; - $sql = "SELECT so_resultentrydetail.*, IF(NonlabTemplateMcuID IS NULL,'N','Y') as is_kesimpulan, T_TestID, T_TestName, So_ResultEntryT_OrderHeaderID, Group_ResultID - FROM so_resultentrydetail - JOIN so_resultentry ON So_ResultEntryDetailSo_ResultEntryID = So_ResultEntryID AND So_ResultEntryIsActive = 'Y' - JOIN t_orderdetail ON So_ResultEntryT_OrderDetailID = T_OrderDetailID AND T_OrderDetailIsActive = 'Y' - JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' - JOIN group_resultdetail ON Group_ResultDetailT_TestID = T_TestID AND Group_ResultDetailIsActive = 'Y' - JOIN group_result ON Group_ResultDetailGroup_ResultID = Group_ResultID AND Group_ResultIsActive = 'Y' - LEFT JOIN nonlab_template_mcu ON NonlabTemplateMcuNat_TestID = T_TestNat_TestID AND NonlabTemplateMcuIsActive = 'Y' AND - NonlabTemplateMcuNonlabTemplateDetailID = So_ResultEntryDetailNonlab_TemplateDetailID - WHERE + $sql = "SELECT so_resultentrydetail.*, IF(NonlabTemplateMcuID IS NULL,'N','Y') as is_kesimpulan, T_TestID, T_TestName, So_ResultEntryT_OrderHeaderID, Group_ResultID + FROM so_resultentrydetail + JOIN so_resultentry ON So_ResultEntryDetailSo_ResultEntryID = So_ResultEntryID AND So_ResultEntryIsActive = 'Y' + JOIN t_orderdetail ON So_ResultEntryT_OrderDetailID = T_OrderDetailID AND T_OrderDetailIsActive = 'Y' + JOIN t_test ON T_OrderDetailT_TestID = T_TestID AND T_TestIsActive = 'Y' + JOIN group_resultdetail ON Group_ResultDetailT_TestID = T_TestID AND Group_ResultDetailIsActive = 'Y' + JOIN group_result ON Group_ResultDetailGroup_ResultID = Group_ResultID AND Group_ResultIsActive = 'Y' + LEFT JOIN nonlab_template_mcu ON NonlabTemplateMcuNat_TestID = T_TestNat_TestID AND NonlabTemplateMcuIsActive = 'Y' AND + NonlabTemplateMcuNonlabTemplateDetailID = So_ResultEntryDetailNonlab_TemplateDetailID + WHERE So_ResultEntryDetailSo_ResultEntryID = {$last_id} AND So_ResultEntryDetailIsActive = 'Y'"; $qry = $this->db_onedev->query($sql); $data_result_details = $qry->result_array(); - if (count($data_result_details) > 0) { - $group_result_id = $data_result_details[0]['Group_ResultID']; - $test_id = $data_result_details[0]['T_TestID']; - $test_name = $data_result_details[0]['T_TestName']; - $order_id = $data_result_details[0]['So_ResultEntryT_OrderHeaderID']; - $data_result_details = json_encode($data_result_details); - $sql = "UPDATE mcu_resume_results SET Mcu_ResumeResultsIsActive = 'N' - WHERE Mcu_ResumeResultsT_OrderHeaderID = ? AND - Mcu_ResumeResultsGroupResultID = ? AND - Mcu_ResumeResultsT_TestID = ? AND - Mcu_ResumeResultsIsActive = 'Y'"; - - $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id)); + if (count($data_result_details) > 0) { + $group_result_id = $data_result_details[0]['Group_ResultID']; + $test_id = $data_result_details[0]['T_TestID']; + $test_name = $data_result_details[0]['T_TestName']; + $order_id = $data_result_details[0]['So_ResultEntryT_OrderHeaderID']; + $data_result_details = json_encode($data_result_details); + $sql = "UPDATE mcu_resume_results SET Mcu_ResumeResultsIsActive = 'N' + WHERE Mcu_ResumeResultsT_OrderHeaderID = ? AND + Mcu_ResumeResultsGroupResultID = ? AND + Mcu_ResumeResultsT_TestID = ? AND + Mcu_ResumeResultsIsActive = 'Y'"; + + $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id)); //echo $this->db_onedev->last_query(); if (!$qry) { //echo $this->db_onedev->last_query(); @@ -987,17 +987,17 @@ class Resultentry extends MY_Controller ); exit; } - $sql = "INSERT INTO mcu_resume_results( - Mcu_ResumeResultsType, - Mcu_ResumeResultsT_OrderHeaderID, - Mcu_ResumeResultsGroupResultID, - Mcu_ResumeResultsT_TestID, - Mcu_ResumeResultsName, - Mcu_ResumeResultsJSON, - Mcu_ResumeResultsCreated, - Mcu_ResumeResultsUserID) - VALUES('KHUSUS',?,?,?,?,?,NOW(),?)"; - $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id, $test_name, $data_result_details, $userid)); + $sql = "INSERT INTO mcu_resume_results( + Mcu_ResumeResultsType, + Mcu_ResumeResultsT_OrderHeaderID, + Mcu_ResumeResultsGroupResultID, + Mcu_ResumeResultsT_TestID, + Mcu_ResumeResultsName, + Mcu_ResumeResultsJSON, + Mcu_ResumeResultsCreated, + Mcu_ResumeResultsUserID) + VALUES('KHUSUS',?,?,?,?,?,NOW(),?)"; + $qry = $this->db_onedev->query($sql, array($order_id, $group_result_id, $test_id, $test_name, $data_result_details, $userid)); if (!$qry) { //echo $this->db_onedev->last_query(); echo json_encode( @@ -1185,7 +1185,7 @@ class Resultentry extends MY_Controller ['PUsername', 'PT_OrderHeaderID', 'TS'], [ trim($this->sys_user['M_UserUsername']), - $prm['trx']['orderid'], + $prm['trx']['trx_id'], time() ], $full_url