diff --git a/Apollo/api/application/models/Dashboard_model.php b/Apollo/api/application/models/Dashboard_model.php index 22cedd64..8e4e0b50 100755 --- a/Apollo/api/application/models/Dashboard_model.php +++ b/Apollo/api/application/models/Dashboard_model.php @@ -821,7 +821,7 @@ public function leadCountMonth($branchId = null, $requestedBy = null){ LEFT JOIN T_StudentDetails std ON std.StudentID = a.StudentID LEFT JOIN T_StaffDetails sd ON sd.StaffID = std.AdmittedBy LEFT JOIN T_BatchMaster bm ON bm.BatchCode = a.BatchCode - where a.BranchCode = '".$branchId."' + where a.BranchCode = '".$branchId."' and a.BatchCode != 'Not applicable' GROUP BY std.AdmittedBy , bcode) b @@ -928,7 +928,7 @@ public function leadCountMonth($branchId = null, $requestedBy = null){ left join T_Students_Fees_Status sfs on sfs.StudentID =scd.StudentID and sfs.CourseID = scd.CourseID left join T_BatchMaster bm on bm.BatchCode = sfs.BatchCode left join T_StaffDetails sd on sd.StaffID = std.AdmittedBy - where year(std.CreatedOn) = year(now()) and std.BranchCode = '".$branchId."' + where year(std.CreatedOn) = year(now()) and sfs.BatchCode != 'Not applicable' and std.BranchCode = '".$branchId."' "; if($univ != ''){