From 18de1deff31611be126596e47a3885b8149be787 Mon Sep 17 00:00:00 2001
From: weiwei <weiwei@toca.com>
Date: Tue, 13 Sep 2016 16:17:36 +0800
Subject: [PATCH] added filter search for modalitiesinstudy

---
 .../client/components/worklistResult/worklistResult.js         | 3 ++-
 Packages/worklist/server/services/dimse/studies.js             | 2 +-
 Packages/worklist/server/services/qido/studies.js              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.js b/Packages/worklist/client/components/worklistResult/worklistResult.js
index c44dd8a8b..7d20e37c2 100644
--- a/Packages/worklist/client/components/worklistResult/worklistResult.js
+++ b/Packages/worklist/client/components/worklistResult/worklistResult.js
@@ -135,7 +135,8 @@ function search() {
         accessionNumber: getFilter($('input#accessionNumber').val()),
         studyDescription: getFilter($('input#studyDescription').val()),
         studyDateFrom: studyDateFrom,
-        studyDateTo: studyDateTo
+        studyDateTo: studyDateTo,
+        modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : ""
     };
 
     // Make sure that modality has a reasonable value, since it is occasionally
diff --git a/Packages/worklist/server/services/dimse/studies.js b/Packages/worklist/server/services/dimse/studies.js
index f3940c8c2..105e95df6 100755
--- a/Packages/worklist/server/services/dimse/studies.js
+++ b/Packages/worklist/server/services/dimse/studies.js
@@ -39,7 +39,7 @@ Services.DIMSE.Studies = function(filter) {
         0x00081030: filter.studyDescription,
         0x00100040: '',
         0x00201208: '',
-        0x00080061: ''
+        0x00080061: filter.modalitiesInStudy
     };
 
     var results = DIMSE.retrieveStudies(parameters);
diff --git a/Packages/worklist/server/services/qido/studies.js b/Packages/worklist/server/services/qido/studies.js
index 58d9f9018..063418534 100644
--- a/Packages/worklist/server/services/qido/studies.js
+++ b/Packages/worklist/server/services/qido/studies.js
@@ -36,6 +36,7 @@ function filterToQIDOURL(server, filter) {
         PatientID: filter.patientId,
         AccessionNumber: filter.accessionNumber,
         StudyDescription: filter.studyDescription,
+        ModalitiesInStudy: filter.modalitiesInStudy,
         limit: filter.limit || 20,
         includefield: server.qidoSupportsIncludeField ? 'all' : commaSeparatedFields
     };