root 3 years ago
parent
commit
bc1e6f0b8c

+ 10 - 7
app/Http/Controllers/PracticeManagementController.php

@@ -3660,18 +3660,21 @@ ORDER BY c.name_last, c.name_first
 		-- n.visit_number = 2 AND
 		n.is_signed_by_hcp IS TRUE AND
             -- n.effective_dateest < '2022-03-01' AND
-	    -- n.id IN (SELECT note_id FROM segment WHERE summary_html ILIKE '%n95%') AND
-	    n.is_claim_closed IS NOT TRUE AND
-            n.is_cancelled IS NOT 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
             c.client_engagement_status_category <> 'DUMMY' AND
             c.name_first NOT ILIKE '%test%' AND 
             c.name_last NOT ILIKE '%test%' AND
-            n.id IN (SELECT note_id FROM bill WHERE code ILIKE '%treatment%' AND bill.is_cancelled IS NOT TRUE AND note_id IS NOT NULL) AND
+            n.id IN (SELECT note_id FROM bill WHERE code ILIKE '%treatment%' AND bill.is_cancelled IS NOT TRUE AND note_id IS NOT NULL)
+		-- AND	
             -- n.id NOT IN (SELECT note_id FROM claim WHERE note_id IS NOT NULL) AND
-            c.is_part_b_primary <> 'YES' -- AND
+            -- c.is_part_b_primary <> 'YES' 
+	    -- AND
             -- c.latest_eligible_refresh_at::DATE >= '2022-01-01' AND
-            -- c.mpb_remaining = 0 -- AND
+            AND c.mpb_remaining = 0 -- AND
             -- c.created_at::DATE >= '2022-01-01'::DATE
             ";
         $filters = [];
@@ -3689,7 +3692,7 @@ ORDER BY c.name_last, c.name_first
         }
         // $filters = '';
         $orderBy = "ORDER BY 
-		c.id ASC, 
+			-- c.id ASC, 
 		n.id ASC, n.effective_dateest ASC";
 
         $countQuery = "SELECT count(*) {$from} {$where} {$filters}";

+ 5 - 1
resources/views/app/patient/note/rhs-sidebar.blade.php

@@ -146,7 +146,11 @@
                 <?php $rel = $problem->relevanceToNote($note); ?>
                 <div class="d-inline-flex align-items-baseline px-1 {{$rel ? 'bg-warning-mellow' : ''}}">
                     <span class="mr-1">•</span>
-                    <span>{{$problem->data->name}}</span>
+                    <span>{{$problem->data->name}}
+			@if($performer->pro->pro_type == 'ADMIN')
+                    		{{$problem->data->icd}}
+			@endif
+			</span>
                 </div>
             @endforeach
         @else