Skip to content
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
7 changes: 4 additions & 3 deletions extensions/cornerstone-dicom-seg/src/commandsModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ const commandsModule = ({
// If DisplaySet of the segmentation exists, then over write it.
const displaySet = displaySetService.getDisplaySetByUID(segmentationId);
const defaultDataSource = dataSource ?? extensionManager.getActiveDataSource()[0];
const shouldOverWrite = !!displaySet?.StudyInstanceUID && !!displaySet.SeriesInstanceUID;

let reportName: string,
selectedDataSource: string,
Expand Down Expand Up @@ -263,11 +264,11 @@ const commandsModule = ({
SeriesNumber: series ? undefined : 1 + priorSeriesNumber,
predecessorImageId: series,
// Use Series and SOP instancesUIDs if displaySet of the segmentation already exists.
...(displaySet && {
...(shouldOverWrite && {
SeriesInstanceUID: displaySet.SeriesInstanceUID,
SOPInstanceUID: displaySet.instances[0].SOPInstanceUID,
SOPInstanceUID: displaySet.instances?.[0].SOPInstanceUID,
SeriesNumber: displaySet.SeriesNumber,
Manufacturer: displaySet.instances[0].Manufacturer,
Manufacturer: displaySet.instances?.[0].Manufacturer,
}),
},
};
Expand Down
3 changes: 2 additions & 1 deletion extensions/default/src/Actions/createReportAsync.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ async function createReportAsync({
.getDisplaySetsForSeries(SeriesInstanceUID)
?.find(ds => ds.instances.some(instance => instance.SOPInstanceUID === SOPInstanceUID));

const shouldOverWrite = displaySet && displaySet.Modality === 'SEG';
const shouldOverWrite =
displaySet?.StudyInstanceUID && displaySet.SeriesInstanceUID && displaySet.Modality === 'SEG';

if (!naturalizedReport) {
return;
Expand Down
4 changes: 2 additions & 2 deletions extensions/default/src/commandsModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ const commandsModule = ({
const deidSeriesUIDs = params.getAll('SeriesInstanceUIDs');

const studyDisplaySets = displaySetService.getDisplaySetsBy(ds =>
deidStudyUIDs.includes(ds.instance.DeidStudyInstanceUID)
deidStudyUIDs.includes(ds.instance?.DeidStudyInstanceUID)
);
const displaySets = studyDisplaySets.filter(
ds => !deidSeriesUIDs.length || deidSeriesUIDs.includes(ds.instance.DeidSeriesInstanceUID)
ds => !deidSeriesUIDs.length || deidSeriesUIDs.includes(ds.instance?.DeidSeriesInstanceUID)
);

// If the series filtered displaysets are empty, then use study filtered displaysets.
Expand Down
Loading