From 28ba53b328b217a7c9311c712f7f7f6dc1e34a4d Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Tue, 15 Mar 2016 10:17:37 -0400
Subject: [PATCH] - Add modality tag in filter object to filter studies

---
 .../server/services/dimse/studies.js          |  2 +-
 .../server/services/qido/studies.js           |  1 +
 .../worklistResult/worklistResult.js          | 21 +++----------------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Packages/viewerbase/server/services/dimse/studies.js b/Packages/viewerbase/server/services/dimse/studies.js
index 4ebb3d204..eea74e9a9 100755
--- a/Packages/viewerbase/server/services/dimse/studies.js
+++ b/Packages/viewerbase/server/services/dimse/studies.js
@@ -40,7 +40,7 @@ Services.DIMSE.Studies = function(filter) {
         0x00081030: filter.studyDescription,
         0x00100040: "",
         0x00201208: "",
-        0x00080061: ""
+        0x00080061: filter.modality
     };
 
     var results = DIMSE.retrieveStudies(parameters);
diff --git a/Packages/viewerbase/server/services/qido/studies.js b/Packages/viewerbase/server/services/qido/studies.js
index 68e033334..f67f38858 100644
--- a/Packages/viewerbase/server/services/qido/studies.js
+++ b/Packages/viewerbase/server/services/qido/studies.js
@@ -17,6 +17,7 @@ function filterToQIDOURL(server, filter) {
         PatientID: filter.patientId,
         AccessionNumber: filter.accessionNumber,
         StudyDescription: filter.studyDescription,
+        ModalitiesInStudy: filter.modality,
         limit: filter.limit || 20,
         includefield: server.qidoSupportsIncludeField ? 'all' : commaSeparatedFields
     };
diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.js b/Packages/worklist/client/components/worklistResult/worklistResult.js
index 0cccb3c6c..ad68ce1a2 100644
--- a/Packages/worklist/client/components/worklistResult/worklistResult.js
+++ b/Packages/worklist/client/components/worklistResult/worklistResult.js
@@ -71,17 +71,6 @@ function isIndexOf(mainVal, searchVal) {
     return false;
 }
 
-/**
- * Replace object if undefined
- */
-function replaceUndefinedColumnValue(text) {
-    if (text === undefined || text === 'undefined') {
-        return '';
-    } else {
-        return text.toUpperCase();
-    }
-}
-
 /**
  * Convert string to study date
  */
@@ -109,13 +98,10 @@ function search() {
         patientName: getFilter($('input#patientName').val()),
         patientId: getFilter($('input#patientId').val()),
         accessionNumber: getFilter($('input#accessionNumber').val()),
-        studyDescription: getFilter($('input#studyDescription').val())
+        studyDescription: getFilter($('input#studyDescription').val()),
+        modality: getFilter($('input#modality').val())
     };
 
-    // Make sure that modality has a reasonable value, since it is occasionally
-    // returned as 'undefined'
-    var modality = replaceUndefinedColumnValue($('input#modality').val());
-
     // Clear all current studies
     WorklistStudies.remove({});
 
@@ -137,8 +123,7 @@ function search() {
         studies.forEach(function(study) {
 
             // Search the rest of the parameters that aren't done via the server call
-            if (isIndexOf(study.modalities, modality) &&
-                (new Date(studyDateFrom).setHours(0, 0, 0, 0) <= convertStringToStudyDate(study.studyDate) || !studyDateFrom || studyDateFrom === "") &&
+            if ((new Date(studyDateFrom).setHours(0, 0, 0, 0) <= convertStringToStudyDate(study.studyDate) || !studyDateFrom || studyDateFrom === "") &&
                 (convertStringToStudyDate(study.studyDate) <= new Date(studyDateTo).setHours(0, 0, 0, 0) || !studyDateTo || studyDateTo === "")) {
 
                 // Convert numberOfStudyRelatedInstance string into integer