diff --git a/LesionTracker/defaultSettings.js b/LesionTracker/defaultSettings.js index f630cd9a3..9c1345759 100644 --- a/LesionTracker/defaultSettings.js +++ b/LesionTracker/defaultSettings.js @@ -7,24 +7,24 @@ Meteor.startup(function() { console.log('Using default LesionTracker dicomWeb settings'); Meteor.settings = { - "dicomWeb" : { - "endpoints": [ + dicomWeb: { + endpoints: [ { - "name": "Orthanc", - "wadoUriRootNOTE" : "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently", - "wadoUriRoot" : "http://localhost:8043/wado", - "qidoRoot": "http://localhost:8042/dicom-web", - "wadoRoot": "http://localhost:8042/dicom-web", - "qidoSupportsIncludeField": false, - "imageRendering" : "wadouri", - "requestOptions" : { - "auth": "orthanc:orthanc", - "logRequests" : true, - "logResponses" : false, - "logTiming" : true - } + name: 'Orthanc', + wadoUriRootNOTE: 'either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently', + wadoUriRoot: 'http://localhost:8043/wado', + qidoRoot: 'http://localhost:8042/dicom-web', + wadoRoot: 'http://localhost:8042/dicom-web', + qidoSupportsIncludeField: false, + imageRendering: 'wadouri', + requestOptions: { + auth: 'orthanc:orthanc', + logRequests: true, + logResponses: false, + logTiming: true + } } ] - } + } }; -}); \ No newline at end of file +}); diff --git a/Packages/viewerbase/server/services/qido/studies.js b/Packages/viewerbase/server/services/qido/studies.js index cfcfd3c87..a5f4393dc 100644 --- a/Packages/viewerbase/server/services/qido/studies.js +++ b/Packages/viewerbase/server/services/qido/studies.js @@ -7,12 +7,17 @@ * @returns {string} The URL with encoded filter query data */ function filterToQIDOURL(server, filter) { + var commaSeparatedFields = [ + '00081030' // Study Description + // Add more fields here if you want them in the Study List + ].join(','); + var parameters = { - PatientName : filter.patientName, + PatientName: filter.patientName, PatientID: filter.patientId, - AccessionNumber : filter.accessionNumber, - limit : filter.limit || 20, - includefield : server.qidoSupportsIncludeField ? 'all' : undefined + AccessionNumber: filter.accessionNumber, + limit: filter.limit || 20, + includefield: server.qidoSupportsIncludeField ? 'all' : commaSeparatedFields }; return server.qidoRoot + '/studies?' + encodeQueryData(parameters); } @@ -28,29 +33,29 @@ function resultDataToStudies(resultData) { resultData.forEach(function(study) { studies.push({ - studyInstanceUid: DICOMWeb.getString(study['0020000D']), - // 00080005 = SpecificCharacterSet - studyDate: DICOMWeb.getString(study['00080020']), - studyTime: DICOMWeb.getString(study['00080030']), - accessionNumber: DICOMWeb.getString(study['00080050']), - referringPhysicianName: DICOMWeb.getString(study['00080090']), - // 00081190 = URL - patientName: DICOMWeb.getName(study['00100010']), - patientId: DICOMWeb.getString(study['00100020']), - patientBirthdate: DICOMWeb.getString(study['00100030']), - patientSex: DICOMWeb.getString(study['00100040']), - imageCount: DICOMWeb.getString(study['00201208']), - studyId: DICOMWeb.getString(study['00200010']), - studyDescription: DICOMWeb.getString(study['00081030']), - modalities: DICOMWeb.getString(study['00080061']) + studyInstanceUid: DICOMWeb.getString(study['0020000D']), + // 00080005 = SpecificCharacterSet + studyDate: DICOMWeb.getString(study['00080020']), + studyTime: DICOMWeb.getString(study['00080030']), + accessionNumber: DICOMWeb.getNumber(study['00080050']), + referringPhysicianName: DICOMWeb.getString(study['00080090']), + // 00081190 = URL + patientName: DICOMWeb.getName(study['00100010']), + patientId: DICOMWeb.getString(study['00100020']), + patientBirthdate: DICOMWeb.getString(study['00100030']), + patientSex: DICOMWeb.getString(study['00100040']), + studyId: DICOMWeb.getString(study['00200010']), + numberOfStudyRelatedSeries: DICOMWeb.getString(study['00201206']), + numberOfStudyRelatedInstances: DICOMWeb.getString(study['00201208']), + studyDescription: DICOMWeb.getString(study['00081030']), + modalities: DICOMWeb.getString(study['00080061']) }); }); return studies; } - Services.QIDO.Studies = function(server, filter) { var url = filterToQIDOURL(server, filter); var result = DICOMWeb.getJSON(url, server.requestOptions); return resultDataToStudies(result.data); -}; \ No newline at end of file +}; diff --git a/Packages/worklist/components/worklistStudy/worklistStudy.html b/Packages/worklist/components/worklistStudy/worklistStudy.html index f767ca4b0..5a490f759 100644 --- a/Packages/worklist/components/worklistStudy/worklistStudy.html +++ b/Packages/worklist/components/worklistStudy/worklistStudy.html @@ -24,7 +24,7 @@ {{#unless isTouchDevice}}