feat: allow saving to same SR series (#4889)
This commit is contained in:
1 parent
7b40963997
commit
62e5a62066
9 files changed
+167
-63
No files matched your search
@@ -1,41 +0,0 @@
|
||||
import { DisplaySetService, Types } from '@ohif/core';
|
||||
|
||||
import getNextSRSeriesNumber from './getNextSRSeriesNumber';
|
||||
|
||||
/**
|
||||
* Find an SR having the same series description.
|
||||
* This is used by the store service in order to store DICOM SR's having the
|
||||
* same Series Description into a single series under consecutive instance numbers
|
||||
* That way, they are all organized as a set and could have tools to view
|
||||
* "prior" SR instances.
|
||||
*
|
||||
* @param SeriesDescription - is the description to look for
|
||||
* @param displaySetService - the display sets to search for DICOM SR in
|
||||
* @returns SeriesMetadata from a DICOM SR having the same series description
|
||||
*/
|
||||
export default function findSRWithSameSeriesDescription(
|
||||
SeriesDescription: string,
|
||||
displaySetService: DisplaySetService
|
||||
): Types.SeriesMetadata {
|
||||
const activeDisplaySets = displaySetService.getActiveDisplaySets();
|
||||
const srDisplaySets = activeDisplaySets.filter(ds => ds.Modality === 'SR');
|
||||
const sameSeries = srDisplaySets.find(ds => ds.SeriesDescription === SeriesDescription);
|
||||
if (sameSeries) {
|
||||
console.log('Storing to same series', sameSeries);
|
||||
const { instance } = sameSeries;
|
||||
const { SeriesInstanceUID, SeriesDescription, SeriesDate, SeriesTime, SeriesNumber, Modality } =
|
||||
instance;
|
||||
return {
|
||||
SeriesInstanceUID,
|
||||
SeriesDescription,
|
||||
SeriesDate,
|
||||
SeriesTime,
|
||||
SeriesNumber,
|
||||
Modality,
|
||||
InstanceNumber: sameSeries.instances.length + 1,
|
||||
};
|
||||
}
|
||||
|
||||
const SeriesNumber = getNextSRSeriesNumber(displaySetService);
|
||||
return { SeriesDescription, SeriesNumber };
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
export const getSeriesDateTime = (jsDate: Date = new Date()) => {
|
||||
const dicomDateTime = getDicomDateTime(jsDate);
|
||||
return {
|
||||
SeriesDate: dicomDateTime.date,
|
||||
SeriesTime: dicomDateTime.time,
|
||||
};
|
||||
};
|
||||
|
||||
export const getDicomDateTime = (jsDate: Date = new Date()) => {
|
||||
const month = String(jsDate.getUTCMonth() + 1).padStart(2, '0');
|
||||
const day = String(jsDate.getUTCDate()).padStart(2, '0');
|
||||
const year = String(jsDate.getUTCFullYear()).padStart(4, '0');
|
||||
const date = `${year}${month}${day}`;
|
||||
const hours = String(jsDate.getUTCHours()).padStart(2, '0');
|
||||
const minutes = String(jsDate.getUTCMinutes()).padStart(2, '0');
|
||||
const seconds = String(jsDate.getUTCSeconds()).padStart(2, '0');
|
||||
const time = `${hours}${minutes}${seconds}`;
|
||||
|
||||
return { date, time };
|
||||
};
|
||||
@@ -1,10 +0,0 @@
|
||||
const MIN_SR_SERIES_NUMBER = 4700;
|
||||
|
||||
export default function getNextSRSeriesNumber(displaySetService) {
|
||||
const activeDisplaySets = displaySetService.getActiveDisplaySets();
|
||||
const srDisplaySets = activeDisplaySets.filter(ds => ds.Modality === 'SR');
|
||||
const srSeriesNumbers = srDisplaySets.map(ds => ds.SeriesNumber);
|
||||
const maxSeriesNumber = Math.max(...srSeriesNumbers, MIN_SR_SERIES_NUMBER);
|
||||
|
||||
return maxSeriesNumber + 1;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
const MIN_SR_SERIES_NUMBER = 4700;
|
||||
|
||||
export function getNextSeriesNumber({ displaySetService, modality, minSeriesNumber }) {
|
||||
const activeDisplaySets = displaySetService.getActiveDisplaySets();
|
||||
const modalityDisplaySets = activeDisplaySets.filter(ds => ds.Modality === modality);
|
||||
const modalitySeriesNumbers = modalityDisplaySets.map(ds => ds.SeriesNumber);
|
||||
const maxSeriesNumber = Math.max(...modalitySeriesNumbers, minSeriesNumber);
|
||||
|
||||
const allSeriesNumbers = activeDisplaySets.map(ds => ds.SeriesNumber);
|
||||
|
||||
let finalSeriesNumber = maxSeriesNumber + 1;
|
||||
while (allSeriesNumbers.includes(finalSeriesNumber)) {
|
||||
finalSeriesNumber++;
|
||||
}
|
||||
|
||||
return { SeriesNumber: finalSeriesNumber, InstanceNumber: 1 };
|
||||
}
|
||||
|
||||
export function getSRSeriesAndInstanceNumber({ displaySetService, SeriesInstanceUid }) {
|
||||
if (!SeriesInstanceUid) {
|
||||
return getNextSeriesNumber({
|
||||
displaySetService,
|
||||
modality: 'SR',
|
||||
minSeriesNumber: MIN_SR_SERIES_NUMBER,
|
||||
});
|
||||
}
|
||||
|
||||
const displaySetsMap = displaySetService.getDisplaySetCache();
|
||||
const displaySets = Array.from(displaySetsMap.values());
|
||||
const srDisplaySet = displaySets.find(
|
||||
ds => ds.Modality === 'SR' && ds.SeriesInstanceUID === SeriesInstanceUid
|
||||
);
|
||||
const InstanceNumber = srDisplaySet.instances?.length + 1;
|
||||
|
||||
if (!srDisplaySet?.SeriesNumber || !InstanceNumber) {
|
||||
return getNextSeriesNumber({
|
||||
displaySetService,
|
||||
modality: 'SR',
|
||||
minSeriesNumber: MIN_SR_SERIES_NUMBER,
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
SeriesNumber: srDisplaySet.SeriesNumber,
|
||||
InstanceNumber,
|
||||
referenceDisplaySet: srDisplaySet,
|
||||
};
|
||||
}
|
||||
@@ -2,8 +2,9 @@ import { utils } from '@ohif/core';
|
||||
|
||||
import createReportAsync from '../Actions/createReportAsync';
|
||||
import { createReportDialogPrompt } from '../Panels';
|
||||
import getNextSRSeriesNumber from './getNextSRSeriesNumber';
|
||||
import PROMPT_RESPONSES from './_shared/PROMPT_RESPONSES';
|
||||
import { getSRSeriesAndInstanceNumber } from './getSRSeriesAndInstanceNumber';
|
||||
import { getSeriesDateTime } from './getCurrentDicomDateTime';
|
||||
|
||||
const {
|
||||
filterAnd,
|
||||
@@ -27,7 +28,7 @@ async function promptSaveReport({ servicesManager, commandsManager, extensionMan
|
||||
filterMeasurementsBySeriesUID(trackedSeries),
|
||||
filterPlanarMeasurement
|
||||
),
|
||||
defaultSaveTitle = 'Research Derived Series',
|
||||
defaultSaveTitle = 'Create Report',
|
||||
} = ctx;
|
||||
let displaySetInstanceUIDs;
|
||||
|
||||
@@ -45,7 +46,12 @@ async function promptSaveReport({ servicesManager, commandsManager, extensionMan
|
||||
|
||||
const SeriesDescription = promptResult.value || defaultSaveTitle;
|
||||
|
||||
const SeriesNumber = getNextSRSeriesNumber(displaySetService);
|
||||
const { SeriesNumber, InstanceNumber, referenceDisplaySet } = getSRSeriesAndInstanceNumber({
|
||||
displaySetService,
|
||||
SeriesInstanceUid: promptResult.series,
|
||||
});
|
||||
|
||||
const { SeriesDate, SeriesTime } = referenceDisplaySet ?? getSeriesDateTime();
|
||||
|
||||
const getReport = async () => {
|
||||
return commandsManager.runCommand(
|
||||
@@ -57,6 +63,10 @@ async function promptSaveReport({ servicesManager, commandsManager, extensionMan
|
||||
options: {
|
||||
SeriesDescription,
|
||||
SeriesNumber,
|
||||
InstanceNumber,
|
||||
SeriesInstanceUID: promptResult.series,
|
||||
SeriesDate,
|
||||
SeriesTime,
|
||||
},
|
||||
},
|
||||
'CORNERSTONE_STRUCTURED_REPORT'
|
||||
|
||||
Reference in new issue
Block a user