Преглед на файлове

Patients list - if no next appt. show reason if any

Vijayakrishnan преди 3 години
родител
ревизия
12892dda59
променени са 2 файла, в които са добавени 22 реда и са изтрити 7 реда
  1. 5 5
      app/Models/Client.php
  2. 17 2
      resources/views/app/admin/patients-table-extended.blade.php

+ 5 - 5
app/Models/Client.php

@@ -392,6 +392,11 @@ class Client extends Model
         return $this->hasOne(Appointment::class, 'id', 'previous_mcp_appointment_id');
     }
 
+    public function mostRecentCompletedMcpNote()
+    {
+        return $this->hasOne(Note::class, 'id', 'most_recent_completed_mcp_note_id');
+    }
+
     public function lastMeasurementOfType($_type) {
         return Measurement::where('client_id', $this->id)
             ->whereNotNull('bdt_measurement_id')
@@ -942,11 +947,6 @@ ORDER BY m.ts DESC
         return $this->hasOne(Note::class, 'id', 'core_note_id');
     }
 
-    public function mostRecentCompletedMcpNote(){
-        return $this->hasOne(Note::class, 'id', 'most_recent_completed_mcp_note_id');
-    }
-
-    
     public function nonCoreVisitNotes() {
         return $this->hasMany(Note::class, 'client_id', 'id')
             ->where('id', '<>', $this->core_note_id)

+ 17 - 2
resources/views/app/admin/patients-table-extended.blade.php

@@ -302,9 +302,24 @@
                         {{count($patient->activeNotes)}}
                     </div>
                 </td>
-                <td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}
+                <td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : ''}}
+                    <span if-grid-view>
+                        @if($patient->nextMcpAppointment)
+                            {{--{{$patient->nextMcpAppointment->status}}--}}
+                        @elseif($patient->mostRecentCompletedMcpNote && $patient->mostRecentCompletedMcpNote->follow_up_not_needed_memo)
+                            <div class="w-100 text-nowrap overflow-hidden text-ellipsis">
+                                <b>No</b>
+                                {{$patient->mostRecentCompletedMcpNote->follow_up_not_needed_memo}}
+                            </div>
+                        @endif
+                    </span>
                     <div if-details-view>
-                        {{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}
+                        @if($patient->nextMcpAppointment)
+                            {{$patient->nextMcpAppointment->status}}
+                        @elseif($patient->mostRecentCompletedMcpNote && $patient->mostRecentCompletedMcpNote->follow_up_not_needed_memo)
+                            <b>No</b>
+                            {{$patient->mostRecentCompletedMcpNote->follow_up_not_needed_memo}}
+                        @endif
                     </div>
                 </td>
                 <td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at) }}</td>