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

app/Http/Controllers/PracticeManagementController.php

@@ -1501,7 +1501,7 @@ WHERE
         $c_lt16MeasurementDays = "care_month.number_of_days_with_remote_measurements < 16";
         $c_gte16MeasurementDays = "care_month.number_of_days_with_remote_measurements >= 16";
         $c_subscribedToSMS = "client.send_sms_on_bdt_measurement = TRUE";
-        $c_deviceUsed = "(client.most_recent_cellular_bp_measurement_at IS NOT NULL OR most_recent_cellular_weight_measurement_at IS NOT NULL)";
+        $c_deviceUsed = "(client.most_recent_cellular_bp_measurement_at IS NOT NULL OR client.most_recent_cellular_weight_measurement_at IS NOT NULL)";
         $c_lt20BillingMinutes = "care_month.rm_total_time_in_seconds_by_mcp < 1200";
         $c_gte20BillingMinutes = "care_month.rm_total_time_in_seconds_by_mcp >= 1200";
 

app/Models/Note.php

@@ -124,7 +124,16 @@ class Note extends Model
 
     public function reasons()
     {
-        return $this->hasMany(NoteReason::class, 'note_id', 'id');
+        $reasons = [];
+        for ($i = 1; $i <= 4; $i++) {
+            if($this->{'note_reason_icd' . $i}) {
+                $reason = new \stdClass();
+                $reason->code = $this->{'note_reason_icd' . $i};
+                $reason->description = $this->{'note_reason_icd' . $i . 'description'};
+                $reasons[] = $reason;
+            }
+        }
+        return $reasons;
     }
 
     public function claims()

resources/views/app/admin/notes_pending_summary_suggestion.blade.php

@@ -28,10 +28,10 @@
                         </td>
                         <td>{{$row->client->displayName()}}</td>
                         <td>
