Conflict check

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

@@ -3,202 +3,145 @@
         $coverage = $patient->latestClientPrimaryCoverage;
     @endphp
     @if(!$coverage)
-
-        No coverage info!
-
+        <span><b>No coverage info!</b></span>
     @elseif($coverage->plan_type === 'MEDICARE')
-        <div>
-            <table class="table table-sm">
-                <tr>
-                    <td>Medicare</td>
-                </tr>
-                <tr>
-                    <td>MCR #</td>
-                    <td>{{$coverage->payer_member_identifier}}</td>
-                </tr>
-                <tr>
-                    <td>Valid number?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_payer_member_identifier_valid}}
-                        @else
-                            {{$coverage->auto_is_payer_member_identifier_valid}}
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Coverage active? (PBP?)</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
-                        @else
-                            {{$coverage->is_partbprimary ? 'Covered' : 'Not Covered'}}
-                        @endif
-                    </td>
-                </tr>
-            </table>
-        </div>
+      @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($coverage->auto_medicare_is_partbprimary)
+              <span><i class="fas fa-check-circle text-success"></i> (auto)</span>
+            @elseif(!$coverage->auto_medicare_is_match_found)
+              <span><i class="fas fa-times text-danger"></i> record not found (auto)</span>
+            @else
+              <span><i class="fas fa-times text-danger"></i> not primary!</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>
+            @endif
+          </td>
+        </tr>
+        @if($coverage->auto_medicare_is_partbactive)
+        <tr>
+          <td class="font-weight-bold">Part B Deductible</td>
+          <td>{{$coverage->auto_medicare_mpb_deductible ?? '-'}}</td>
+        </tr>
+        <tr>
+          <td class="font-weight-bold">Part B Remaining</td>
+          <td>{{$coverage->auto_medicare_mpb_remaining ?? '-'}}</td>
+        </tr>
+        @endif
+      </table>
+      @else
+      <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>
+            @endif
+          </td>
+        </tr>
+        @if($coverage->auto_medicare_is_partbactive)
+        <tr>
+          <td class="font-weight-bold">Part B Deductible</td>
+          <td>{{$coverage->auto_medicare_mpb_deductible ?? '-'}}</td>
+        </tr>
+        <tr>
+          <td class="font-weight-bold">Part B Remaining</td>
+          <td>{{$coverage->auto_medicare_mpb_remaining ?? '-'}}</td>
+        </tr>
+        @endif
+      </table>
+      @endif
+      <div class="w-50">
+        {{$coverage->manual_determination_category_memo}}
+      </div>
+
     @elseif($coverage->plan_type === 'MEDICAID')
-        <div>
-            <table class="table table-sm">
-                <tr>
-                    <td>Medicare</td>
-                </tr>
-                <tr>
-                    <td>MCR #</td>
-                    <td>{{$coverage->payer_member_identifier}}</td>
-                </tr>
-                <tr>
-                    <td>Valid number?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_payer_member_identifier_valid}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Coverage active? (PBP?)</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-            </table>
-        </div>
+      @if($coverage->creation_strategy == 'NEW' || $coverage->creation_strategy == 'AUTO_REFRESH')
+      <table class="table table-sm table-bordered">
+        <tr>
+          <td class="font-weight-bold">Medicaid (Primary):</td>
+          <td>
+            <span><b>{{$coverage->mcd_payer_name ?? '-'}}</b></span> <br>
+            <span><i class="fas fa-hourglass-half text-warning"></i> Pending Validation</span> <br>
+          </td>
+        </tr>
+        <tr>
+          <td class="font-weight-bold">Date Created:</td>
+          <td><span>{{date_format($coverage->created_at, 'm/d/Y')}}</span></td>
+        </tr>
+      </table>
+      @else
+        <table class="table table-sm table-bordered">
+          <tr>
+            <td class="font-weight-bold">Medicaid (Primary):</td>
+            <td>
+              <span><b>{{$coverage->mcd_payer_name ?? '-'}}</b></span> <br>
+              @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>
+              @elseif($coverage->manual_determination_category == 'INVALID')
+              <span><i class="fas fa-times text-danger"></i> record not found ({{$coverage->manual_determination_strategy}})</span>
+              @else
+              <span><i class="fas fa-hourglass-half text-warning"></i> pending ({{$coverage->manual_determination_strategy}})</span>
+              @endif
+            </td>
+          </tr>
+        </table>
+      @endif
+      <div class="w-50">
+        {{$coverage->manual_determination_category_memo}}
+      </div>
+
     @elseif($coverage->plan_type === 'COMMERCIAL')
