瀏覽代碼

resolved conflict

= 3 年之前
父節點
當前提交
8ab0547382

+ 1 - 0
app/Http/Controllers/AdminController.php

@@ -100,6 +100,7 @@ class AdminController extends Controller
         $this->filterMultiQuery($request, $patients, 'usual_bmi_max', 'bmi_category', 'bmi_value_1', 'bmi_value_2');
         $this->filterMultiQuery($request, $patients, 'most_recent_weight_at', 'last_weighed_in_category', 'last_weighed_in_value_1', 'last_weighed_in_value_2');
         $this->filterMultiQuery($request, $patients, 'most_recent_bp_at', 'last_bp_category', 'last_bp_value_1', 'last_bp_value_2');
+        $this->filterMultiQuery($request, $patients, 'created_at', 'created_at', 'created_at_value_1', 'created_at_value_2');
 
         if($request->input('number_of_measurements')){
             $keyName = $request->input('number_of_measurements');

+ 3 - 0
app/Models/Client.php

@@ -21,6 +21,9 @@ class Client extends Model
     }
 
     
+    public function latestManualParentClientPrimaryCoverage(){
+        return $this->hasOne(ClientPrimaryCoverage::class, 'id', 'latest_manual_parent_client_primary_coverage_id');
+    }
     public function effectiveClientPrimaryCoverage(){
         return $this->hasOne(ClientPrimaryCoverage::class, 'id', 'effective_client_primary_coverage_id');
     }

+ 1 - 1
config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 92,
+    'asset_version' => 93,
 
     'temp_dir' => env('TEMP_DIR'),
 

+ 13 - 0
config/constants.php

@@ -57,6 +57,19 @@
         "MEDICAID WEST VIRGINIA",
         "MEDICAID WISCONSIN",
         "MEDICAID WYOMING",
+      ],
+      'client_engagement_status_color_codes' => [
+        'ACTIVE' => 'rgba(157, 223, 172, 0.5)',
+        'INACTIVE' => 'rgba(220, 53, 69, 0.5)',
+        'ENTRY_ERROR' => 'rgba(220, 53, 69, 0.5)',
+        'DUMMY' => 'rgba(255, 193, 7, 0.5)',
+        'DECEASED' => 'rgba(78, 80, 82, 0.5)',
+        'DUPLICATE' => 'rgba(23, 162, 184, 0.5)',
+        'NO_LONGER_INTERESTED' => 'rgba(255, 3, 61, 0.5)',
+        'BAD_RECORD' => 'rgba(102, 16, 242, 0.5)',
+        'NO_LONGER_ELIGIBLE' => 'rgba(253, 126, 20, 0.5)',
       ]
   ];
+
+
 ?>

+ 4 - 0
public/css/style.css

@@ -3602,3 +3602,7 @@ table.v-top th {
 .note-container .segments-list p:empty {
     display: none;
 }
+.no-column-wrap th:first-child,
+.no-column-wrap td:first-child {
+    white-space: nowrap;
+}

+ 31 - 21
resources/views/app/admin/patients-table-extended.blade.php

@@ -1,3 +1,6 @@
+<?php
+ $patientEngagementColorCodes = @Config::get('constants.client_engagement_status_color_codes');
+?>
 <div>
     <div class="pl-3 mb-3 d-inline-flex align-items-baseline">
         <a href="#" native class="mr-3 text-decoration-none enable-grid" onclick="$('#admin-patients-list-extended>table').addClass('stag-compact-grid'); return false;"><i class="fa fa-list text-sm"></i> Grid</a>
@@ -8,6 +11,7 @@
     <table class="table p-0 m-0 table-sm table-striped table-bordered border-bottom text-nowrap">
         <thead class="bg-light">
         <tr>
+        <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'Status', 'key' => 'client_engagement_status_category'])</th>
             <th class="border-0 width-90px">#</th>
             <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'Name', 'key' => 'name_first'])</th>            
             @if($pro->pro_type == 'ADMIN')
@@ -20,17 +24,18 @@
             <th class="border-0">Mailing Address State</th>
             <th class="border-0">Insurance</th>
             @if($performer->pro->pro_type == 'ADMIN')
-		<th class="border-0">Ded.</th>
-	    @endif
+                <th class="border-0">Ded.</th>
+            @endif
+            <th class="border-0">Age</th>
             <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'Last Visit', 'key' => 'most_recent_completed_mcp_note_date'])</th>
+            <th class="border-0">Notes</th>
             <th class="border-0">Next Appt.</th>
             <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'BP/Pulse Timestamp', 'key' => 'most_recent_cellular_bp_measurement_at'])</th>
             <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'Weight Timestamp', 'key' => 'most_recent_cellular_weight_measurement_at'])</th>
             <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'Created', 'key' => 'created_at'])</th>
             <th class="border-0">Assigned On</th>
             <th class="border-0">NA</th>
