Mercurial > hg > orthanc-tests
changeset 97:c39520dacdd7
test_other_aet
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 12 Dec 2016 11:01:29 +0100 |
| parents | 272d1229cb49 |
| children | f2cbfaf1a9b0 9daaf841c17c |
| files | Database/Worklists/Sequences/Queries/7814.without.length.dump Database/Worklists/Sequences/Queries/7814.without.station.aet.dump Database/Worklists/Sequences/Queries/orig.7814.dump Database/Worklists/Sequences/STATION_AET/orig.7705.dump Database/Worklists/Sequences/STATION_AET/orig.7814.dump Database/Worklists/Sequences/STATION_AET/orig.7814.other.station.dump Database/Worklists/Sequences/STATION_AET/orig.7814.without.seq.dump Plugins/Worklists/Run.py |
| diffstat | 8 files changed, 138 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Database/Worklists/Sequences/Queries/7814.without.length.dump Fri Dec 09 17:12:00 2016 +0100 +++ b/Database/Worklists/Sequences/Queries/7814.without.length.dump Mon Dec 12 11:01:29 2016 +0100 @@ -77,4 +77,4 @@ (0040,1001) SH (no value available) # 0, 0 RequestedProcedureID (0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority (0040,1004) LO (no value available) # 0, 0 PatientTransportArrangements -(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription \ No newline at end of file +(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Database/Worklists/Sequences/Queries/7814.without.station.aet.dump Mon Dec 12 11:01:29 2016 +0100 @@ -0,0 +1,80 @@ +# Dicom-Data-Set +# Used TransferSyntax: LittleEndianExplicit +(0008,0000) UL 156 # 4, 1 IdentifyingGroupLength +(0008,0005) CS (no value available) # 0, 0 SpecificCharacterSet +(0008,0050) SH (no value available) # 0, 0 AccessionNumber +(0008,0090) PN (no value available) # 0, 0 ReferringPhysiciansName +(0008,1030) LO (no value available) # 0, 0 StudyDescription +(0008,103e) LO (no value available) # 0, 0 SeriesDescription +(0008,1080) LO (no value available) # 0, 0 AdmittingDiagnosesDescription +(0008,1084) SQ (Sequence with explicit length #=0) # 0, 1 AdmittingDiagnosesCodeSequence +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0008,1110) SQ (Sequence with explicit length #=1) # 36, 1 ReferencedStudySequence + (fffe,e000) na (Item with explicit length #=3) # 28, 1 Item + (0008,0000) UL 16 # 4, 1 IdentifyingGroupLength + (0008,1150) UI (no value available) # 0, 0 ReferencedSOPClassUID + (0008,1155) UI (no value available) # 0, 0 ReferencedSOPInstanceUID + (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0008,1120) SQ (Sequence with explicit length #=1) # 36, 1 ReferencedPatientSequence + (fffe,e000) na (Item with explicit length #=3) # 28, 1 Item + (0008,0000) UL 16 # 4, 1 IdentifyingGroupLength + (0008,1150) UI (no value available) # 0, 0 ReferencedSOPClassUID + (0008,1155) UI (no value available) # 0, 0 ReferencedSOPInstanceUID + (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0010,0000) UL 114 # 4, 1 PatientGroupLength +(0010,0010) PN [* ] # 2, 1 PatientsName +(0010,0020) LO (no value available) # 0, 0 PatientID +(0010,0030) DA (no value available) # 0, 0 PatientsBirthDate +(0010,0040) CS (no value available) # 0, 0 PatientsSex +(0010,1000) LO (no value available) # 0, 0 OtherPatientIDs +(0010,1030) DS (no value available) # 0, 0 PatientsWeight +(0010,1040) LO (no value available) # 0, 0 PatientsAddress +(0010,2000) LO (no value available) # 0, 0 MedicalAlerts +(0010,2110) LO (no value available) # 0, 0 ContrastAllergies +(0010,2154) SH (no value available) # 0, 0 PatientsTelephoneNumbers +(0010,21c0) US (no value available) # 0, 0 PregnancyStatus +(0010,2201) LO (no value available) # 0, 0 Unknown Tag & Data +(0010,2292) LO (no value available) # 0, 0 Unknown Tag & Data +(0010,2297) PN (no value available) # 0, 0 Unknown Tag & Data +(0020,0000) UL 16 # 4, 1 ImageGroupLength +(0020,000d) UI (no value available) # 0, 0 StudyInstanceUID +(0020,0010) SH (no value available) # 0, 0 StudyID +(0032,0000) UL 28 # 4, 1 StudyGroupLength +(0032,1032) PN (no value available) # 0, 0 RequestingPhysician +(0032,1060) LO (no value available) # 0, 0 RequestedProcedureDescription +(0032,1064) SQ (Sequence with explicit length #=0) # 0, 1 RequestedProcedureCodeSequence +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0038,0000) UL 32 # 4, 1 VisitGroupLength +(0038,0010) LO (no value available) # 0, 0 AdmissionID +(0038,0050) LO (no value available) # 0, 0 SpecialNeeds +(0038,0300) LO (no value available) # 0, 0 CurrentPatientLocation +(0038,0500) LO (no value available) # 0, 0 PatientState +(0040,0000) UL 220 # 4, 1 ModalityWorklistGroupLength +(0040,0100) SQ (Sequence with explicit length #=1) # 176, 1 ScheduledProcedureStepSequence + (fffe,e000) na (Item with explicit length #=17) # 168, 1 Item + (0008,0000) UL 8 # 4, 1 IdentifyingGroupLength + (0008,0060) CS (no value available) # 0, 0 Modality + (0032,0000) UL 8 # 4, 1 StudyGroupLength + (0032,1070) LO (no value available) # 0, 0 RequestedContrastAgent + (0040,0000) UL 116 # 4, 1 ModalityWorklistGroupLength + (0040,0001) AE (no value available) # 8, 1 ScheduledStationAETitle + (0040,0002) DA [20161116] # 8, 1 ScheduledProcedureStepStartDate + (0040,0003) TM (no value available) # 0, 0 ScheduledProcedureStepStartTime + (0040,0004) DA (no value available) # 0, 0 ScheduledProcedureStepEndDate + (0040,0005) TM (no value available) # 0, 0 ScheduledProcedureStepEndTime + (0040,0006) PN (no value available) # 0, 0 ScheduledPerformingPhysiciansName + (0040,0007) LO (no value available) # 0, 0 ScheduledProcedureStepDescription + (0040,0008) SQ (Sequence with explicit length #=0) # 0, 1 ScheduledProtocolCodeSequence + (fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem + (0040,0009) SH (no value available) # 0, 0 ScheduledProcedureStepID + (0040,0010) SH (no value available) # 0, 0 ScheduledStationName + (0040,0011) SH (no value available) # 0, 0 ScheduledProcedureStepLocation + (0040,0020) CS (no value available) # 0, 0 ScheduledProcedureStepStatus + (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0040,1001) SH (no value available) # 0, 0 RequestedProcedureID +(0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority +(0040,1004) LO (no value available) # 0, 0 PatientTransportArrangements +(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription
--- a/Database/Worklists/Sequences/Queries/orig.7814.dump Fri Dec 09 17:12:00 2016 +0100 +++ b/Database/Worklists/Sequences/Queries/orig.7814.dump Mon Dec 12 11:01:29 2016 +0100 @@ -77,4 +77,4 @@ (0040,1001) SH (no value available) # 0, 0 RequestedProcedureID (0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority (0040,1004) LO (no value available) # 0, 0 PatientTransportArrangements -(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription \ No newline at end of file +(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription
--- a/Database/Worklists/Sequences/STATION_AET/orig.7705.dump Fri Dec 09 17:12:00 2016 +0100 +++ b/Database/Worklists/Sequences/STATION_AET/orig.7705.dump Mon Dec 12 11:01:29 2016 +0100 @@ -41,4 +41,4 @@ (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem (fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem (0040,1001) SH (no value available) # 0, 0 RequestedProcedureID -(0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority \ No newline at end of file +(0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority
--- a/Database/Worklists/Sequences/STATION_AET/orig.7814.dump Fri Dec 09 17:12:00 2016 +0100 +++ b/Database/Worklists/Sequences/STATION_AET/orig.7814.dump Mon Dec 12 11:01:29 2016 +0100 @@ -42,4 +42,4 @@ (0040,1001) SH (no value available) # 0, 0 RequestedProcedureID (0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority (0040,1004) LO (no value available) # 0, 0 PatientTransportArrangements -(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription \ No newline at end of file +(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Database/Worklists/Sequences/STATION_AET/orig.7814.other.station.dump Mon Dec 12 11:01:29 2016 +0100 @@ -0,0 +1,45 @@ +(0008,0050) SH [AN123457] # 14, 1 AccessionNumber +(0008,0090) PN [ReferringPhysiciansName] # 12, 1 ReferringPhysiciansName +(0008,1080) LO (no value available) # 0, 0 AdmittingDiagnosesDescription +(0008,1110) SQ (Sequence with explicit length #=0) # 36, 1 ReferencedStudySequence +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0008,1120) SQ (Sequence with explicit length #=0) # 36, 1 ReferencedPatientSequence +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0010,0010) PN [nn] # 2, 1 PatientsName +(0010,0020) LO [01234568] # 10, 1 PatientID +(0010,0030) DA (no value available) # 0, 0 PatientsBirthDate +(0010,0040) CS [F ] # 2, 1 PatientsSex +(0010,1000) LO (no value available) # 0, 0 OtherPatientIDs +(0010,1030) DS (no value available) # 0, 0 PatientsWeight +(0010,1040) LO (no value available) # 0, 0 PatientsAddress +(0010,2000) LO (no value available) # 0, 0 MedicalAlerts +(0010,2110) LO (no value available) # 0, 0 ContrastAllergies +(0010,21c0) US 4 # 2, 1 PregnancyStatus +(0020,000d) UI [1.2.826.0.1.12345678.8.975.1.11.123456.20161117140053.7814] # 58, 1 StudyInstanceUID +(0032,1032) PN [RequestingPhysician] # 12, 1 RequestingPhysician +(0032,1060) LO (no value available) # 0, 0 RequestedProcedureDescription +(0038,0010) LO (no value available) # 0, 0 AdmissionID +(0038,0050) LO (no value available) # 0, 0 SpecialNeeds +(0038,0300) LO (no value available) # 0, 0 CurrentPatientLocation +(0038,0500) LO (no value available) # 0, 0 PatientState +(0040,0100) SQ (Sequence with explicit length #=1) # 176, 1 ScheduledProcedureStepSequence + (fffe,e000) na (Item with explicit length #=13) # 168, 1 Item + (0008,0060) CS [CR] # 2, 1 Modality + (0032,1070) LO (no value available) # 0, 0 RequestedContrastAgent + (0040,0001) AE [ORTHANCTEST] # 8, 1 ScheduledStationAETitle + (0040,0002) DA [20161116] # 8, 1 ScheduledProcedureStepStartDate + (0040,0003) TM [110253] # 6, 1 ScheduledProcedureStepStartTime + (0040,0004) DA (no value available) # 0, 0 ScheduledProcedureStepEndDate + (0040,0005) TM (no value available) # 0, 0 ScheduledProcedureStepEndTime + (0040,0006) PN [ScheduledPerformingPhysicianName] # 12, 1 ScheduledPerformingPhysiciansName + (0040,0007) LO (no value available) # 0, 0 ScheduledProcedureStepDescription + (0040,0009) SH (no value available) # 0, 0 ScheduledProcedureStepID + (0040,0010) SH (no value available) # 0, 0 ScheduledStationName + (0040,0011) SH (no value available) # 0, 0 ScheduledProcedureStepLocation + (0040,0020) CS (no value available) # 0, 0 ScheduledProcedureStepStatus + (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem +(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem +(0040,1001) SH (no value available) # 0, 0 RequestedProcedureID +(0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority +(0040,1004) LO (no value available) # 0, 0 PatientTransportArrangements +(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription
--- a/Database/Worklists/Sequences/STATION_AET/orig.7814.without.seq.dump Fri Dec 09 17:12:00 2016 +0100 +++ b/Database/Worklists/Sequences/STATION_AET/orig.7814.without.seq.dump Mon Dec 12 11:01:29 2016 +0100 @@ -42,4 +42,4 @@ (0040,1001) SH (no value available) # 0, 0 RequestedProcedureID (0040,1003) SH (no value available) # 0, 0 RequestedProcedurePriority (0040,1004) LO (no value available) # 0, 0 PatientTransportArrangements -(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription \ No newline at end of file +(0040,3001) LO (no value available) # 0, 0 ConfidentialityConstraintOnPatientDataDescription
--- a/Plugins/Worklists/Run.py Fri Dec 09 17:12:00 2016 +0100 +++ b/Plugins/Worklists/Run.py Mon Dec 12 11:01:29 2016 +0100 @@ -211,7 +211,14 @@ self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.length.dump', []))) self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.seq.dump', []))) self.assertEqual(2, len(RunQuery('Sequences/Queries/orig.7814.dump', []))) - #self.assertEqual(2, len(RunQuery('Sequences/Queries/orig.7814.without.station.aet.dump', []))) + + + @unittest.skip("This test requires a modification in the sample worklist plugin") + def test_other_aet(self): + AddToDatabase('Sequences/STATION_AET/orig.7814.dump') + AddToDatabase('Sequences/STATION_AET/orig.7814.other.station.txt') + + self.assertEqual(1, len(RunQuery('Sequences/Queries/7814.without.station.aet.txt', []))) def test_encodings(self):