masroor/radfusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge-statuses'

Browse Source
This commit is contained in:
Dr Masroor Ehsan 2025-01-29 23:30:39 +06:00
commit 97481e8473
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DAL/Studies/IUserStudyLister.php
View File

@ -10,7 +10,7 @@ interface IUserStudyLister
{ {
public function setRadiologist(int $radiologist_id): self; public function setRadiologist(int $radiologist_id): self;
public function setWorkflowLevel(WorkflowLevel $status): self; public function setWorkflowLevel(WorkflowLevel $level): self;
public function setPerPage(int $size): self; public function setPerPage(int $size): self;

5
app/DAL/Studies/WorklistBase.php
View File

@ -48,9 +48,9 @@ public function setRadiologist(int $radiologist_id): self
return $this; return $this;
} }
public function setWorkflowLevel(WorkflowLevel $status): self public function setWorkflowLevel(WorkflowLevel $level): self
{ {
$this->workflowLevel = $status; $this->workflowLevel = $level;
return $this; return $this;
} }
@ -71,7 +71,6 @@ public function get(?int $user_id = null): LengthAwarePaginator
$query = $this->applySearch($query); $query = $this->applySearch($query);
$query = $this->applyRadiologist($query); $query = $this->applyRadiologist($query);
$query = $this->applyWorkflowLevel($query); $query = $this->applyWorkflowLevel($query);
$query = $this->applyReportStatus($query);
$query = $this->applyArchived($query); $query = $this->applyArchived($query);
$query = $this->applyLocked($query); $query = $this->applyLocked($query);
$query = $this->applyDateFilters($query); $query = $this->applyDateFilters($query);