Merge branch 'master' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -3561,7 +3561,8 @@ ORDER BY c.name_last, c.name_first
  n.note_reason_icd3description AS icd3description,
  n.note_reason_icd4 AS icd4,
  n.note_reason_icd4description AS icd4description,
- n.note_reason_memo AS icd_memo
+ n.note_reason_memo AS icd_memo,
+ n.visit_number
 
             ";
         $from = "FROM note AS n
@@ -3571,7 +3572,8 @@ ORDER BY c.name_last, c.name_first
 	    JOIN bill AS b ON (b.note_id = n.id AND b.is_cancelled IS NOT TRUE AND b.code ILIKE '%treatment%')
             ";
         $where = "WHERE
-            n.is_signed_by_hcp IS TRUE AND
+            -- n.visit_number IN (1,2) AND
+	    n.is_signed_by_hcp IS TRUE AND
             -- n.is_claim_closed IS NOT TRUE AND
             n.is_cancelled IS NOT TRUE AND 
             n.created_at::DATE >= '2022-01-01'::DATE AND
@@ -3599,14 +3601,14 @@ ORDER BY c.name_last, c.name_first
             $filters = '';
         }
         // $filters = '';
-        $orderBy = "ORDER BY c.id ASC, n.effective_dateest ASC";
+        $orderBy = "ORDER BY c.id ASC, n.visit_number ASC";
 
         $countQuery = "SELECT count(*) {$from} {$where} {$filters}";
         // dd($countQuery);
         $countResult = DB::select($countQuery);
         $total = $countResult[0]->count;
 
-	$defaultPageSize = 50;
+	$defaultPageSize = 25;
 
         $page = $request->input('page') ?: 1;
         $perPage = $request->input('per_page') ?: $defaultPageSize;

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

@@ -112,7 +112,7 @@
                     @if($segment->accepted_suggestion_summary_html)
                         {!! $segment->accepted_suggestion_summary_html !!}
                     @else 
-                        {!! true ? $segment->getRecalculatedHtml($performer, $performer->session_key, true)['summaryHtml'] : '' !!}
+                        {!! 1 ? $segment->getRecalculatedHtml($performer, $performer->session_key, true)['summaryHtml'] : '' !!}
                     @endif 
                 </textarea>
                 @if($performer->pro->pro_type == 'ADMIN')

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

@@ -41,19 +41,22 @@
                 <th class="border-bottom-0 text-nowrap">Minutes</th>
                 <th class="border-bottom-0 text-nowrap">Note ICDs</th>
                 <th class="border-bottom-0 text-nowrap">Note Link</th>
+                <th class="border-bottom-0 text-nowrap"></th>
+                <th class="border-bottom-0 text-nowrap"></th>
                 <th class="border-bottom-0 text-nowrap">Farah Green?</th>
                 <th class="border-bottom-0 text-nowrap">Shawn Review?</th>
                 <th class="border-bottom-0 text-nowrap">Memo to Shawn</th>
                 <th class="border-bottom-0 text-nowrap">Shawn Green?</th>
                 <th class="border-bottom-0 text-nowrap">Shawn Reject?</th>
                 <th class="border-bottom-0 text-nowrap">Claiming Closed?</th>
-                <th class="border-bottom-0 text-nowrap">Kyle Billed?</th>
+                <th class="border-bottom-0 text-nowrap d-none">Kyle Billed?</th>
                 <th class="border-bottom-0 w-50 d-none"></th>
             </tr>
             </thead>
             <tbody>
             @foreach($rows as $row)
                 @php
+		    $visitCount = $row->visit_number;
                     $parsedDetailJson = new stdClass();
                     if($row->detail_json) {
                         try {
@@ -84,13 +87,46 @@
                            href="/resolve-note/{{$row->client_uid}}/{{$row->uid}}">View</a>&nbsp;
 			            <a href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on" target="popup" onclick="window.open("/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on",'popup','width=600,height=600,scrollbars=no,resizable=no'); return false;"><i class="fa fa-arrow-right"></i></a>
                     </td>
+                    <td>
+			@if(!$row->is_claim_closed)
+                            <div moe>
+                                <a start show>Submit claim</a>
+                                <form url="/api/note/processNoteShortcut">
+                                    <input type="hidden" name="uid" value="{{$row->uid}}">
+                                    <div class="form-group mb-2">
+                                        <p>Are you sure?</p>
+                                    </div>
+                                    <div class="form-group m-0">
+                                        <button submit class="btn btn-primary btn-sm">submit</button>
+                                        <button cancel class="btn btn-primary btn-sm">cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+			@endif
+                    </td>
+                    <td>
+                        @if($row->visit_number == 1 && !$row->is_claim_closed)
+                            <div moe>
+                                <form show url="/api/note/processVisit1ForCovidIntake">
+                                    <input type="hidden" name="uid" value="{{$row->uid}}">
+                                    <div class="form-group mb-2 d-none">
+                                        <p>Are you sure?</p>
+                                    </div>
+                                    <div class="form-group m-0">
+                                        <button submit class="btn btn-danger btn-sm" process-intake="true">Process Intake</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </td>
                     <td class="font-weight-bold text-success">{!! @$parsedDetailJson->farah_decision && @$parsedDetailJson->farah_decision === 'green' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
                     <td class="font-weight-bold text-warning-dark">{!! @$parsedDetailJson->farah_decision && @$parsedDetailJson->farah_decision === 'red' ? '<i class="fa fa-exclamation-triangle"></i> Yes' : '' !!}</td>
                     <td class="font-weight-bold">{{ @$parsedDetailJson->memo_to_shawn }}</td>
                     <td class="font-weight-bold text-success">{!! @$parsedDetailJson->shawn_decision && @$parsedDetailJson->shawn_decision === 'green' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
                     <td class="font-weight-bold text-danger">{!! @$parsedDetailJson->shawn_decision && @$parsedDetailJson->shawn_decision === 'red' ? '<i class="fa fa-times"></i> Rejected' : '' !!}</td>
                     <td class="font-weight-bold text-success">{{ $row->is_claim_closed }}</td>
-                    <td class="font-weight-bold text-success">{!! @$parsedDetailJson->kyle_billed && @$parsedDetailJson->kyle_billed === 'yes' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
+                    <td class="font-weight-bold text-success d-none">{!! @$parsedDetailJson->kyle_billed && @$parsedDetailJson->kyle_billed === 'yes' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
+                    
                     <td class="d-none">
 		            {{--
 			<a href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on" target="popup"

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

@@ -326,7 +326,7 @@ $addressParts .= implode(", ", $addressPart2);
               </span> 
             </div>
             @if($performer->pro->pro_type == 'ADMIN')
-              @if(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)
+              @if(true || @$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)
                 <div class="ml-2">Deductible: {{format_number(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)}} </div>
               @endif
             @endif