guard

app/Services/ACL/WorklistGuard.php

@@ -13,23 +13,37 @@ public static function worklistColumns(User|int|null $usr = null): Collection
         $columns = collect([
             WorklistColumn::Priority,
             WorklistColumn::ReportStatus,
-            WorklistColumn::History,
+            WorklistColumn::ActionButtons,
-            WorklistColumn::Modality,
             WorklistColumn::PatientId,
             WorklistColumn::PatientName,
             WorklistColumn::PatientSexAge,
-            WorklistColumn::StudyDescription,
             WorklistColumn::StudyDate,
+            WorklistColumn::ReceiveDate,
+            WorklistColumn::StudyDescription,
             WorklistColumn::AssignedPhysician,
             WorklistColumn::ReadingPhysician,
-            // WorklistColumn::ReportDate,
+            WorklistColumn::ReportDate,
+            WorklistColumn::History,
+            WorklistColumn::Modality,
             WorklistColumn::Series,
-            WorklistColumn::ReceiveDate,
-            WorklistColumn::ActionButtons,
             WorklistColumn::ReportButtons,
             WorklistColumn::ViewerButtons,
         ]);
 
+        if ($user->isRadiologist()) {
+            $columns = $columns->except([
+                WorklistColumn::AssignedPhysician,
+                WorklistColumn::ReadingPhysician,
+            ]);
+            $columns = $columns->reject(function ($col) {
+                return $col == WorklistColumn::AssignedPhysician || $col == WorklistColumn::ReadingPhysician;
+            });
+        } else {
+            $columns = $columns->reject(function ($col) {
+                return $col == WorklistColumn::ReportDate;
+            });
+        }
+
         return $columns;
     }