Josh преди 4 години
родител
ревизия
a43427caae
променени са 4 файла, в които са добавени 124 реда и са изтрити 142 реда
  1. 2 2
      app/Http/Controllers/PracticeManagementController.php
  2. 12 0
      app/Models/Claim.php
  3. 5 0
      app/Models/Note.php
  4. 105 140
      resources/views/app/practice-management/billing-manager.blade.php

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

@@ -336,7 +336,7 @@ class PracticeManagementController extends Controller
     }
 
     public function billingManager(Request $request, $proUid = null) {
-        $bills = Bill::paginate();
-        return view('app.practice-management.billing-manager', compact('bills'));
+        $notes = Note::orderBy('created_at', 'desc')->paginate();
+        return view('app.practice-management.billing-manager', compact('notes'));
     }
 }

+ 12 - 0
app/Models/Claim.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Claim extends Model
+{
+
+    protected $table = 'claim';
+    //
+}

+ 5 - 0
app/Models/Note.php

@@ -55,6 +55,11 @@ class Note extends Model
         return $this->hasMany(NoteReason::class, 'note_id', 'id');
     }
 
+    public function claims()
+    {
+        return $this->hasMany(Claim::class, 'id', 'note_id');
+    }
+
     public function summary()
     {
         $parts = [];

+ 105 - 140
resources/views/app/practice-management/billing-manager.blade.php

@@ -1,148 +1,113 @@
-@extends ('layouts.template')
+@extends ('layouts/template')
 
 @section('content')
-<div>
-    <h1>Billing Manager</h1>
-    <div>
-        <table class="table table-striped table-condensed">
-            <thead>
-                <tr>
-                    <th>created_at</th>
-                    <th>bill_service_type</th>
-                    <th>cm_expected_payment_amount</th>
-                    <th>cm_or_rm</th>
-                    <th>cm_payment_amount</th>
-                    <th>code</th>
-                    <th>collected_amount</th>
-                    <th>effective_date</th>
-                    <th>has_cm_been_paid</th>
-                    <th>has_hcp_been_paid</th>
-                    <th>has_na_been_paid</th>
-                    <th>has_rme_been_paid</th>
-                    <th>has_rmm_been_paid</th>
-                    <th>hcp_expected_payment_amount</th>
-                    <th>hcp_payment_amount</th>
-                    <th>is_cancelled</th>
-                    <th>is_signed_by_cm</th>
-                    <th>is_signed_by_hcp</th>
-                    <th>is_signed_by_rme</th>
-                    <th>is_signed_by_rmm</th>
-                    <th>is_submitted</th>
-                    <th>marked_cancelled_at</th>
-                    <th>marked_submitted_at</th>
-                    <th>memo</th>
-                    <th>modifier</th>
-                    <th>na_expected_payment_amount</th>
-                    <th>na_payment_amount</th>
-                    <th>number_of_units</th>
-                    <th>reason1</th>
-                    <th>reason2</th>
-                    <th>reason3</th>
-                    <th>reason3plus</th>
-                    <th>rme_expected_payment_amount</th>
-                    <th>rme_payment_amount</th>
-                    <th>rmm_expected_payment_amount</th>
-                    <th>rmm_payment_amount</th>
-                    <th>service_location</th>
-                    <th>signed_by_cm_at</th>
-                    <th>signed_by_hcp_at</th>
-                    <th>signed_by_rme_at</th>
-                    <th>signed_by_rmm_at</th>
-                    <th>created_by_session_id</th>
-                    <th>care_month_id</th>
-                    <th>client_id</th>
-                    <th>cm_payment_pro_transaction_id</th>
-                    <th>cm_pro_id</th>
-                    <th>hcp_payment_pro_transaction_id</th>
-                    <th>hcp_pro_id</th>
-                    <th>marked_cancelled_by_session_id</th>
-                    <th>marked_submitted_by_session_id</th>
-                    <th>na_payment_pro_transaction_id</th>
-                    <th>na_pro_id</th>
-                    <th>note_id</th>
-                    <th>note_ally_id</th>
-                    <th>rme_payment_pro_transaction_id</th>
-                    <th>rme_pro_id</th>
-                    <th>rmm_payment_pro_transaction_id</th>
-                    <th>rmm_pro_id</th>
-                    <th>signed_by_cm_session_id</th>
-                    <th>signed_by_hcp_session_id</th>
-                    <th>signed_by_rme_session_id</th>
-                    <th>signed_by_rmm_session_id</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach($bills as $bill)
+
+    <div class="p-3 mcp-theme-1">
+    <div class="card">
+
+        <div class="card-header px-3 py-2 d-flex align-items-center">
+            <strong class="mr-4">
+                <i class="fas fa-user-injured"></i>
+                Notes
+            </strong>
+            
+        </div>
+        <div class="card-body p-0">
+        |  | Bill(s) | Assessment(s) | Claim(s)
+            <table class="table table-sm table-condensed p-0 m-0">
+                <thead class="bg-light">
                 <tr>
-                    <td>{{$bill->created_at}}</td>
-                    <td>{{$bill->bill_service_type}}</td>
-                    <td>{{$bill->cm_expected_payment_amount}}</td>
-                    <td>{{$bill->cm_or_rm}}</td>
-                    <td>{{$bill->cm_payment_amount}}</td>
-                    <td>{{$bill->code}}</td>
-                    <td>{{$bill->collected_amount}}</td>
-                    <td>{{$bill->effective_date}}</td>
-                    <td>{{$bill->has_cm_been_paid}}</td>
-                    <td>{{$bill->has_hcp_been_paid}}</td>
-                    <td>{{$bill->has_na_been_paid}}</td>
-                    <td>{{$bill->has_rme_been_paid}}</td>
-                    <td>{{$bill->has_rmm_been_paid}}</td>
-                    <td>{{$bill->hcp_expected_payment_amount}}</td>
-                    <td>{{$bill->hcp_payment_amount}}</td>
-                    <td>{{$bill->is_cancelled}}</td>
-                    <td>{{$bill->is_signed_by_cm}}</td>
-                    <td>{{$bill->is_signed_by_hcp}}</td>
-                    <td>{{$bill->is_signed_by_rme}}</td>
-                    <td>{{$bill->is_signed_by_rmm}}</td>
-                    <td>{{$bill->is_submitted}}</td>
-                    <td>{{$bill->marked_cancelled_at}}</td>
-                    <td>{{$bill->marked_submitted_at}}</td>
-                    <td>{{$bill->memo}}</td>
-                    <td>{{$bill->modifier}}</td>
-                    <td>{{$bill->na_expected_payment_amount}}</td>
-                    <td>{{$bill->na_payment_amount}}</td>
-                    <td>{{$bill->number_of_units}}</td>
-                    <td>{{$bill->reason1}}</td>
-                    <td>{{$bill->reason2}}</td>
-                    <td>{{$bill->reason3}}</td>
-                    <td>{{$bill->reason3plus}}</td>
-                    <td>{{$bill->rme_expected_payment_amount}}</td>
-                    <td>{{$bill->rme_payment_amount}}</td>
-                    <td>{{$bill->rmm_expected_payment_amount}}</td>
-                    <td>{{$bill->rmm_payment_amount}}</td>
-                    <td>{{$bill->service_location}}</td>
-                    <td>{{$bill->signed_by_cm_at}}</td>
-                    <td>{{$bill->signed_by_hcp_at}}</td>
-                    <td>{{$bill->signed_by_rme_at}}</td>
-                    <td>{{$bill->signed_by_rmm_at}}</td>
-                    <td>{{$bill->created_by_session_id}}</td>
-                    <td>{{$bill->care_month_id}}</td>
-                    <td>{{$bill->client_id}}</td>
-                    <td>{{$bill->cm_payment_pro_transaction_id}}</td>
-                    <td>{{$bill->cm_pro_id}}</td>
-                    <td>{{$bill->hcp_payment_pro_transaction_id}}</td>
-                    <td>{{$bill->hcp_pro_id}}</td>
-                    <td>{{$bill->marked_cancelled_by_session_id}}</td>
-                    <td>{{$bill->marked_submitted_by_session_id}}</td>
-                    <td>{{$bill->na_payment_pro_transaction_id}}</td>
-                    <td>{{$bill->na_pro_id}}</td>
-                    <td>{{$bill->note_id}}</td>
-                    <td>{{$bill->note_ally_id}}</td>
-                    <td>{{$bill->rme_payment_pro_transaction_id}}</td>
-                    <td>{{$bill->rme_pro_id}}</td>
-                    <td>{{$bill->rmm_payment_pro_transaction_id}}</td>
-                    <td>{{$bill->rmm_pro_id}}</td>
-                    <td>{{$bill->signed_by_cm_session_id}}</td>
-                    <td>{{$bill->signed_by_hcp_session_id}}</td>
-                    <td>{{$bill->signed_by_rme_session_id}}</td>
-                    <td>{{$bill->signed_by_rmm_session_id}}</td>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Note Eff. Date</th>
+                    <th class="border-0">HCP</th>
+                    <th class="border-0">Signed?</th>
+                    <th class="border-0">Bills</th>
+                    <th class="border-0">Assessments</th>
+                    <th class="border-0">Claims</th>
+                    <th class="px-3 border-0">Created</th>
                 </tr>
+                </thead>
+                <tbody>
+                @foreach ($notes as $note)
+                    <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
+                        
+                        <td class="">
+                            <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}">{{ $note->client->displayName() }}</a>
+                        </td>
+                        <td class="">
+                            <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
+                                {{ friendly_date_time($note->effective_dateest, false) }}
+                            </a>
+                            <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
+                        </td>
+                        <td>{{$note->hcpPro->name_first}} {{$note->hcpPro->name_first}}</td>
+                        <td>{{$note->is_signed_by_hcp?'Yes':'No'}}</td>
+                        <td>
+                            <table class="table table-sm table-condensed table-stripe">
+                                <thead>
+                                    <tr>
+                                        <th>Service</th>
+                                        <th>Signed?</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($note->bills as $bill)
+                                    <tr>
+                                        <td>{{$bill->bill_service_type}}</td>
+                                        <td>{{$bill->is_signed_by_hcp?'Yes':'No'}}</td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </td>
+                        <td>
+                            <table class="table table-sm table-condensed table-stripe">
+                                <thead>
+                                    <tr>
+                                        <th>Code</th>
+                                        <th>Description</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($note->reasons as $reason)
+                                    <tr>
+                                        <td>{{$reason->code}}</td>
+                                        <td>{{$reason->description}}</td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </td>
+                        <td>
+                            <table class="table table-sm table-condensed table-stripe">
+                                <thead>
+                                    <tr>
+                                        <th>Identifier</th>
+                                        <th>Submitted?</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($note->claims as $claim)
+                                    <tr>
+                                        <td>{{$claim->uid}}</td>
+                                        <td>{{$claim->was_submitted?'Yes':'No'}}</td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </td>
+                        <td class="px-3">
+                            {{ friendly_date_time($note->created_at, true) }}
+                        </td>
+                    </tr>
                 @endforeach
-            </tbody>
-        </table>
-        <div>
-            {{$bills->links()}}
+                </tbody>
+            </table>
+            <div>
+                {{$notes->links()}}
+            </div>
         </div>
     </div>
-</div>
+    </div>
+
 @endsection