server changes

app/Http/Controllers/PracticeManagementController.php

@@ -3306,7 +3306,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
@@ -3344,7 +3345,7 @@ 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);

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

@@ -58,12 +58,7 @@
             @endphp
             @foreach($rows as $row)
                 @php
-                    if($prevChartNumber !== $row->chart_number) {
-                        $visitCount = 1;
-                    }
-                    else {
-                        $visitCount++;
-                    }
+		    $visitCount = $row->visit_number;
                     $parsedDetailJson = new stdClass();
                     if($row->detail_json) {
                         try {
@@ -74,7 +69,7 @@
                     $prevChartNumber = $row->chart_number;
                 @endphp
                 <tr class="{{ $visitCount > 2 ? 'bgyellow':'' }} {{ $visitCount == 1 ? 'bggreen':'' }} {{ $visitCount == 2 ? 'bgblue':'' }} {{ $row->is_claim_closed ? 'claim-closed' : '' }}">
-                    <td class="text-nowrap text-right pr-2">{{$visitCount}}</td>
+                    <td class="text-nowrap text-right pr-2">{{$row->visit_number}}</td>
                     <td class="text-nowrap">{{$row->client_name}}</td>
                     <td class="text-nowrap">{{$row->hcp_name}}</td>
                     <td class="text-nowrap d-none">{{$row->na_name}}</td>