diff --git a/app/DAL/Studies/WorklistBase.php b/app/DAL/Studies/WorklistBase.php index 5ffb9a7..fd9dd29 100644 --- a/app/DAL/Studies/WorklistBase.php +++ b/app/DAL/Studies/WorklistBase.php @@ -164,7 +164,7 @@ protected function getStudiesQuery(): Builder $q = Study::query(); } - return $q->with(['readingPhysician', 'assignedPhysician', 'dicomServer']); + return $q->with(['readingPhysician', 'dicomServer']); } protected function applySort(Builder $query): Builder @@ -281,7 +281,7 @@ private function applyDateFilters(Builder $query): Builder } if (filled($this->reportDateFrom)) { - $query = $this->applyDateFilter($query, 'reported_at', $this->reportDateFrom, $this->reportDateTo); + $query = $this->applyDateFilter($query, 'read_at', $this->reportDateFrom, $this->reportDateTo); } return $query; diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 8286af2..62e0c87 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -231,10 +231,10 @@ private function renderCustomColumns(): array $columns[$col->value] = fn (Study $study) => $study->sanitizedStudyDescription(); break; case WorklistColumn::AssignedPhysician: - $columns[$col->value] = fn (Study $study) => $this->physicianColumn($study->assignedPhysician, $study->assigned_at); + $columns[$col->value] = fn (Study $study) => $this->physicianColumn(null, $study->assigned_at); break; case WorklistColumn::ReadingPhysician: - $columns[$col->value] = fn (Study $study) => $this->physicianColumn($study->readingPhysician, $study->reported_at); + $columns[$col->value] = fn (Study $study) => $this->physicianColumn($study->readingPhysician, $study->read_at); break; case WorklistColumn::Series: $columns[$col->value] = fn (Study $study) => Blade::render( diff --git a/app/Models/Study.php b/app/Models/Study.php index 6bccc67..6db6545 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -130,9 +130,9 @@ public function dicomServer(): BelongsTo return $this->belongsTo(DicomServer::class); } - public function isAssigned(int $rad_id): bool + public function isAssigned(User|int|null $user = null): bool { - return $this->assigned_physician_id === $rad_id; + return $this->assignedPhysicians->contains(me($user)->id); } public function isActive(): bool @@ -272,7 +272,7 @@ public function toArray(): array return array_merge(parent::toArray(), [ 'disk_size_human' => human_filesize($this->disk_size), 'reader_name' => $this->readingPhysician?->display_name, - 'assigned_physician_name' => $this->assignedPhysician?->display_name, + // 'assigned_physician_name' => $this->assignedPhysician?->display_name, 'reader_photo' => $this->readingPhysician?->profile_photo_url, 'report_status_led' => $this->getReportStatusLedAttribute(), 'priority_icon' => $this->getPriorityIcon(), @@ -384,11 +384,6 @@ public function isLockedBy(User|int|null $user = null): bool return $this->locking_physician_id === me($user)->id; } - public function isAssignedTo(User|int|null $user = null): bool - { - return $this->assigned_physician_id === me($user)->id; - } - public function setReportStatus(ReportStatus $status, User|int|null $user = null): void { $user_id = me($user)->id; diff --git a/app/Services/ACL/WorklistColumn.php b/app/Services/ACL/WorklistColumn.php index 6e80a37..c5d6620 100644 --- a/app/Services/ACL/WorklistColumn.php +++ b/app/Services/ACL/WorklistColumn.php @@ -13,7 +13,7 @@ enum WorklistColumn: string case History = 'history'; case StudyDate = 'study_date'; case ReceiveDate = 'received_at'; - case ReportDate = 'reported_at'; + case ReportDate = 'read_at'; case AssignDate = 'assigned_at'; case AuthorizeDate = 'authorized_at'; case ArchiveDate = 'archived_at';