-        <div>
-            <table class="table table-sm">
-                <tr>
-                    <td>COMMERCIAL</td>
-                </tr>
-                <tr>
-                    <td>Payer Member #</td>
-                    <td>{{$coverage->payer_member_identifier}}</td>
-                </tr>
-                <tr>
-                    <td>Valid number?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_payer_member_identifier_valid}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Coverage active?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-            </table>
-        </div>
-    @elseif($coverage->plan_type === 'MCR_ADV')
-        <div>
-            <table class="table table-sm">
-                <tr>
-                    <td>Medicare Advantage</td>
-                </tr>
-                <tr>
-                    <td>Member #</td>
-                    <td>{{$coverage->payer_member_identifier}}</td>
-                </tr>
-                <tr>
-                    <td>MCR #</td>
-                    <td>{{$coverage->mcr_number}}</td>
-                </tr>
-                <tr>
-                    <td>Valid Member #?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_payer_member_identifier_valid}}
-                        @else
-                            {{$coverage->auto_is_payer_member_identifier_valid}}
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Valid MCR #?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_mcr_number_valid}}
-                        @else
-                            {{$coverage->auto_is_mcr_number_valid}}
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Coverage active?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
-                        @else
-                            {{$coverage->manual_is_mcr_partbprimary === 'NO' && $coverage->manual_is_mcr_partcactive === 'NO' ? 'Covered' : 'Not Covered'}}
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Is Part B Primary?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_mcr_partbprimary}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Is Part C Active?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_mcr_partcactive}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-            </table>
-        </div>
-    @elseif($coverage->plan_type === 'MCD_MCO')
-        <div>
-            <table class="table table-sm">
-                <tr>
-                    <td>Medicaid MCO</td>
-                </tr>
-                <tr>
-                    <td>MCD #</td>
-                    <td>{{$coverage->payer_member_identifier}}</td>
-                </tr>
-                <tr>
-                    <td>Valid number?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_mcd_number_valid}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>Coverage active?</td>
-                    <td>
-                        @if($coverage->is_manually_determined)
-                            {{$coverage->manual_is_mcd_response_mco_active}}
-                        @else
-                            UNKNOWN
-                        @endif
-                    </td>
-                </tr>
-            </table>
-        </div>
+      @if($coverage->creation_strategy == 'NEW' || $coverage->creation_strategy == 'AUTO_REFRESH')
+      <table class="table table-sm table-bordered">
+        <tr>
+          <td class="font-weight-bold">Commercial (Primary):</td>
+          <td>
+            <span><b>{{$coverage->payer->name ?? '-'}}</b></span> <br>
+            <span><i class="fas fa-hourglass-half text-warning"></i> Pending Validation</span> <br>
+          </td>
+        </tr>
+        <tr>
+          <td class="font-weight-bold">Date Created:</td>
+          <td><span>{{date_format($coverage->created_at, 'm/d/Y')}}</span></td>
+        </tr>
+      </table>
+      @else
+        <table class="table table-sm table-bordered">
+          <tr>
+            <td class="font-weight-bold">Commercial (Primary):</td>
+            <td>
+              <span><b>{{$coverage->payer->name ?? '-'}}</b></span> <br>
+              @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>
+              @elseif($coverage->manual_determination_category == 'INVALID')
+              <span><i class="fas fa-times text-danger"></i> record not found ({{$coverage->manual_determination_strategy}})</span>
+              @else
+              <span><i class="fas fa-hourglass-half text-warning"></i> pending ({{$coverage->manual_determination_strategy}})</span>
+              @endif
+            </td>
+          </tr>
+        </table>
+      @endif
+      <div class="w-50">
+        {{$coverage->manual_determination_category_memo}}
+      </div>
     @endif
 </div>

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

