浏览代码

On call updates

Vijayakrishnan 4 年之前
父节点
当前提交
06d0ea1bb0

+ 12 - 6
app/Http/Controllers/PracticeManagementController.php

@@ -1111,45 +1111,51 @@ ORDER BY claim.created_at ASC
             "bad" => Note::where('is_cancelled', false)
                 ->whereRaw("(detail_json)::json->>'isBad' = 'true'")
                 ->count(),
+            // not yet signed
             "mode-1" => Note::where('is_cancelled', false)
                 ->where('is_signed_by_hcp', false)
                 ->whereRaw("((detail_json)::json->>'isBad' is null OR ((detail_json)::json->>'isBad')::text != 'true')")
-                ->whereNull('current_note_pickup_for_processing_id')
+//                ->whereNull('current_note_pickup_for_processing_id')
                 ->count(),
+            // billing not marked done
             "mode-2" => Note::where('is_cancelled', false)
                 ->where('is_signed_by_hcp', true)
                 ->whereRaw("((detail_json)::json->>'isBad' is null OR ((detail_json)::json->>'isBad')::text != 'true')")
-                ->whereNull('current_note_pickup_for_processing_id')
+//                ->whereNull('current_note_pickup_for_processing_id')
                 ->where('is_billing_marked_done', false)
                 ->count(),
+            // billing not closed
             "mode-3" => Note::where('is_cancelled', false)
                 ->where('is_signed_by_hcp', true)
                 ->whereRaw("((detail_json)::json->>'isBad' is null OR ((detail_json)::json->>'isBad')::text != 'true')")
-                ->whereNull('current_note_pickup_for_processing_id')
+//                ->whereNull('current_note_pickup_for_processing_id')
                 ->where('is_billing_marked_done', true)
                 ->where('is_bill_closed', false)
                 ->count(),
+            // claiming not closed
             "mode-4" => Note::where('is_cancelled', false)
                 ->where('is_signed_by_hcp', true)
                 ->whereRaw("((detail_json)::json->>'isBad' is null OR ((detail_json)::json->>'isBad')::text != 'true')")
-                ->whereNull('current_note_pickup_for_processing_id')
+//                ->whereNull('current_note_pickup_for_processing_id')
                 ->where('is_billing_marked_done', true)
                 ->where('is_bill_closed', true)
                 ->where('is_claim_closed', false)
                 ->count(),
+            // has unsubmitted claims
             "mode-5" => Note::where('is_cancelled', false)
                 ->where('is_signed_by_hcp', true)
                 ->whereRaw("((detail_json)::json->>'isBad' is null OR ((detail_json)::json->>'isBad')::text != 'true')")
-                ->whereNull('current_note_pickup_for_processing_id')
+//                ->whereNull('current_note_pickup_for_processing_id')
                 ->where('is_billing_marked_done', true)
                 ->where('is_bill_closed', true)
                 ->where('is_claim_closed', true)
                 ->whereRaw("(SELECT count(id) FROM claim WHERE note_id = note.id AND is_cancelled IS FALSE AND status != 'CANCELLED' AND status != 'SUBMITTED') > 0")
                 ->count(),
+            // all good
             "mode-6" => Note::where('is_cancelled', false)
                 ->where('is_signed_by_hcp', true)
                 ->whereRaw("((detail_json)::json->>'isBad' is null OR ((detail_json)::json->>'isBad')::text != 'true')")
-                ->whereNull('current_note_pickup_for_processing_id')
+//                ->whereNull('current_note_pickup_for_processing_id')
                 ->where('is_billing_marked_done', true)
                 ->where('is_bill_closed', true)
                 ->where('is_claim_closed', true)

+ 16 - 1
public/css/style.css

@@ -1819,4 +1819,19 @@ form.non-interactive .form-content * {
     background: #a72132;
     border-color: #a72132;
     cursor: auto;
-}
+}
+/*
+.process-notes-badge {
+    position: relative;
+}
+.process-notes-badge:after {
+    position: absolute;
+    content: attr(data-index);
+    top: -14px;
+    left: 10px;
+    background: #fff;
+    border: 1px solid;
+    width: 20px;
+    text-align: center;
+    border-radius: 100%;
+}*/

+ 8 - 3
resources/views/app/practice-management/process-notes.blade.php

@@ -14,9 +14,9 @@
     <div id="process-notes" class="p-3 mcp-theme-1">
         <div class="d-flex align-items-baseline pb-3 border-bottom mb-3">
             <h2 class="font-size-16 font-weight-bold m-0">Process Notes</h2>
-            <a class="ml-auto" href="{{route('practice-management.picked-notes')}}">Picked Notes ({{$counts['picked']}})</a>
-            <span class="mx-2 text-secondary">|</span>
-            <a class="text-danger" href="{{route('practice-management.bad-notes')}}">Bad Notes ({{$counts['bad']}})</a>
+<!--            <a class="ml-auto" href="{{route('practice-management.picked-notes')}}">Picked Notes ({{$counts['picked']}})</a>
+            <span class="mx-2 text-secondary">|</span>-->
+            <a class="ml-auto text-danger" href="{{route('practice-management.bad-notes')}}">Bad Notes ({{$counts['bad']}})</a>
             <span class="mx-2 text-secondary">|</span>
             <a class="" href="{{route('practice-management.done-notes')}}">Done Notes ({{$counts['mode-6']}})</a>
         </div>
@@ -37,6 +37,11 @@
                 <div class="text-nowrap">Billing Not Closed</div>
                 <div class="text-right font-size-16 font-weight-bold">{{$counts["mode-3"]}}</div>
             </a>
+<!--            <a href="{{route('practice-management.process-notes')}}?mode=4"
+               class="process-notes-badge mr-3 {{$mode === '4' ? 'active' : ''}}" data-index="4">
+                <div class="text-nowrap">Claims Not Created</div>
+                <div class="text-right font-size-16 font-weight-bold">{{$counts["mode-4"]}}</div>
+            </a>-->
             <a href="{{route('practice-management.process-notes')}}?mode=4"
                class="process-notes-badge mr-3 {{$mode === '4' ? 'active' : ''}}" data-index="4">
                 <div class="text-nowrap">Claiming Not Closed</div>