Skip to content

Commit

Permalink
dcm4che/dcm4chee-arc-light#798 : dcm4che-tools-findscu: query paramet…
Browse files Browse the repository at this point in the history 
…er sample xml files shall only specify return, but no matching keys
  • Loading branch information
@vrindanayak @hczedik
vrindanayak authored and hczedik committed Jun 20, 2017
1 parent 0a72761 commit e24ec56
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 307 deletions.
52 changes: 13 additions & 39 deletions dcm4che-assembly/src/etc/findscu/instance.xml
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<NativeDicomModel xml:space="preserve">
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS">
<Value number="1">ISO_IR 100</Value>
</DicomAttribute>
<DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI">
<Value number="1">1.2.840.10008.5.1.4.1.1.77.1.4.1</Value>
</DicomAttribute>
<DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI">
<Value number="1">2.25.106721503559573646259164186659116325126</Value>
</DicomAttribute>
<DicomAttribute keyword="QueryRetrieveLevel" tag="00080052" vr="CS">
<Value number="1">IMAGE</Value>
</DicomAttribute>
<DicomAttribute keyword="RetrieveAETitle" tag="00080054" vr="AE">
<Value number="1">DCM4CHEE</Value>
</DicomAttribute>
<DicomAttribute keyword="InstanceAvailability" tag="00080056" vr="CS">
<Value number="1">ONLINE</Value>
</DicomAttribute>
<DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI">
<Value number="1">2.25.212881979922684227788175379860170241869</Value>
</DicomAttribute>
<DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI">
<Value number="1">2.25.160113608229543500371717028072698963974</Value>
</DicomAttribute>
<DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS">
<Value number="1">2</Value>
</DicomAttribute>
<DicomAttribute keyword="NumberOfFrames" tag="00280008" vr="IS">
<Value number="1">421</Value>
</DicomAttribute>
<DicomAttribute keyword="Rows" tag="00280010" vr="US">
<Value number="1">240</Value>
</DicomAttribute>
<DicomAttribute keyword="Columns" tag="00280011" vr="US">
<Value number="1">320</Value>
</DicomAttribute>
<DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US">
<Value number="1">8</Value>
</DicomAttribute>
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS"/>
<DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI"/>
<DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI"/>
<DicomAttribute keyword="QueryRetrieveLevel" tag="00080052" vr="CS"/>
<DicomAttribute keyword="RetrieveAETitle" tag="00080054" vr="AE"/>
<DicomAttribute keyword="InstanceAvailability" tag="00080056" vr="CS"/>
<DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"/>
<DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"/>
<DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS"/>
<DicomAttribute keyword="NumberOfFrames" tag="00280008" vr="IS"/>
<DicomAttribute keyword="Rows" tag="00280010" vr="US"/>
<DicomAttribute keyword="Columns" tag="00280011" vr="US"/>
<DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US"/>
</NativeDicomModel>
155 changes: 23 additions & 132 deletions dcm4che-assembly/src/etc/findscu/mwl.xml
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<NativeDicomModel xml:space="preserve">
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS">
<Value number="1">ISO_IR 100</Value>
</DicomAttribute>
<DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH">
<Value number="1">$ACCESSION_NUMBER$</Value>
</DicomAttribute>
<DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN">
<PersonName number="1">
<Alphabetic>
<FamilyName>ReferringPhysicianSurname</FamilyName>
<GivenName>ReferringPhysicianName</GivenName>
<MiddleName>P</MiddleName>
<NamePrefix>DR</NamePrefix>
</Alphabetic>
</PersonName>
</DicomAttribute>
<DicomAttribute keyword="PatientName" tag="00100010" vr="PN">
<PersonName number="1">
<Alphabetic>
<FamilyName>PatientSurname</FamilyName>
<GivenName>PatientName</GivenName>
</Alphabetic>
</PersonName>
</DicomAttribute>
<DicomAttribute keyword="PatientID" tag="00100020" vr="LO">
<Value number="1">M4001</Value>
</DicomAttribute>
<DicomAttribute keyword="IssuerOfPatientID" tag="00100021" vr="LO">
<Value number="1">ADT1</Value>
</DicomAttribute>
<DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA">
<Value number="1">19450804</Value>
</DicomAttribute>
<DicomAttribute keyword="PatientSex" tag="00100040" vr="CS">
<Value number="1">M</Value>
</DicomAttribute>
<DicomAttribute keyword="MedicalAlerts" tag="00102000" vr="LO">
<Value number="1">xxx</Value>
</DicomAttribute>
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS"/>
<DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/>
<DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/>
<DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/>
<DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/>
<DicomAttribute keyword="IssuerOfPatientID" tag="00100021" vr="LO"/>
<DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/>
<DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/>
<DicomAttribute keyword="MedicalAlerts" tag="00102000" vr="LO"/>
<DicomAttribute keyword="PregnancyStatus" tag="001021C0" vr="US"/>
<DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI">
<Value number="1">1.2.4.0.13.1.432252867.1552647.1</Value>
</DicomAttribute>
<DicomAttribute keyword="NumberOfPatientRelatedStudies" tag="00201200" vr="IS">
<Value number="1">0</Value>
</DicomAttribute>
<DicomAttribute keyword="RequestingPhysician" tag="00321032" vr="PN">
<PersonName number="1">
<Alphabetic>
<FamilyName>RequestingPhysicianSurname</FamilyName>
<GivenName>RequestingPhysicianName</GivenName>
<MiddleName>P</MiddleName>
<NamePrefix>DR</NamePrefix>
</Alphabetic>
</PersonName>
</DicomAttribute>
<DicomAttribute keyword="RequestedProcedureDescription" tag="00321060" vr="LO">
<Value number="1">$PROCEDURE_CODE$</Value>
</DicomAttribute>
<DicomAttribute keyword="AdmissionID" tag="00380010" vr="LO">
<Value number="1">V100</Value>
</DicomAttribute>
<DicomAttribute keyword="IssuerOfAdmissionIDSequence" tag="00380014" vr="SQ">
<Item number="1">
<DicomAttribute keyword="LocalNamespaceEntityID" tag="00400031" vr="UT">
<Value number="1">ADT1</Value>
</DicomAttribute>
</Item>
</DicomAttribute>
<DicomAttribute keyword="OrderPlacerIdentifierSequence" tag="00400026" vr="SQ">
<Item number="1">
<DicomAttribute keyword="LocalNamespaceEntityID" tag="00400031" vr="UT">
<Value number="1">MESA_ORDPLC</Value>
</DicomAttribute>
</Item>
</DicomAttribute>
<DicomAttribute keyword="OrderFillerIdentifierSequence" tag="00400027" vr="SQ">
<Item number="1">
<DicomAttribute keyword="LocalNamespaceEntityID" tag="00400031" vr="UT">
<Value number="1">MESA_ORDFIL</Value>
</DicomAttribute>
</Item>
</DicomAttribute>
<DicomAttribute keyword="ScheduledProcedureStepSequence" tag="00400100" vr="SQ">
<Item number="1">
<DicomAttribute keyword="Modality" tag="00080060" vr="CS">
<Value number="1">MR</Value>
</DicomAttribute>
<DicomAttribute keyword="ScheduledStationAETitle" tag="00400001" vr="AE">
<Value number="1">UNKNOWN</Value>
</DicomAttribute>
<DicomAttribute keyword="ScheduledProcedureStepDescription" tag="00400007" vr="LO">
<Value number="1">SP Action Item X1_A1</Value>
</DicomAttribute>
<DicomAttribute keyword="ScheduledProtocolCodeSequence" tag="00400008" vr="SQ">
<Item number="1">
<DicomAttribute keyword="CodeValue" tag="00080100" vr="SH">
<Value number="1">X1_A1</Value>
</DicomAttribute>
<DicomAttribute keyword="CodingSchemeDesignator" tag="00080102" vr="SH">
<Value number="1">DSS_MESA</Value>
</DicomAttribute>
<DicomAttribute keyword="CodeMeaning" tag="00080104" vr="LO">
<Value number="1">SP Action Item X1_A1</Value>
</DicomAttribute>
</Item>
</DicomAttribute>
<DicomAttribute keyword="ScheduledProcedureStepID" tag="00400009" vr="SH">
<Value number="1">$SCHEDULED_PROCEDURE_STEP_ID$</Value>
</DicomAttribute>
<DicomAttribute keyword="ScheduledStationName" tag="00400010" vr="SH">
<Value number="1">unknown</Value>
</DicomAttribute>
<DicomAttribute keyword="ScheduledProcedureStepStatus" tag="00400020" vr="CS">
<Value number="1">SCHEDULED</Value>
</DicomAttribute>
</Item>
</DicomAttribute>
<DicomAttribute keyword="RequestedProcedureID" tag="00401001" vr="SH">
<Value number="1">$REQUESTED_PROCEDURE_ID$</Value>
</DicomAttribute>
<DicomAttribute keyword="RequestedProcedurePriority" tag="00401003" vr="SH">
<Value number="1">STAT</Value>
</DicomAttribute>
<DicomAttribute keyword="PatientTransportArrangements" tag="00401004" vr="LO">
<Value number="1">WALK</Value>
</DicomAttribute>
<DicomAttribute keyword="PlacerOrderNumberImagingServiceRequest" tag="00402016" vr="LO">
<Value number="1">A100Z</Value>
</DicomAttribute>
<DicomAttribute keyword="FillerOrderNumberImagingServiceRequest" tag="00402017" vr="LO">
<Value number="1">B100Z</Value>
</DicomAttribute>
<DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"/>
<DicomAttribute keyword="NumberOfPatientRelatedStudies" tag="00201200" vr="IS"/>
<DicomAttribute keyword="RequestingPhysician" tag="00321032" vr="PN"/>
<DicomAttribute keyword="RequestedProcedureDescription" tag="00321060" vr="LO"/>
<DicomAttribute keyword="AdmissionID" tag="00380010" vr="LO"/>
<DicomAttribute keyword="IssuerOfAdmissionIDSequence" tag="00380014" vr="SQ"/>
<DicomAttribute keyword="OrderPlacerIdentifierSequence" tag="00400026" vr="SQ"/>
<DicomAttribute keyword="OrderFillerIdentifierSequence" tag="00400027" vr="SQ"/>
<DicomAttribute keyword="ScheduledProcedureStepSequence" tag="00400100" vr="SQ"/>
<DicomAttribute keyword="RequestedProcedureID" tag="00401001" vr="SH"/>
<DicomAttribute keyword="RequestedProcedurePriority" tag="00401003" vr="SH"/>
<DicomAttribute keyword="PatientTransportArrangements" tag="00401004" vr="LO"/>
<DicomAttribute keyword="PlacerOrderNumberImagingServiceRequest" tag="00402016" vr="LO"/>
<DicomAttribute keyword="FillerOrderNumberImagingServiceRequest" tag="00402017" vr="LO"/>
</NativeDicomModel>
29 changes: 6 additions & 23 deletions dcm4che-assembly/src/etc/findscu/patient.xml
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<NativeDicomModel xml:space="preserve">
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS">
<Value number="1">ISO_IR 100</Value>
</DicomAttribute>
<DicomAttribute keyword="QueryRetrieveLevel" tag="00080052" vr="CS">
<Value number="1">PATIENT</Value>
</DicomAttribute>
<DicomAttribute keyword="PatientName" tag="00100010" vr="PN">
<PersonName number="1">
<Alphabetic>
<FamilyName>PatientSurname</FamilyName>
<GivenName>PatientName</GivenName>
</Alphabetic>
</PersonName>
</DicomAttribute>
<DicomAttribute keyword="PatientID" tag="00100020" vr="LO">
<Value number="1">P1</Value>
</DicomAttribute>
<DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA">
<Value number="1">19411216</Value>
</DicomAttribute>
<DicomAttribute keyword="PatientSex" tag="00100040" vr="CS">
<Value number="1">M</Value>
</DicomAttribute>
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS"/>
<DicomAttribute keyword="QueryRetrieveLevel" tag="00080052" vr="CS"/>
<DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/>
<DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/>
<DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/>
<DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/>
</NativeDicomModel>
63 changes: 12 additions & 51 deletions dcm4che-assembly/src/etc/findscu/series.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,55 +41,16 @@
-->