@@ -108,8 +108,8 @@
 						<label class="control-label">Subscriber Sex</label>
 						<select class="form-control input-sm" name="subscriberSex">
 							<option value="">--</option>
-							<option value="MALE">Male</option>
-							<option value="FEMALE">Female</option>
+							<option value="M">Male</option>
+							<option value="F">Female</option>
 							<option value="UNKNOWN">Unknown</option>
 						</select>
 					</div>

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

@@ -17,7 +17,7 @@
 				</div>
 			</div>
 			<div class="table-responsive">
-				<table class="table table-bordered table-striped">
+				<table class="table table-sm table-bordered table-striped">
 					<thead>
 						<tr>
 							<th></th>
@@ -44,19 +44,19 @@
 						</tr>
 						<tr>
 							<td>Medicaid Number</td>
-							<td colspan="2">{{$cpc->mcd_number}}</td>
+							<td colspan="2">{{$cpc->mcd_number ?? '-'}}</td>
 						</tr>
 						<tr>
 							<td>Medicaid State</td>
-							<td colspan="2">{{$cpc->mcd_payer_name}}</td>
+							<td colspan="2">{{$cpc->mcd_payer_name ?? '-'}}</td>
 						</tr>
 						<tr>
 							<td>Was Medicaid Record Found?</td>
-							<td colspan="2">{{$cpc->auto_medicaid_is_match_found}}</td>
+							<td colspan="2">{{$cpc->auto_medicaid_is_match_found ? 'Yes' : 'No'}}</td>
 						</tr>
 						<tr>
 							<td>Medicare Number</td>
-							<td colspan="2">{{$cpc->mcr_number}}</td>
+							<td colspan="2">{{$cpc->mcr_number ?? '-'}}</td>
 						</tr>
 
 						<tr>
@@ -248,4 +248,4 @@
 		}
 		addMCInitializer('manual-determination-form-{{$patient->uid}}', init, '#manual-determination-form-{{$patient->uid}}')
 	}).call(window);
-</script>
+</script>

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

@@ -17,7 +17,7 @@
 				</div>
 			</div>
 			<div class="table-responsive">
-				<table class="table table-bordered table-striped">
+				<table class="table table-sm table-bordered table-striped">
 					<thead>
 						<tr>
 							<th></th>
@@ -32,10 +32,10 @@
 							<td>
 								<div class="form-group">
 									<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'" @click="inputChange">Yes</label>
+										<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>
 									<div class="form-check form-check-inline">
-										<label class="form-check-label"><input class="form-check-input" type="radio" name="manualMedicaidIsMatched" value="NO" :checked="uiState.manualMedicaidIsMatched === 'NO'" @click="inputChange">No</label>
+										<label class="form-check-label"><input class="form-check-input" type="radio" name="manualMedicaidIsMatched" value="NO" :checked="uiState.manualMedicaidIsMatched === 'NO'" @change="inputChange">No</label>
 									</div>
 								</div>
 							</td>
@@ -96,11 +96,13 @@
 						var name = input.name;
 						var value = input.value;
 						self.uiState[name] = value;
