Explorar o código

Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

Samson Mutunga %!s(int64=3) %!d(string=hai) anos
pai
achega
9635ba5ebb

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

@@ -44,9 +44,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>

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

@@ -1,116 +1,137 @@
-<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>
+								<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>Sex</td>
-								<td>{{$cpc->subscriber_sex ?? '-'}}</td>
+							<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-fixed">
+										<tbody>
+											<tr>
+												<td>Is Patient the subscriber?</td>
+												<td>{{$cpc->is_patient_subscriber ? 'Yes' : 'No'}}</td>
+											</tr>
+											@if(!$cpc->is_patient_subscriber)
+											<tr>
+												<td>First Name</td>
+												<td>{{$cpc->subscriber_name_first ?? '-'}}</td>
+											</tr>
+											<tr>
+												<td>Middle Name / MI</td>
+												<td>{{$cpc->subscriber_name_middle ?? '-'}}</td>
+											</tr>
+											<tr>
+												<td>Last Name</td>
+												<td>{{$cpc->subscriber_name_last ?? '-'}}</td>
+											</tr>
+											<tr>
+												<td>Suffix</td>
+												<td>{{$cpc->subscriber_name_suffix ?? '-'}}</td>
+											</tr>
+											<tr>
+												<td>Sex</td>
+												<td>{{$cpc->subscriber_sex ?? '-'}}</td>
+											</tr>
+											<tr>
+												<td>Dob</td>
+												<td>{{$cpc->subscriber_dob ? date_format(date_create($cpc->subscriber_dob), 'm/d/Y') : '-'}}</td>
+											</tr>
+											@endif
+										</tbody>
+									</table>
+								</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 ?? '-'}}</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',

+ 9 - 26
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>