From fb88b138e458bc4889b937c14ee4ab97f9b8a745 Mon Sep 17 00:00:00 2001 From: "sas.fajri" Date: Fri, 24 Apr 2026 16:49:40 +0700 Subject: [PATCH] Fix resume save schema --- .../mockup/resumeindividufacelift/Resume.php | 153 ++++++++++-------- 1 file changed, 85 insertions(+), 68 deletions(-) diff --git a/application/controllers/mockup/resumeindividufacelift/Resume.php b/application/controllers/mockup/resumeindividufacelift/Resume.php index e4bb55a8..5f570c94 100644 --- a/application/controllers/mockup/resumeindividufacelift/Resume.php +++ b/application/controllers/mockup/resumeindividufacelift/Resume.php @@ -674,6 +674,12 @@ class Resume extends MY_Controller $header = isset($data['header']) && is_array($data['header']) ? $data['header'] : []; $act = $data['act'] ?? ($header['act'] ?? 'NEW'); $userid = $this->sys_user["M_UserID"]; + $orderID = intval($data['orderID'] ?? ($header['orderID'] ?? 0)); + $doctorID = intval( + $data['resumeDoctorID'] ?? + ($header['resumeDoctorID'] ?? + ($header['selectedDoctor']['id'] ?? 0)) + ); $fitnessCategoryData = $data['fitnessCategory'] ?? ($header['fitnessCategory'] ?? null); $fitnessCategoryID = 0; if (is_array($fitnessCategoryData)) { @@ -752,22 +758,32 @@ class Resume extends MY_Controller $this->sys_error("Pilih kategori fitness atau generate terlebih dahulu"); exit; } - - $sql = ""; - $query = $this->db_onedev->query($sql, [$data['orderID']]); - if (!$query) { - $message = $this->db_onedev->error(); - $message['qry'] = $this->db_onedev->last_query(); - $this->sys_error_db("Error cek validasi " . $this->db_onedev->last_query()); - exit; - } - $cekValidation = $query->row_array(); - $expdCek = explode(',', $cekValidation['val']); - if (in_array('N', $expdCek) && $cekValidation['val'] != null && trim($cekValidation['val']) != '' && count($expdCek) > 0) { - $this->sys_error("Hasil Nonlab atau fisik belum di validasi ....."); - exit; - } - } + if ($orderID <= 0) { + $this->sys_error("Order tidak valid"); + exit; + } + + $sql = ""; + if (trim($sql) != '') { + $query = $this->db_onedev->query($sql, [$orderID]); + if (!$query) { + $message = $this->db_onedev->error(); + $message['qry'] = $this->db_onedev->last_query(); + $this->sys_error_db("Error cek validasi " . $this->db_onedev->last_query()); + exit; + } + $cekValidation = $query->row_array(); + $expdCek = explode(',', $cekValidation['val']); + if (in_array('N', $expdCek) && $cekValidation['val'] != null && trim($cekValidation['val']) != '' && count($expdCek) > 0) { + $this->sys_error("Hasil Nonlab atau fisik belum di validasi ....."); + exit; + } + } + } + else if ($orderID <= 0) { + $this->sys_error("Order tidak valid"); + exit; + } $status = 'NEW'; $statusLog = $act; @@ -787,41 +803,44 @@ class Resume extends MY_Controller $jsonAfter = ""; //insert mcu_resume $resumeID = 0; - $sql = "SELECT * - FROM mcu_resume - WHERE Mcu_ResumeT_OrderHeaderID = ? - AND Mcu_ResumeIsActive = 'Y'"; - $query = $this->db_onedev->query($sql, [$data['orderID']]); - if (!$query) { - $message = $this->db_onedev->error(); - $message['qry'] = $this->db_onedev->last_query(); - $this->sys_error($message); - exit; + $sql = "SELECT * + FROM mcu_resume + WHERE Mcu_ResumeT_OrderHeaderID = ? + AND Mcu_ResumeIsActive = 'Y'"; + $query = $this->db_onedev->query($sql, [$orderID]); + if (!$query) { + $message = $this->db_onedev->error(); + $message['qry'] = $this->db_onedev->last_query(); + $this->sys_error($message); + exit; } - $dataCek = $query->result_array(); - if (count($dataCek) == 0) { - $sql = "INSERT INTO mcu_resume - (Mcu_ResumeT_OrderHeaderID, - Mcu_ResumeStatus, - Mcu_ResumeValidation, - Mcu_ResumeValidationDateTime, - Mcu_ResumeValidationUserID, - Mcu_ResumeKesimpulan, - Mcu_ResumeRekomendasi, - Mcu_ResumeSaran, - Mcu_ResumeMcu_FitnessCategoryID) - VALUES(?,?,?,?,?,?,?,?,?)"; - $query = $this->db_onedev->query($sql, [ - $data['orderID'], + $dataCek = $query->result_array(); + if (count($dataCek) == 0) { + $sql = "INSERT INTO mcu_resume + (Mcu_ResumeM_DoctorID, + Mcu_ResumeT_OrderHeaderID, + Mcu_ResumeStatus, + Mcu_ResumeVerification, + Mcu_ResumeVerificationUserID, + Mcu_ResumeValidation, + Mcu_ResumeValidationDateTime, + Mcu_ResumeValidationUserID, + Mcu_ResumeMcu_FitnessCategoryID, + Mcu_ResumeUserID, + Mcu_ResumeCreated) + VALUES(?,?,?,?,?,?,?,?,?,NOW())"; + $query = $this->db_onedev->query($sql, [ + $doctorID, + $orderID, $status, + 'N', + 0, $val, $dt, $userid, - $idConclusion['kesimpulan'], - $idConclusion['rekomendasi'], - $idConclusion['saran'], $fitnessCategoryID, + $userid, ]); if (!$query) { $message = $this->db_onedev->error(); @@ -858,27 +877,25 @@ class Resume extends MY_Controller $this->sys_error($message); exit; } - $detail = $query->result_array(); - $jsonBefore['detail'] = $detail; - $sql = "UPDATE mcu_resume - SET Mcu_ResumeStatus = ?, - Mcu_ResumeValidation = ?, - Mcu_ResumeValidationDateTime = ?, - Mcu_ResumeValidationUserID = ?, - Mcu_ResumeKesimpulan = ?, - Mcu_ResumeRekomendasi = ?, - Mcu_ResumeSaran = ?, - Mcu_ResumeMcu_FitnessCategoryID = ? - WHERE Mcu_ResumeID = ?"; - $query = $this->db_onedev->query($sql, [ + $detail = $query->result_array(); + $jsonBefore['detail'] = $detail; + $sql = "UPDATE mcu_resume + SET Mcu_ResumeM_DoctorID = ?, + Mcu_ResumeStatus = ?, + Mcu_ResumeValidation = ?, + Mcu_ResumeValidationDateTime = ?, + Mcu_ResumeValidationUserID = ?, + Mcu_ResumeMcu_FitnessCategoryID = ?, + Mcu_ResumeUserID = ? + WHERE Mcu_ResumeID = ?"; + $query = $this->db_onedev->query($sql, [ + $doctorID, $status, $val, $dt, $userid, - $idConclusion['kesimpulan'], - $idConclusion['rekomendasi'], - $idConclusion['saran'], $fitnessCategoryID, + $userid, $resumeID, ]); if (!$query) { @@ -1197,10 +1214,10 @@ class Resume extends MY_Controller WHEN Mcu_ResumeDetailsMcu_ResumeID IS NULL THEN 'N' WHEN Mcu_ResumeDetailsMcu_ResumeID IS NOT NULL THEN 'Y' END as hasResult, - Mcu_ResumeID AS resumeID , - Mcu_ResumeKesimpulan AS resumeKesimpulan , - Mcu_ResumeRekomendasi AS resumeRekomendasi , - Mcu_ResumeSaran AS resumeSaran , + Mcu_ResumeID AS resumeID , + '' AS resumeKesimpulan , + '' AS resumeRekomendasi , + '' AS resumeSaran , Mcu_ResumeDetailsResult AS resumeDetailResult , Mcu_ResumeDetailsResult AS resumeEntryResult FROM t_orderdetail @@ -1451,10 +1468,10 @@ class Resume extends MY_Controller WHEN Mcu_ResumeDetailsMcu_ResumeID IS NULL THEN 'N' WHEN Mcu_ResumeDetailsMcu_ResumeID IS NOT NULL THEN 'Y' END as hasResult, - Mcu_ResumeID AS resumeID , - Mcu_ResumeKesimpulan AS resumeKesimpulan , - Mcu_ResumeRekomendasi AS resumeRekomendasi , - Mcu_ResumeSaran AS resumeSaran , + Mcu_ResumeID AS resumeID , + '' AS resumeKesimpulan , + '' AS resumeRekomendasi , + '' AS resumeSaran , Mcu_ResumeDetailsResult AS resumeDetailResult , Mcu_ResumeDetailsResult AS resumeEntryResult FROM t_orderdetail