-            <th class="border-0">Notes</th>
-            <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("admin.patients"), 'label' => 'Status', 'key' => 'client_engagement_status_category'])</th>
+                        
             <th class="border-0">Temp. Gun</th>
             <th class="border-0">Pulse Ox.</th>
             <th class="border-0">Cell. Bp</th>
@@ -56,6 +61,7 @@
         <tbody>
         @foreach($patients as $patient)
             <tr>
+                <td style="background-color:<?= $patientEngagementColorCodes[$patient->client_engagement_status_category] ?? '' ?>;">{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td> 
                 <td>
                     <a native target="_blank" href="{{route('patients.view.dashboard', $patient)}}">
                         {{$patient->chart_number}}
@@ -90,26 +96,15 @@
                             <span class="font-weight-bold">{{ format_number(@$patient->mpb_remaining)}}</span>
                         </small>
 		</td>
+        <td>{{$patient->age_in_years}}</td>
 		@endif
                 <td>
                     {{ friendly_date($patient->most_recent_completed_mcp_note_date) }}
-                    {{-- {{$patient->lastMcpAppointment ? friendly_date_time($patient->lastMcpAppointment->raw_date.' '.$patient->lastMcpAppointment->raw_start_time) : '-'}}--}}
-                </td>
-                <td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}
-                    <div if-details-view>
-                        {{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}
-                    </div>
-                </td>
-                <td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at) }}</td>
-                <td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at) }}</td>
-                <td>
-                    <div title="{{friendly_date_time($patient->created_at)}}">{{friendly_date_time($patient->created_at, false)}}</div>
-                    <div class="mt-1" if-details-view>
-                        By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
-                    </div>
+                    @if($patient->lastMcpAppointment)
+                        <br />
+                        <small class="text-muted">{{ $patient->lastMcpAppointment->pro->displayName() }}</small>
+                    @endif
                 </td>
-                <td>{{$patient->getMcpAssignedOn()}}</td>
-                <td>{{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-'}}</td>
                 <td class="p-0 pb-1">
                     <div if-details-view>
                     @if(count($patient->activeNotes))
@@ -295,7 +290,22 @@
                         {{count($patient->activeNotes)}}
                     </div>
                 </td>
-                <td>{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td>                
+                <td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}
+                    <div if-details-view>
+                        {{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}
+                    </div>
+                </td>
+                <td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at) }}</td>
+                <td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at) }}</td>
+                <td>
+                    <div title="{{friendly_date_time($patient->created_at)}}">{{friendly_date_time($patient->created_at, false)}}</div>
+                    <div class="mt-1" if-details-view>
+                        By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
+                    </div>
+                </td>
+                <td>{{$patient->getMcpAssignedOn()}}</td>
+                <td>{{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-'}}</td>                
+                               
                 <td>{{$patient->temparatureGunDeliveryStatus()}}</td>
                 <td>{{$patient->pulseOximeterDeliveryStatus()}}</td>
                 <td>{{$patient->hasBPDevice()?'DELIVERED':''}}</td>

+ 33 - 6
resources/views/app/admin/patients_filters.blade.php

@@ -111,10 +111,10 @@
 			</select>
 			<div v-show="filters.last_visit_category" class="mt-2">
 				<div>
-					<input  name="last_visit_value_1" v-model="filters.last_visit_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'Last Visit'" />
+					<input  name="last_visit_value_1" v-model="filters.last_visit_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'Last Visit'" />
 				</div>
 				<div v-show="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN'" class="mt-2">
-					<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="number" class="form-control input-sm" placeholder="To" />
+					<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>
@@ -135,10 +135,10 @@
 			</select>
 			<div v-show="filters.next_appointment_category && filters.next_appointment_category !== 'NONE'" class="mt-2">
 				<div>
-					<input  name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="number" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'Next Appt.'" />
+					<input  name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="date" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'Next Appt.'" />
 				</div>
 				<div v-show="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN'" class="mt-2">
-					<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="number" class="form-control input-sm" placeholder="To" />
+					<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>
@@ -272,6 +272,29 @@
 		</div>
 	</div>
 
+	<!-- CREATED AT -->
+	<div class="sm-section">
+		<div class="">
+			<label>Created At:</label>
+			<select name="created_at" class="form-control input-sm" v-model="filters.created_at">
+				<option value="">All</option>
+				<option value="EXACTLY">Exactly</option>
+				<option value="LESS_THAN">Less Than</option>
+				<option value="GREATER_THAN">Greater Than</option>
+				<option value="BETWEEN">Between</option>
+				<option value="NOT_BETWEEN">Not Between</option>
+			</select>
+			<div v-show="filters.created_at" class="mt-2">
+				<div>
+					<input  name="created_at_value_1" v-model="filters.created_at_value_1" type="date" class="form-control input-sm" :placeholder="(filters.created_at === 'BETWEEN' || filters.created_at === 'NOT_BETWEEN') ? 'From' : 'Last Visit'" />
+				</div>
+				<div v-show="filters.created_at === 'BETWEEN' || filters.created_at === 'NOT_BETWEEN'" class="mt-2">
+					<input name="created_at_value_2" v-model="filters.created_at_value_2" type="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
+		</div>
+	</div>
+
 	@if($performer->pro->pro_type == 'ADMIN')
 	<div class="sm-section">
 		<div class="">
@@ -383,7 +406,11 @@ $allFilterKeys = [
 	'number_of_measurements_value_1',
 	'number_of_measurements_value_2',
 	'home_address_state',
-	'chart_number'
+	'chart_number',
+	'created_at',
+	'created_at_value_1',
+	'created_at_value_2',
+
 ];
 for ($i=0; $i < count($allFilterKeys); $i++) {
 	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
@@ -405,7 +432,7 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 
 					},
 					doSubmit: function() {
-						fastLoad('{{ route('admin.patients') }}?' + $('#admin-patients-filters').serialize());
+						fastLoad("{{ route('admin.patients') }}?" + $('#admin-patients-filters').serialize());
 						return false;
 					}
 				},

+ 4 - 1
resources/views/app/patient/coverage_column_renderer.blade.php

@@ -35,4 +35,7 @@
     @else
         <small class="ml-2 text-muted">(No insurance)</small>
     @endif
-</div>
+</div>
+@if(@$patient->mpb_remaining)
+    <small class="text-muted d-block ml-3">Deductible: {{format_number(@$patient->mpb_remaining)}} </small>
+@endif

+ 5 - 5
resources/views/app/patient/note/rm-setup.blade.php

@@ -112,10 +112,10 @@
                         @endif
                     </div>
                 </div>
-                
-            </div> 
+
+            </div>
         @endif
-        
+
         <div class="d-flex align-items-baseline mb-1">
             <div class="flex-grow-1">
                 <div>
@@ -321,7 +321,7 @@
         <div class="border-top mt-1 pt-2">
             @include('app.patient.partials.client_bp_weight_phone_number_status')
         </div>
-        
+
     </div>
     <div class="col-5 border-left">
         <?php
@@ -492,4 +492,4 @@
         }
         addMCInitializer('rm-setup', init, '#rm-setup')
     }).call(window);
