Merge branch 'dev' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -79,8 +79,22 @@ class PracticeManagementController extends Controller
 
     public function billingReport(Request $request)
     {
+
+        $claimStatus = $request->get('status');
+        
         $rows = BillingReport::paginate(50);
-        return view('app.practice-management.billing-report', compact('rows'));
+        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);
+        }
+        
+
+        $claimStatuses = DB::select('SELECT distinct status FROM claim ORDER BY status DESC');
+
+        return view('app.practice-management.billing-report', compact('rows', 'claimStatuses'));
     }
 
     public function dashboard(Request $request)

app/Models/ClientPrimaryCoverage.php

@@ -67,4 +67,7 @@ class ClientPrimaryCoverage extends Model
     public function payer(){
         return $this->hasOne(Payer::class, 'id', 'commercial_payer_id');
     }
+    public function mcdPayer(){
+        return $this->hasOne(Payer::class, 'id', 'mcd_payer_id');
+    }
 }

resources/views/app/new-patient.blade.php

@@ -6,6 +6,11 @@
 $patients = [1, 2, 3, 4];
 $medicaidStates = Config::get('constants.medicaid_states');
 ?>
+<style media="screen">
+	.form-control {
+		border-radius: 0;
+	}
+</style>
 
 <div class="p-3 mcp-theme-1" id="newPatientContainer" v-cloak>
 	<div class="col-12">
@@ -18,68 +23,76 @@ $medicaidStates = Config::get('constants.medicaid_states');
 				</strong>
 			</div>
 			<div class="card-body">
-				<form show url="/api/client/create" class="px-2 pb-1 primary-form" redir="patients/view/[data]">
+				<form id="createNewPatientForm" show url="/api/client/create" class="px-2 pb-1 primary-form" redir="patients/view/[data]">
 					@if (session('message'))
 					<div class="alert alert-danger">{{ session('message') }}</div>
 					@endif
 					<div class="row">
-						<div class="border-lighter col-md-5">
+						<div class="border-lighter col-md-6">
 							<div class="row">
 								<div class="col-md-12 bg-light p-3 mb-2">
 									<h5 class="m-0 font-weight-bold">Patient Name / Demographics:</h5>
 								</div>
-								<div class="form-group col-md-4">
-									<label class="control-label">First Name <span class="text-danger">*</span> </label>
-									<input type="text" required name="patientNameFirst" value="" class="form-control input-sm">
-								</div>
-								<div class="form-group col-md-4">
-									<label class="control-label">Middle Name / MI</label>
-									<input type="text" name="patientNameMiddle" value="" class="form-control input-sm">
-								</div>
-								<div class="form-group col-md-4">
-									<label class="control-label">Last Name <span class="text-danger">*</span></label>
-									<input type="text" required name="patientNameLast" value="" class="form-control input-sm">
-								</div>
-								<div class="form-group col-md-4">
-									<label class="control-label">Prefix</label>
-									<input type="text" name="patientNamePrefix" value="" class="form-control input-sm">
+								<div class="col-md-12 form-group mt-2">
+									<div class="d-flex align-items-center">
+										<label class="m-0 w-25">Name:</label>
+										<input autocomplete="_blank" type="text" name="patientNamePrefix" placeholder="Prefix" class="ml-2 form-control input-sm w-50">
+										<input autocomplete="_blank" type="text" required name="patientNameFirst" placeholder="First" class="ml-2 form-control input-sm">
+										<input autocomplete="_blank" type="text" name="patientNameMiddle" placeholder="Middle" class="ml-2 form-control input-sm">
+										<input autocomplete="_blank" type="text" name="patientNameLast" placeholder="Last" class="ml-2 form-control input-sm">
+										<input autocomplete="_blank" type="text" name="patientNameSuffix" placeholder="Suffix" class="ml-2 form-control input-sm w-50">
+									</div>
 								</div>
-								<div class="form-group col-md-4">
-									<label class="control-label">Suffix</label>
-									<input type="text" name="patientNameSuffix" value="" class="form-control input-sm">
+								<div class="col-md-12 p-0">
+									<div class="col-md-6 form-group">
+										<div class="d-flex align-items-center">
+											<label class="m-0">Email:</label>
+											<input class='form-control ml-2' type='email' placeholder="Email Address" name='emailAddress'>
+										</div>
+									</div>
 								</div>
-								<div class="form-group col-md-4">
-									<label class="control-label">Sex</label>
-									<select class="form-control input-sm" name="patientSex" select2>
-										<option value="">--</option>
-										<option value="M">Male</option>
-										<option value="F">Female</option>
-										<option value="UNKNOWN">Unknown</option>
-									</select>
+								<div class="col-md-12 p-0">
+									<div class="col-md-4 form-group">
+										<div class="d-flex align-items-center">
+											<label class="m-0 w-25">Gender:</label>
+											<select class="form-control input-sm ml-2" name="patientSex" select2>
+												<option value="">--</option>
+												<option value="M">Male</option>
+												<option value="F">Female</option>
+												<option value="UNKNOWN">Unknown</option>
+											</select>
+										</div>
+									</div>
 								</div>
-								<div class="form-group col-md-6">
-									<label class="control-label">Date of Birth <span class="text-danger">*</span></label>
-									<input type="date" required name="patientDob" value="" class="form-control input-sm">
+							</div>
+							<div class="row">
+								<div class="col-md-5 form-group">
+									<div class="d-flex align-items-center">
+										<label class="m-0 w-25">DOB: <span class="text-danger">*</span></label>
+										<input type="date" required name="patientDob" value="" class="form-control input-sm">
+									</div>
 								</div>
-								<div class="form-group col-md-6">
-									<label class="control-label">Date Of Service</label>
-									<input type="date" name="dateOfService" value="{{date('Y-m-d')}}" class="form-control input-sm">
+								<div class="col-md-5 form-group">
+									<div class="d-flex align-items-center">
+										<label class="m-0 w-25">Service:</label>
+										<input type="date" name="dateOfService" value="{{date('Y-m-d')}}" class="form-control input-sm">
+									</div>
 								</div>
 							</div>
 							@if($pro->pro_type === 'ADMIN')
 							<div class="row">
-								<div class="col-md-6">
-									<div class='form-group mb-3'>
-										<label class='control-label'>HCP Pro</label>
-										<select name="hcpProUid" class="form-control" provider-search provider-type="hcp">
+								<div class="col-md-5 form-group">
+									<div class="d-flex align-items-center">
+										<label class="m-0 w-25">HCP Pro:</label>
+										<select name="hcpProUid" class="form-control input-sm" provider-search provider-type="hcp">
 											<option value="">--select--</option>
 										</select>
 									</div>
 								</div>
