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

app/Http/Controllers/HomeController.php

@@ -1725,7 +1725,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
 
         if(!($pro->pro_type === 'ADMIN' && $pro->can_see_any_client_via_search)) {
             $clientQuery->where(function ($q) use ($pro) {
-                if($pro->pro_type === 'ADMIN') {
+                if($pro->pro_type === 'ADMIN' || $pro->is_enrolled_as_mcp) {
                     $q->whereIn('id', $pro->getMyClientIds(true))->orWhereNull('mcp_pro_id');
                 }
                 else {

app/Models/Pro.php

@@ -585,7 +585,8 @@ WHERE mcp_pro_id = :pro_id
         $canAccess = Client::select('uid')
             ->where('uid', $_patientUid)
             ->where(function ($q) use ($proID) {
-                $q->where('mcp_pro_id', $proID)
+                $q->whereNull('mcp_pro_id')
+                    ->orWhere('mcp_pro_id', $proID)
                     ->orWhere('cm_pro_id', $proID)
                     ->orWhere('rmm_pro_id', $proID)
                     ->orWhere('rme_pro_id', $proID)