From e8a0b039de24845a853c775654a716bc500c4b45 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Thu, 23 Jan 2025 15:08:37 +0600 Subject: [PATCH] minor --- app/Services/Pacs/Sync/StudiesSync.php | 7 ++++--- app/Services/StudyRouter/DicomStudyRouter.php | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Services/Pacs/Sync/StudiesSync.php b/app/Services/Pacs/Sync/StudiesSync.php index 9263be7..4bbdafd 100644 --- a/app/Services/Pacs/Sync/StudiesSync.php +++ b/app/Services/Pacs/Sync/StudiesSync.php @@ -140,9 +140,8 @@ public function transformData(mixed $orthanc_src): array } $orthanc_uuid = strtolower($orthanc_src['ID']); - $dicom_tags = $this->getStudyDicomTags($orthanc_uuid); - $routing = DicomStudyRouter::matchStudy($dicom_tags); - // dd($routing); + $dicomHeaders = $this->getStudyDicomTags($orthanc_uuid); + $routing = DicomStudyRouter::matchStudy($dicomHeaders); $inst_name = data_get($orthanc_src, 'MainDicomTags.InstitutionName'); $patient_name = data_get($orthanc_src, 'PatientMainDicomTags.PatientName'); @@ -269,6 +268,8 @@ public function transformData(mixed $orthanc_src): array $details = array_purge(compact('properties', 'series', 'dicom_properties')); $study = array_purge($study); + // todo: handle $routing['radiologists'] + return compact('study', 'details'); } diff --git a/app/Services/StudyRouter/DicomStudyRouter.php b/app/Services/StudyRouter/DicomStudyRouter.php index 9866615..c72061e 100644 --- a/app/Services/StudyRouter/DicomStudyRouter.php +++ b/app/Services/StudyRouter/DicomStudyRouter.php @@ -36,6 +36,11 @@ public static function matchStudy(array $dicomHeaders): array ? $conditions->every(fn ($condition) => self::matchCondition($condition, $dicomHeaders)) : $conditions->contains(fn ($condition) => self::matchCondition($condition, $dicomHeaders)); + /* + if ($dicomHeaders[RawDicomTags::Modality->value] === 'CR') { + dd($rule, $conditions->toArray(), $matches, $dicomHeaders[RawDicomTags::Modality->value]); + } + */ if ($matches) { return [ 'organization_id' => $rule->organization_id,