-								<div class="col-md-6">
-									<div class='form-group mb-3'>
-										<label class='control-label'>Care Coordinator</label>
-										<select name="assistantProUid" class="form-control" provider-search provider-type="default-na">
+								<div class="col-md-7 form-group">
+									<div class="d-flex align-items-center">
+										<label class='m-0 w-25'>Coordinator:</label>
+										<select name="assistantProUid" class="form-control input-sm ml-2" provider-search provider-type="default-na">
 											<option value="">--select--</option>
 										</select>
 									</div>
@@ -88,18 +101,20 @@ $medicaidStates = Config::get('constants.medicaid_states');
 							@elseif($pro->is_hcp === true)
 							<div class="row">
 								<div class="col-md-12">
-									<div class='form-group mb-3'>
-										<label class='control-label'>HCP Pro</label>
-										<input type="text" class="form-control" readonly value="{{$pro->displayName()}}">
-										<input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
+									<div class='form-group'>
+										<div class="d-flex align-items-center">
+											<label class="m-0 w-25">HCP Pro:</label>
+											<input type="text" class="form-control" readonly value="{{$pro->displayName()}}">
+											<input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
+										</div>
 									</div>
 								</div>
 							</div>
 							@elseif($pro->isDefaultNA())
 							<div class="row">
-								<div class="col-md-6">
-									<div class='form-group mb-3'>
-										<label class='control-label'>HCP Pro</label>
+								<div class="col-md-5 form-group">
+									<div class="d-flex align-items-center">
+										<label class="m-0 w-25">HCP Pro:</label>
 										<?php $teams = $pro->teamsWhereAssistant; ?>
 										<select name="hcpProUid" class="form-control">
 											@if(count($teams) > 1)
@@ -110,23 +125,21 @@ $medicaidStates = Config::get('constants.medicaid_states');
 											@endforeach
 										</select>
 									</div>
-
 								</div>
-								<div class="col-md-6">
-									<div class='form-group mb-3'>
-										<label class='control-label'>Care Coordinator</label>
+								<div class="col-md-7 form-group">
+									<div class="d-flex align-items-center">
+										<label class='m-0 w-25'>Coordinator:</label>
 										<input type="text" class="form-control" readonly value="{{$pro->displayName()}}">
 										<input type="hidden" name="assistantProUid" value="{{$pro->uid}}">
 									</div>
 								</div>
 							</div>
 							@endif
-
 							<div class="row">
-								<div class="col-md-4">
-									<div class='form-group mb-3'>
-										<label class='control-label d-flex align-items-center'>
-											<span>Home Phone Number</span>
+								<div class="col-md-6 form-group">
+									<div class="d-flex align-items-center">
+										<label class='control-label m-0 d-flex align-items-center'>
+											<span>Phone:</span>
 											<a v-if="form.homeNumber" @click="hpnToCpn" class="ml-1 px-1 on-hover-opaque hpn-to-cpn c-pointer">
 												<i class="fa fa-arrow-right"></i>
 											</a>
@@ -134,24 +147,20 @@ $medicaidStates = Config::get('constants.medicaid_states');
 												<i class="fa fa-retweet"></i>
 											</a>
 										</label>
-										<input class='form-control' stag-input-phone type='tel' name='homeNumber' v-model="form.homeNumber">
+										<input class='form-control ml-2' placeholder="Home Phone" autocomplete="_blank" stag-input-phone type='tel' name='homeNumber' v-model="form.homeNumber">
+										</select>
 									</div>
 								</div>
-								<div class="col-md-4">
-									<div class='form-group mb-3'>
-										<label class='control-label d-flex align-items-center'>
-											<span>Cell Phone Number</span>
+								<div class="col-md-6 form-group">
+									<div class="d-flex align-items-center">
+										<label class='control-label m-0 d-flex align-items-center'>
+											<span>Phone:</span>
 											<a v-if="form.cellNumber" @click="cpnToHpn" class="ml-1 px-1 on-hover-opaque cpn-to-hpn c-pointer">
 												<i class="fa fa-arrow-left"></i>
 											</a>
 										</label>
-										<input class='form-control' stag-input-phone type='tel' name='cellNumber' v-model="form.cellNumber">
-									</div>
-								</div>
-								<div class="col-md-4">
-									<div class='form-group mb-3'>
-										<label class='control-label'>Email Address </label>
-										<input class='form-control' type='email' name='emailAddress'>
+										<input class='form-control ml-2' placeholder="Cell Phone" autocomplete="_blank" stag-input-phone type='tel' name='cellNumber' v-model="form.cellNumber">
+										</select>
 									</div>
 								</div>
 							</div>
@@ -159,18 +168,18 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 							<div class='form-group mb-3'>
 								<label class='control-label'>How did you hear about us?</label>
-								<input class='form-control' type='text' required="" name='initiative' />
+								<input class='form-control' type='text' name='initiative' />
 							</div>
 
 							<div class='form-group mb-3 checkbox'>
 								<label>
-									<input type='checkbox' name='isTestRecord' />	
+									<input type='checkbox' name='isTestRecord' />
 									This is a test record
 								</label>
 							</div>
 
 						</div>
-						<div class="col-md-7">
+						<div class="col-md-6">
 							<div class="border-lighter">
 								<div class="col-md-12 bg-light py-3 px-3 mb-2 ">
 									<h5 class="m-0 font-weight-bold">Insurance Coverage:</h5>
@@ -194,7 +203,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 										<div class="row" v-show="planType == 'COMMERCIAL'">
 											<div class="form-group col-md-12">
 												<label for="" class="control-label">Commercial Payer</label>
-												<input name="commercialPayerUidSuggest" class="form-control input-sm" value="" stag-suggest stag-suggest-ep="/search-payer/json" />
+												<input name="commercialPayerUidSuggest" class="form-control input-sm" value="" autocomplete="off" stag-suggest stag-suggest-ep="/search-payer/json" />
 												<input type="hidden" name="commercialPayerUid" />
 											</div>
 											<div class="form-group col-md-6">
@@ -271,23 +280,25 @@ $medicaidStates = Config::get('constants.medicaid_states');
 													<h5 class="m-0 font-weight-bold">Medicaid Information:</h5>
 												</div>
 											</div>
