Merge branch 'dev' of https://rav.triplestart.com/jmudaka/stagfe2 into dev

app/Http/Controllers/PracticeManagementController.php

@@ -1408,7 +1408,7 @@ ORDER BY claim.created_at ASC
             ->where('rm_total_time_in_seconds_by_mcp', '>=', 1800)
             ->where('rm_total_time_in_seconds', '>=', 4200) // at 4200 (70 minutes, it becomes eligible for plus40)
             ->where('number_of_days_with_remote_measurements', '>=', 16 )
-            ->where('has_anyone_interacted_with_client_about_rm_outside_note', '=', true)
+            ->whereRaw('has_anyone_interacted_with_client_about_rm_outside_note IS  TRUE OR has_mcp_rm_interacted_by_note IS  TRUE ')
             ->count();
 
         $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40_ifHadInteraction'] = CareMonth::where('is_bill_closed', false)
@@ -1419,7 +1419,7 @@ ORDER BY claim.created_at ASC
             ->where('rm_total_time_in_seconds_by_mcp', '>=', 1800)
             ->where('rm_total_time_in_seconds', '>=', 4200) // at 4200 (70 minutes, it becomes eligible for plus40)
             ->where('number_of_days_with_remote_measurements', '>=', 16 )
-            ->where('has_anyone_interacted_with_client_about_rm_outside_note', '=', false)
+            ->whereRaw('has_anyone_interacted_with_client_about_rm_outside_note IS NOT TRUE AND has_mcp_rm_interacted_by_note IS NOT TRUE AND is_rm_interaction_waived IS NOT TRUE ')
             ->count();
 
         $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20'] = CareMonth::where('is_bill_closed', false)
@@ -1431,7 +1431,7 @@ ORDER BY claim.created_at ASC
             ->where('rm_total_time_in_seconds', '<', 4200)
             ->where('rm_total_time_in_seconds', '>=', 3000) // at 3000 (50 minutes, it becomes eligible for plus20)
             ->where('number_of_days_with_remote_measurements', '>=', 16 )
-            ->where('has_anyone_interacted_with_client_about_rm_outside_note', '=', true)
+            ->whereRaw('has_anyone_interacted_with_client_about_rm_outside_note IS TRUE OR has_mcp_rm_interacted_by_note IS TRUE')
             ->count();
 
         $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20_ifHadInteraction'] = CareMonth::where('is_bill_closed', false)
@@ -1443,7 +1443,7 @@ ORDER BY claim.created_at ASC
             ->where('rm_total_time_in_seconds', '<', 4200)
             ->where('rm_total_time_in_seconds', '>=', 3000) // at 3000 (50 minutes, it becomes eligible for plus20)
             ->where('number_of_days_with_remote_measurements', '>=', 16 )
-            ->where('has_anyone_interacted_with_client_about_rm_outside_note', '=', false)
+            ->whereRaw('has_anyone_interacted_with_client_about_rm_outside_note IS NOT TRUE AND has_mcp_rm_interacted_by_note IS NOT TRUE AND is_rm_interaction_waived IS NOT TRUE ')
             ->count();
 
         $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] = CareMonth::where('is_bill_closed', false)