-                            @foreach($row->reasons as $reason)
+                            @foreach($row->reasons() as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
-                            @if(!$row->reasons || !count($row->reasons))
+                            @if(!$row->reasons() || !count($row->reasons()))
                                 -
                             @endif
                         </td>

resources/views/app/admin/notes_rejected_summary_suggestion.blade.php

@@ -28,10 +28,10 @@
                         </td>
                         <td>{{$row->client->displayName()}}</td>
                         <td>
-                            @foreach($row->reasons as $reason)
+                            @foreach($row->reasons() as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
-                            @if(!$row->reasons || !count($row->reasons))
+                            @if(!$row->reasons() || !count($row->reasons()))
                                 -
                             @endif
                         </td>

resources/views/app/admin/patients-table.blade.php

@@ -163,8 +163,8 @@
 													{!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
 												</td>
 												<td class="max-width-200px">
-													@if(count($note->reasons))
-														@foreach ($note->reasons as $reason)
+													@if(count($note->reasons()))
+														@foreach ($note->reasons() as $reason)
 															<div class="mb-1">
 																<span>{{ $reason->code }}</span>
 																<span class="text-secondary text-sm">{{ $reason->description}}</span>

resources/views/app/mcp/notes_pending_billing.blade.php

@@ -21,10 +21,10 @@
                         </td>
                         <td>{{$row->client->displayName()}}</td>
                         <td>
-                            @foreach($row->reasons as $reason)
+                            @foreach($row->reasons() as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
-                            @if(!$row->reasons || !count($row->reasons))
+                            @if(!$row->reasons() || !count($row->reasons()))
                                 -
                             @endif
                         </td>

resources/views/app/mcp/notes_pending_signature.blade.php

@@ -28,10 +28,10 @@
                         </td>
                         <td>{{$row->client->displayName()}}</td>
                         <td>
-                            @foreach($row->reasons as $reason)
+                            @foreach($row->reasons() as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
-                            @if(!$row->reasons || !count($row->reasons))
+                            @if(!$row->reasons() || !count($row->reasons()))
                                 -
                             @endif
                         </td>

resources/views/app/mcp/notes_pending_summary_suggestion.blade.php

@@ -28,10 +28,10 @@
                         </td>
                         <td>{{$row->client->displayName()}}</td>
                         <td>
-                            @foreach($row->reasons as $reason)
+                            @foreach($row->reasons() as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
-                            @if(!$row->reasons || !count($row->reasons))
+                            @if(!$row->reasons() || !count($row->reasons()))
                                 -
                             @endif
                         </td>

resources/views/app/mcp/notes_rejected_summary_suggestion.blade.php

@@ -28,10 +28,10 @@
                         </td>
                         <td>{{$row->client->displayName()}}</td>
                         <td>
-                            @foreach($row->reasons as $reason)
+                            @foreach($row->reasons() as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
-                            @if(!$row->reasons || !count($row->reasons))
+                            @if(!$row->reasons() || !count($row->reasons()))
                                 -
                             @endif
                         </td>

resources/views/app/patient/note/_create-claim.blade.php

@@ -5,7 +5,7 @@
     <span class="text-warning-mellow font-weight-bold">
         <i class="fa fa-exclamation-triangle"></i>
         Please sign off on the comprehensive care plan before creating claims.
-    </span>
+    </span> 
 @else
     <span class="mx-2 text-secondary">|</span>
     <a href="#" onclick="return showStagPopup('create-claim')">Create Claim</a>
@@ -126,6 +126,17 @@
         </div>
     </form>
 </div>
+<script>
+    window.noteReasons = [];
+    @if(count($note->reasons()))
+    @foreach($note->reasons() as $reason)
+    window.noteReasons.push({
+        code: '{{$reason->code}}',
+        description: '{{$reason->description}}'
+    });
+    @endforeach
+    @endif
+</script>
 <script>
     window.createClaimApp = new Vue({
         el: '#createClaimApp',

resources/views/app/patient/note/_create-note-reason.blade.php

@@ -1,7 +1,7 @@
 <script>
     window.noteReasons = [];
-    @if(count($note->reasons))
-        @foreach($note->reasons as $reason)
+    @if(count($note->reasons()))
+        @foreach($note->reasons() as $reason)
         window.noteReasons.push({
             code: '{{$reason->code}}',
             description: '{{$reason->description}}'
@@ -22,8 +22,8 @@
                 </tr>
             </thead>
             <tbody>
-                @if(count($note->reasons))
-                @foreach($note->reasons as $reason)
+                @if(count($note->reasons()))
+                @foreach($note->reasons() as $reason)
                 <tr class="data-row">
                     <td><input type="text" class="form-control note-reason-icd" data-index="{{$loop->index}}" id="icd_{{$loop->index}}" name="noteReasonDTOs[{{$loop->index}}].code" value="{{$reason->code}}"></td>
                     <td><input type="text" class="form-control note-reason-description" data-index="{{$loop->index}}" id="description_{{$loop->index}}" name="noteReasonDTOs[{{$loop->index}}].description" value="{{$reason->description}}"></td>

resources/views/app/patient/note/pdf.blade.php

@@ -354,10 +354,10 @@
     <!-- icds -->
     <div style="padding: 1rem; padding-bottom: 0;">
         <p><b style="font-size: 18px">ICDs</b></p>
-        @if(!count($note->reasons))
+        @if(!count($note->reasons()))
             Unavailable
         @else
-            @foreach ($note->reasons as $reason)
+            @foreach ($note->reasons() as $reason)
                 <div style="margin-bottom: 0.5rem;">
                     {{ $reason->description}} ({{ $reason->code }})
                 </div>

resources/views/app/patient/note/segment/suggestions_and_updates.blade.php

@@ -106,7 +106,7 @@
                     @if($segment->accepted_suggestion_summary_html)
                         {!! $segment->accepted_suggestion_summary_html !!}
                     @else 
-                        {!! $segment->getRecalculatedHtml($performer)['summaryHtml'] !!}
+                        {!! $segment->getRecalculatedHtml($performer, $performer->session_key)['summaryHtml'] !!}
                     @endif 
                 </textarea>
                 <div class="mb-0 mt-2">

resources/views/app/patient/notes.blade.php

@@ -304,8 +304,8 @@
                     {!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
                 </td>
                 <td class="max-width-200px">
-                    @if(count($note->reasons))
-                        @foreach ($note->reasons as $reason)
+                    @if(count($note->reasons()))
+                        @foreach ($note->reasons() as $reason)
                             <span class="d-inline-block mr-2" title="{{ $reason->description}}">{{ $reason->code }}</span>
                         @endforeach
                     @else

resources/views/app/practice-management/billing-manager-v1.blade.php

@@ -162,7 +162,7 @@
                                         </tr>
                                         </thead>
                                         <tbody>
-                                        @foreach($note->reasons as $reason)
+                                        @foreach($note->reasons() as $reason)
                                             <tr>
                                                 <td>{{$reason->code}}</td>
                                                 <td>{{$reason->description}}</td>

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

@@ -130,7 +130,7 @@
                             @if($performer->pro->pro_type == 'ADMIN')
                                 <td>
                                     <div class="d-flex flex-wrap width-100px">
-                                        @foreach($note->reasons as $reason)
+                                        @foreach($note->reasons() as $reason)
                                             <span class="border-bottom c-pointer mr-2 mb-1" title="{{$reason->description}}">{{$reason->code}}</span>
                                         @endforeach
                                     </div>

resources/views/app/practice-management/notes-processing-center.blade.php

@@ -146,7 +146,7 @@
                             </td>
                             <td>
                                 <div class="d-flex flex-wrap width-100px">
-                                    @foreach($note->reasons as $reason)
+                                    @foreach($note->reasons() as $reason)
                                         <span class="border-bottom c-pointer mr-2 mb-1" title="{{$reason->description}}">{{$reason->code}}</span>
                                     @endforeach
                                 </div>

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

@@ -345,15 +345,18 @@ $addressParts .= implode(", ", $addressPart2);
         <div class="d-flex">
           <div>DOB: {{friendly_date($patient->dob, false,null, true)}} </div>
           @if($patient->getPrimaryCoverage() && $patient->getPrimaryCoverageStatus() === 'YES')
-          <div class="text-nowrap screen-only ml-2 pl-2 border-left">
-            {{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
-            <span class="on-hover-show d-inline-block on-hover-opaque">
-              <i class="fa fa-check-circle text-success"></i>
-              <div class="on-hover-content py-2 pl-3 text-nowrap">
-                Covered
-              </div>
-            </span>
-          </div>
+            <div class="text-nowrap screen-only ml-2 pl-2 border-left">
+              {{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
+              <span class="on-hover-show d-inline-block on-hover-opaque">
+                <i class="fa fa-check-circle text-success"></i>
+                <div class="on-hover-content py-2 pl-3 text-nowrap">
+                  Covered
+                </div>
+              </span> 
+            </div>
+            @if($performer->pro->pro_type == 'ADMIN')
+              <div class="ml-2">Deductible: {{@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining}} </div>
+            @endif 
           @endif
         </div>
       </div>