Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHC API add search studies by tag #1503

Merged
merged 3 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion healthcare/dicom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ Run the following command to install the library dependencies for Node.js:
node dicomWebRetrieveRendered.js <projectId> <cloudRegion> Handles the GET requests specified in the DICOMweb
<datasetId> <dicomStoreId> <studyUid> <seriesUid> standard.
<instanceUid>


node dicomWebSearchStudies.js <projectId> <cloudRegion> Searches studies using DICOM tags.
<datasetId> <dicomStoreId>

node dicomWebDeleteStudy.js <projectId> <cloudRegion> Handles DELETE requests.
<datasetId> <dicomStoreId> <studyUid>

Expand Down
67 changes: 67 additions & 0 deletions healthcare/dicom/dicomWebSearchStudies.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* Copyright 2019, Google, LLC
* Licensed under the Apache License, Version 2.0 (the `License`);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an `AS IS` BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* eslint-disable no-warning-comments */

'use strict';

const main = (
projectId = process.env.GCLOUD_PROJECT,
cloudRegion = 'us-central1',
datasetId,
dicomStoreId
) => {
// [START healthcare_dicomweb_search_studies]
const {google} = require('googleapis');
const healthcare = google.healthcare('v1beta1');

const dicomWebSearchStudies = async () => {
const auth = await google.auth.getClient({
scopes: ['https://www.googleapis.com/auth/cloud-platform'],
});

google.options({
auth,
// Refine your search by appending DICOM tags to the
// request in the form of query parameters. This sample
// searches for studies containing a patient's name.
params: {PatientName: 'Sally Zhang'},
headers: {Accept: 'application/dicom+json'},
});

// TODO(developer): uncomment these lines before running the sample
// const cloudRegion = 'us-central1';
// const projectId = 'adjective-noun-123';
// const datasetId = 'my-dataset';
// const dicomStoreId = 'my-dicom-store';
const parent = `projects/${projectId}/locations/${cloudRegion}/datasets/${datasetId}/dicomStores/${dicomStoreId}`;
const dicomWebPath = `studies`;
const request = {parent, dicomWebPath};

const studies = await healthcare.projects.locations.datasets.dicomStores.searchForStudies(
request
);
console.log(studies);

console.log(`Found ${studies.data.length} studies:`);
console.log(JSON.stringify(studies.data));
};

dicomWebSearchStudies();
// [END healthcare_dicomweb_search_studies]
};

// node dicomWebSearchStudies.js <projectId> <cloudRegion> <datasetId> <dicomStoreId>
main(...process.argv.slice(2));
8 changes: 8 additions & 0 deletions healthcare/dicom/system-test/dicomweb.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ it('should retrieve a DICOM rendered PNG image', async () => {
assert.ok(output.includes('Retrieved rendered image'));
});

it('should search for DICOM studies', async () => {
const output = await tools.runAsync(
`node dicomWebSearchStudies.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`,
cwd
);
assert.ok(output.includes('Found'));
});

it('should delete a DICOM study', async () => {
const output = await tools.runAsync(
`node dicomWebDeleteStudy.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${studyUid}`,
Expand Down