diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index add8c9e4..3fd50ce4 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -763,9 +763,9 @@ $sql.=" group by Student_id,cid,ctype";
         return $results;
     
     }
-    public function wav_ref($bat=null,$br=null,$u=null){
+     public function wav_ref($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(scd.branch,'-') as Branch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,staff.FirstName as staffname,ifnull(sms.waiver_bill,'-') as Waiver_bill,ifnull(sms.waiver,0) as Waiver_amount,AdmittedBy as admittedby,ifnull(sms.referal_bill,'-') as Referal_bill,ifnull(sms.referal,0) as Referal_amount,ifnull(sms.cmts,'-') as Comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(scd.branch,'-') as Branch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,staff.FirstName as staffname,ifnull(sms.waiver_bill,'-') as Waiver_bill,ifnull(sms.waiver,0) as Waiver_amount,ifnull(sms.referal_bill,'-') as Referal_bill,ifnull(sms.referal,0) as Referal_amount,concat(sta.FirstName,' ',sta.Lastname)as Stafname,ifnull(sms.cmts,'-') as Comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
         from 
 			 (SELECT StudentID as sid,CreatedBy as lid,CommentsForStudent as cmts,FeesId as fid,
         IF(ModeOfPayment = 'WAIVER', BillNO,'-') AS waiver_bill,
@@ -789,12 +789,16 @@ left join
         order by CourseID) 
     as cm on cm.cid=cfd.ccid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,AdmittedBy as admittedby,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,AdmittedBy ,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
          T_Login as login on login.ID=sms.lid
 left join 
-         T_StaffDetails as staff on staff.StaffID=login.StaffID		 
+         T_StaffDetails as staff on staff.StaffID=login.StaffID	
+left join 
+          T_StaffDetails as sta on sta.StaffID=std.AdmittedBy	
+		 
        where std.active = 1 and scd.branch = '".$br."' 
+	   
           
         ";
       
@@ -827,7 +831,7 @@ left join
     }
     public function examfee($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,AdmittedBy as AdmittedBy,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,concat(sta.FirstName,' ',sta.Lastname)as Stafname,ifnull(std.AlternateNumber,'') as AlternateNumber 
         from 
 			 (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others,Comments as cmts,BranchCode as branch FROM T_Students_Fees_Status
 where STFOrWR != ''
@@ -844,10 +848,13 @@ left join
         group by cid
         order by CourseID) 
     as cm on cm.cid=sms.cid
+	
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,AdmittedBy as AdmittedBy,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
-       where std.active = 1 and sms.branch = '".$br."' 
- 
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,AdmittedBy,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
+       
+ left join 
+          T_StaffDetails as sta on sta.StaffID=std.AdmittedBy
+where std.active = 1 and sms.branch = '".$br."' 		  
 ";
       
         if ($bat!= ''){
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html
index c6f9f99c..b3819216 100755
--- a/Apollo/assets/views/report_exam_writing_fee.html
+++ b/Apollo/assets/views/report_exam_writing_fee.html
@@ -95,7 +95,7 @@
                              
                     <thead>
                         <tr>
-                            <th colspan="7"></th>
+                            <th colspan="8"></th>
                             <th>Sum of Exam Writing Fee</th>
                             <th></th>
                         </tr>
@@ -128,7 +128,7 @@
                             <td>{{p.Course_name}}</td>
                             <td>{{p.Sem_year}}</td>
                             <td>{{p.University}}</td>
-							<td>{{p.AdmittedBy}}</td>
+							<td>{{p.Stafname}}</td>
                             <td style="text-align:right;">{{p.Amount}}</td>
                             <td>{{p.Comments}}</td>
                            
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index 48b9332a..f4938abb 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -122,8 +122,8 @@
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}</td>
-                         <td>{{p.University}}</td>
-						<td>{{p.admittedby}}</td>
+                        <td>{{p.University}}</td>
+						<td>{{p.Stafname}}</td>
                         <td>{{p.staffname}}</td>
                         <td>{{p.Waiver_bill}}</td>
                         <td style="text-align:right;">{{p.Waiver_amount}}</td>