From f02ad545c394708613df65089f4b45cba6b4067f Mon Sep 17 00:00:00 2001 From: Egor Radchenko Date: Mon, 12 Aug 2019 15:07:59 +0700 Subject: [PATCH] [#29] Modify storage commitment adapter to query only on sop instance uid (temporarily) --- .../imaging/dicomadapter/StorageCommitmentService.java | 6 ++++-- integration_test/commitment-expected.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/import/src/main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java b/import/src/main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java index 97c7c187..8d2bc08b 100644 --- a/import/src/main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java +++ b/import/src/main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java @@ -149,8 +149,10 @@ public void run() { attrsItem.getString(Tag.ReferencedSOPClassUID)); queryAttributes .setString(Tag.SOPInstanceUID, VR.UI, cmtItem.getInstanceUid()); - queryAttributes - .setString(Tag.SOPClassUID, VR.UI, cmtItem.getClassUid()); + // current (v1beta1) healthcare api wrongly returns + // "SOPClassUID is not a supported instance or study or series level attribute" + //queryAttributes + // .setString(Tag.SOPClassUID, VR.UI, cmtItem.getClassUid()); queryAttributes.setString(Tag.QueryRetrieveLevel, VR.CS, "IMAGE"); try { String qidoPath = AttributesUtil.attributesToQidoPath(queryAttributes); diff --git a/integration_test/commitment-expected.xml b/integration_test/commitment-expected.xml index c37e4bbf..48d411e1 100644 --- a/integration_test/commitment-expected.xml +++ b/integration_test/commitment-expected.xml @@ -1 +1 @@ -AAE=1.2.840.10008.1.20.11.2.840.10008.1.20.1.11.2.840.10008.1.2.11.2.40.0.13.1.3dcm4che-5.15.1IMPORTADAPTER1.2.840.10008.5.1.4.1.1.7111272 \ No newline at end of file +AAE=1.2.840.10008.1.20.11.2.840.10008.1.20.1.11.2.840.10008.1.2.11.2.40.0.13.1.3dcm4che-5.15.1IMPORTADAPTER1.2.840.10008.5.1.4.1.1.7111 \ No newline at end of file