<NativeDicomModel xml:space="preserve">
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS">
<Value number="1">ISO_IR 100</Value>
</DicomAttribute>
<DicomAttribute keyword="QueryRetrieveLevel" tag="00080052" vr="CS">
<Value number="1">SERIES</Value>
</DicomAttribute>
<DicomAttribute keyword="RetrieveAETitle" tag="00080054" vr="AE">
<Value number="1">DCM4CHEE</Value>
</DicomAttribute>
<DicomAttribute keyword="InstanceAvailability" tag="00080056" vr="CS">
<Value number="1">ONLINE</Value>
</DicomAttribute>
<DicomAttribute keyword="Modality" tag="00080060" vr="CS">
<Value number="1">MR</Value>
</DicomAttribute>
<DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI">
<Value number="1">1.113654.5.13.1041</Value>
</DicomAttribute>
<DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI">
<Value number="1">1.113654.5.14.1140</Value>
</DicomAttribute>
<DicomAttribute keyword="SeriesNumber" tag="00200011" vr="IS">
<Value number="1">107</Value>
</DicomAttribute>
<DicomAttribute keyword="NumberOfSeriesRelatedInstances" tag="00201209" vr="IS">
<Value number="1">2</Value>
</DicomAttribute>
<DicomAttribute keyword="PerformedProcedureStepStartDate" tag="00400244" vr="DA">
<Value number="1">20170119</Value>
</DicomAttribute>
<DicomAttribute keyword="PerformedProcedureStepStartTime" tag="00400245" vr="TM">
<Value number="1">085223</Value>
</DicomAttribute>
<DicomAttribute keyword="RequestAttributesSequence" tag="00400275" vr="SQ">
<Item number="1">
<DicomAttribute keyword="ScheduledProcedureStepID" tag="00400009" vr="SH">
<Value number="1">SPS2114</Value>
</DicomAttribute>
<DicomAttribute keyword="RequestedProcedureID" tag="00401001" vr="SH">
<Value number="1">RP1111</Value>
</DicomAttribute>
</Item>
<Item number="2">
<DicomAttribute keyword="ScheduledProcedureStepID" tag="00400009" vr="SH">
<Value number="1">SPS2113</Value>
</DicomAttribute>
<DicomAttribute keyword="RequestedProcedureID" tag="00401001" vr="SH">
<Value number="1">RP1110</Value>
</DicomAttribute>
</Item>
</DicomAttribute>
<DicomAttribute keyword="SpecificCharacterSet" tag="00080005" vr="CS"/>
<DicomAttribute keyword="QueryRetrieveLevel" tag="00080052" vr="CS"/>
<DicomAttribute keyword="RetrieveAETitle" tag="00080054" vr="AE"/>
<DicomAttribute keyword="InstanceAvailability" tag="00080056" vr="CS"/>
<DicomAttribute keyword="Modality" tag="00080060" vr="CS"/>
<DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"/>
<DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"/>
<DicomAttribute keyword="SeriesNumber" tag="00200011" vr="IS"/>
<DicomAttribute keyword="NumberOfSeriesRelatedInstances" tag="00201209" vr="IS"/>
<DicomAttribute keyword="PerformedProcedureStepStartDate" tag="00400244" vr="DA"/>
<DicomAttribute keyword="PerformedProcedureStepStartTime" tag="00400245" vr="TM"/>
<DicomAttribute keyword="RequestAttributesSequence" tag="00400275" vr="SQ"/>
</NativeDicomModel>

0 comments on commit e24ec56

Please sign in to comment.