-						if(self.uiState.manualDeterminationCategory === 'COVERED'){
-							self.uiState.manualMedicaidIsMatched = "YES";
-						}
-						if(self.uiState.manualDeterminationCategory === 'INVALID'){
-							self.uiState.manualMedicaidIsMatched = "NO";
+						if(name == 'manualDeterminationCategory') {
+							if(self.uiState.manualDeterminationCategory === 'COVERED'){
+								self.uiState.manualMedicaidIsMatched = "YES";
+							}
+							if(self.uiState.manualDeterminationCategory === 'INVALID'){
+								self.uiState.manualMedicaidIsMatched = "NO";
+							}
 						}
 
 						if(name === 'manualMedicaidIsMatched'){
@@ -108,7 +110,7 @@
 							if(value === 'NO') self.uiState.manualDeterminationCategory = 'INVALID';
 						}
 						self.$forceUpdate();
-						
+
 					},
 					submitForm: function(evt) {
 						var self = this;
@@ -150,4 +152,4 @@
 		}
 		addMCInitializer('manual-determination-form-{{$patient->uid}}', init, '#manual-determination-form-{{$patient->uid}}')
 	}).call(window);
-</script>
+</script>

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

@@ -17,7 +17,7 @@
 				</div>
 			</div>
 			<div class="table-responsive">
-				<table class="table table-bordered table-striped">
+				<table class="table table-sm table-bordered table-striped">
 					<thead>
 						<tr>
 							<th></th>
@@ -40,8 +40,8 @@
 								</div>
 							</td>
 						</tr>
-						
-						
+
+
 
 						<tr>
 							<td>Part B Active?</td>
@@ -317,4 +317,4 @@
 		}
 		addMCInitializer('manual-determination-form-{{$patient->uid}}', init, '#manual-determination-form-{{$patient->uid}}')
 	}).call(window);
-</script>
+</script>

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

@@ -1,6 +1,6 @@
 <div id="primaryCoverageManualDeterminationView">
 	<div class="table-responsive">
-	<table class="table table-bordered table-striped">
+	<table class="table table-sm table-bordered table-striped">
 		<thead>
 			<tr>
 				<th></th>
@@ -10,34 +10,6 @@
 		</thead>
 		<tbody>
 			<tr>