-</script>
+</script>

+ 4 - 0
resources/views/app/patient/notes.blade.php

@@ -274,6 +274,9 @@
                     @if(!!$note->visitTemplate)
                         <span class="text-info font-weight-bold">*</span>
                     @endif
+                    @if($note->was_cm_setup_performed)
+                        <i class="fas fa-clipboard-check text-success" title="Care plan was setup on this note."></i> 
+                    @endif
                     <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
                 </td>
                 <td>
@@ -304,6 +307,7 @@
                         -
                     @endif
                 </td>
+               
                 @if($pro->pro_type == 'ADMIN')
                     <td>{{ $note->is_bill_closed ? 'YES':'NO' }}</td>
                 @endif

+ 37 - 32
resources/views/app/patient/partials/coverage-information.blade.php

@@ -1,6 +1,7 @@
 <div class="mt-2 pt-2">
     @php
         $cpc = $coverage;
+        $latestCpc = $patient->latestClientPrimaryCoverage;
     @endphp
 </div>
     @if(!$cpc)
@@ -23,6 +24,7 @@
             }
         ?>
         <div class="d-flex align-items-center mb-2">
+            <span class="mr-2">Plan Type: <b>{{ $latestCpc->plan_type }}</b></span>
             @if($cpc->is_manually_determined)
                 <div>
                     <span class="d-inline bg-warning px-2 rounded mr-1"><i class="fas fa-map-pin"></i> Manually Determined</span> 
@@ -38,39 +40,42 @@
 
             @endif
             <h1 class="mr-2 mb-0">Is Covered: {{$cpc->is_covered}}</h1>