-											<div class="col-12 px-0">
-												<div class="px-2">
-													<div class="form-group col-md-6">
-														<label for="" class="control-label">Medicaid State</label>
-														<input class="form-control input-sm" list="mcdPayer" name="mcdPayerName" id="mcdPayerName">
-														<datalist id="mcdPayer">
-															<option value="">--</option>
-															@foreach($medicaidStates as $state)
-															<option>{{ $state }}</option>
-															@endforeach
-														</datalist>
-													</div>
+											<div class="col-12">
+												<div class="row">
+
+												
+												<div class="form-group col-md-6">
+													<label for="" class="control-label">Medicaid State</label>
+													<input class="form-control input-sm" list="mcdPayerOptions" name="mcdPayerName" id="mcdPayerName">
+													<datalist id="mcdPayerOptions">
+														<option value="">--</option>
+														@foreach($medicaidStates as $state)
+														<option>{{ $state }}</option>
+														@endforeach
+													</datalist>
+												</div>
 
-													<div class="form-group col-md-6">
-														<label class="control-label">Medicaid Number</label>
-														<input type="text" name="mcdNumber" class="form-control input-sm">
-													</div>
+												<div class="form-group col-md-6">
+													<label class="control-label">Medicaid Number</label>
+													<input type="text" name="mcdNumber" class="form-control input-sm" oninput="this.value = this.value.toUpperCase()">
+												</div>
 												</div>
 											</div>
 										</div>
@@ -298,12 +309,10 @@ $medicaidStates = Config::get('constants.medicaid_states');
 													<h5 class="m-0 font-weight-bold">Medicare Information:</h5>
 												</div>
 											</div>
-											<div class="col-12 px-0">
-												<div class="px-2">
-													<div class="form-group col-md-6">
-														<label class="control-label">Medicare Number</label>
-														<input type="text" name="mcrNumber" class="form-control input-sm">
-													</div>
+											<div class="col-12">
+												<div class="form-group col-md-6">
+													<label class="control-label">Medicare Number</label>
+													<input type="text" name="mcrNumber" class="form-control input-sm" oninput="this.value = this.value.toUpperCase()">
 												</div>
 											</div>
 
@@ -376,7 +385,16 @@ $medicaidStates = Config::get('constants.medicaid_states');
 						hiddenInput.val(_data.uid);
 					});
 			},
+			initOnInputChange: function() {
+				var form = $('#createNewPatientForm');
+				form.find('input[type=text],textarea').change(function() {
+					var value = this.value.replace(/\s\s+/g, ' ');
+					value = value.trim();
+					$(this).val(value);
+				});
+			},
 			init: function() {
+				this.initOnInputChange();
 				this.onCommercialPayerChange();
 			}
 		},

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

@@ -1,28 +1,43 @@
 <div>
     @php
         $coverage = $patient->latestClientPrimaryCoverage;
+        $mcnDetails = json_decode($patient->mcn_response_detail ?? null);
     @endphp
     @if(!$coverage)
-        <span><b>No coverage info!</b></span>
+        <table class="table table-sm table-bordered">
+          <tr>
+            <td>
+              <b>No coverage info!</b>
+            </td>
+          </tr>
+        </table>
     @elseif($coverage->plan_type === 'MEDICARE')
       @if($coverage->creation_strategy == 'NEW' || $coverage->creation_strategy == 'AUTO_REFRESH')
       <table class="table table-sm table-bordered">
         <tr>
           <td class="font-weight-bold">Medicare Part B (Primary)</td>
           <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($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
             @if($coverage->auto_medicare_is_partbprimary == 'YES')
-              <span><i class="fas fa-check-circle text-success"></i> (auto)</span>
+              <span><i class="fas fa-check-circle text-success"></i> <b>Part B Primary:</b> YES (auto)</span> <br>
             @elseif(!$coverage->auto_medicare_is_match_found)
-              <span><i class="fas fa-times text-danger"></i> record not found (auto)</span>
+              <span><i class="fas fa-times text-danger"></i> record not found (auto)</span> <br>
             @else
-              <span><i class="fas fa-times text-danger"></i> {{$coverage->auto_medicare_is_partbprimary}}</span> <br>
               <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
-              <span><b>Part B:</b> {{$coverage->auto_medicare_is_partbactive}}</span> <br>
-              <span><b>Part C:</b> {{$coverage->auto_medicare_is_partcactive}}</span>
+              <span><i class="fas fa-times text-danger"></i> <b>Part B Primary:</b> {{$coverage->auto_medicare_is_partbprimary}}</span> <br>
+              <span><b>Part B Active:</b> {{$coverage->auto_medicare_is_partbactive}}</span> <br>
+              <span><b>Part C Active:</b> {{$coverage->auto_medicare_is_partcactive}}</span>
             @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive == 'YES' && $performer->pro->pro_type == 'ADMIN')
+        @if($coverage->auto_medicare_is_partbactive == 'YES' && !$coverage->auto_medicare_is_partcactive)
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
           <td>{{number_format($coverage->auto_medicare_mpb_deductible, 2, '.',',') ?? '-'}}</td>
@@ -32,25 +47,43 @@
           <td>{{number_format($coverage->auto_medicare_mpb_remaining,2, '.',',') ?? '-'}}</td>
         </tr>
         @endif
+        @if($coverage->manual_determination_category_memo)
+        <tr>
+          <td><b>Manual Determination Memo: </b></td>
+          <td>{{$coverage->manual_determination_category_memo}}</td>
+        </tr>
+        @endif
       </table>
       @else
+      <!-- Manual determination -->
       <table class="table table-sm table-bordered">
         <tr>
           <td class="font-weight-bold">Medicare Part B (Primary)</td>
           <td>
