TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix accession number and study description in study list

Browse Source
This commit is contained in:
Erik Ziegler 2016-02-02 22:21:23 +01:00
parent 0d66437be9
commit 6c4eae3699
3 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
LesionTracker/defaultSettings.js
View File

@ -7,24 +7,24 @@ Meteor.startup(function() {
console.log('Using default LesionTracker dicomWeb settings'); console.log('Using default LesionTracker dicomWeb settings');
Meteor.settings = { Meteor.settings = {
"dicomWeb" : { dicomWeb: {
"endpoints": [ endpoints: [
{ {
"name": "Orthanc", name: 'Orthanc',
"wadoUriRootNOTE" : "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently", wadoUriRootNOTE: 'either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently',
"wadoUriRoot" : "http://localhost:8043/wado", wadoUriRoot: 'http://localhost:8043/wado',
"qidoRoot": "http://localhost:8042/dicom-web", qidoRoot: 'http://localhost:8042/dicom-web',
"wadoRoot": "http://localhost:8042/dicom-web", wadoRoot: 'http://localhost:8042/dicom-web',
"qidoSupportsIncludeField": false, qidoSupportsIncludeField: false,
"imageRendering" : "wadouri", imageRendering: 'wadouri',
"requestOptions" : { requestOptions: {
"auth": "orthanc:orthanc", auth: 'orthanc:orthanc',
"logRequests" : true, logRequests: true,
"logResponses" : false, logResponses: false,
"logTiming" : true logTiming: true
} }
} }
] ]
} }
}; };
}); });

47
Packages/viewerbase/server/services/qido/studies.js
View File

@ -7,12 +7,17 @@
* @returns {string} The URL with encoded filter query data * @returns {string} The URL with encoded filter query data
*/ */
function filterToQIDOURL(server, filter) { function filterToQIDOURL(server, filter) {
var commaSeparatedFields = [
'00081030' // Study Description
// Add more fields here if you want them in the Study List
].join(',');
var parameters = { var parameters = {
PatientName : filter.patientName, PatientName: filter.patientName,
PatientID: filter.patientId, PatientID: filter.patientId,
AccessionNumber : filter.accessionNumber, AccessionNumber: filter.accessionNumber,
limit : filter.limit || 20, limit: filter.limit || 20,
includefield : server.qidoSupportsIncludeField ? 'all' : undefined includefield: server.qidoSupportsIncludeField ? 'all' : commaSeparatedFields
}; };
return server.qidoRoot + '/studies?' + encodeQueryData(parameters); return server.qidoRoot + '/studies?' + encodeQueryData(parameters);
} }
@ -28,29 +33,29 @@ function resultDataToStudies(resultData) {
resultData.forEach(function(study) { resultData.forEach(function(study) {
studies.push({ studies.push({
studyInstanceUid: DICOMWeb.getString(study['0020000D']), studyInstanceUid: DICOMWeb.getString(study['0020000D']),
// 00080005 = SpecificCharacterSet // 00080005 = SpecificCharacterSet
studyDate: DICOMWeb.getString(study['00080020']), studyDate: DICOMWeb.getString(study['00080020']),
studyTime: DICOMWeb.getString(study['00080030']), studyTime: DICOMWeb.getString(study['00080030']),
accessionNumber: DICOMWeb.getString(study['00080050']), accessionNumber: DICOMWeb.getNumber(study['00080050']),
referringPhysicianName: DICOMWeb.getString(study['00080090']), referringPhysicianName: DICOMWeb.getString(study['00080090']),
// 00081190 = URL // 00081190 = URL
patientName: DICOMWeb.getName(study['00100010']), patientName: DICOMWeb.getName(study['00100010']),
patientId: DICOMWeb.getString(study['00100020']), patientId: DICOMWeb.getString(study['00100020']),
patientBirthdate: DICOMWeb.getString(study['00100030']), patientBirthdate: DICOMWeb.getString(study['00100030']),
patientSex: DICOMWeb.getString(study['00100040']), patientSex: DICOMWeb.getString(study['00100040']),
imageCount: DICOMWeb.getString(study['00201208']), studyId: DICOMWeb.getString(study['00200010']),
studyId: DICOMWeb.getString(study['00200010']), numberOfStudyRelatedSeries: DICOMWeb.getString(study['00201206']),
studyDescription: DICOMWeb.getString(study['00081030']), numberOfStudyRelatedInstances: DICOMWeb.getString(study['00201208']),
modalities: DICOMWeb.getString(study['00080061']) studyDescription: DICOMWeb.getString(study['00081030']),
modalities: DICOMWeb.getString(study['00080061'])
}); });
}); });
return studies; return studies;
} }
Services.QIDO.Studies = function(server, filter) { Services.QIDO.Studies = function(server, filter) {
var url = filterToQIDOURL(server, filter); var url = filterToQIDOURL(server, filter);
var result = DICOMWeb.getJSON(url, server.requestOptions); var result = DICOMWeb.getJSON(url, server.requestOptions);
return resultDataToStudies(result.data); return resultDataToStudies(result.data);
}; };

2
Packages/worklist/components/worklistStudy/worklistStudy.html
View File

@ -24,7 +24,7 @@
</td> </td>
{{#unless isTouchDevice}} {{#unless isTouchDevice}}
<td> <td>
{{imageCount}} {{numberOfStudyRelatedInstances}}
</td> </td>
{{/unless}} {{/unless}}
</tr> </tr>