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

minor

Browse Source
This commit is contained in:
Dr Masroor Ehsan 2025-01-23 15:08:37 +06:00
parent b58dce026f
commit e8a0b039de
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Services/Pacs/Sync/StudiesSync.php
View File

@ -140,9 +140,8 @@ public function transformData(mixed $orthanc_src): array
} }
$orthanc_uuid = strtolower($orthanc_src['ID']); $orthanc_uuid = strtolower($orthanc_src['ID']);
$dicom_tags = $this->getStudyDicomTags($orthanc_uuid); $dicomHeaders = $this->getStudyDicomTags($orthanc_uuid);
$routing = DicomStudyRouter::matchStudy($dicom_tags); $routing = DicomStudyRouter::matchStudy($dicomHeaders);
// dd($routing);
$inst_name = data_get($orthanc_src, 'MainDicomTags.InstitutionName'); $inst_name = data_get($orthanc_src, 'MainDicomTags.InstitutionName');
$patient_name = data_get($orthanc_src, 'PatientMainDicomTags.PatientName'); $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')); $details = array_purge(compact('properties', 'series', 'dicom_properties'));
$study = array_purge($study); $study = array_purge($study);
// todo: handle $routing['radiologists']
return compact('study', 'details'); return compact('study', 'details');
} }

5
app/Services/StudyRouter/DicomStudyRouter.php
View File

@ -36,6 +36,11 @@ public static function matchStudy(array $dicomHeaders): array
? $conditions->every(fn ($condition) => self::matchCondition($condition, $dicomHeaders)) ? $conditions->every(fn ($condition) => self::matchCondition($condition, $dicomHeaders))
: $conditions->contains(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) { if ($matches) {
return [ return [
'organization_id' => $rule->organization_id, 'organization_id' => $rule->organization_id,