- Return modalities attribute by merging modality and modalitiesInStudy attributes to be able to filter if only modality tag exists

- Remove modality tag in filter object and filter modalities of studies returned from WorklistSearch method

Packages/dicomweb/package.js

@@ -13,6 +13,7 @@ Package.onUse(function(api) {
     api.addFiles('server/getName.js', 'server');
     api.addFiles('server/getNumber.js', 'server');
     api.addFiles('server/getString.js', 'server');
+    api.addFiles('server/getModalities.js', 'server');
 
     api.export('DICOMWeb', ['client', 'server']);
 });

Packages/dicomweb/server/getModalities.js

@@ -0,0 +1,21 @@
+DICOMWeb.getModalities = function(modality, modalitiesInStudy) {
+    var modalities = {};
+    if (modality) {
+        modalities = modality;
+    }
+
+    if (modalitiesInStudy) {
+        // Find vr in modalities
+        if (modalities.vr && modalities.vr === modalitiesInStudy.vr) {
+            for (var i = 0; i < modalitiesInStudy.Value.length; i++) {
+                var value = modalitiesInStudy.Value[i];
+                if (modalities.Value.indexOf(value) === -1) {
+                    modalities.Value.push(value);
+                }
+            }
+        } else {
+            modalities = modalitiesInStudy;
+        }
+    }
+    return modalities;
+};