Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -5182,7 +5182,7 @@ print_r(date('H:i',$ms));exit();*/
 				$notificationResult = $this->Webservice_model->get_doctor_notification_list($authtoken->doctor_id, 0, 0);
 				$result = $this->Webservice_model->get_doctor_notification_list($authtoken->doctor_id,$start,$per_page);
 				$count = $this->Webservice_model->get_doctor_notification_list_unread_count($authtoken->doctor_id);
-
+exit();
 				if($count){
 					$unread_count = $count->count;
 				}else{

admin/application/models/Webservice_model.php

@@ -3246,7 +3246,7 @@ class Webservice_model extends CI_Model {
 			$this->db->limit($per_page,$start);
 		}
 		$result = $this->db->get_where('tbl_doctor_notifications',array('doctor_id'=>$doctorid))->result();
-		echo $this->db->last_query();exit();
+		echo $this->db->last_query();
 		if(count($result) > 0){
 			return $result;
 		}else{