-            @if($coverage->manual_medicare_is_partbprimary)
-              <span><i class="fas fa-check-circle text-success"></i>  ({{$coverage->manual_determination_strategy}})</span>
-            @elseif(!$coverage->manual_medicare_is_match_found)
-            <span><i class="fas fa-times text-danger"></i> record not found ({{$coverage->manual_determination_strategy}})</span>
-            @else
-            <span><i class="fas fa-times text-danger"></i> not primary! ({{$coverage->manual_determination_strategy}})</span> <br>
-            <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
-            <span><b>Part B:</b> {{$coverage->manual_medicare_is_partbactive}}</span> <br>
-            <span><b>Part C:</b> {{$coverage->manual_medicare_is_partcactive}}</span>
+            @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($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
+
+            @if($coverage->manual_medicare_is_partbprimary == 'YES')
+              <span><i class="fas fa-check-circle text-success"></i> <b>Part B Primary:</b> YES ({{strtolower(implode(' ', explode('_', strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy))))))}})</span> <br>
+            @elseif($coverage->manual_medicare_is_matched == 'NO')
+              <span><i class="fas fa-times text-danger"></i> record not found ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span> <br>
+            @else
+              <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
+              <span><i class="fas fa-times text-danger"></i> <b>Part B Primary:</b> {{$coverage->manual_medicare_is_partbprimary}}</span> <br>
+              <span><b>Part B Active:</b> {{$coverage->manual_medicare_is_partbactive}}</span> <br>
+              @if($coverage->manual_medicare_is_partcactive)
+              <span><b>Part C Active:</b> {{$coverage->manual_medicare_is_partcactive}}</span>
+              @endif
+              @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive && $performer->pro->pro_type == 'ADMIN')
+        @if($coverage->auto_medicare_is_partbactive && !$coverage->manual_medicare_is_partcactive)
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
           <td>{{number_format($coverage->auto_medicare_mpb_deductible,2,'.',',') ?? '-'}}</td>
@@ -60,11 +93,14 @@
           <td>{{number_format($coverage->auto_medicare_mpb_remaining, 2, '.',',') ?? '-'}}</td>
         </tr>
         @endif
+        @if($coverage->manual_determination_category_memo)
+        <tr>
+          <td><b>Manual Determination Memo: </b></td>
+          <td>{{$coverage->manual_determination_category_memo}}</td>
+        </tr>
+        @endif
       </table>
       @endif
-      <div class="w-50">
-        {{$coverage->manual_determination_category_memo}}
-      </div>
 
     @elseif($coverage->plan_type === 'MEDICAID')
       @if($coverage->creation_strategy == 'NEW' || $coverage->creation_strategy == 'AUTO_REFRESH')
@@ -72,7 +108,7 @@
         <tr>
           <td class="font-weight-bold">Medicaid (Primary):</td>
           <td>
-            <span><b>{{$coverage->mcd_payer_name ?? '-'}}</b></span> <br>
+            <span><b>{{$coverage->mcdPayer->name ?? '-'}}</b></span> <br>
             <span><i class="fas fa-hourglass-half text-warning"></i> Pending Validation</span> <br>
           </td>
         </tr>
@@ -80,6 +116,12 @@
           <td class="font-weight-bold">Date Created:</td>
           <td><span>{{date_format($coverage->created_at, 'm/d/Y')}}</span></td>
         </tr>
+        @if($coverage->manual_determination_category_memo)
+        <tr>
+          <td><b>Manual Determination Memo: </b></td>
+          <td>{{$coverage->manual_determination_category_memo}}</td>
+        </tr>
+        @endif
       </table>
       @else
         <table class="table table-sm table-bordered">
@@ -90,20 +132,23 @@
               @if($coverage->manual_determination_category == 'COVERED')
               <span><i class="fas fa-check-circle text-success"></i></span>
               @elseif($coverage->manual_determination_category == 'NOT_COVERED')
-              <span><i class="fas fa-check-circle text-danger"></i> record found</span> <br>
-              <span><i class="fas fa-times text-danger"></i> not covered ({{$coverage->manual_determination_strategy}})</span>
+              <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
+              <span><i class="fas fa-times text-danger"></i> not covered ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span>
               @elseif($coverage->manual_determination_category == 'INVALID')
-              <span><i class="fas fa-times text-danger"></i> record not found ({{$coverage->manual_determination_strategy}})</span>
+              <span><i class="fas fa-times text-danger"></i> record not found ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span>
               @else
-              <span><i class="fas fa-hourglass-half text-warning"></i> pending ({{$coverage->manual_determination_strategy}})</span>
+              <span><i class="fas fa-hourglass-half text-warning"></i> pending ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span>
               @endif
             </td>
           </tr>
+          @if($coverage->manual_determination_category_memo)
+          <tr>
+            <td><b>Manual Determination Memo: </b></td>
+            <td>{{$coverage->manual_determination_category_memo}}</td>
+          </tr>
+          @endif
         </table>
       @endif
-      <div class="w-50">
-        {{$coverage->manual_determination_category_memo}}
-      </div>
 
     @elseif($coverage->plan_type === 'COMMERCIAL')
       @if($coverage->creation_strategy == 'NEW' || $coverage->creation_strategy == 'AUTO_REFRESH')
@@ -119,6 +164,12 @@
           <td class="font-weight-bold">Date Created:</td>
           <td><span>{{date_format($coverage->created_at, 'm/d/Y')}}</span></td>
         </tr>
+        @if($coverage->manual_determination_category_memo)
+        <tr>
+          <td><b>Manual Determination Memo: </b></td>
+          <td>{{$coverage->manual_determination_category_memo}}</td>
+        </tr>
+        @endif
       </table>
       @else
         <table class="table table-sm table-bordered">
@@ -129,19 +180,22 @@
               @if($coverage->manual_determination_category == 'COVERED')
               <span><i class="fas fa-check-circle text-success"></i></span>
               @elseif($coverage->manual_determination_category == 'NOT_COVERED')
-              <span><i class="fas fa-check-circle text-danger"></i> record found</span> <br>
-              <span><i class="fas fa-times text-danger"></i> not covered ({{$coverage->manual_determination_strategy}})</span>
+              <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
+              <span><i class="fas fa-times text-danger"></i> not covered ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span>
               @elseif($coverage->manual_determination_category == 'INVALID')
-              <span><i class="fas fa-times text-danger"></i> record not found ({{$coverage->manual_determination_strategy}})</span>
+              <span><i class="fas fa-times text-danger"></i> record not found ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span>
               @else
-              <span><i class="fas fa-hourglass-half text-warning"></i> pending ({{$coverage->manual_determination_strategy}})</span>
+              <span><i class="fas fa-hourglass-half text-warning"></i> pending ({{strtolower(implode(' ', explode('_', $coverage->manual_determination_strategy)))}})</span>
               @endif
             </td>
           </tr>
+          @if($coverage->manual_determination_category_memo)
+          <tr>
+            <td><b>Manual Determination Memo: </b></td>
+            <td>{{$coverage->manual_determination_category_memo}}</td>
+          </tr>
+          @endif
         </table>
       @endif
-      <div class="w-50">
-        {{$coverage->manual_determination_category_memo}}
-      </div>
     @endif
 </div>

resources/views/app/patient/primary-coverage-form.blade.php

@@ -1,9 +1,10 @@
 <?php
