Commit ffadb8c6 by Jansa Jose

Merge branch 'jansa'

parents 8f1d71cc c0dc7d91
......@@ -3817,7 +3817,7 @@ class Webservice_model extends CI_Model {
}
public function get_consultation_transaction_list($doctorid,$start,$per_page,$type){
$this->db->select("tbl_booking.id,tbl_booking.patient_id,tbl_registration.name as patient_name,tbl_doctors.consultation_duration as duration,(tbl_booking.total_sum - ((tbl_booking.total_sum * tbl_booking.ipok_fee) / 100)) as earnings,tbl_doctors.domiciliary_status as type,tbl_booking.date");
$this->db->select("tbl_booking.id,tbl_booking.patient_id,tbl_registration.name as patient_name,tbl_doctors.consultation_duration as duration,(tbl_booking.total_sum - ((tbl_booking.total_sum * tbl_booking.ipok_fee) / 100)) as earnings,tbl_doctors.domiciliary_status as type,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->join('tbl_doctors','tbl_doctors.id = tbl_booking.doctor_id');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment