fajri/BE_CPONE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MCU dummy generation and participant dedup

Browse Source
This commit is contained in:
sas.fajri
2026-05-06 16:51:53 +07:00
parent 5aed7c05b4
commit 3d50bcf7f1
5 changed files with 1224 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/controllers/cpone/SendEmailPreregister.php
View File

@@ -326,7 +326,8 @@ class SendEmailPreregister extends MY_Controller
$data_send_patients = $que_patients->result_array();
$sql_notif_config = "SELECT
Email_ConfigNofificationTemplate
Email_ConfigNofificationTemplate,
Email_ConfigNofificationSender
FROM email_config_nofification
WHERE Email_ConfigNofificationIsActive = 'Y'
ORDER BY Email_ConfigNofificationID DESC
@@ -571,6 +572,12 @@ class SendEmailPreregister extends MY_Controller
$recipient = json_encode([
["name" => $patient['nama_pasien'], "email" => $targetEmail]
]);
$senderEmail = isset($notifConfig['Email_ConfigNofificationSender'])
? trim((string)$notifConfig['Email_ConfigNofificationSender'])
: '';
$sendCC = $senderEmail !== ''
? json_encode([["name" => $senderEmail, "email" => $senderEmail]])
: NULL;
$sql_cek_outbox = "SELECT PreregisterEmailOutboxID
FROM preregister_email_outbox
@@ -598,7 +605,7 @@ class SendEmailPreregister extends MY_Controller
$que_insert_outbox = $this->db->query($sql_insert_outbox, [
$subject,
$recipient,
NULL,
$sendCC,
$body,
'PREREGIST',
$patient['preregister_id']
@@ -620,7 +627,7 @@ class SendEmailPreregister extends MY_Controller
$que_update_outbox = $this->db->query($sql_update_outbox, [
$subject,
$recipient,
NULL,
$sendCC,
$body,
$cek_outbox[0]['PreregisterEmailOutboxID']
]);

28
application/controllers/mockup/mcuoffline/Resumeindividucponev7.php
View File

@@ -1131,10 +1131,10 @@ class Resumeindividucponev7 extends MY_Controller
T_OrderDetailT_TestSasCode AS testSasCode,
T_OrderDetailT_TestName AS testName,
T_OrderDetailResult AS result,
Nat_SubSubGroupID AS subGroupID,
IFNULL(Nat_SubSubGroupID, 0) AS subGroupID,
T_OrderDetailMinValue AS minValues,
T_OrderDetailMaxValue AS maxValues,
Nat_SubSubGroupName AS groupName,
IFNULL(Nat_SubSubGroupName, T_OrderDetailT_TestName) AS groupName,
T_TestNat_TestID AS natTestID,
T_TestIsQuantitative as isKuantitatif,
CASE
@@ -1167,8 +1167,8 @@ class Resumeindividucponev7 extends MY_Controller
JOIN t_test
ON T_OrderDetailT_TestID = T_TestID
JOIN nat_test ON T_TestNat_TestID = Nat_TestID
JOIN nat_subsubgroup
ON T_TestNat_SubSubGroupID = Nat_SubSubGroupID
LEFT JOIN nat_subsubgroup
ON T_TestNat_SubSubGroupID = Nat_SubSubGroupID
LEFT JOIN mcu_resume
ON T_OrderDetailT_OrderHeaderID = Mcu_ResumeT_OrderHeaderID
AND Mcu_ResumeIsActive = 'Y'
@@ -1375,10 +1375,10 @@ class Resumeindividucponev7 extends MY_Controller
T_OrderDetailT_TestSasCode AS testSasCode,
T_OrderDetailT_TestName AS testName,
T_OrderDetailResult AS result,
Nat_SubSubGroupID AS subGroupID,
IFNULL(Nat_SubSubGroupID, 0) AS subGroupID,
T_OrderDetailMinValue AS minValues,
T_OrderDetailMaxValue AS maxValues,
Nat_SubSubGroupName AS groupName,
IFNULL(Nat_SubSubGroupName, T_OrderDetailT_TestName) AS groupName,
T_TestNat_TestID AS natTestID,
T_TestIsQuantitative as isKuantitatif,
CASE
@@ -1411,8 +1411,8 @@ class Resumeindividucponev7 extends MY_Controller
JOIN t_test
ON T_OrderDetailT_TestID = T_TestID
JOIN nat_test ON T_TestNat_TestID = Nat_TestID
JOIN nat_subsubgroup
ON T_TestNat_SubSubGroupID=Nat_SubSubGroupID
LEFT JOIN nat_subsubgroup
ON T_TestNat_SubSubGroupID=Nat_SubSubGroupID
LEFT JOIN mcu_resume
ON T_OrderDetailT_OrderHeaderID = Mcu_ResumeT_OrderHeaderID
AND Mcu_ResumeIsActive = 'Y'
@@ -2300,12 +2300,12 @@ class Resumeindividucponev7 extends MY_Controller
Mcu_ResumeStatus,
Mcu_ResumeMcu_FitnessCategoryID,
Mcu_ResumeCreated,
Mcu_ResumeUserID,
Mcu_ResumeKesimpulan,
Mcu_ResumeRekomendasi,
Mcu_ResumeSaran,
)
VALUES(?,'NEW',?,NOW(),?,?,?,?)";
Mcu_ResumeUserID,
Mcu_ResumeKesimpulan,
Mcu_ResumeRekomendasi,
Mcu_ResumeSaran
)
VALUES(?,'NEW',?,NOW(),?,?,?,?)";
$query = $this->db_onedev->query($sql, [
$id,
$fitnessID,