Sākums Izpētīt Palīdzība
Pierakstīties
tigerphp
/
stagfe2
4
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Merge branch 'cleanup' of https://rav.triplestart.com/tigerphp/stagfe2 into cleanup

root 1 gadu atpakaļ
vecāks
4579625be6 3683092ac4
revīzija
a1764733d4
2 mainītis faili ar 21 papildinājumiem un 19 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 6 6
      resources/views/app/patient/prescriptions/pdf/DRUG.blade.php
  2. 15 13
      resources/views/app/patient/prescriptions/pdf/pdf-preview.blade.php

+ 6 - 6
resources/views/app/patient/prescriptions/pdf/DRUG.blade.php
Parādīt failu 

@@ -27,7 +27,7 @@ if($coverage) {
 
 }
 
 ?>
 
 <section style="padding-top: 0.1rem;">
 
-    <table style="width:100%;font-size:14px; margin-bottom:1rem;border-collapse: collapse;table-layout:fixed;">
 
+    <table style="width:100%;font-size:14px; margin-bottom:1rem;border-collapse: collapse; {{$payerName == 'Medicare' ? '' : 'table-layout:fixed'}};">
 
       <tr>
 
         <td style="vertical-align:top;padding: 5px;">
 
           <h4 style="line-height:20px;margin:0;text-transform:uppercase;">{{ $patient->displayName() }}</h4>
 
@@ -45,7 +45,7 @@ if($coverage) {
 
           <h4 style="line-height:20px;margin:0;">INSURANCE</h4>
 
           <span style="font-size:13px;line-height:20px;display:block">{{$payerName}}</span>
 
           {{-- <span style="font-size:13px;line-height:20px;display:block">Member ID: {{$memberID}}</span> --}}
 
-          <span style="font-size:13px;line-height:20px;display:block">Insurance Contact:</span>
 
+          <!-- <span style="font-size:13px;line-height:20px;display:block">Insurance Contact:</span> -->
 
         </td>
 
       </tr>
 
     </table>
 
@@ -72,16 +72,16 @@ if($coverage) {
 
                         </p>
 
                         <div style="">
 
                             @if(@$item->frequency)
 
-                                <p style="margin: 0.5rem 0;">Frequency: {{ $item->frequency }}</p>
 
+                                <p style="margin: 0.5rem 0;"><span style="opacity: 0.7;">Frequency:</span> <span style="opacity:1">{{ $item->frequency }}</span> </p>
 
                             @endif
 
                             @if(@$item->instructions)
 
-                                <p style="margin: 0.5rem 0;">Instructions: {{ $item->instructions }}</p>
 
+                                <p style="margin: 0.5rem 0;"><span style="opacity: 0.7;">Instructions:</span> <span style="opacity:1">{{ $item->instructions }}</span> </p>
 
                             @endif
 
                             @if(isset($item->dispense))
 
-                                <p style="margin: 0.5rem 0;">Dispense: {{ $item->dispense }}</p>
 
+                                <p style="margin: 0.5rem 0;"><span style="opacity: 0.7;">Dispense:</span> <span style="opacity:1">{{ $item->dispense }}</span> </p>
 
                             @endif
 
                             @if(isset($item->refills))
 
-                                <p style="margin: 0.5rem 0;">Refills: {{ $item->refills }}</p>
 
+                                <p style="margin: 0.5rem 0;"><span style="opacity: 0.7;">Refills:</span> <span style="opacity:1">{{ $item->refills }}</span> </p>
 
                             @endif
 
                         </div>
 
                     </div>

+ 15 - 13
resources/views/app/patient/prescriptions/pdf/pdf-preview.blade.php
Parādīt failu 

@@ -32,24 +32,26 @@
 
 </head>
 
 <body>
 
 <div style="margin: 0; padding: .3rem; font-family: sans-serif">
 
-    <header style="padding: 0; border: 0; margin: 0">
 
-        <div style="text-align: center">
 
-            <h3 style="margin-bottom:1px;line-height:5px;">{{ $prescription->hcpPro->displayName(true) }}</h3>
 
-            <h4 style="margin-bottom:1px;line-height:5px;">{{$companyName}}</h4>
 
-            <h4 style="margin-bottom:1px;line-height:3px;font-weight:400;">{{$addressLine1}}, {{$addressLine2}}</h4>
 
-            <h4 style="margin-bottom:1rem;line-height:3px;font-weight:400;">{{$city}}, {{$state}} {{$zip}}</h4>
 
+    <header style="padding: 0; border: 0; margin: 0;">
 
+      <div style="width:100%;">
 
+        <div style="text-align: left">
 
+          <h3 style="margin-bottom:1px;line-height:5px;">{{ $prescription->hcpPro->displayName(true) }}</h3>
 
+          <h4 style="margin-bottom:1px;line-height:5px;">{{$companyName}}</h4>
 
+          <h4 style="margin-bottom:1px;line-height:3px;font-weight:400;">{{$addressLine1}}, {{$addressLine2}}</h4>
 
+          <h4 style="margin-bottom:1rem;line-height:3px;font-weight:400;">{{$city}}, {{$state}} {{$zip}}</h4>
 
         </div>
 
-        <div style="text-align:center;">
 
-          <span style="width:33.33%; display:inline-block;">Phone: (800) 707-9705</span>
 
-          <span style="width:33.33%; display:inline-block;">Fax: (800) 878-1414</span>
 
-          <span style="width:33.33%; display:inline-block;">NPI: {{$prescription->hcpPro->hcp_npi}}</span>
 
+        <div style="text-align:right;margin-top:-80px;padding-bottom:0px;">
 
+          <span style="margin-bottom:5px;display:block;">Phone: (800) 707-9705</span>
 
+          <span style="margin-bottom:5px;display:block;">Fax: (800) 878-1414</span>
 
+          <span style="margin-bottom:5px;display:block;">NPI: {{$prescription->hcpPro->hcp_npi}}</span>
 
         </div>
 
+      </div>
 
     </header>
 
-
 
-    <hr style="border-top: 2px solid #5ca4e8; border-bottom: 0; margin-top:5px; margin-bottom:.5rem;">
 
+    <hr style="border-top: 2px solid #5ca4e8; border-bottom: 0; margin-top:10px; margin-bottom:.5rem;">
 
 
     @include('app.patient.prescriptions.pdf.' . $prescription->erx_category)
 
 
+    <hr style="border-top: 1px solid #dedede; border-bottom: 0; margin-top:10px; margin-bottom:.5rem;">
 
     <?php if($prescription->logistics_detail_json): ?>
 
         <?php $logistics = json_decode($prescription->logistics_detail_json); ?>
 
         <hr style="margin: 0 0 0.5rem 0; border:0; border-color: #bbb">
 
@@ -57,7 +59,7 @@
 
             <p style="margin: 0.5rem 0;"><b>{{ $logistics->facilityName }}</b></p>
 
             <p style="margin: 0.5rem 0;">{{$logistics->facilityCity}} {{$logistics->facilityState}} {{$logistics->facilityZip}}</p>
 
             <p style="margin: 0.5rem 0;">Phone: {{$logistics->facilityPhone}}</p>
 
-            <p style="margin: 0.5rem 0;">Fax: {{$logistics->facilityFax}}</p>
 
+            @if($logistics->facilityFax)<p style="margin: 0.5rem 0;">Fax: {{$logistics->facilityFax}}</p>@endif
 
         </div>
 
     <?php endif; ?>