diff --git a/admin/application/models/Webservice_model.php b/admin/application/models/Webservice_model.php
index 28b005e..25da747 100644
--- a/admin/application/models/Webservice_model.php
+++ b/admin/application/models/Webservice_model.php
@@ -1121,13 +1121,24 @@ class Webservice_model extends CI_Model {
 		//echo $this->db->last_query();exit();
 		//print_r($this->db->last_query());die();
 		if ($query->num_rows() > 0) {
-			// if(isset($data['date']) && strlen($data['date'])){
-			// 	$date = $data['date'];
-			// 	$leave_query = $this->db->query("SELECT * FROM `tbl_doctor_leave` WHERE NOT($date > `tbl_doctor_leave`.`start_date` OR $date < `tbl_doctor_leave`.`end_date`)")->result();
-			// 	//echo $this->db->last_query();
-			// 	echo "<pre>";print_r($leave_query);exit();
-			// }
-			$return_array = array('status'=>'success','data'=>$query->result_array());
+			$querys = $query->result_array();
+			if(isset($data['date']) && strlen($data['date'])){
+				$date = $data['date'];
+				$leave_query = $this->db->query("SELECT * FROM `tbl_doctor_leave` WHERE NOT($date > `tbl_doctor_leave`.`start_date` OR $date < `tbl_doctor_leave`.`end_date`)")->result();
+				//echo $this->db->last_query();
+				echo "<pre>";print_r($leave_query);
+			}
+			if($leave_query){
+				foreach ($leave_query as $key => $value) {
+					foreach ($querys as $keys => $values) {
+						if(($values->doctor_id == $value->doctor_id ) && ($values->clinic_id == $value->clinic_id)){
+							unset($querys[$keys]);
+						}
+					}
+				}
+			}
+			print_r($querys);exit();
+			$return_array = array('status'=>'success','data'=>$querys);
 		}
 		else{
 			$return_array = array('status'=>'fail');