diff --git a/application/controllers/mockup/resumeindividufacelift/Resume.php b/application/controllers/mockup/resumeindividufacelift/Resume.php index 5813f025..2f35efe8 100644 --- a/application/controllers/mockup/resumeindividufacelift/Resume.php +++ b/application/controllers/mockup/resumeindividufacelift/Resume.php @@ -373,6 +373,7 @@ class Resume extends MY_Controller $sql = "SELECT MIN(kelainans.id) AS id, + kelainans.Mcu_KelainanID, kelainans.type, IFNULL(GROUP_CONCAT(DISTINCT NULLIF(kelainans.Nat_TestName, '') ORDER BY kelainans.Nat_TestName SEPARATOR ', '), '') AS Nat_TestName, kelainans.Mcu_KelainanName, @@ -492,11 +493,38 @@ class Resume extends MY_Controller } $dataKelainans = $query->result_array(); + $dataAdvices = []; + $arrKelainanIDs = array_values(array_unique(array_filter(array_column($dataKelainans, 'Mcu_KelainanID')))); + foreach ($dataKelainans as $key => $kelainan) { + unset($dataKelainans[$key]['Mcu_KelainanID']); + } + if (count($arrKelainanIDs) > 0) { + $sql = "SELECT DISTINCT + na.Nat_AdviceID, + na.Nat_AdviceIna, + IF(na.Nat_AdviceEng = '', na.Nat_AdviceIna, na.Nat_AdviceEng) AS Nat_AdviceEng + FROM nat_advice_kelainan nak + JOIN nat_advice na + ON nak.Nat_AdvicekelainanNat_AdviceID = na.Nat_AdviceID + AND na.Nat_AdviceIsActive = 'Y' + WHERE nak.Nat_AdvicekelainanMcu_KelainanID IN ? + AND nak.Nat_AdvicekelainanIsActive = 'Y' + ORDER BY na.Nat_AdviceIna"; + $query = $this->db_onedev->query($sql, [$arrKelainanIDs]); + if (!$query) { + $message = $this->db_onedev->error(); + $message['qry'] = $this->db_onedev->last_query(); + $this->sys_error($message); + exit; + } + $dataAdvices = $query->result_array(); + } + $sql = "SELECT Mcu_FitnessCategoryID as id, Mcu_FitnessCategoryName as name, Mcu_FitnessCategoryEng as nameEng, Mcu_FitnessCategoryLevel as level - FROM mcu_fitness_category + FROM mcu_fitness_category WHERE Mcu_FitnessCategoryIsActive = 'Y'"; $query = $this->db_onedev->query($sql); if (!$query) { @@ -514,6 +542,7 @@ class Resume extends MY_Controller "records" => $data, "results" => $dataResults, "kelainans" => $dataKelainans, + "advices" => $dataAdvices, "fitnessCategory" => $dataFitnessCategory // 'kesimpulan' => $kesimpulanFisik ];