-$medicaidStates = Config::get('constants.medicaid_states');
+	$medicaidStates = Config::get('constants.medicaid_states');
+	$cpc = $patient->latestClientPrimaryCoverage;
 ?>
 	<div id="new-coverage-form-{{$patient->uid}}">
 		<div class="p-3">
-			<form :url="url" class="mcp-theme-1" @submit.prevent="submitForm">
+			<form :url="url" class="mcp-theme-1" @submit.prevent="submitForm" autocomplete="off">
 				<input type="hidden" name="clientUid" value="{{$patient->uid}}" class="form-control input-sm" />
 				<div class="row">
 					<div class="form-group col-md-12">
@@ -59,11 +60,11 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					</div>
 					<div class="form-group col-md-4">
 						<label class="control-label">Patient Sex</label>
-						<select class="form-control input-sm" name="patientSex" select2>
+						<select class="form-control input-sm" name="sex" select2>
 							<option value="">--</option>
-							<option value="M">Male</option>
-							<option value="F">Female</option>
-							<option value="UNKNOWN">Unknown</option>
+							<option value="M" @if($patient->sex === 'M') selected @endif>Male</option>
+							<option value="F"  @if($patient->sex === 'F') selected @endif>Female</option>
+							<option value="UNKNOWN"  @if($patient->sex === 'UNKNOWN') selected @endif>Unknown</option>
 						</select>
 					</div>
 					<div class="form-group col-md-4">
@@ -144,8 +145,8 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					</div>
 					<div class="form-group col-md-6">
 						<label for="" class="control-label">Medicaid State</label>
-						<input class="form-control input-sm" list="mcdPayer" name="mcdPayerUid" id="mcdPayerUid">
-						<datalist id="mcdPayer">
+						<input class="form-control input-sm" list="mcdPayerOptions" name="mcdPayerName" id="mcdPayerName">
+						<datalist id="mcdPayerOptions">
 							<option value="">--</option>
 							@foreach($medicaidStates as $state)
               <option>{{$state}}</option>
@@ -155,7 +156,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 					<div class="form-group col-md-6">
 						<label class="control-label">Medicaid Number</label>
-						<input type="text" name="mcdNumber" class="form-control input-sm">
+						<input type="text" name="mcdNumber" class="form-control input-sm" value="{{ $cpc->mcd_number ?? '' }}" oninput="this.value = this.value.toUpperCase()">
 					</div>
 				</div>
 
@@ -165,7 +166,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					</div>
 					<div class="form-group col-md-6">
 						<label class="control-label">Medicare Number</label>
-						<input type="text" name="mcrNumber" class="form-control input-sm">
+						<input type="text" name="mcrNumber" class="form-control input-sm" value="{{ $cpc->mcr_number ?? '' }}" oninput="this.value = this.value.toUpperCase()">
 					</div>
 
 				</div>

resources/views/app/patient/primary-coverage-manual-determination-commercial-modal.blade.php

@@ -3,6 +3,17 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
+		@if($cpc->mcd_number)
+		<div class="mb-2">
+			<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
+			<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+		</div>
+		@endif
+		@if($cpc->mcr_number)
+		<div class="mb-2">
+			<b>Medicare Number:</b> {{$cpc->mcr_number}}
+		</div>
+		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">
@@ -20,9 +31,9 @@
 				<table class="table table-sm table-bordered table-striped">
 					<thead>
 						<tr>
-							<th></th>
-							<th>Automatic</th>
-							<th>Override</th>
+							<th class="border-bottom-0"></th>
+							<th class="border-bottom-0">Automatic</th>
+							<th class="border-bottom-0">Override</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -30,7 +41,7 @@
 							<td>Record Found?</td>
 							<td>{{$cpc->auto_commercial_is_match_found ? 'YES' : 'NO'}}</td>
 							<td>
-								<div class="form-group">
+								<div class="form-group mb-0">
 									<div class="form-check form-check-inline">
 										<label class="form-check-label"><input class="form-check-input" type="radio" name="manualCommercialIsMatched" value="YES" @change="onInputChange">Yes</label>
 									</div>
@@ -44,9 +55,9 @@
 							<td>Coverage Status?</td>
 							<td>UNKNOWN</td>
 							<td>
-								<select name="manualDeterminationCategory" class="form-control input-sm" @change="onInputChange">
-									<option value="">--select--</option>
-									<option value="COVERED" :selected="uiState.manualCommercialIsMatched == 'YES'">Covered</option>
+								<select name="manualDeterminationCategory" class="form-control input-sm" @change="onInputChange" required>
+									<option value="" :selected="uiState.manualCommercialIsMatched == 'YES'">--select--</option>
+									<option value="COVERED">Covered</option>
 									<option value="NOT_COVERED">Not Covered</option>
 									<option value="INVALID" :selected="uiState.manualCommercialIsMatched == 'NO'">Invalid</option>
 									<option value="UNKNOWN">Unknown</option>
@@ -66,7 +77,7 @@
 						</tr>
 						<tr>
 							<td>Medicaid State</td>
-							<td>{{$cpc->mcd_payer_name ?? '-'}}</td>
+							<td>{{$cpc->mcd_payer_name ? $cpc->mcdPayer->name : '-'}}</td>
 						</tr>
 						<tr>
 							<td>Was Medicaid Record Found?</td>
@@ -138,7 +149,7 @@
 						<tr>
 							<td>Is Part C Active?</td>
 							<td>{{$cpc->auto_medicare_is_partcactive}}</td>
-							<td>
+							<td style="max-width:200px;">
 								<div class="alert alert-danger" v-if="(cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES') || (uiState.manualMedicareIsPartBPrimary == 'YES' && uiState.manualMedicareIsPartCActive == 'YES')">
 									Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
 								</div>

resources/views/app/patient/primary-coverage-manual-determination-medicaid-modal.blade.php

@@ -3,6 +3,12 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
+		@if($cpc->mcd_number)
+		<div class="mb-2">
+			<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
+			<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+		</div>
+		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">
@@ -20,9 +26,9 @@
 				<table class="table table-sm table-bordered table-striped">
 					<thead>
 						<tr>
-							<th></th>
-							<th>Automatic</th>
-							<th>Override</th>
+							<th class="border-bottom-0"></th>
+							<th class="border-bottom-0">Automatic</th>
+							<th class="border-bottom-0">Override</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -30,7 +36,7 @@
 							<td>Record Found?</td>
 							<td>{{$cpc->auto_medicaid_is_match_found ? 'YES' : 'NO'}}</td>
 							<td>
