diff --git a/app/Http/Controllers/Staff/StudiesController.php b/app/Http/Controllers/Staff/StudiesController.php index d41ff4f..2462c51 100644 --- a/app/Http/Controllers/Staff/StudiesController.php +++ b/app/Http/Controllers/Staff/StudiesController.php @@ -10,7 +10,7 @@ class StudiesController extends HashidControllerBase { public function index() { - $studies = Study::where('is_active', true) + $studies = Study::active() ->orderBy('study_date', 'desc') ->paginate(15); @@ -20,7 +20,7 @@ public function index() public function details() { $this->decodeKeys(); - $study = Study::with(['series', 'details'])->findOrFail($this->key); + $study = Study::with(['details'])->findOrFail($this->key); audit() ->did(Activity::Study_Metadata_View) ->on($study) diff --git a/app/Models/Study.php b/app/Models/Study.php index 1cef46b..fcc85c2 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -26,11 +26,6 @@ public function attachments(): HasMany return $this->hasMany(StudyAttachment::class); } - public function series(): HasMany - { - return $this->hasMany(StudySeries::class); - } - public function reports(): HasMany { return $this->hasMany(StudyReport::class); diff --git a/resources/views/staff/studies/index.blade.php b/resources/views/staff/studies/index.blade.php index b954598..32a0073 100644 --- a/resources/views/staff/studies/index.blade.php +++ b/resources/views/staff/studies/index.blade.php @@ -91,7 +91,7 @@ class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking- @endif | ZIP + href="{{ \App\Services\Pacs\PacsUrlGen::archive($study->orthanc_uuid) }}">ZIP | TXT