public async Task <GetExtendedQueryTagEntry> GetTagAsync(string tagPath, CancellationToken cancellationToken = default)
{
EnsureArg.IsNotNull(tagPath, nameof(tagPath));
var response = await _dicomWebClient.GetExtendedQueryTagAsync(tagPath, cancellationToken);
return(await response.GetValueAsync());
}
public async Task GivenValidExtendedQueryTags_WhenGoThroughEndToEndScenario_ThenShouldSucceed()
{
// Prepare 3 extended query tags.
// One is private tag on Instance level
// To add private tag, need to add identification code element at first.
DicomTag identificationCodeTag = new DicomTag(0x0407, 0x0010);
DicomElement identificationCodeElement = new DicomLongString(identificationCodeTag, PrivateCreatorName);
DicomTag privateTag = new DicomTag(0x0407, 0x1001, PrivateCreatorName);
AddExtendedQueryTagEntry privateQueryTag = new AddExtendedQueryTagEntry {
Path = privateTag.GetPath(), VR = DicomVRCode.SS, Level = QueryTagLevel.Instance, PrivateCreator = privateTag.PrivateCreator.Creator
};
// One is standard tag on Series level
DicomTag standardTagSeries = DicomTag.ManufacturerModelName;
AddExtendedQueryTagEntry standardTagSeriesQueryTag = new AddExtendedQueryTagEntry {
Path = standardTagSeries.GetPath(), VR = standardTagSeries.GetDefaultVR().Code, Level = QueryTagLevel.Series
};
// One is standard tag on Study level
DicomTag standardTagStudy = DicomTag.PatientSex;
AddExtendedQueryTagEntry standardTagStudyQueryTag = new AddExtendedQueryTagEntry {
Path = standardTagStudy.GetPath(), VR = standardTagStudy.GetDefaultVR().Code, Level = QueryTagLevel.Study
};
AddExtendedQueryTagEntry[] queryTags = new AddExtendedQueryTagEntry[] { privateQueryTag, standardTagSeriesQueryTag, standardTagStudyQueryTag };
// Create 3 test files on same studyUid.
string studyUid = TestUidGenerator.Generate();
string seriesUid1 = TestUidGenerator.Generate();
string seriesUid2 = TestUidGenerator.Generate();
string instanceUid1 = TestUidGenerator.Generate();
string instanceUid2 = TestUidGenerator.Generate();
string instanceUid3 = TestUidGenerator.Generate();
// One is on seriesUid1 and instanceUid1
DicomDataset dataset1 = Samples.CreateRandomInstanceDataset(studyInstanceUid: studyUid, seriesInstanceUid: seriesUid1, sopInstanceUid: instanceUid1);
dataset1.Add(identificationCodeElement);
dataset1.AddOrUpdate(new DicomSignedShort(privateTag, 1));
dataset1.Add(standardTagSeries, "ManufacturerModelName1");
dataset1.Add(standardTagStudy, "0");
// One is on seriesUid1 and instanceUid2
DicomDataset dataset2 = Samples.CreateRandomInstanceDataset(studyInstanceUid: studyUid, seriesInstanceUid: seriesUid1, sopInstanceUid: instanceUid2);
dataset2.Add(identificationCodeElement);
dataset2.AddOrUpdate(new DicomSignedShort(privateTag, 2));
dataset2.Add(standardTagSeries, "ManufacturerModelName2");
dataset2.Add(standardTagStudy, "0");
// One is on seriesUid2 and instanceUid3
DicomDataset dataset3 = Samples.CreateRandomInstanceDataset(studyInstanceUid: studyUid, seriesInstanceUid: seriesUid2, sopInstanceUid: instanceUid3);
dataset3.Add(identificationCodeElement);
dataset3.AddOrUpdate(new DicomSignedShort(privateTag, 3));
dataset3.Add(standardTagSeries, "ManufacturerModelName3");
dataset3.Add(standardTagStudy, "1");
try
{
// Add extended query tags
await _client.AddExtendedQueryTagAsync(queryTags);
try
{
foreach (var queryTag in queryTags)
{
GetExtendedQueryTagEntry returnTag = await(await _client.GetExtendedQueryTagAsync(queryTag.Path)).GetValueAsync();
CompareExtendedQueryTagEntries(queryTag, returnTag);
}
// Upload test files
IEnumerable <DicomFile> dicomFiles = new DicomDataset[] { dataset1, dataset2, dataset3 }.Select(dataset => new DicomFile(dataset));
await _client.StoreAsync(dicomFiles, studyInstanceUid : string.Empty, cancellationToken : default);
// Query on instance for private tag
DicomWebAsyncEnumerableResponse <DicomDataset> queryInstanceResponse = await _client.QueryAsync(new Uri($"/instances?{privateTag.GetPath()}=3", UriKind.Relative), cancellationToken : default);
DicomDataset[] instanceResult = await queryInstanceResponse.ToArrayAsync();
Assert.Single(instanceResult);
Assert.Equal(instanceUid3, instanceResult[0].GetSingleValue <string>(DicomTag.SOPInstanceUID));
// Query on series for standardTagSeries
DicomWebAsyncEnumerableResponse <DicomDataset> querySeriesResponse = await _client.QueryAsync(new Uri($"/series?{standardTagSeries.GetPath()}=ManufacturerModelName2", UriKind.Relative), cancellationToken : default);
DicomDataset[] seriesResult = await querySeriesResponse.ToArrayAsync();
Assert.Single(seriesResult);
Assert.Equal(seriesUid1, seriesResult[0].GetSingleValue <string>(DicomTag.SeriesInstanceUID));
// Query on study for standardTagStudy
DicomWebAsyncEnumerableResponse <DicomDataset> queryStudyResponse = await _client.QueryAsync(new Uri($"/studies?{standardTagStudy.GetPath()}=1", UriKind.Relative), cancellationToken : default);
DicomDataset[] studyResult = await queryStudyResponse.ToArrayAsync();
Assert.Single(studyResult);
Assert.Equal(studyUid, seriesResult[0].GetSingleValue <string>(DicomTag.StudyInstanceUID));
}
finally
{
await _client.DeleteStudyAsync(studyUid);
}
}
finally
{
// Cleanup extended query tags, also verify GetExtendedQueryTagsAsync.
var responseQueryTags = await(await _client.GetExtendedQueryTagsAsync()).GetValueAsync();
foreach (var rTag in responseQueryTags)
{
if (queryTags.Any(tag => tag.Path == rTag.Path))
{
await _client.DeleteExtendedQueryTagAsync(rTag.Path);
}
}
}
}
public async Task GivenExtendedQueryTag_WhenReindexing_ThenShouldSucceed()
{
DicomTag weightTag = DicomTag.PatientWeight;
DicomTag sizeTag = DicomTag.PatientSize;
// Try to delete these extended query tags.
await CleanupExtendedQueryTag(weightTag);
await CleanupExtendedQueryTag(sizeTag);
// Define DICOM files
DicomDataset instance1 = Samples.CreateRandomInstanceDataset();
instance1.Add(weightTag, 68.0M);
instance1.Add(sizeTag, 1.78M);
DicomDataset instance2 = Samples.CreateRandomInstanceDataset();
instance2.Add(weightTag, 50.0M);
instance2.Add(sizeTag, 1.5M);
// Upload files
Assert.True((await _instanceManager.StoreAsync(new DicomFile(instance1))).IsSuccessStatusCode);
Assert.True((await _instanceManager.StoreAsync(new DicomFile(instance2))).IsSuccessStatusCode);
// Add extended query tag
OperationStatus operation = await _tagManager.AddTagsAsync(
new AddExtendedQueryTagEntry[]
{
new AddExtendedQueryTagEntry {
Path = weightTag.GetPath(), VR = weightTag.GetDefaultVR().Code, Level = QueryTagLevel.Study
},
new AddExtendedQueryTagEntry {
Path = sizeTag.GetPath(), VR = sizeTag.GetDefaultVR().Code, Level = QueryTagLevel.Study
},
});
Assert.Equal(OperationRuntimeStatus.Completed, operation.Status);
// Check specific tag
DicomWebResponse <GetExtendedQueryTagEntry> getResponse;
GetExtendedQueryTagEntry entry;
getResponse = await _client.GetExtendedQueryTagAsync(weightTag.GetPath());
entry = await getResponse.GetValueAsync();
Assert.Null(entry.Errors);
Assert.Equal(QueryStatus.Enabled, entry.QueryStatus);
getResponse = await _client.GetExtendedQueryTagAsync(sizeTag.GetPath());
entry = await getResponse.GetValueAsync();
Assert.Null(entry.Errors);
Assert.Equal(QueryStatus.Enabled, entry.QueryStatus);
// Query multiple tags
// Note: We don't necessarily need to check the tags are the above ones, as another test may have added ones beforehand
var multipleTags = await _tagManager.GetTagsAsync(2, 0);
Assert.Equal(2, multipleTags.Count);
Assert.Equal(multipleTags[0].Path, (await _tagManager.GetTagsAsync(1, 0)).Single().Path);
Assert.Equal(multipleTags[1].Path, (await _tagManager.GetTagsAsync(1, 1)).Single().Path);
// QIDO
DicomWebAsyncEnumerableResponse <DicomDataset> queryResponse = await _client.QueryInstancesAsync($"{weightTag.GetPath()}=50.0");
DicomDataset[] instances = await queryResponse.ToArrayAsync();
Assert.Contains(instances, instance => instance.ToInstanceIdentifier().Equals(instance2.ToInstanceIdentifier()));
}