-								<div class="form-group">
+								<div class="form-group mb-0">
 									<div class="form-check form-check-inline">
 										<label class="form-check-label"><input class="form-check-input" type="radio" name="manualMedicaidIsMatched" value="YES" :checked="uiState.manualMedicaidIsMatched === 'YES'" @change="inputChange">Yes</label>
 									</div>
@@ -44,9 +50,9 @@
 							<td>Coverage Status?</td>
 							<td>UNKNOWN</td>
 							<td>
-								<select name="manualDeterminationCategory" class="form-control input-sm" @change="inputChange">
-									<option value="">--select--</option>
-									<option value="COVERED" :selected="uiState.manualMedicaidIsMatched == 'YES'">Covered</option>
+								<select name="manualDeterminationCategory" class="form-control input-sm" required @change="inputChange">
+									<option value="" :selected="uiState.manualMedicaidIsMatched == 'YES'">--select--</option>
+									<option value="COVERED">Covered</option>
 									<option value="NOT_COVERED">Not Covered</option>
 									<option value="INVALID" :selected="uiState.manualMedicaidIsMatched == 'NO'">Invalid</option>
 									<option value="UNKNOWN">Unknown</option>

resources/views/app/patient/primary-coverage-manual-determination-medicare-modal.blade.php

@@ -3,6 +3,11 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
+		@if($cpc->mcr_number)
+		<div class="mb-2">
+			<b>Medicare Number:</b> {{$cpc->mcr_number}}
+		</div>
+		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">
@@ -20,9 +25,9 @@
 				<table class="table table-sm table-bordered table-striped">
 					<thead>
 						<tr>
-							<th></th>
-							<th>Automatic</th>
-							<th>Override</th>
+							<th class="border-bottom-0"></th>
+							<th class="border-bottom-0">Automatic</th>
+							<th class="border-bottom-0">Override</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -40,9 +45,6 @@
 								</div>
 							</td>
 						</tr>
-
-
-
 						<tr>
 							<td>Part B Active?</td>
 							<td>{{$cpc->auto_medicare_is_partbactive}}</td>
@@ -82,8 +84,8 @@
 						<tr>
 							<td>Is Part C Active?</td>
 							<td>{{$cpc->auto_medicare_is_partcactive}}</td>
-							<td>
-								<div class="alert alert-danger" v-if="(cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES') || (uiState.manualMedicareIsPartBPrimary == 'YES' && uiState.manualMedicareIsPartCActive == 'YES')">
+							<td style="max-width:200px;">
+								<div class="alert alert-danger p-1 mb-1" v-if="(cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES') || (uiState.manualMedicareIsPartBPrimary == 'YES' && uiState.manualMedicareIsPartCActive == 'YES')">
 									Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
 								</div>
 								<div class="form-group mb-0">

resources/views/app/patient/primary-coverage-manual-determination-view-commercial.blade.php

@@ -3,9 +3,9 @@
 	<table class="table table-sm table-bordered table-striped">
 		<thead>
 			<tr>
-				<th></th>
-				<th>Automatic</th>
-				<th>Override</th>
+				<th class="border-bottom-0"></th>
+				<th class="border-bottom-0">Automatic</th>
+				<th class="border-bottom-0">Override</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -13,7 +13,7 @@
 				<td>Record Found?</td>
 				<td>{{$cpc->auto_commercial_is_match_found ? 'YES' : 'NO'}}</td>
 				<td>
-					<div class="form-group">
+					<div class="form-group mb-0">
 						<p class="mb-1 text-secondary">Manual Determination Category</p>
 						<span>{{$cpc->manual_determination_category ?? '-'}}</span>
 					</div>
@@ -34,7 +34,7 @@
 				<td>Part B Primary?</td>
 				<td>{{$cpc->auto_medicare_is_partbprimary}}</td>
 				<td>
-					<div class="form-group">
+					<div class="form-group mb-1">
 						<p class="mb-1 text-secondary">Manual Determination Category</p>
 						<span>{{$cpc->manual_determination_category  ?? '-'}}</span>
 					</div>
@@ -97,6 +97,10 @@
 					</div>
 				</td>
 			</tr>
+			<tr>
+				<td>Memo</td>
+				<td colspan="2">{{$cpc->manual_determination_category_memo ?? '-'}}</td>
+			</tr>
 		</tbody>
 	</table>
 </div>

resources/views/app/patient/primary-coverage-manual-determination-view-medicaid.blade.php

@@ -3,9 +3,9 @@
 	<table class="table table-sm table-bordered table-striped">
 		<thead>
 			<tr>
-				<th></th>
-				<th>Automatic</th>
-				<th>Override</th>
+				<th class="border-bottom-0"></th>
+				<th class="border-bottom-0">Automatic</th>
+				<th class="border-bottom-0">Override</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -13,7 +13,7 @@
 				<td>Record Found?</td>
 				<td>{{$cpc->auto_medicaid_is_match_found ? 'YES' : 'NO'}}</td>
 				<td>
-					<div class="form-group">
+					<div class="form-group mb-0">
 						<p class="mb-1 text-secondary">Is Matched?</p>
 						<span>{{$cpc->manual_medicaid_is_matched ?? '-'}}</span>
 					</div>
@@ -23,12 +23,16 @@
 				<td>Coverage Status?</td>
 				<td>UNKNOWN</td>
 				<td>
-					<div class="form-group">
+					<div class="form-group mb-0">
 						<p class="mb-1 text-secondary">Manual Determination Category</p>
 						<span>{{$cpc->manual_determination_category ?? '-'}}</span>
 					</div>
 				</td>
 			</tr>
+			<tr>
+				<td>Memo</td>
+				<td colspan="2">{{$cpc->manual_determination_category_memo ?? '-'}}</td>
+			</tr>
 		</tbody>
 	</table>
 </div>

resources/views/app/patient/primary-coverage-manual-determination-view-medicare.blade.php

@@ -3,9 +3,9 @@
 	<table class="table table-sm table-bordered table-striped">
 		<thead>
 			<tr>
-				<th></th>
-				<th>Automatic</th>
-				<th>Override</th>
+				<th class="border-bottom-0"></th>
+				<th class="border-bottom-0">Automatic</th>
+				<th class="border-bottom-0">Override</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -17,7 +17,7 @@
 				<td>Record Found?</td>
 				<td>{{$cpc->auto_medicare_is_match_found ? 'YES' : 'NO'}}</td>
 				<td>
-					<div class="form-group">
+					<div class="form-group mb-0">
 						<p class="mb-1 text-secondary">Is Matched?</p>
 						<span>{{$cpc->manual_medicare_is_matched ?? '-'}}</span>
 					</div>
