minor
This commit is contained in:
parent
a638e05f31
commit
b5ca5b59d9
@ -8,7 +8,6 @@
|
||||
use App\Services\Pacs\DicomUtils;
|
||||
use App\Services\Pacs\OrthancRestClient;
|
||||
use App\Services\StudyRouter\DicomStudyRouter;
|
||||
use App\Services\StudyRouter\RawDicomTags;
|
||||
use Carbon\Carbon;
|
||||
use Exception;
|
||||
use Illuminate\Pipeline\Pipeline;
|
||||
@ -116,31 +115,6 @@ public function fetchInstancesTags(string $orthanc_uuid): ?array
|
||||
return $this->client->getInstanceDetails($orthanc_uuid, true);
|
||||
}
|
||||
|
||||
public function matchRouting(mixed $orthanc_src)
|
||||
{
|
||||
/*
|
||||
$dicomData = [
|
||||
RawDicomTags::PatientName->value => data_get($orthanc_src, 'PatientMainDicomTags.PatientName'),
|
||||
RawDicomTags::PatientID->value => data_get($orthanc_src, 'PatientMainDicomTags.PatientID'),
|
||||
RawDicomTags::Modality->value => data_get($orthanc_src, 'RequestedTags.Modality'),
|
||||
RawDicomTags::StudyDescription->value => $this->getStudyDescription($orthanc_src),
|
||||
RawDicomTags::BodyPartExamined->value => data_get($orthanc_src, 'RequestedTags.BodyPartExamined'),
|
||||
RawDicomTags::ReferringPhysicianName->value => data_get($orthanc_src, 'MainDicomTags.ReferringPhysicianName'),
|
||||
RawDicomTags::AccessionNumber->value => data_get($orthanc_src, 'MainDicomTags.AccessionNumber'),
|
||||
RawDicomTags::InstitutionName->value => data_get($orthanc_src, 'MainDicomTags.InstitutionName'),
|
||||
RawDicomTags::InstitutionAddress->value => data_get($orthanc_src, 'RequestedTags.InstitutionAddress'),
|
||||
RawDicomTags::OperatorsName->value => data_get($orthanc_src, 'RequestedTags.OperatorsName'),
|
||||
RawDicomTags::StationName->value => data_get($orthanc_src, 'RequestedTags.StationName'),
|
||||
RawDicomTags::Manufacturer->value => data_get($orthanc_src, 'RequestedTags.Manufacturer'),
|
||||
RawDicomTags::ManufacturerModelName->value => data_get($orthanc_src, 'RequestedTags.ManufacturerModelName'),
|
||||
RawDicomTags::SoftwareVersions->value => data_get($orthanc_src, 'RequestedTags.SoftwareVersions'),
|
||||
RawDicomTags::ProtocolName->value => data_get($orthanc_src, 'xxx'),
|
||||
];
|
||||
$dicomData = array_purge($dicomData);
|
||||
*/
|
||||
return DicomStudyRouter::matchStudy($orthanc_src);
|
||||
}
|
||||
|
||||
public function getStudyDescription(mixed $orthanc_src): ?string
|
||||
{
|
||||
$result = data_get($orthanc_src, 'MainDicomTags.StudyDescription');
|
||||
@ -162,7 +136,7 @@ public function transformData(mixed $orthanc_src): array
|
||||
$orthanc_uuid = strtolower($orthanc_src['ID']);
|
||||
|
||||
$dicom_tags = $this->getStudyDicomTags($orthanc_uuid);
|
||||
$routing = $this->matchRouting($dicom_tags);
|
||||
$routing = DicomStudyRouter::matchStudy($dicom_tags);
|
||||
// dd($routing);
|
||||
|
||||
$patient_name = data_get($orthanc_src, 'PatientMainDicomTags.PatientName');
|
||||
|
Loading…
Reference in New Issue
Block a user