removed care month bills

app/Http/Controllers/HomeController.php

@@ -216,7 +216,7 @@ class HomeController extends Controller
             ->count();
         $keyNumbers['patientsNotSeenYet'] = $patientNotSeenYet;
 
-        $pendingBillsToSign = Bill::where(function ($query) use ($performerProID) {
+        $pendingBillsToSign = Bill::where('bill_service_type', '<>', 'CARE_MONTH')->where(function ($query) use ($performerProID) {
             $query->where('hcp_pro_id', $performerProID)->where('is_signed_by_hcp', false)->where('is_cancelled', false);
         })
             ->orWhere(function ($query) use ($performerProID) {
@@ -791,7 +791,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
         else {
             $pros = $pros->orderBy('name_last', 'asc');
         }
-            
+
         $pros = $pros->paginate(20);
 
         return view('app/log-in-as', ['logInAsPros' => $pros]);

app/Http/Controllers/PracticeManagementController.php

@@ -118,7 +118,7 @@ class PracticeManagementController extends Controller
 
             case 'without-bills':
                 $query = $query->where('is_signed_by_hcp', true)->where('is_cancelled', false)->whereDoesntHave('bills');
-                
+
                 break;
 
             // more cases can be added as needed
@@ -132,7 +132,7 @@ class PracticeManagementController extends Controller
     public function bills(Request $request, $filter = '')
     {
         $proID = $this->performer()->pro->id;
-        $query = Bill::where('is_cancelled', false);
+        $query = Bill::where('is_cancelled', false)->where('bill_service_type', '<>', 'CARE_MONTH');
         switch ($filter) {
             case 'not-yet-signed':
                 $query = $query
@@ -1066,8 +1066,8 @@ SELECT claim.uid AS uid,
        note.method,
        note.new_or_fu_or_na,
        -- claim.status_updated_at,
-       (DATE(claim.status_updated_at) || ' ' || 
-            LPAD(EXTRACT(hour FROM claim.status_updated_at)::text, 2, '0') || ':' || 
+       (DATE(claim.status_updated_at) || ' ' ||
+            LPAD(EXTRACT(hour FROM claim.status_updated_at)::text, 2, '0') || ':' ||
             LPAD(EXTRACT(minute FROM claim.status_updated_at)::text, 2, '0')) AS status_updated_at,
        (SELECT string_agg(claim_line.cpt, ', ') FROM claim_line where claim_id = claim.id) AS cpts,
        (SELECT COUNT(claim_line_icd.id) FROM claim_line_icd WHERE claim_line_id IN (SELECT id FROM claim_line WHERE claim_id = claim.id)) AS icds,
@@ -1081,9 +1081,9 @@ FROM claim
 --WHERE claim.status IS NULL OR claim.status = 'NEW'
 WHERE (claim.status is NULL OR claim.status NOT IN ('CANCELLED', 'ABANDONED'))
 -- AND claim.current_version_id IS NOT NULL
-AND (client.name_first ILIKE :q OR 
-     client.name_last ILIKE :q OR 
-     client.chart_number ILIKE :q OR 
+AND (client.name_first ILIKE :q OR
+     client.name_last ILIKE :q OR
+     client.chart_number ILIKE :q OR
      client.mcn ILIKE :q)
 AND (claim.created_at >= :from AND claim.created_at <= :to)
 " . ($hcpPro ? "AND claim.pro_id = :hcp" : '') . "