IHE RAD-68: Provide and Register Imaging Document Set #566

dcm4che · Mar 3, 2017 · aeb5acc · aeb5acc
1 parent 9914214
commit aeb5acc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
@@ -987,7 +987,7 @@ cn: Leading DCMQRSCP
 
 dn: dcmExporterID=XDS-I,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmRetrieveAET: DCM4CHEE
-dcmRetrieveLocationUID: 1.3.6.1.4.1.21367.2011.2.1.260
+dcmRetrieveLocationUID: 1.3.6.1.4.1.21367.13.80.110
 dicomDescription: XDS-I Provide and Register
 dcmQueueName: Export3
 dcmExporterID: XDS-I
@@ -999,11 +999,11 @@ dcmProperty: DocumentEntry.typeCode=(DICOM KON TYPECODE, 1.3.6.1.4.1.21367.100.1
 dcmProperty: Manifest.title=(113030, DCM, "Manifest")
 dcmProperty: DocumentEntry.confidentialityCode=(N, 2.16.840.1.113883.5.25, "Normal")
 dcmProperty: DocumentEntry.healthCareFacilityTypeCode=(GENERAL HOSPITAL, RSNA-ISN, "GENERAL HOSPITAL")
-dcmProperty: AssigningAuthority.patientId=1.3.6.1.4.1.21367.13.20.1000
+dcmProperty: AssigningAuthority.patientId=1.3.6.1.4.1.21367.2005.13.20.1000
 dcmProperty: DocumentEntry.practiceSettingCode=(R-3027B, SRT, "Radiology")
 dcmProperty: DocumentEntry.classCode=(Imaging Exam, RSNA ISN, "Imaging Exam")
-dcmProperty: XDSSubmissionSet.sourceId=1.3.6.1.4.1.21367.2011.2.1.260
-dcmURI: xds-i:http://localhost:8081/xdstools4/sim/default__rr2/rep/prb
+dcmProperty: XDSSubmissionSet.sourceId=1.3.6.1.4.1.21367.13.80.110
+dcmURI: xds-i:http://localhost:8081/xdstools4/sim/default__rr/rep/prb
 
 dn: dcmQueueName=IANSCU,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dicomDescription: IAN Tasks

diff --git a/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java b/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java
@@ -901,9 +901,9 @@ static IDGenerator newIDGenerator(IDGenerator.Name name, String format) {
     static final String WADO_JSON_ACCEPT = "application/json";
     static final String XDSI_EXPORTER_ID = "XDS-I";
     static final String XDSI_EXPORTER_DESC = "XDS-I Provide and Register";
-    static final URI XDSI_EXPORT_URI = URI.create("xds-i:http://localhost:8081/xdstools4/sim/default__rr2/rep/prb");
-    static final String XDSI_SOURCE_ID = "1.3.6.1.4.1.21367.2011.2.1.260";
-    static final String XDSI_ASSIGNING_AUTHORITY_OID = "1.3.6.1.4.1.21367.13.20.1000";
+    static final URI XDSI_EXPORT_URI = URI.create("xds-i:http://localhost:8081/xdstools4/sim/default__rr/rep/prb");
+    static final String XDSI_SOURCE_ID = "1.3.6.1.4.1.21367.13.80.110";
+    static final String XDSI_ASSIGNING_AUTHORITY_PAT_ID = "1.3.6.1.4.1.21367.2005.13.20.1000";
     static final String XDSI_LANGUAGE_CODE = "en-us";
     static final Code XDSI_KON_TYPECODE = new Code(
             "DICOM KON TYPECODE",
@@ -1413,7 +1413,7 @@ private static void addArchiveDeviceExtension(Device device, Device unknown, Con
             xdsiExportDescriptor.setRetrieveAETitles("DCM4CHEE");
             xdsiExportDescriptor.setRetrieveLocationUID(XDSI_SOURCE_ID);
             xdsiExportDescriptor.setProperty("Manifest.title", XDSI_MANIFEST_TITLE.toString());
-            xdsiExportDescriptor.setProperty("AssigningAuthority.patientId", XDSI_ASSIGNING_AUTHORITY_OID);
+            xdsiExportDescriptor.setProperty("AssigningAuthority.patientId", XDSI_ASSIGNING_AUTHORITY_PAT_ID);
             xdsiExportDescriptor.setProperty("XDSSubmissionSet.sourceId", XDSI_SOURCE_ID);
             xdsiExportDescriptor.setProperty("XDSSubmissionSet.contentType", XDSI_KON_TYPECODE.toString());
             xdsiExportDescriptor.setProperty("DocumentEntry.typeCode", XDSI_KON_TYPECODE.toString());

diff --git a/dcm4chee-arc-export-xdsi/src/main/java/org/dcm4chee/arc/export/xdsi/XDSiExporter.java b/dcm4chee-arc-export-xdsi/src/main/java/org/dcm4chee/arc/export/xdsi/XDSiExporter.java
@@ -69,7 +69,7 @@ public class XDSiExporter extends AbstractExporter {
     private static final String SUBMISSION_SET_ID = "SubmissionSet01";
     private static final String DOCUMENT_ID = "Document01";
     private static final ObjectFactory rimFactory = new ObjectFactory();
-    private static final String DEFAULT_SOURCE_ID = "1.3.6.1.4.1.21367.2011.2.1.260";
+    private static final String DEFAULT_SOURCE_ID = "1.3.6.1.4.1.21367.13.80.110";
     private static final String DEFAULT_LANGUAGE_CODE = "en-us";
     private static final Code DICOM_KON_TYPECODE = new Code(
             "DICOM KON TYPECODE",