@@ -39,7 +39,7 @@
 				<td>Part B Primary?</td>
 				<td>{{$cpc->auto_medicare_is_partbprimary}}</td>
 				<td>
-					<div class="form-group">
+					<div class="form-group mb-1">
 						<p class="mb-1 text-secondary">Manual Determination Category</p>
 						<span>{{$cpc->manual_determination_category  ?? '-'}}</span>
 					</div>
@@ -103,6 +103,10 @@
 					</div>
 				</td>
 			</tr>
+			<tr>
+				<td>Memo</td>
+				<td colspan="2">{{$cpc->manual_determination_category_memo ?? '-'}}</td>
+			</tr>
 		</tbody>
 	</table>
 </div>

resources/views/app/patient/primary-coverage-view.blade.php

@@ -1,116 +1,138 @@
-<h4 class="font-weight-bold">Patient Name / Demographics</h4>
-<div class="table-responsive">
-	<table class="table table-sm table-bordered table-striped">
-		<tbody>
-			<tr>
-				<td>Patient First Name</td>
-				<td>{{$cpc->patient_name_first}}</td>
-			</tr>
-			<tr>
-				<td>Patient Middle Name / MI</td>
-				<td>{{$cpc->patient_name_middle}}</td>
-			</tr>
-			<tr>
-				<td>Patient Last Name</td>
-				<td>{{$cpc->patient_name_last}}</td>
-			</tr>
-			<tr>
-				<td>Patient Suffix</td>
-				<td>{{$cpc->patient_name_suffix}}</td>
-			</tr>
-			<tr>
-				<td>Patient Dob</td>
-				<td>{{$cpc->patient_dob ? date_format(date_create($cpc->patient_dob), 'm/d/Y') : '-'}}</td>
-			</tr>
-			<tr>
-				<td>Patient Sex</td>
-				<td>{{$cpc->patient_sex ?? '-'}}</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+<div class="container-fluid px-lg-0">
+	<div class="row">
+		<div class="col-lg-5">
+			<h4 class="font-weight-bold">Patient Name / Demographics</h4>
+			<div class="table-responsive">
+				<table class="table table-sm table-bordered table-striped">
+					<tbody>
+						<tr>
+							<td>Patient First Name</td>
+							<td>{{$cpc->patient_name_first}}</td>
+						</tr>
+						<tr>
+							<td>Patient Middle Name / MI</td>
+							<td>{{$cpc->patient_name_middle}}</td>
+						</tr>
+						<tr>
+							<td>Patient Last Name</td>
+							<td>{{$cpc->patient_name_last}}</td>
+						</tr>
+						<tr>
+							<td>Patient Suffix</td>
+							<td>{{$cpc->patient_name_suffix}}</td>
+						</tr>
+						<tr>
+							<td>Patient Dob</td>
+							<td>{{$cpc->patient_dob ? date_format(date_create($cpc->patient_dob), 'm/d/Y') : '-'}}</td>
+						</tr>
+						<tr>
+							<td>Patient Sex</td>
+							<td>{{$cpc->patient_sex ?? '-'}}</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
 
