فهرست منبع

RM action report - list cpts, create claim, close claiming

Vijayakrishnan 3 سال پیش
والد
کامیت
e67092e249

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

@@ -4005,7 +4005,12 @@ ORDER BY c.name_last, c.name_first
             rmm_rm_bill.uid as rmm_rm_bill_uid,
             mcp_rm_bill.code as mcp_rm_bill_code,
             rmm_rm_bill.code as rmm_rm_bill_code,
-            (SELECT cl.status FROM claim cl WHERE cl.care_month_id = cm.id AND cl.is_cancelled IS NOT TRUE LIMIT 1) as claim_status
+            cl.status as claim_status,
+            cl.uid as claim_uid,
+            array_to_string(
+                ARRAY(SELECT claim_line.cpt FROM claim_line WHERE claim_line.claim_id = cl.id),
+                ', '::text
+                ) AS cpts
         ";
 
         $from = "
@@ -4016,6 +4021,7 @@ ORDER BY c.name_last, c.name_first
             left join bill mcp_rm_bill on cm.mcp_rm_generic_bill_id = mcp_rm_bill.id
             left join bill rmm_rm_bill on cm.rmm_rm_generic_bill_id = rmm_rm_bill.id
             left join note mrnote on c.most_recent_completed_mcp_note_id = mrnote.id
+            left join claim cl on cl.care_month_id = cm.id AND cl.is_cancelled IS NOT TRUE
         ";
 
         $page = $request->input('page') ?: 1;
@@ -4028,6 +4034,7 @@ ORDER BY c.name_last, c.name_first
         FROM
             $from
         where " . implode(" AND ", $conditions) . "
+            AND cl.is_cancelled IS NOT TRUE
         ";
 
         $countResult = DB::select($countSql);

+ 1 - 0
resources/views/app/patient/care-month/_create-claim-table-action.blade.php

@@ -1,3 +1,4 @@
+<?php $careMonth = \App\Models\CareMonth::where('uid', $row->care_month_uid)->first(); ?>
 @if($careMonth->is_claim_closed)
     <b class="ml-2 text-info">[CLAIMING CLOSED]</b>
 @elseif($pro->pro_type === 'ADMIN' && $careMonth->was_rm_setup_performed && !$careMonth->rm_setup_claim_id)

+ 9 - 9
resources/views/app/patient/care-month/update-claim-status.blade.php

@@ -1,23 +1,23 @@
 <span moe relative title="Submit Claim">
 	<a class="" href="" show start><i class="fa fa-pencil-alt"></i></a>
 	<form url="/api/claim/updateStatus" right>
-		<input type="hidden" name="uid" value="{{$claim->uid}}">
+		<input type="hidden" name="uid" value="{{$uid}}">
 		<div class="mb-2">
 			<label for="" class="control-label">Status</label>
 			<select name="status" class="form-control form-control-sm" required>
 				<option value="">-- select --</option>
-				<option value="NEW" {{$claim->status === 'NEW' ? 'selected' : ''}}>New</option>
-				<option value="PICKED_UP" {{$claim->status === 'PICKED_UP' ? 'selected' : ''}}>Picked Up</option>
-				<option value="SUBMITTED" {{$claim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
-				<option value="IN_PROCESS" {{$claim->status === 'IN_PROCESS' ? 'selected' : ''}}>In Process</option>
-				<option value="ACCEPTED" {{$claim->status === 'ACCEPTED' ? 'selected' : ''}}>Accepted</option>
-				<option value="REJECTED" {{$claim->status === 'REJECTED' ? 'selected' : ''}}>Rejected</option>
-				<option value="ABANDONED" {{$claim->status === 'ABANDONED' ? 'selected' : ''}}>Abandoned</option>
+				<option value="NEW" {{$status === 'NEW' ? 'selected' : ''}}>New</option>
+				<option value="PICKED_UP" {{$status === 'PICKED_UP' ? 'selected' : ''}}>Picked Up</option>
+				<option value="SUBMITTED" {{$status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+				<option value="IN_PROCESS" {{$status === 'IN_PROCESS' ? 'selected' : ''}}>In Process</option>
+				<option value="ACCEPTED" {{$status === 'ACCEPTED' ? 'selected' : ''}}>Accepted</option>
+				<option value="REJECTED" {{$status === 'REJECTED' ? 'selected' : ''}}>Rejected</option>
+				<option value="ABANDONED" {{$status === 'ABANDONED' ? 'selected' : ''}}>Abandoned</option>
 			</select>
 		</div>
 		<div class="mb-2">
 			<label for="" class="control-label">Status Memo</label>
-			<textarea name="memo" class="form-control"><?= $claim->status_memo ?></textarea>
+			<textarea name="memo" class="form-control"></textarea>
 		</div>
 		<div class="mb-0">
 			<button class="btn btn-primary btn-sm" submit>Submit</button>

+ 3 - 18
resources/views/app/practice-management/rm-action-report.blade.php

@@ -281,27 +281,12 @@
                             {{ $row->is_claim_closed ? 'YES':'NO' }}
                         </td>
                         <td>
-{{--                            <div class="d-flex justify-content-between">--}}
-{{--                                <div>--}}
-{{--                                    @foreach($row->claims as $claim)--}}
-{{--                                        <div class="d-flex flex-column">--}}
-{{--                                            @foreach($claim->lines as $claimLine)--}}
-{{--                                            <span><i class="fas fa-check-circle" style="color: #8bc34a;"></i> {{$claimLine->cpt}}</span>--}}
-{{--                                            @endforeach--}}
-{{--                                        </div>                                --}}
-{{--                                    @endforeach--}}
-{{--                                </div>--}}
-{{--                                --}}
-{{--                            </div>--}}
-{{--                            @include('app.patient.care-month._create-claim-table-action', ['careMonth' => $row])--}}
+                            <div>{{@$row->cpts}}</div>
+                            @include('app.patient.care-month._create-claim-table-action', ['careMonth' => $row])
                         </td>
                         <td>
-{{--                            <?php $rowFirstClaim = $row->claims->first(); ?>--}}
-{{--                            @if($rowFirstClaim)--}}
-{{--                                <span class="mr-2"><b>{{$rowFirstClaim->status}}</b></span>--}}
-{{--                                @include('app.patient.care-month.update-claim-status', ['claim' => $rowFirstClaim])--}}
-{{--                            @endif--}}
                             {{$row->claim_status}}
+                            @include('app.patient.care-month.update-claim-status', ['uid' => $row->claim_uid, 'status' => $row->claim_status])
                         </td>
                     </tr>
                     @endforeach