misc
This commit is contained in:
parent
f95ada6426
commit
59f74f0e3f
@ -41,7 +41,7 @@ abstract class WorklistBase implements IUserStudyLister
|
||||
|
||||
protected static function reportCompleteQuery(Builder $query): Builder
|
||||
{
|
||||
return $query->where('report_status', '=', ReportStatus::Authorized->value);
|
||||
return $query->where('report_status', '=', ReportStatus::Approved->value);
|
||||
}
|
||||
|
||||
public function setRadiologist(int $radiologist_id): self
|
||||
|
@ -4,9 +4,10 @@
|
||||
|
||||
enum ReportStatus: int
|
||||
{
|
||||
case Pending = 0;
|
||||
case Unread = 0;
|
||||
case Opened = 10;
|
||||
case Draft = 20;
|
||||
case Finalized = 30;
|
||||
case Authorized = 90;
|
||||
case Transcribed = 20;
|
||||
case Preliminary = 30;
|
||||
case Finalized = 40;
|
||||
case Approved = 90;
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
enum Priority: int
|
||||
{
|
||||
case Low = 0;
|
||||
case Normal = 50;
|
||||
case Routine = 50;
|
||||
case High = 75;
|
||||
case Urgent = 100;
|
||||
}
|
||||
|
@ -128,19 +128,19 @@ public function isActive(): bool
|
||||
public function getReportStatusLedAttribute(): string
|
||||
{
|
||||
$color = match ($this->report_status) {
|
||||
ReportStatus::Pending => 'bg-white',
|
||||
ReportStatus::Unread => 'bg-white',
|
||||
ReportStatus::Opened => 'bg-secondary',
|
||||
ReportStatus::Draft => 'bg-info',
|
||||
ReportStatus::Preliminary => 'bg-info',
|
||||
ReportStatus::Finalized => 'bg-primary',
|
||||
ReportStatus::Authorized => 'bg-success',
|
||||
ReportStatus::Approved => 'bg-success',
|
||||
default => 'bg-light',
|
||||
};
|
||||
// <i class="fa-solid fa-spinner"></i>
|
||||
$icon = match ($this->report_status) {
|
||||
ReportStatus::Pending => 'spinner text-muted',
|
||||
ReportStatus::Draft => 'pen-to-square',
|
||||
ReportStatus::Unread => 'spinner text-muted',
|
||||
ReportStatus::Preliminary => 'pen-to-square',
|
||||
ReportStatus::Finalized => 'badge-check',
|
||||
ReportStatus::Authorized => 'shield-check',
|
||||
ReportStatus::Approved => 'shield-check',
|
||||
default => 'spinner text-muted',
|
||||
};
|
||||
|
||||
|
@ -64,17 +64,17 @@ private function activeStudy(Closure $fn): bool
|
||||
|
||||
public function canAssignPhysician(): bool
|
||||
{
|
||||
return $this->activeStudy(fn () => $this->study->report_status <= ReportStatus::Draft);
|
||||
return $this->activeStudy(fn () => $this->study->report_status <= ReportStatus::Preliminary);
|
||||
}
|
||||
|
||||
public function canStudyHistoryEdit(): bool
|
||||
{
|
||||
return $this->activeStudy(fn () => $this->study->report_status <= ReportStatus::Draft);
|
||||
return $this->activeStudy(fn () => $this->study->report_status <= ReportStatus::Preliminary);
|
||||
}
|
||||
|
||||
public function canAttachmentUpload(): bool
|
||||
{
|
||||
return $this->activeStudy(fn () => $this->study->report_status <= ReportStatus::Draft);
|
||||
return $this->activeStudy(fn () => $this->study->report_status <= ReportStatus::Preliminary);
|
||||
}
|
||||
|
||||
public function canReportDownload(): bool
|
||||
|
@ -15,7 +15,7 @@ public function up(): void
|
||||
$table->id();
|
||||
$table->string('orthanc_uuid')->unique();
|
||||
$table->boolean('is_archived')->default(false);
|
||||
$table->unsignedTinyInteger('priority')->default(Priority::Normal);
|
||||
$table->unsignedTinyInteger('priority')->default(Priority::Routine);
|
||||
|
||||
$table->string('patient_id')->nullable();
|
||||
$table->string('patient_uuid')->nullable()->index();
|
||||
@ -41,7 +41,7 @@ public function up(): void
|
||||
$table->timestamp('archived_at')->nullable();
|
||||
|
||||
$table->unsignedTinyInteger('study_status')->default(StudyLevelStatus::Pending->value);
|
||||
$table->unsignedTinyInteger('report_status')->default(ReportStatus::Pending->value);
|
||||
$table->unsignedTinyInteger('report_status')->default(ReportStatus::Unread->value);
|
||||
|
||||
$table->unsignedSmallInteger('image_count')->nullable();
|
||||
$table->unsignedSmallInteger('series_count')->nullable();
|
||||
|
@ -15,7 +15,7 @@ public function up(): void
|
||||
{
|
||||
Schema::create('study_reports', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->unsignedTinyInteger('report_status')->default(ReportStatus::Pending->value);
|
||||
$table->unsignedTinyInteger('report_status')->default(ReportStatus::Unread->value);
|
||||
$table->string('accession_number', 64)->unique()->index()->default(DB::raw("concat('REP-', gen_random_uuid())"));
|
||||
|
||||
$table->foreignIdFor(Institute::class)->index()->nullable()->constrained()->nullOnDelete();
|
||||
|
Loading…
Reference in New Issue
Block a user