瀏覽代碼

updated cellular device matrix

logicpowerhouse 4 年之前
父節點
當前提交
dfba474933

+ 2 - 2
app/Http/Controllers/PracticeManagementController.php

@@ -408,9 +408,9 @@ class PracticeManagementController extends Controller
         $bills = [];
         if($targetPro){
             $expectedForHcp = DB::select(DB::raw("SELECT coalesce(SUM(hcp_expected_payment_amount),0) as expected_pay FROM bill WHERE hcp_pro_id = :targetProID  AND is_signed_by_hcp IS TRUE AND is_cancelled = false"), ['targetProID' => $targetPro->id])[0]->expected_pay;
-            $bills = Bill::where('hcp_pro_id', $targetPro->id)->orderBy('created_at', 'desc')->paginate(100);
+            $bills = Bill::where('hcp_pro_id', $targetPro->id)->orderBy('created_at', 'desc')->paginate();
         }else{
-            $bills = Bill::orderBy('created_at', 'desc')->paginate(100);
+            $bills = Bill::orderBy('created_at', 'desc')->paginate();
         }
         return view('app.practice-management.hcp-bill-matrix', compact('bills', 'allPros', 'expectedForHcp', 'targetPro'));
     }

+ 2 - 1
resources/views/app/practice-management/hcp-bill-matrix.blade.php

@@ -56,7 +56,8 @@
                     <tbody>
                     @foreach ($bills as $bill)
                         <?php $note = $bill->note; ?>
-                        <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
+                        <?php if(!$note) { continue; } ?>
+                        <tr class="">
 
                             <td class="">
                                 <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}">{{ $note->client->displayName() }}</a>