-				<td>Plan Type</td>
-				<td colspan="2">{{$cpc->plan_type}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'MEDICARE'">
-				<td>Record Found?</td>
-				<td>{{$cpc->auto_medicare_is_match_found ? 'YES' : 'NO'}}</td>
-				<td>
-					<div class="form-group">
-						<p class="mb-1 text-secondary">Is Matched?</p>
-						<span>{{$cpc->manual_medicare_is_matched ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'MEDICAID'">
-				<td>Record Found?</td>
-				<td>{{$cpc->auto_medicaid_is_match_found ? 'YES' : 'NO'}}</td>
-				<td>
-					<div class="form-group">
-						<p class="mb-1 text-secondary">Is Matched?</p>
-						<span>{{$cpc->manual_medicaid_is_matched ?? '-'}}</span>
-					</div>
-					<div class="form-group">
-						<p class="mb-1 text-secondary">Manual Determination Category</p>
-						<span>{{$cpc->manual_determination_category ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
 				<td>Record Found?</td>
 				<td>{{$cpc->auto_commercial_is_match_found ? 'YES' : 'NO'}}</td>
 				<td>
@@ -47,24 +19,8 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number">
-				<td>Medicaid Number</td>
-				<td colspan="2">{{$cpc->mcd_number ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number">
-				<td>Medicaid State</td>
-				<td colspan="2">{{$cpc->mcd_payer_name ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number">
-				<td>Was Medicaid Record Found?</td>
-				<td colspan="2">{{$cpc->auto_medicaid_is_match_found ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number">
-				<td>Medicare Number</td>
-				<td colspan="2">{{$cpc->mcr_number ?? '-'}}</td>
-			</tr>
 
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>Part B Active?</td>
 				<td>{{$cpc->auto_medicare_is_partbactive}}</td>
 				<td>
@@ -74,7 +30,7 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>Part B Primary?</td>
 				<td>{{$cpc->auto_medicare_is_partbprimary}}</td>
 				<td>
@@ -88,20 +44,20 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>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')">
-						Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
-					</div>
 					<div class="form-group mb-0">
+						<div class="alert alert-danger" v-if="(cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES')">
+							Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
+						</div>
 						<p class="mb-1 text-secondary">Is Part C Active?</p>
 						<span>{{$cpc->manual_medicare_is_partcactive ?? '-'}}</span>
 					</div>
 				</td>
 			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>Inpatient?</td>
 				<td>{{$cpc->auto_medicare_is_inpatient}}</td>
 				<td>
@@ -111,7 +67,7 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>Hospice?</td>
 				<td>UNKNOWN</td>
 				<td>
@@ -121,7 +77,7 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>Home Health?</td>
 				<td>UNKNOWN</td>
 				<td>
@@ -131,7 +87,7 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
+			<tr>
 				<td>MSP?</td>
 				<td>{{$cpc->auto_medicare_is_msp}}</td>
 				<td>

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

@@ -1,6 +1,6 @@
 <div id="primaryCoverageManualDeterminationView">
 	<div class="table-responsive">
-	<table class="table table-bordered table-striped">
+	<table class="table table-sm table-bordered table-striped">
 		<thead>
 			<tr>
 				<th></th>
@@ -10,20 +10,6 @@
 		</thead>
 		<tbody>
 			<tr>
-				<td>Plan Type</td>
-				<td colspan="2">{{$cpc->plan_type}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'MEDICARE'">
-				<td>Record Found?</td>
-				<td>{{$cpc->auto_medicare_is_match_found ? 'YES' : 'NO'}}</td>
-				<td>
-					<div class="form-group">
-						<p class="mb-1 text-secondary">Is Matched?</p>
-						<span>{{$cpc->manual_medicare_is_matched ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'MEDICAID'">
 				<td>Record Found?</td>
 				<td>{{$cpc->auto_medicaid_is_match_found ? 'YES' : 'NO'}}</td>
 				<td>
@@ -31,15 +17,11 @@
 						<p class="mb-1 text-secondary">Is Matched?</p>
 						<span>{{$cpc->manual_medicaid_is_matched ?? '-'}}</span>
 					</div>
-					<div class="form-group">
-						<p class="mb-1 text-secondary">Manual Determination Category</p>
-						<span>{{$cpc->manual_determination_category ?? '-'}}</span>
-					</div>
 				</td>
 			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
-				<td>Record Found?</td>
-				<td>{{$cpc->auto_commercial_is_match_found ? 'YES' : 'NO'}}</td>
+			<tr>
+				<td>Coverage Status?</td>
+				<td>UNKNOWN</td>
 				<td>
 					<div class="form-group">
 						<p class="mb-1 text-secondary">Manual Determination Category</p>
@@ -47,100 +29,6 @@
 					</div>
 				</td>
 			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number">
-				<td>Medicaid Number</td>
-				<td colspan="2">{{$cpc->mcd_number ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number">
-				<td>Medicaid State</td>
-				<td colspan="2">{{$cpc->mcd_payer_name ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number">
-				<td>Was Medicaid Record Found?</td>
-				<td colspan="2">{{$cpc->auto_medicaid_is_match_found ?? '-'}}</td>
-			</tr>
-			<tr v-if="cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number">
-				<td>Medicare Number</td>
-				<td colspan="2">{{$cpc->mcr_number ?? '-'}}</td>
-			</tr>
-
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>Part B Active?</td>
-				<td>{{$cpc->auto_medicare_is_partbactive}}</td>
-				<td>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">Is Part B Active?</p>
-						<span>{{$cpc->manual_medicare_is_partbactive ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>Part B Primary?</td>
-				<td>{{$cpc->auto_medicare_is_partbprimary}}</td>
-				<td>
-					<div class="form-group">
-						<p class="mb-1 text-secondary">Manual Determination Category</p>
-						<span>{{$cpc->manual_determination_category  ?? '-'}}</span>
-					</div>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">Is Part B Primary?</p>
-						<span>{{$cpc->manual_medicare_is_partbprimary ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>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')">
-						Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
-					</div>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">Is Part C Active?</p>
-						<span>{{$cpc->manual_medicare_is_partcactive ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>Inpatient?</td>
-				<td>{{$cpc->auto_medicare_is_inpatient}}</td>
-				<td>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">Inpatient?</p>
-						<span>{{$cpc->manual_medicare_is_inpatient ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>Hospice?</td>
-				<td>UNKNOWN</td>
-				<td>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">Hospice?</p>
-						<span>UNKNOWN</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>Home Health?</td>
-				<td>UNKNOWN</td>
-				<td>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">Home Health?</p>
-						<span>UNKNOWN</span>
-					</div>
-				</td>
-			</tr>
-			<tr v-if="(cpc.plan_type == 'MEDICARE') || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
-				<td>MSP?</td>
-				<td>{{$cpc->auto_medicare_is_msp}}</td>
-				<td>
-					<div class="form-group mb-0">
-						<p class="mb-1 text-secondary">MSP?</p>
-						<span>{{$cpc->manual_medicare_is_msp ?? '-'}}</span>
-					</div>
-				</td>
-			</tr>
 		</tbody>
 	</table>
 </div>

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

@@ -1,6 +1,6 @@
 <div id="primaryCoverageManualDeterminationView">
 	<div class="table-responsive">
-	<table class="table table-bordered table-striped">
+	<table class="table table-sm table-bordered table-striped">
 		<thead>
 			<tr>
 				<th></th>
@@ -53,10 +53,10 @@
 				<td>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'">
-						Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
-					</div>
 					<div class="form-group mb-0">
+						<div class="alert alert-danger" v-if="cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES'">
+							Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
+						</div>
 						<p class="mb-1 text-secondary">Is Part C Active?</p>
 						<span>{{$cpc->manual_medicare_is_partcactive ?? '-'}}</span>
 					</div>

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

@@ -1,6 +1,6 @@
 <h4 class="font-weight-bold">Patient Name / Demographics</h4>
 <div class="table-responsive">
-	<table class="table table-bordered table-striped">
+	<table class="table table-sm table-bordered table-striped">
 		<tbody>
 			<tr>
 				<td>Patient First Name</td>
@@ -33,7 +33,7 @@
 <h4 class="font-weight-bold">Primary Coverage Information</h4>
 <div id="primaryCoverageLatestCoverage">
 	<div class="table-responsive">
-	<table class="table table-bordered table-striped">
+	<table class="table table-sm table-bordered table-striped">
 		<tbody>
 			<tr>
 				<td>Plan Type</td>
@@ -41,7 +41,7 @@
 			</tr>
 			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
 				<td>Commercial Payer</td>
-				<td>{{$cpc->commercial_payer_name ?? '-'}}</td>
+				<td>{{$cpc->commercial_payer_id ? $cpc->payer->name : '-'}}</td>
 			</tr>
 			<tr v-if="cpc.plan_type == 'COMMERCIAL'">
 				<td>Patient Member Identifier</td>

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

@@ -72,7 +72,7 @@
                 @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 == 'MEDICAID')
+              @elseif($cpc->plan_type == 'COMMERCIAL')
               @include('app.patient.primary-coverage-manual-determination-view-commercial')
               @else
                 No plan Type specified.

resources/views/layouts/patient.blade.php

@@ -586,7 +586,7 @@
                                         </div>
                                     </section>--}}
                                     <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
-                                        
+
                                         <div moe>
                                             <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
                                             </button>
@@ -699,12 +699,11 @@
                                             <button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
                                         </div>
                                         @endif
-                                        <div>
-                                            @if($pro->pro_type === 'ADMIN')
-                                                @include('app.patient.coverage-status')
-                                            @endif
-                                        </div>
                                     </section>
+																		<section class="hide-inside-popup screen-only vbox align-self-start mt-2">
+																			@include('app.patient.coverage-status')
+																		</section>
+
 									<ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">