diff --git a/Packages/ohif-study-list/server/services/wado/retrieveMetadata.js b/Packages/ohif-study-list/server/services/wado/retrieveMetadata.js index f1d6f932b..0185ba4d8 100644 --- a/Packages/ohif-study-list/server/services/wado/retrieveMetadata.js +++ b/Packages/ohif-study-list/server/services/wado/retrieveMetadata.js @@ -119,13 +119,26 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) { lossyImageCompressionRatio: DICOMWeb.getString(instance['00282112']), lossyImageCompressionMethod: DICOMWeb.getString(instance['00282114']), echoNumber: DICOMWeb.getString(instance['00180086']), - contrastBolusAgent: DICOMWeb.getString(instance['00180010']) + contrastBolusAgent: DICOMWeb.getString(instance['00180010']), + baseWadoRsUri: server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid }; + // Get additional information if the instance uses "PALETTE COLOR" photometric interpretation + if (instanceSummary.photometricInterpretation === 'PALETTE COLOR') { + instanceSummary.paletteColorLookupTableUID = DICOMWeb.getString(instance['00281199']); + instanceSummary.redPaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281101']); + instanceSummary.greenPaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281102']); + instanceSummary.bluePaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281103']); + instanceSummary.redPaletteColorLookupTableData = instance['00281201']; + instanceSummary.greenPaletteColorLookupTableData = instance['00281202']; + instanceSummary.bluePaletteColorLookupTableData = instance['00281203']; + } + if (server.imageRendering === 'wadouri') { instanceSummary.wadouri = WADOProxy.convertURL(server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + '&contentType=application%2Fdicom', server.requestOptions); } else { instanceSummary.wadorsuri = server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1'; + // instanceSummary.wadorsuri = WADOProxy.convertURL(server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1'); } series.instances.push(instanceSummary); diff --git a/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js b/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js index d58945792..dfc84de11 100644 --- a/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js +++ b/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js @@ -13,8 +13,9 @@ Template.imageThumbnail.onCreated(() => { instance.getThumbnailImageId = () => { const stack = instance.data.thumbnail.stack; const lastIndex = (stack.images.length || 1) - 1; - const imageIndex = Math.floor(lastIndex / 2); + const imageIndex = Math.floor(lastIndex / 2) !== 0 ? 0 : 0; const imageInstance = stack.images[imageIndex]; + return imageInstance.getImageId(); }; });