diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php
index 8a0b6b91..5dd3aacd 100644
--- a/Apollo/api/application/controllers/HallTickets_Controller.php
+++ b/Apollo/api/application/controllers/HallTickets_Controller.php
@@ -337,9 +337,6 @@ class HallTickets_Controller extends REST_Controller {
 								         {
 								$maparray[]=$object->SubjectCode;
 								      }
-									//  $a1=$fileArray;
-									//  $b1=$maparray;
-									//   print_r($maparray);
 									 $result=array_diff($fileArray,$maparray);
 									$unmatched= sizeof($result);
 									
diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php
index 26432801..c03f257a 100755
--- a/Apollo/api/application/models/Calltracking_model.php
+++ b/Apollo/api/application/models/Calltracking_model.php
@@ -10,7 +10,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 class Calltracking_model extends CI_Model {
     /*
      * get lead details
-     * @params mobile number,requestedby
+     * @params mobile number,requestedby    
      * created by kms
      * */
     public function getLeadDetails($requestedBy=null,$mobileNumber=null,$branchID=null,$userType=null)
@@ -1398,7 +1398,7 @@ class Calltracking_model extends CI_Model {
             }else{
 
 
-                if($track_Details['StatusCode'] == 'S020' || $track_Details['StatusCode'] == 'S002'){
+                if($track_Details['StatusCode'] == 'S020' || $track_Details['StatusCode'] == 'S002' ||$track_Details['StatusCode'] == 'S001'){
                 $lead_Details['UpdatedOn'] = date('Y-m-d H:i:s');
                 $lead_Details['UpdatedBy'] = $CreatedBy;
                 $track_Details['UpdatedOn'] = date('Y-m-d H:i:s');
diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php
index e7884a04..ac128551 100644
--- a/Apollo/api/application/models/Data_correction.php
+++ b/Apollo/api/application/models/Data_correction.php
@@ -30,24 +30,17 @@ group by Student_id,cid";
 	
 	 Public function getMobile($deleteNo=null,$mergeNo=null)
 	{
-	  $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@err_meesage,@suc_message);
+	  $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@re_message);
               ";
-      $a=$this->db->query($sql);	
-      //To get error message	  
-	  $sql_err = " select @err_message as err_message;";		  
-        $b=$this->db->query($sql_err);
-        $err_res = $b->result();
-        //To get success message
-        $sqlOut = " select @suc_message as suc_message;";		  
-        $c=$this->db->query($sqlOut);
-        $suc_res = $c->result();
-		//echo $batch[0]->err_message;
-        if ($suc_res[0]->suc_message != null) {
+     $a=$this->db->query($sql);	
+     $sp_res = $a->result();
+     
+        if ($sp_res[0]->re_message = 1) {
             $results['MergeStatus']      = true;
-            $results['message']      = $suc_res[0]->suc_message;
+            $results['message']      = 'Student merged Successfully';
         } else {
             $results['MergeStatus'] = false;
-            $results['message']      = $err_res[0]->err_message;
+            $results['message']      = 'Can not merge';
         }
         return $results;	
 	}
diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php
index 4c17cf0e..582da2af 100644
--- a/Apollo/api/application/models/Hallticket_model.php
+++ b/Apollo/api/application/models/Hallticket_model.php
@@ -114,7 +114,7 @@ class Hallticket_model extends CI_Model
 		////////////
 		public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID)
 		{
-		//echo $mapid;
+		
 	$sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName
            FROM T_SemSubMap_Child  semchild 
           LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID
@@ -122,7 +122,7 @@ class Hallticket_model extends CI_Model
 and bsm.CourseID=semmaster.CourseID
 LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID
 LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID
-WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."' 
+WHERE semchild.isActive = '1' and bsc.SchId='".$mapid."' 
 group by semchild.SubjectID,semchild.MapID";
   $b=$this->db->query($sql);
      //print_r($b);	
@@ -136,7 +136,8 @@ group by semchild.SubjectID,semchild.MapID";
 		$this->db->from('T_Batch_Schedule_Master SCM');
         $this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
 		$this->db->where('SCM.BranchCode',$branchcode);
-        $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
+		 $this->db->where('SCM.CourseID',$CourseID);
+       // $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
 		$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
         $existsheduledetails = $this->db->get();
 		//print_r($existsheduledetails);