瀏覽代碼

RM filters logic fix

Vijayakrishnan 3 年之前
父節點
當前提交
9a59de42eb

+ 2 - 3
app/Http/Controllers/PracticeManagementController.php

@@ -716,12 +716,11 @@ class PracticeManagementController extends Controller
         }
         $fcomm = $request->input('fcomm');
         if($fcomm && $fcomm !== 'all') {
-            $fcomm = +$fcomm;
             switch($fcomm) {
-                case 0:
+                case 'not-done':
                     $filters .= ' AND (care_month.has_non_hcp_communicated_to_patient_about_rm = FALSE OR care_month.has_non_hcp_communicated_to_patient_about_rm IS NULL) ';
                     break;
-                case 1:
+                case 'done':
                     $filters .= ' AND (care_month.has_non_hcp_communicated_to_patient_about_rm = TRUE AND care_month.has_non_hcp_communicated_to_patient_about_rm IS NOT NULL) ';
                     break;
             }

+ 2 - 2
resources/views/app/practice-management/remote-monitoring.blade.php

@@ -27,8 +27,8 @@
                 <select class="ml-3 max-width-200px form-control form-control-sm"
                         onchange="fastLoad('/practice-management/remote-monitoring?fmd={{request()->input('fmd')}}&fcomm=' + this.value + '{{$dateInput}}', true, false, false)">
                     <option value="all" {{ !request()->input('fcomm') || request()->input('fcomm') === 'all' ? 'selected' : '' }}>All</option>
-                    <option value="0" {{ request()->input('fcomm') === '0' ? 'selected' : '' }}>Patients with whom comm. not done</option>
-                    <option value="1" {{ request()->input('fcomm') === '1' ? 'selected' : '' }}>Patients with whom comm. done</option>
+                    <option value="not-done" {{ request()->input('fcomm') === 'not-done' ? 'selected' : '' }}>Patients with whom comm. not done</option>
+                    <option value="done" {{ request()->input('fcomm') === 'done' ? 'selected' : '' }}>Patients with whom comm. done</option>
                 </select>
             </div>
             <div class="card-body p-0">

+ 0 - 7
resources/views/app/practice-management/rm-bills-to-sign.blade.php

@@ -50,13 +50,6 @@
                             <span class="d-inline-block width-30px">{{$bill->careMonth->number_of_days_with_remote_measurements ?: '0'}}</span>
                             <span class="">
                                 <?php $moreMDNeeded = 16 - $bill->careMonth->number_of_days_with_remote_measurements; ?>
-                                @if($bill->careMonth->number_of_days_with_remote_measurements >= 16)
-                                    <i class="fa fa-check text-success" title="16 measurement days reached"></i>
-                                @elseif($daysRemaining >= $moreMDNeeded)
-                                    <i class="fa fa-exclamation-triangle text-warning-mellow" title="{{$moreMDNeeded}} more measurement day{{$moreMDNeeded > 1 ? 's' : ''}} needed"></i>
-                                @elseif($daysRemaining < $moreMDNeeded)
-                                    <i class="fa fa-exclamation-triangle text-secondary opacity-60" title="Can no longer reach 16 measurement days this month"></i>
-                                @endif
                                 </span>
                         </td>
                         <td>