-            @if($cpc->plan_type == 'MEDICARE')
-                @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForMedicare'])
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a native target="_blank"
-                   open-in-stag-popup
-                   mc-initer="manual-determination-form-{{$patient->uid}}"
-                   title="Medicare Part B (Primary)"
-                   href="/patients/view/primary-coverage-manual-determination-modal/{{$patient->uid}}?coverageUid={{ $cpc->uid }}">
-                    Manual Determination for Medicare Part B (Primary)
-                </a>
-            @endif
-            @if($cpc->plan_type == 'MEDICAID')
-                @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForMedicaid'])
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a native target="_blank"
-                   open-in-stag-popup
-                   mc-initer="manual-determination-form-{{$patient->uid}}"
-                   title="Medicaid (Primary)"
-                   href="/patients/view/primary-coverage-manual-determination-modal/{{$patient->uid}}?coverageUid={{ $cpc->uid }}">
-                    Manual Determination for Medicaid (Primary)
-                </a>
-            @endif
-            @if($cpc->plan_type == 'COMMERCIAL')
-                @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForCommercial'])
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a native target="_blank"
-                   open-in-stag-popup
-                   mc-initer="manual-determination-form-{{$patient->uid}}"
-                   title="Commercial (Primary)"
-                   href="/patients/view/primary-coverage-manual-determination-modal/{{$patient->uid}}?coverageUid={{ $cpc->uid }}">
-                    Manual Determination for Commercial (Primary)
-                </a>
+            @if(!$cpc->is_manually_determined)
+                @if($cpc->plan_type == 'MEDICARE')
+                    @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForMedicare'])
+                    <span class="mx-2 text-secondary text-sm">|</span>
+                    <a native target="_blank"
+                    open-in-stag-popup
+                    mc-initer="manual-determination-form-{{$patient->uid}}"
+                    title="Medicare Part B (Primary)"
+                    href="/patients/view/primary-coverage-manual-determination-modal/{{$patient->uid}}?coverageUid={{ $cpc->uid }}">
+                        Manual Determination for Medicare Part B (Primary)
+                    </a>
+                @endif
+                @if($cpc->plan_type == 'MEDICAID')
+                    @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForMedicaid'])
+                    <span class="mx-2 text-secondary text-sm">|</span>
+                    <a native target="_blank"
+                    open-in-stag-popup
+                    mc-initer="manual-determination-form-{{$patient->uid}}"
+                    title="Medicaid (Primary)"
+                    href="/patients/view/primary-coverage-manual-determination-modal/{{$patient->uid}}?coverageUid={{ $cpc->uid }}">
+                        Manual Determination for Medicaid (Primary)
+                    </a>
+                @endif
+                @if($cpc->plan_type == 'COMMERCIAL')
+                    @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForCommercial'])
+                    <span class="mx-2 text-secondary text-sm">|</span>
+                    <a native target="_blank"
+                    open-in-stag-popup
+                    mc-initer="manual-determination-form-{{$patient->uid}}"
+                    title="Commercial (Primary)"
+                    href="/patients/view/primary-coverage-manual-determination-modal/{{$patient->uid}}?coverageUid={{ $cpc->uid }}">
+                        Manual Determination for Commercial (Primary)
+                    </a>
+                @endif
             @endif
+            <span class="mx-2">Created At: {{ friendly_date_time($cpc->created_at) }}</span>
         </div>
 
         <div class="mt-4 {{ $cpc->is_cancelled ? 'cpc-cancelled':'' }}">

+ 11 - 0
resources/views/app/patient/partials/display-coverage-details.blade.php

@@ -0,0 +1,11 @@
+<?php
+//DEV ONLY
+//$displayCoverage = $patient->getPrimaryCoverage();
+$displayCoverageObject = $displayCoverage ? json_decode($displayCoverage->toJson()) : null;
+?>
+
+@if($displayCoverageObject)
+<div class="table-responsive">
+<?php parseRender(@$displayCoverageObject); ?>
+</div>
+@endif

+ 171 - 176
resources/views/app/patient/partials/rm-setup.blade.php

@@ -1,122 +1,125 @@
 <div class="row">
     <div class="col-6">
