Samson Mutunga 3 年之前
父節點
當前提交
48c03f8205

+ 1 - 1
app/Http/Controllers/PracticeManagementController.php

@@ -2891,7 +2891,7 @@ ORDER BY c.name_last, c.name_first
             if($claimingClosed === 'NO') $cmQuery = $cmQuery->where('is_claim_closed', false);
         }
 
-        $rows = $cmQuery->paginate(50);
+        $rows = $cmQuery->paginate(15);
 
         return view('app.practice-management.rm-action-report', compact('rows', 'filters', 'minRequiredMeasurements'));
 

+ 9 - 0
app/Models/CareMonth.php

@@ -114,4 +114,13 @@ class CareMonth extends Model
         return $this->hasOne(Note::class, 'id', 'note_id');
     }
 
+    public function mcpRmGenericBill()
+    {
+        return $this->hasOne(Bill::class, 'id', 'mcp_rm_generic_bill_id');
+    }
+    public function rmmRmGenericBill()
+    {
+        return $this->hasOne(Bill::class, 'id', 'rmm_rm_generic_bill_id');
+    }
+
 }

+ 24 - 8
resources/views/app/practice-management/rm-action-report.blade.php

@@ -199,32 +199,48 @@
                         </td>
                         <td>
                             <!-- Is Payable to MCP? -->
+                            {{ $row->mcpRmGenericBill ? 'YES':'NO' }}
                         </td>
                         <td>
                             <!-- MCP Bill -->
+                            @if($row->mcpRmGenericBill)
+                                {{ $row->rmmRmGenericBill->code }}
+                            @else
+                                -
+                            @endif
                         </td>
                         <td>
                             <!-- Is Payable to RMM? -->
+                            {{ $row->rmmRmGenericBill ? 'YES':'NO' }}
                         </td>
                         <td>
                             <!-- RMM Bill -->
+                            @if($row->rmmRmGenericBill)
+                                {{ $row->rmmRmGenericBill->code }}
+                            @else
+                                -
+                            @endif
                         </td>
                         <td>
-                            {{--<div class="d-flex flex-column">
-                                <span>453: --</span>
-                                <span>454: --</span>
-                                <span>457: --</span>
-                                <span>458: --</span>
-                            </div>--}}
+                            <?php
+                                $careMonthClaimSuggestion = json_decode($row->claim_suggestion_json);
+                            ?>
+                            @if($careMonthClaimSuggestion)
+                            <div class="d-flex flex-column">
+                                @foreach($careMonthClaimSuggestion->lines as $line)
+                                <span><i class="fas fa-circle" style="color: #00bcd4;"></i> {{ $line->cpt }}</span>
+                                @endforeach
+                            </div>
+                            @endif
                         </td>
                         <td>
-                            <!-- Claiming Closed? -->
+                            {{ $row->is_claim_closed ? 'YES':'NO' }}
                         </td>
                         <td>
                             @foreach($row->claims as $claim)
                             <div class="d-flex flex-column">
                                 @foreach($claim->lines as $claimLine)
-                                <span>{{$claimLine->cpt}}</span>
+                                <span><i class="fas fa-check-circle" style="color: #8bc34a;"></i> {{$claimLine->cpt}}</span>
                                 @endforeach
                             </div>
                             @endforeach