From 1979928d592dabe0ab39e0093e9f25be175363a8 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Tue, 12 May 2020 09:57:02 -0400
Subject: [PATCH] Round trip mrn filtering

---
 extensions/default/src/DicomWebDataSource/qido.js           | 2 +-
 platform/viewer/src/routes/DataSourceWrapper.jsx            | 2 +-
 .../src/routes/StudyListContainer/StudyListContainer.jsx    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/default/src/DicomWebDataSource/qido.js b/extensions/default/src/DicomWebDataSource/qido.js
index 95f8f73b3..41d9aedb9 100644
--- a/extensions/default/src/DicomWebDataSource/qido.js
+++ b/extensions/default/src/DicomWebDataSource/qido.js
@@ -51,8 +51,8 @@ function processResults(qidoStudies) {
       studyTime: getString(qidoStudy['00080030']),
       accessionNumber: getString(qidoStudy['00080050']),
       // referringPhysicianName: getString(qidoStudy['00080090']),
+      mrn: getString(qidoStudy['00100020']), // patientId
       patientName: getName(qidoStudy['00100010']),
-      patientId: getString(qidoStudy['00100020']),
       // patientBirthdate: getString(qidoStudy['00100030']),
       // patientSex: getString(qidoStudy['00100040']),
       // studyId: getString(qidoStudy['00200010']), // mrn?
diff --git a/platform/viewer/src/routes/DataSourceWrapper.jsx b/platform/viewer/src/routes/DataSourceWrapper.jsx
index 0cf7f41b9..7411cdf24 100644
--- a/platform/viewer/src/routes/DataSourceWrapper.jsx
+++ b/platform/viewer/src/routes/DataSourceWrapper.jsx
@@ -92,8 +92,8 @@ function _getQueryFilterValues(query) {
 
   const queryFilterValues = {
     // DCM
+    patientId: query.get('mrn'),
     patientName: query.get('patientName'),
-    // mrn: query.get('mrn'), patientId?
     studyDescription: query.get('description'),
     modalitiesInStudy: query.get('modalities')
       ? query.get('modalities').split(',')
diff --git a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
index 0f8b63810..f0a65982a 100644
--- a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
+++ b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
@@ -153,7 +153,7 @@ function StudyListContainer({ history, data: studies }) {
       modalities,
       instances,
       studyDescription,
-      patientId,
+      mrn,
       patientName,
       studyDate,
       studyTime,
@@ -188,8 +188,8 @@ function StudyListContainer({ history, data: studies }) {
         },
         {
           key: 'mrn',
-          content: patientId,
-          title: patientId,
+          content: mrn,
+          title: mrn,
           gridCol: 2,
         },
         {