Merge branch 'master' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -73,7 +73,15 @@ class PracticeManagementController extends Controller
             ->where('number_of_days_with_remote_measurements', '>=', 16)
             ->where('days_between_most_recent_mcp_note_date_and_end_of_care_month', '<=', 90);
 	if(!$isAdmin) $query->where('mcp_pro_id', '=', $proID);
-	$rows = $query->orderByRaw(DB::raw('start_date DESC'))->paginate(10000) ;
+
+    if($request->get('show_billing_not_closed_only')){
+        $query->where(function($q){
+            return $q->where('is_bill_closed', false)->orWhereNull('is_bill_closed');
+        });
+    }
+
+
+	$rows = $query->orderByRaw(DB::raw('start_date DESC'))->paginate(100) ;
         return view ('app.practice-management.remote-monitoring-report', compact('rows', 'isAdmin'));
 	}
 
@@ -84,11 +92,18 @@ class PracticeManagementController extends Controller
         
         $rows = BillingReport::paginate(50);
         if($claimStatus){
-            $rows = BillingReport::whereHas('note', function($noteQuery) use ($claimStatus){
-                return $noteQuery->whereHas('claims', function($claimQuery) use ($claimStatus) {
-                    return $claimQuery->where('status', $claimStatus);
-                });
-            })->paginate(50);
+            if($claimStatus == 'NO_CLAIMS'){
+                $rows = BillingReport::whereHas('note', function($noteQuery) use ($claimStatus){
+                    return $noteQuery->has('claims', '=', 0);
+                })->paginate(50);
+            }else{
+                $rows = BillingReport::whereHas('note', function($noteQuery) use ($claimStatus){
+                    return $noteQuery->whereHas('claims', function($claimQuery) use ($claimStatus) {
+                        return $claimQuery->where('status', $claimStatus);
+                    });
+                })->paginate(50);
+            }
+            
         }
         
 

resources/views/app/patient/coverage-status.blade.php

@@ -19,11 +19,13 @@
           <td>
             @if($mcnDetails && $mcnDetails->plan_details)
             <span class="font-weight-bold">{{ $mcnDetails->plan_details->MC->payer_name }}</span> <br>
-              @foreach($mcnDetails->plan_details->MC->contacts as $contact)
+              @if($mcnDetails->plan_details && $mcnDetails->plan_details->MC && $mcnDetails->plan_details->MC->contacts)
+	      @foreach($mcnDetails->plan_details->MC->contacts as $contact)
                 @if($contact->contact_type == 'telephone')
                   <a href="tel:{{ $contact->contact_value }}"><b><i class="fas fa-phone-alt"></i></b> {{ $contact->contact_value }}</a> <br>
                 @endif
               @endforeach
+	      @endif
             @endif
             @if($coverage->auto_medicare_is_partbprimary == 'YES')
               <span><i class="fas fa-check-circle text-success"></i> <b>Part B Primary:</b> YES (auto)</span> <br>

resources/views/app/patient/prescriptions/pdf/DRUG.blade.php

@@ -70,6 +70,9 @@
                             @if(@$item->frequency)
                                 <p style="margin: 0.5rem 0;">Frequency: {{ $item->frequency }}</p>
                             @endif
+                            @if(@$item->instructions)
+                                <p style="margin: 0.5rem 0;">Instructions: {{ $item->instructions }}</p>
+                            @endif
                             @if(@$item->dispense)
                                 <p style="margin: 0.5rem 0;">Dispense: {{ $item->dispense }}</p>
                             @endif

resources/views/app/practice-management/billing-report.blade.php

@@ -15,6 +15,7 @@
             <div class="m-2">
                 Claim status: 
                 <a href="/practice-management/billing-report" class="badge">ALL</a>
+                <a href="/practice-management/billing-report?status=NO_CLAIMS" class="badge">NO_CLAIMS</a>
                 @foreach($claimStatuses as $claimStatus)
                 <a href="/practice-management/billing-report?status={{$claimStatus->status}}" class="badge">{{$claimStatus->status}}</a>
                 @endforeach
@@ -92,7 +93,7 @@
         </div>
     </div>
     <div class="mt-3">
-        {{$rows->links()}}
+        {{$rows->appends(request()->input())->links()}}
     </div>
 
 </div>

resources/views/app/practice-management/remote-monitoring-report.blade.php

@@ -7,6 +7,10 @@
             <strong class="mr-4">
                 <i class="fas fa-chart-bar"></i>
                 Remote Monitoring Report
+                <span class="inline-block mr-2">|</span>
+                <a href="/practice-management/remote-monitoring-report">Show All</a>
+                <span class="inline-block mr-2">|</span>
+                <a href="/practice-management/remote-monitoring-report?show_billing_not_closed_only=1">Show 'Billing Not Closed' Only</a>
             </strong>
         </div>
 
@@ -157,7 +161,7 @@
         </div>
     </div>
     <div class="mt-3">
-        {{$rows->links()}}
+        {{$rows->appends(request()->input())->links()}}
     </div>
 </div>
 @endsection