|
|
@@ -100,16 +100,19 @@ class McpController extends Controller
|
|
|
$this->filterMultiQuery($request, $patients, 'most_recent_bp_at', 'last_bp_category', 'last_bp_value_1', 'last_bp_value_2');
|
|
|
$this->filterMultiQuery($request, $patients, 'most_recent_completed_mcp_note_date', 'last_visit_category', 'last_visit_value_1', 'last_visit_value_2');
|
|
|
|
|
|
- switch($request->input('status')) {
|
|
|
- case 'ACTIVE':
|
|
|
- $patients->where('is_active', true)->where('has_mcp_done_onboarding_visit', true);
|
|
|
- break;
|
|
|
- case 'AWAITING_VISIT':
|
|
|
- $patients->where('is_active', true)->where('has_mcp_done_onboarding_visit', false);
|
|
|
- break;
|
|
|
- case 'INACTIVE':
|
|
|
- $patients->where('is_active', '<>', true);
|
|
|
- break;
|
|
|
+ $status = $request->input('status');
|
|
|
+ if($status){
|
|
|
+ if($status === 'ACTIVE'){
|
|
|
+ $patients->where('is_active', true)->where(function($q) use ($status){
|
|
|
+ return $q->where('client_engagement_status_category', $status)
|
|
|
+ ->orWhereNull('client_engagement_status_category');
|
|
|
+ });
|
|
|
+ }elseif($status === 'NONE'){
|
|
|
+ $patients->whereNull('client_engagement_status_category');
|
|
|
+ }else {
|
|
|
+ $patients->where('client_engagement_status_category', $status);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
$initiative = $request->input('initiative');
|
