Skip to content

Commit

Permalink
Fix #2826 : Return Available Transfer Syntax UID (0008,3002) in query…
Browse files Browse the repository at this point in the history
… responses by C-FIND Query Service and QIDO-RS
  • Loading branch information
vrindanayak committed Oct 14, 2020
1 parent 913f35a commit e8d2b3a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,8 @@ private int[] allFieldsOf(Model model, Attributes match) {
new int[] { Tag.NumberOfPatientRelatedStudies,
Tag.NumberOfStudyRelatedSeries,
Tag.NumberOfStudyRelatedInstances,
Tag.NumberOfSeriesRelatedInstances });
Tag.NumberOfSeriesRelatedInstances,
Tag.AvailableTransferSyntaxUID });
case INSTANCE:
return allNonSeqTags(match,
tags,
Expand All @@ -837,7 +838,8 @@ private int[] allFieldsOf(Model model, Attributes match) {
new int[] { Tag.NumberOfPatientRelatedStudies,
Tag.NumberOfStudyRelatedSeries,
Tag.NumberOfStudyRelatedInstances,
Tag.NumberOfSeriesRelatedInstances });
Tag.NumberOfSeriesRelatedInstances,
Tag.AvailableTransferSyntaxUID });
case MWL:
return allNonSeqTags(match, tags,
arcDev.getAttributeFilter(Entity.MWL).getSelection());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ public Attributes getSeriesAttributes(Long seriesPk, QueryContext context) {
series.get(Series_.failuresOfLastStorageVerification),
series.get(Series_.compressionTime),
series.get(Series_.compressionFailures),
series.get(Series_.transferSyntaxUID),
metadata.get(Metadata_.createdTime),
metadata.get(Metadata_.storageID),
metadata.get(Metadata_.storagePath),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ protected CriteriaQuery<Tuple> multiselect() {
series.get(Series_.failuresOfLastStorageVerification),
series.get(Series_.compressionTime),
series.get(Series_.compressionFailures),
series.get(Series_.transferSyntaxUID),
metadata.get(Metadata_.createdTime),
metadata.get(Metadata_.storageID),
metadata.get(Metadata_.storagePath),
Expand Down Expand Up @@ -220,6 +221,7 @@ private <T> CriteriaQuery<T> restrict(CriteriaQuery<T> q, Join<Study, Patient> p
static void addSeriesQRAttrs(Root<Series> series, Join<Series, Metadata> metadata, QueryContext context,
Tuple results, int numberOfSeriesRelatedInstances, Attributes attrs) {
attrs.setInt(Tag.NumberOfSeriesRelatedInstances, VR.IS, numberOfSeriesRelatedInstances);
attrs.setString(Tag.AvailableTransferSyntaxUID, VR.UI, results.get(series.get(Series_.transferSyntaxUID)));
if (!context.isReturnPrivate())
return;

Expand Down

0 comments on commit e8d2b3a

Please sign in to comment.