-<h4 class="font-weight-bold">Primary Coverage Information</h4>
-<div id="primaryCoverageLatestCoverage">
-	<div class="table-responsive">
-	<table class="table table-sm table-bordered table-striped">
-		<tbody>
-			<tr>
-				<td>Plan Type</td>
-				<td>{{$cpc->plan_type}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
-				<td>Commercial Payer</td>
-				<td>{{$cpc->commercial_payer_id ? $cpc->payer->name : '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
-				<td>Patient Member Identifier</td>
-				<td>{{$cpc->commercial_member_identifier ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
-				<td>Patient Group Name</td>
-				<td>{{$cpc->commercial_group_number ?? '-'}}</td>
-			</tr>
-			<tr>
-				<td>Date of Service</td>
-				<td>{{$cpc->date_of_service ? date_format(date_create($cpc->date_of_service), 'm/d/Y') : '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' || cpc.plan_type == 'MEDICAID'">
-				<td colspan="2">
-					<h5 class="font-weight-bold">Subscriber Details</h5>
-					<table class="table table-bordered table-striped">
+			<h4 class="font-weight-bold">Primary Coverage Information</h4>
+			<div id="primaryCoverageLatestCoverage">
+				<div class="table-responsive">
+					<table class="table table-sm table-bordered table-striped">
 						<tbody>
 							<tr>
-								<td>Is Patient the subscriber?</td>
-								<td>{{$cpc->is_patient_subscriber ? 'Yes' : 'No'}}</td>
+								<td>Plan Type</td>
+								<td>{{$cpc->plan_type}}</td>
 							</tr>
-							@if(!$cpc->is_patient_subscriber)
-							<tr>
-								<td>First Name</td>
-								<td>{{$cpc->subscriber_name_first ?? '-'}}</td>
+							<tr v-if="cpc.plan_type == 'COMMERCIAL'">
+								<td>Commercial Payer</td>
+								<td>{{$cpc->commercial_payer_id ? $cpc->payer->name : '-'}}</td>
 							</tr>
-							<tr>
-								<td>Middle Name / MI</td>
-								<td>{{$cpc->subscriber_name_middle ?? '-'}}</td>
+							<tr v-if="cpc.plan_type == 'COMMERCIAL'">
+								<td>Patient Member Identifier</td>
+								<td>{{$cpc->commercial_member_identifier ?? '-'}}</td>
 							</tr>
-							<tr>
-								<td>Last Name</td>
-								<td>{{$cpc->subscriber_name_last ?? '-'}}</td>
+							<tr v-if="cpc.plan_type == 'COMMERCIAL'">
+								<td>Patient Group Name</td>
+								<td>{{$cpc->commercial_group_number ?? '-'}}</td>
 							</tr>
-							<tr>
-								<td>Suffix</td>
-								<td>{{$cpc->subscriber_name_suffix ?? '-'}}</td>
+							<tr v-if="cpc.plan_type == 'COMMERCIAL' || cpc.plan_type == 'MEDICAID'">
+								<td colspan="2">
+									<h5 class="font-weight-bold">Subscriber Details</h5>
+									<div class="table-responsive">
+										<table class="table table-bordered">
+											<tbody>
+												<tr class="bg-white">
+													<td>Is Patient the subscriber?</td>
+													<td>{{$cpc->is_patient_subscriber ? 'Yes' : 'No'}}</td>
+												</tr>
+												@if(!$cpc->is_patient_subscriber)
+												<tr class="bg-white">
+													<td>First Name</td>
+													<td>{{$cpc->subscriber_name_first ?? '-'}}</td>
+												</tr>
+												<tr class="bg-white">
+													<td>Middle Name / MI</td>
+													<td>{{$cpc->subscriber_name_middle ?? '-'}}</td>
+												</tr>
+												<tr class="bg-white">
+													<td>Last Name</td>
+													<td>{{$cpc->subscriber_name_last ?? '-'}}</td>
+												</tr>
+												<tr class="bg-white">
+													<td>Suffix</td>
+													<td>{{$cpc->subscriber_name_suffix ?? '-'}}</td>
+												</tr>
+												<tr class="bg-white">
+													<td>Sex</td>
+													<td>{{$cpc->subscriber_sex ?? '-'}}</td>
+												</tr>
+												<tr class="bg-white">
+													<td>Dob</td>
+													<td>{{$cpc->subscriber_dob ? date_format(date_create($cpc->subscriber_dob), 'm/d/Y') : '-'}}</td>
+												</tr>
+												@endif
+											</tbody>
+										</table>
+									</div>
+								</td>
 							</tr>
 							<tr>
-								<td>Sex</td>
-								<td>{{$cpc->subscriber_sex ?? '-'}}</td>
+								<td>Date of Service</td>
+								<td>{{$cpc->date_of_service ? date_format(date_create($cpc->date_of_service), 'm/d/Y') : '-'}}</td>
 							</tr>
-							<tr>
-								<td>Dob</td>
-								<td>{{$cpc->subscriber_dob ? date_format(date_create($cpc->subscriber_dob), 'm/d/Y') : '-'}}</td>
+							<tr v-if="cpc.plan_type == 'MEDICAID' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number)">
+								<td>Medicaid State</td>
+								<td>{{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</td>
+							</tr>
+							<tr v-if="cpc.plan_type == 'MEDICAID' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number)">
+								<td>Medicaid Number</td>
+								<td class="text-uppercase">{{$cpc->mcd_number ?? '-'}}</td>
+							</tr>
+							<tr v-if="cpc.plan_type == 'MEDICARE' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+								<td>Medicare Number</td>
+								<td class="text-uppercase">{{$cpc->mcr_number ?? '-'}}</td>
 							</tr>
-							@endif
 						</tbody>
 					</table>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr v-if="cpc.plan_type == 'MEDICAID' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number)">
-				<td>Medicaid State</td>
-				<td>{{$cpc->mcd_payer_id ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'MEDICAID' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number)">
-				<td>Medicaid Number</td>
-				<td>{{$cpc->mcd_number ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'MEDICARE' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>Medicare Number</td>
-				<td>{{$cpc->mcr_number ?? '-'}}</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+		</div>
+		<div class="col-lg-7">
+
+			<h4 class="font-weight-bold">Manual Determination Information</h4>
+			@if($cpc->plan_type == 'MEDICARE')
+				@include('app.patient.primary-coverage-manual-determination-view-medicare')
+			@elseif($cpc->plan_type == 'MEDICAID')
+			@include('app.patient.primary-coverage-manual-determination-view-medicaid')
+			@elseif($cpc->plan_type == 'COMMERCIAL')
+			@include('app.patient.primary-coverage-manual-determination-view-commercial')
+			@else
+				No plan Type specified.
+			@endif
+		</div>
+	</div>
 </div>
+
 <script type="text/javascript">
 	var primaryCoverageLatestCoverage = new Vue({
 		el: '#primaryCoverageLatestCoverage',

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

@@ -64,37 +64,20 @@
 
         <div class="mt-4">
           <div class="row">
-            <div class="col-md-9">
-
+            <div class="col-md-12">
               @include('app.patient.primary-coverage-view')
-
-              <h4 class="font-weight-bold">Manual Determination Information</h4>
-              @if($cpc->plan_type == 'MEDICARE')
-                @include('app.patient.primary-coverage-manual-determination-view-medicare')
-              @elseif($cpc->plan_type == 'MEDICAID')
-              @include('app.patient.primary-coverage-manual-determination-view-medicaid')
-              @elseif($cpc->plan_type == 'COMMERCIAL')
-              @include('app.patient.primary-coverage-manual-determination-view-commercial')
-              @else
-                No plan Type specified.
-              @endif
             </div>
           </div>
-
             {{--
-              @php
-              dump(json_decode($cpc->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)));
-              @endphp
-               --}}
-
-        </div>
-
-        <div>
+            @php
+            dump(json_decode($cpc->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)));
+            @endphp
+            --}}
             {{--
-              @php
-                  dump($cpc->auto_detail_json);
-              @endphp
-              --}}
+            @php
+            dump($cpc->auto_detail_json);
+            @endphp
+            --}}
         </div>
     @endif
 </div>

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

@@ -12,6 +12,13 @@
             </strong>
         </div>
         <div class="card-body p-0 border-0 table-responsive">
+            <div class="m-2">
+                Claim status: 
+                <a href="/practice-management/billing-report" class="badge">ALL</a>
+                @foreach($claimStatuses as $claimStatus)
+                <a href="/practice-management/billing-report?status={{$claimStatus->status}}" class="badge">{{$claimStatus->status}}</a>
+                @endforeach
+            </div>
             <table class="table table-sm table-striped border-0 p-0 m-0 text-nowrap">
                 <thead class="bg-light">
                     <tr>

resources/views/layouts/patient.blade.php

@@ -394,7 +394,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											</div>
 										</div>
 										<div class="screen-only">
-											<div class=separators>											
+											<div class=separators>
 												<div>
 													<label>MCP:</label> {{$mcpName}}
 													@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
@@ -510,7 +510,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 												@endif
 											</div>
 											</div>
-										
+
 										<div>
 											<label>Physician:</label> {{$patient->pcp ? $patient->pcp->displayName() : '-' }}
 											@if($pro->pro_type == 'ADMIN')
@@ -560,7 +560,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
                               @endif
                           @endif
                       </div>
-											
+
                                         </div>
                                     </section>
                                     {{--<section>
@@ -738,10 +738,9 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 																									class="on-hover-opaque fa fa-video text-secondary"></i>&nbsp;Join</button>
 																				</div>
                                     </section>
-									
 									@if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
 									<section class="hide-inside-popup screen-only vbox align-self-start mt-2 mx-2">
-											@include('app.patient.coverage-status')										
+											@include('app.patient.coverage-status')
 									</section>
 									@endif
 									<ul class="vbox mt-2 align-self-start patient-header-address ml-auto">