-        @if($pro->pro_type === 'ADMIN')
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="width-200px">Is Eligible for RM?</span>
-                <div class="ml-3">
-                    <div class="d-inline-flex align-items-start">
-                        <b>{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</b>
-                        <div moe class="ml-2">
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
-                                    <select name="isEligibleForRm"
-                                            class="form-control form-control-sm"
-                                            onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
-                                        <option value="">-- Select Status --</option>
-                                        <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
-                                        <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
-                                        <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-                                    </select>
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
-                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                           {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                           name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
-                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                           {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                           name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
-                                </div>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    @if($patient->is_eligible_for_rm === 'NO')
-                        <div class="mt-1">
-                            <span>{{$patient->why_not_eligible_for_rm_category ?: '-'}}</span>
-                            /
-                            <span class="text-secondary">{{$patient->why_not_eligible_for_rm_memo ?: '-'}}</span>
-                        </div>
-                    @endif
-                </div>
-            </div>
-        @endif
+        <div class="d-flex mb-2">
+          @if($pro->pro_type === 'ADMIN')
+              <div class="d-flex align-items-center">
+                  <div class="d-flex align-items-center">
+                    <span class="mr-2 text-secondary">Eligible for RM?</span>
+                    <span class="mr-1">{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</span>
+                    <div moe>
+                      <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                      <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                        <div class="mb-2">
+                          <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
+                          <select name="isEligibleForRm"
+                          class="form-control form-control-sm"
+                          onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
+                          <option value="">-- Select Status --</option>
+                          <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
+                          <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
+                          <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                        </select>
+                      </div>
+                      <div class="mb-2">
+                        <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
+                        <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                        {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                        name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
+                      </div>
+                      <div class="mb-2">
+                        <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
+                        <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                        {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                        name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
+                      </div>
+                      <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                      </div>
+                    </form>
+                  </div>
+                  @if($patient->is_eligible_for_rm === 'NO')
+                  <span class="ml-1 on-hover-show d-inline-block on-hover-opaque">
+                      <i class="fa fa-info-circle"></i>
+                      <div class="on-hover-content py-2 pl-3 text-nowrap text-dark" style="left:0;right:auto;">
+                          <div>
+                              <small class="text-sm"><b>Category:</b> {{$patient->why_not_eligible_for_rm_category ?: '-'}}</small>
+                          </div>
+                          <div>
+                              <small class="text-sm"><b>Memo:</b> {{$patient->why_not_eligible_for_rm_memo ?: '-'}}</small>
+                          </div>
+                      </div>
+                  </span>
+                  @endif
+                  </div>
+              </div>
+              <span class="text-secondary mx-2">|</span>
+          @endif
 
-        <div class="d-flex align-items-baseline mb-3">
-            <span class="width-200px">RM Enrollment Status:</span>
-            <div class="ml-3">
-                <div class="d-inline-flex align-items-start">
-                    <b>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</b>
-                    @if($patient->is_enrolled_in_rm === 'YES')
-                        <div moe wide class="ml-2">
-                            <a start show>Toggle</a>
-                            <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <h2 class="alert alert-warning"><i class="fa fa-warning"></i> RPM Enrollment Cancellation</h2>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @else
-                        <div moe wide class="ml-2">
-                            <a start show>Toggle</a>
-                            <form url="/api/client/setIsEnrolledInRmToTrue" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <h2>RPM Enrollment:</h2>
-                                <h3>Please confirm the following with patient:</h3>
-                                <p>I understand that:</p>
-                                <ul>
-                                    <li>
-                                        <input type="checkbox" required="true" name="x" class="form-control input-sm">
-                                        I am the only person who should be using the remote monitoring equipment as instructed. I will
-                                        not use the device for reasons other than my own personal health monitoring. I understand that
-                                        I can only participate in this program with one Medical Provider at a time.
-                                    </li>
-                                    <li>
-                                        <input type="checkbox" required="true" name="y" class="form-control input-sm">
-                                        I will not tamper with the equipment. I understand that I am responsible for any fees associated
-                                        with misuse of the equipment.
-                                    </li>
-                                    <li>
-                                        <input type="checkbox" required="true" name="z" class="form-control input-sm">
-                                        I understand the devices are only designed for the RPM program.
-                                    </li>
-                                </ul>
+          <div class="d-flex align-items-center">
+              <span class="mr-1 text-secondary">Enrollment:</span>
+              <span>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</span>
+              @if($patient->is_enrolled_in_rm === 'YES')
+                  <div moe wide class="ml-2">
+                      <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                      <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
+                          <input type="hidden" name="uid" value="{{$patient->uid}}">
+                          <h2 class="alert alert-warning"><i class="fa fa-warning"></i> RPM Enrollment Cancellation</h2>
+                          <div>
+                              <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                              <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                          </div>
+                      </form>
+                  </div>
+              @else
+                  <div moe wide class="ml-2">
+                      <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                      <form url="/api/client/setIsEnrolledInRmToTrue" class="mcp-theme-1">
+                          <input type="hidden" name="uid" value="{{$patient->uid}}">
+                          <h2>RPM Enrollment:</h2>
+                          <h3>Please confirm the following with patient:</h3>
+                          <p class="mb-2">I understand that:</p>
+                          <ul style="list-style:none;" class="pl-2">
+                              <li class="d-flex mb-1">
+                                  <input type="checkbox" required="true" class="mt-1 mr-2" id="x" name="x">
+                                  <label class="c-pointer" for="x">I am the only person who should be using the remote monitoring equipment as instructed. I will
+                                  not use the device for reasons other than my own personal health monitoring. I understand that
+                                  I can only participate in this program with one Medical Provider at a time.</label>
+                              </li>
+                              <li class="d-flex mb-1">
+                                  <input type="checkbox" required="true" class="mt-1 mr-2" id="y" name="y">
+                                  <label class="c-pointer" for="y">I will not tamper with the equipment. I understand that I am responsible for any fees associated
+                                  with misuse of the equipment.</label>
+                              </li>
+                              <li class="d-flex mb-1">
+                                  <input type="checkbox" required="true" class="mt-1 mr-2" id="z" name="z">
+                                  <label class="c-pointer" for="z">I understand the devices are only designed for the RPM program.</label>
+                              </li>
+                          </ul>
 
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
-                </div>
-            </div>
+                          <div class="mb-2">
+                              <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                              <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                          </div>
+                      </form>
+                  </div>
+              @endif
+          </div>
         </div>
 
-        <div class="d-flex align-items-start flex-column mb-1">
-            <div class="mr-2 width-200px">
-                <span class="mr-2">RM Reasons:</span>
+        <div class="d-flex align-items-start flex-column mb-2">
+            <div>
+                <span class="mr-2 text-secondary">RM Reasons:</span>
                 @include('app.patient.partials.put-rm-reasons', ['recordType' => 'CLIENT', 'record' => $patient])
             </div>
-            <div class="pl-3">
+            <div class="pl-3 mt-1">
                 @include('app.patient.partials.rm-reasons-display', ['recordType' => 'CLIENT', 'record' => $patient])
             </div>
         </div>
-        
+
         {{--<div class="d-flex align-items-baseline mb-3">
-            <span class="width-200px">RM Reasons:</span>
+            <span>RM Reasons:</span>
             <div class="ml-3">
                 @if(!$patient->rmReasons || !count($patient->rmReasons))
                     <span class="text-secondary">None</span>
@@ -181,79 +184,71 @@
         </div>--}}
 
         @if($pro->pro_type === 'ADMIN')
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="width-200px">RME Pro:</span>
-                <div class="ml-3">
-                    <div class="d-inline-flex align-items-start">
-                        <b>{{ $patient->rme ? $patient->rme->displayName() : '-' }}</b>
-                        <div moe class="ml-2">
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/putRmePro" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">RME Pro</label>
-                                    <select provider-search data-pro-uid="{{ @$patient->rme->uid }}" name="rmeProUid" class="form-control form-control-sm">
-                                        <option value=""> --select--</option>
-                                    </select>
-                                </div>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
+            <div class="d-flex align-items-center mb-2">
+                <span class="text-secondary">RME Pro:</span>
+                <span>{{ $patient->rme ? $patient->rme->displayName() : '-' }}</span>
+                <div moe class="ml-2">
+                    <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                    <form url="/api/client/putRmePro" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">RME Pro</label>
+                            <select provider-search data-pro-uid="{{ @$patient->rme->uid }}" name="rmeProUid" class="form-control form-control-sm">
+                                <option value=""> --select--</option>
+                            </select>
+                        </div>
+                        <div>
+                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
                         </div>
-                        @if($patient->rme)
-                            <div moe class="ml-2">
-                                <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                <form url="/api/client/removeRmePro" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <p>Remove RME Pro?</p>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
+                    </form>
+                </div>
+                @if($patient->rme)
+                    <div moe class="ml-2">
+                        <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                        <form url="/api/client/removeRmePro" class="mcp-theme-1">
+                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                            <p>Remove RME Pro?</p>
+                            <div>
+                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
                             </div>
-                        @endif
+                        </form>
                     </div>
-                </div>
+                @endif
             </div>
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="width-200px">RMM Pro:</span>
-                <div class="ml-3">
-                    <div class="d-inline-flex align-items-start">
-                        <b>{{ $patient->rmm ? $patient->rmm->displayName() : '-' }}</b>
-                        <div moe class="ml-2">
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/putRmmPro" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">RMM Pro</label>
-                                    <select provider-search data-pro-uid="{{ @$patient->rmm->uid }}" name="rmmProUid" class="form-control form-control-sm">
-                                        <option value=""> --select--</option>
-                                    </select>
-                                </div>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
+            <div class="d-flex align-items-center mb-2">
+                <span class="text-secondary">RMM Pro:</span>
+                <span>{{ $patient->rmm ? $patient->rmm->displayName() : '-' }}</span>
+                <div moe class="ml-2">
+                    <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                    <form url="/api/client/putRmmPro" class="mcp-theme-1">
+                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">RMM Pro</label>
+                            <select provider-search data-pro-uid="{{ @$patient->rmm->uid }}" name="rmmProUid" class="form-control form-control-sm">
+                                <option value=""> --select--</option>
+                            </select>
                         </div>
-                        @if($patient->rmm)
-                            <div moe class="ml-2">
-                                <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                <form url="/api/client/removeRmmPro" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <p>Remove RMM Pro?</p>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
+                        <div>
+                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                        </div>
+                    </form>
+                </div>
+                @if($patient->rmm)
+                    <div moe class="ml-2">
+                        <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                        <form url="/api/client/removeRmmPro" class="mcp-theme-1">
+                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                            <p>Remove RMM Pro?</p>
+                            <div>
+                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
                             </div>
-                        @endif
+                        </form>
                     </div>
-                </div>
+                @endif
             </div>
         @endif
         <div class="border-top mt-2 pt-2">
@@ -352,7 +347,7 @@
             </div>
         @else
             <div class="d-flex align-items-baseline mb-3">
-                <span class="width-200px">Cellular BP Device</span>
+                <span>Cellular BP Device</span>
                 <b class="ml-3">No</b>
             </div>
         @endif
@@ -401,14 +396,14 @@
             </div>
         @else
             <div class="d-flex align-items-baseline mb-3">
-                <span class="width-200px">Cellular Weight Scale</span>
+                <span>Cellular Weight Scale</span>
                 <b class="ml-3">No</b>
             </div>
         @endif
 
         @if($careMonth && ($bpDevice || $weightScale))
             <div class="d-flex align-items-baseline mb-1">
-                <span class="width-200px">Measurement days this month:</span>
+                <span>Measurement days this month:</span>
                 <div class="ml-3">
                     <b>{{$careMonth->number_of_days_with_remote_measurements}} days</b>
                 </div>

+ 2 - 2
resources/views/app/patient/primary-coverage-refresh.blade.php

@@ -1,8 +1,8 @@
 <div moe relative>
-	<a href="" start show class=""><i class="fas fa-sync"></i></a>
+	<a href="" start show class="" title="Auto refresh"><i class="fas fa-sync"></i></a>
 
 	<form url="/api/clientPrimaryCoverage/{{$endpoint}}" class="mcp-theme-1">
-		<input type="hidden" name="uid" value="{{$cpc->uid}}" class="form-control input-sm" />
+		<input type="hidden" name="uid" value="{{$patient->uid}}" class="form-control input-sm" />
 		<div class="form-group">
 			<p>Refresh?</p>
 		</div>

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

@@ -116,6 +116,7 @@
 								<td>Created At</td>
 								<td class="text-uppercase">{{friendly_date_time($cpc->created_at)}}</td>
 							</tr>
+
 						</tbody>
 					</table>
 				</div>
@@ -123,7 +124,7 @@
 					<h4 class="font-weight-bold">Other Coverage Details</h4>
 					<table class="table table-sm table-bordered table-striped">
 						<tbody>
-						<tr>
+							<tr>
 								<td>Plan Effective Date</td>
 								<td>{{ $cpc->plan_effective_date }}</td>
 							</tr>
@@ -230,12 +231,12 @@
 							<tr>
 								<td>Mcn Response Detail</td>
 								<td>
-								@if($cpc->autoMedicareResult->mcn_response_detail)
-									<?php $parsed = json_decode($cpc->autoMedicareResult->mcn_response_detail);?>
+									@if($cpc->autoMedicareResult->mcn_response_detail)
+									<?php $parsed = json_decode($cpc->autoMedicareResult->mcn_response_detail); ?>
 									<?php parseRender($parsed); ?>
-								@else
+									@else
 									&hyphen;
-								@endif
+									@endif
 								</td>
 							</tr>
 							<tr>
@@ -266,20 +267,56 @@
 
 		</div>
 		<div class="col-lg-7">
-
-			<h4 class="font-weight-bold">Manual Determination Information</h4>
-			@if($cpc->creation_strategy === 'MANUAL_DETERMINATION')
+			<div class="mb-3">
+				<h4 class="font-weight-bold">Manual Determination Information</h4>
+				@if($cpc->creation_strategy === 'MANUAL_DETERMINATION')
 				@if($cpc->plan_type == 'MEDICARE')
-					@include('app.patient.primary-coverage-manual-determination-view-medicare', ['coverage' => $patient->getPrimaryCoverage()])
+				@include('app.patient.primary-coverage-manual-determination-view-medicare', ['coverage' => $patient->getPrimaryCoverage()])
 				@elseif($cpc->plan_type == 'MEDICAID')
 				@include('app.patient.primary-coverage-manual-determination-view-medicaid', ['coverage' => $patient->getPrimaryCoverage()])
 				@elseif($cpc->plan_type == 'COMMERCIAL')
 				@include('app.patient.primary-coverage-manual-determination-view-commercial', ['coverage' => $patient->getPrimaryCoverage()])
 				@else
-					No plan Type specified.
+				No plan Type specified.
 				@endif
-			@else
+				@else
 				<small class="text-muted">Not manually determined.</small>
+				@endif
+			</div>
+
+			@if($cpc->is_manually_determined)
+			<!-- Accordion -->
+			<div class="card mb-1" stag-collapsible-card="mcp-key-numbers">
+				<div class="card-header pl-2">
+					<div class="d-flex align-items-center">
+						<strong>
+							Parent Coverage Information
+						</strong>
+						<a href="#" class="stag-collapse-trigger ml-auto"></a>
+					</div>
+				</div>
+				<div class="card-body p-0 no-column-wrap">
+					@include('app.patient.partials.display-coverage-details', ['displayCoverage' => $patient->latestManualParentClientPrimaryCoverage ])
+				</div>
+			</div>
+			<!-- Accordion -->
+			@endif
+			@if($patient->latestAutoRefreshClientPrimaryCoverage)
+			<!-- Accordion -->
+			<div class="card mb-1" stag-collapsible-card="mcp-key-numbers">
+				<div class="card-header pl-2">
+					<div class="d-flex align-items-center">
+						<strong>
+							Latest Auto Refresh Coverage Information
+						</strong>
+						<a href="#" class="stag-collapse-trigger ml-auto"></a>
+					</div>
+				</div>
+				<div class="card-body p-0 no-column-wrap">
+					@include('app.patient.partials.display-coverage-details', ['displayCoverage' => $patient->latestAutoRefreshClientPrimaryCoverage ])
+				</div>
+			</div>
+			<!-- Accordion -->
 			@endif
 		</div>
 	</div>
@@ -292,4 +329,4 @@
 			cpc: <?= json_encode($cpc); ?>,
 		}
 	})
-</script>
+</script>

+ 4 - 70
resources/views/app/patient/primary-coverage.blade.php

@@ -14,77 +14,11 @@
     </div>
 </div>
 <?php $clientPrimaryCoverage = $patient->getPrimaryCoverage(); ?>
-<div class="page-tabs coverage-tabs-display mt-3">
-        <div class="links">
-            @if($patient->latestNewClientPrimaryCoverage)
-                <a class="c-pointer {{ $clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestNewClientPrimaryCoverage->id ? 'active':'' }}" data-link="latest_new_client_primary_coverage">
-                    Latest New Client Primary Coverage
-                    @if($clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestNewClientPrimaryCoverage->id)
-                        <i class="fas fa-star ml-2"></i>
-                    @endif
-                </a>
-            @endif
-            @if($patient->latestAutoRefreshClientPrimaryCoverage)
-                <a class="c-pointer {{ $clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestAutoRefreshClientPrimaryCoverage->id ? 'active':'' }}" data-link="latest_auto_refresh_client_primary_coverage">
-                    Latest Auto Refresh Client Primary Coverage
-                    @if($clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestAutoRefreshClientPrimaryCoverage->id)
-                        <i class="fas fa-star ml-2"></i>
-                    @endif
-                </a>
-            @endif
-            @if($patient->latestManualClientPrimaryCoverage)
-                <a class="c-pointer {{ $clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestManualClientPrimaryCoverage->id ? 'active':'' }}" data-link="latest_manual_client_primary_coverage">
-                    Latest Manual Client Primary Coverage
-                    @if($clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestManualClientPrimaryCoverage->id)
-                        <i class="fas fa-star ml-2"></i>
-                    @endif
-                </a>   
-            @endif     
-        </div>
-        <div class="page-tab">
-            @if($patient->latestNewClientPrimaryCoverage)
-            <div tab id="latest_new_client_primary_coverage" class="{{ $clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestNewClientPrimaryCoverage->id ? '':'d-none' }}">
-                @include('app.patient.partials.coverage-information', ['coverage' => $patient->latestNewClientPrimaryCoverage])
-            </div>
-            @endif
-            @if($patient->latestAutoRefreshClientPrimaryCoverage)
-            <div tab id="latest_auto_refresh_client_primary_coverage" class="{{ $clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestAutoRefreshClientPrimaryCoverage->id ? '':'d-none' }}">
-                @include('app.patient.partials.coverage-information', ['coverage' => $patient->latestAutoRefreshClientPrimaryCoverage])
-            </div>
-            @endif
-            @if($patient->latestManualClientPrimaryCoverage)
-            <div tab id="latest_manual_client_primary_coverage" class="{{ $clientPrimaryCoverage && $clientPrimaryCoverage->id == $patient->latestManualClientPrimaryCoverage->id ? '':'d-none' }}">
-                @include('app.patient.partials.coverage-information', ['coverage' => $patient->latestManualClientPrimaryCoverage])
-            </div>
-            @endif
-        </div>
+<div class="mt-3">
+    <div>
+        @include('app.patient.partials.coverage-information', ['coverage' => $patient->getPrimaryCoverage()])
+    </div>
 </div>
 
-<script>
-    (function($){
-        var coverageTabsComponent = {
-            initTabs: function(){
-                var section = $('.coverage-tabs-display');
-                var sectionContent = section.find('.page-tab');
-                var tabsLinks = section.find('.links a');
-
-                $.each(tabsLinks, function(i, link){
-                    $(link).click(function(evt){
-                        evt.preventDefault();
-                        var target = $(link).data('link');
-                        tabsLinks.removeClass('active');
-                        $(link).addClass('active');
-                        sectionContent.find('[tab]').addClass('d-none');
-                        sectionContent.find('#'+target).removeClass('d-none'); 
-                    });                   
-                });
-            },
-            init: function(){
-                this.initTabs();
-            }
-        };
-        coverageTabsComponent.init();
-    })(jQuery);
-</script>
 
 @endsection

+ 1 - 1
resources/views/layouts/patient-header.blade.php

@@ -344,7 +344,7 @@ $addressParts .= implode(", ", $addressPart2);
               </span> 
             </div>
             @if($performer->pro->pro_type == 'ADMIN')
-              @if(true || @$patient->mpb_remaining)
+              @if(@$patient->mpb_remaining)
                 <div class="ml-2">Deductible: {{format_number(@$patient->mpb_remaining)}} </div>
               @endif
             @endif