diff --git a/admin/application/models/Webservice_model.php b/admin/application/models/Webservice_model.php index fdfd45a..c9c490d 100644 --- a/admin/application/models/Webservice_model.php +++ b/admin/application/models/Webservice_model.php @@ -3049,7 +3049,7 @@ class Webservice_model extends CI_Model { } public function get_doctor_upcoming_consultation_list($doctorid,$start,$per_page,$type){ - $this->db->select('tbl_booking.id,tbl_registration.id as patient_id,tbl_registration.name as patient_name,tbl_registration.profile_photo as patient_profile_photo,tbl_booking.date'); + $this->db->select('tbl_booking.id,tbl_registration.id as patient_id,tbl_registration.name as patient_name,tbl_registration.profile_photo as patient_profile_photo,tbl_booking.date,tbl_booking.time_start'); $this->db->from('tbl_booking'); $this->db->join('tbl_registration','tbl_registration.id = tbl_booking.patient_id'); $this->db->where('tbl_booking.doctor_id',$doctorid); @@ -3439,18 +3439,18 @@ class Webservice_model extends CI_Model { } } } - $this->db->select("DISTINCT(exam_procedure)"); + $this->db->select("DISTINCT(CAST(AES_DECRYPT(exam_procedure,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)) as exam_procedure"); $xam = $this->db->get('tbl_exams')->result(); foreach ($xam as $key => $value) { - $this->db->select('observation'); - $this->db->where('exam_procedure',$value->exam_procedure); + $this->db->select("CAST(AES_DECRYPT(observation,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as observation"); + $this->db->where("CAST(AES_ENCRYPT(exam_procedure,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR)",$value->exam_procedure); $proc = $this->db->get('tbl_exams')->result(); - $new['exams'][$key]['name'] = decrypt_data($value->exam_procedure); + $new['exams'][$key]['name'] = $value->exam_procedure; foreach ($proc as $key1 => $value1) { - $new['exams'][$key]['observations'][] =decrypt_data($value1->observation); + $new['exams'][$key]['observations'][] =$value1->observation; } }