app/DataTables/WorklistDataTable.php

@@ -627,7 +627,7 @@ private function generateActionButtons(Study $study): string
         foreach (WorklistGuard::worklistButtons($study) as $button) {
             switch ($button) {
                 case WorklistButton::StudyMetadata:
-                    $btns[] = $this->renderImageLink($study->hash, $study->hasHistory() ? 'info-green.png' : 'info.png', 'show-study', 'Info');
+                    $btns[] = $this->renderImageLink($study->hash, 'info.png', 'show-study', 'Info');
                     break;
                 case WorklistButton::Assign:
                     $btns[] = $this->renderImageLink($study->hash, 'assign.png', 'show-assign', 'Assign');

app/Http/Controllers/Staff/HistoryController.php

@@ -9,13 +9,12 @@
 use App\Models\StudyDetails;
 use App\Services\AuditTrail\Activity;
 use App\Services\SessionHelper;
-use Illuminate\Support\Facades\Cache;
 
 class HistoryController extends HashidControllerBase
 {
     public function view()
     {
-        abort_unless(may(Permission::StudyHistoryView), 403);
+        abort_unless(auth()->user()->may(Permission::StudyHistoryView), 403);
         $this->decodeKeys();
         $details = StudyDetails::historyOnly($this->key);
         $study = Study::findOrFail($this->key);
@@ -26,7 +25,7 @@ public function view()
     public function edit()
     {
         // SessionHelper::setIntendedUrl();
-        abort_unless(may(Permission::StudyHistoryEdit), 403);
+        abort_unless(auth()->user()->may(Permission::StudyHistoryEdit), 403);
         $this->decodeKeys();
         $details = StudyDetails::historyOnly($this->key);
         $study = Study::findOrFail($this->key);
@@ -36,13 +35,12 @@ public function edit()
 
     public function save(StudyHistoryRequest $request)
     {
-        abort_unless(may(Permission::StudyHistoryEdit), 403);
+        abort_unless(auth()->user()->may(Permission::StudyHistoryEdit), 403);
         $this->decodeKeys();
         $details = StudyDetails::historyOnly($this->key);
         $payload = array_trim_strings($request->validated());
         unset($payload['study_id']);
         $details->update($payload);
-        Cache::forget("study.has_history.{$this->key}");
 
         audit()
             ->did(Activity::Study_History_Edit)

app/Models/Study.php

@@ -12,13 +12,12 @@
 use App\Services\Pacs\PacsUrlGen;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Concerns\HasTimestamps;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
@@ -29,6 +28,7 @@ class Study extends BaseModel implements HasMedia
     use HasDepartment;
     use HashableId;
     use HasOrganization;
+    use HasTimestamps;
     use InteractsWithMedia;
 
     public const string MEDIA_COLLECTION = 'attachments';
@@ -543,16 +543,4 @@ protected function casts(): array
             'patient_birthdate' => 'immutable_date',
         ];
     }
-
-    public function hasHistory(): bool
-    {
-        return Cache::remember("study.has_history.{$this->id}",
-            now()->addMinutes(15),
-            function () {
-                return DB::table('study_details')
-                    ->where('study_id', $this->id)
-                    ->whereNotNull('clinical_history')
-                    ->exists();
-            });
-    }
 }