diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 4153686..c7b336c 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,7 +14,7 @@ public function run(): void { $this->call([ RoleSeeder::class, - InstituteSeeder::class, + OrganizationSeeder::class, UserSeeder::class, ModalityProcedureSeeder::class, ]); diff --git a/database/seeders/OrganizationSeeder.php b/database/seeders/OrganizationSeeder.php index 964f432..01db05e 100644 --- a/database/seeders/OrganizationSeeder.php +++ b/database/seeders/OrganizationSeeder.php @@ -33,7 +33,7 @@ public function run(): void 'is_active' => false, ]); - $chev_xr = Department::create( + $dept_chev_xr = Department::create( [ 'is_active' => true, 'name' => 'Chevron XR', @@ -47,7 +47,7 @@ public function run(): void 'organization_id' => $chev->id, ] ); - $cmch_mr = Department::create( + $dept_cmch_mr = Department::create( [ 'is_active' => false, 'name' => 'CMCH MR', @@ -55,19 +55,10 @@ public function run(): void ] ); - $rul_chev_mr = DicomRoutingRule::create( + $rul_chev_mr_ct = DicomRoutingRule::create( [ 'is_active' => true, - 'name' => 'Chevron MR', - 'organization_id' => $chev->id, - 'department_id' => $chev_dep_ct_mr->id, - 'match_condition' => MatchCondition::ALL->value, - ] - ); - $rul_chev_ct = DicomRoutingRule::create( - [ - 'is_active' => true, - 'name' => 'Chevron CT', + 'name' => 'Chevron MR/CT', 'organization_id' => $chev->id, 'department_id' => $chev_dep_ct_mr->id, 'match_condition' => MatchCondition::ALL->value, @@ -77,24 +68,25 @@ public function run(): void $rul_chev_xr = DicomRoutingRule::create( [ 'is_active' => true, - 'name' => 'Chevron XR', + 'name' => 'Chevron X-ray', 'organization_id' => $chev->id, 'department_id' => $chev_dep_ct_mr->id, 'match_condition' => MatchCondition::ALL->value, + 'priority' => 10, ] ); DicomRuleCondition::create([ 'dicom_tag' => DicomTagIdentifiers::InstitutionName->value, 'search_pattern' => 'chevron', - 'dicom_routing_rule_id' => $rul_chev_mr->id, + 'dicom_routing_rule_id' => $rul_chev_mr_ct->id, 'match_mode' => MatchMode::Contains->value, 'case_sensitive' => false, ]); DicomRuleCondition::create([ 'dicom_tag' => DicomTagIdentifiers::Modality->value, 'search_pattern' => 'MR,CT', - 'dicom_routing_rule_id' => $rul_chev_mr->id, + 'dicom_routing_rule_id' => $rul_chev_mr_ct->id, 'match_mode' => MatchMode::InList->value, 'case_sensitive' => true, ]); @@ -108,7 +100,7 @@ public function run(): void ]); DicomRuleCondition::create([ 'dicom_tag' => DicomTagIdentifiers::Modality->value, - 'search_pattern' => 'CR,DX', + 'search_pattern' => 'CR,DX,MG', 'dicom_routing_rule_id' => $rul_chev_xr->id, 'match_mode' => MatchMode::InList->value, 'case_sensitive' => true, @@ -139,7 +131,7 @@ public function run(): void 'stone_viewer_path' => 'stone-webviewer/index.html', 'ohif_viewer_path' => 'ohif/viewer', 'organization_id' => $chev->id, - 'department_id' => $chev_xr->id, + 'department_id' => $dept_chev_xr->id, ] ); }