1d85f7a74e
* Instance metadata plus metadata provider overhaul. Fix consumption of wado-uri urls fallbacks + datatype agnosticism. WIP DICOMify things. fix various issues with naturalized variable naming migration. Remove metadata provider. Fix consumption of multiframe images and addition of CWIL metadata. Fix strange build issues. Fix CWIL style windowWidth to array from naturalized DICOM. Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs. Move color palette fetching down to the natuaralized JSON level. Remove unused StudyMetadataSummary Remove redundant dicom metadata dictionary. Working local + json routes. Fix SR read. Finished first round of testing + cleaned up debugging etc. * data => metadata for instance naturalizedJSON * Update dcmjs version * Correct github isssues. * Fix erroneously replaced files. * Danny's recommended changes. * Instance metadata plus metadata provider overhaul. Fix consumption of wado-uri urls fallbacks + datatype agnosticism. WIP DICOMify things. fix various issues with naturalized variable naming migration. Remove metadata provider. Fix consumption of multiframe images and addition of CWIL metadata. Fix strange build issues. Fix CWIL style windowWidth to array from naturalized DICOM. Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs. Move color palette fetching down to the natuaralized JSON level. Remove unused StudyMetadataSummary Remove redundant dicom metadata dictionary. Working local + json routes. Fix SR read. Finished first round of testing + cleaned up debugging etc. * data => metadata for instance naturalizedJSON * Update dcmjs version * Correct github isssues. * Fix erroneously replaced files. * Danny's recommended changes. * Update JSON CI * Update casing of import. * Fix jump for SR. * Fix unit tests for measurements service * Fix json CI test. * fix: update yarn lock * Fix local non-encapsulated pdf view * CI updated to new sucess message. Co-authored-by: Danny <danny.ri.brown@gmail.com>
82 lines
2.4 KiB
JavaScript
82 lines
2.4 KiB
JavaScript
import log from '../log';
|
|
import studies from '../studies';
|
|
import utils from '../utils';
|
|
import {
|
|
retrieveMeasurementFromSR,
|
|
stowSRFromMeasurements,
|
|
} from './handleStructuredReport';
|
|
import findMostRecentStructuredReport from './utils/findMostRecentStructuredReport';
|
|
|
|
/**
|
|
*
|
|
* @typedef serverType
|
|
* @property {string} type - type of the server
|
|
* @property {string} wadoRoot - server wado root url
|
|
*
|
|
*/
|
|
|
|
/**
|
|
* Function to be registered into MeasurementAPI to retrieve measurements from DICOM Structured Reports
|
|
*
|
|
* @param {serverType} server
|
|
* @returns {Promise} Should resolve with OHIF measurementData object
|
|
*/
|
|
const retrieveMeasurements = server => {
|
|
log.info('[DICOMSR] retrieveMeasurements');
|
|
|
|
if (!server || server.type !== 'dicomWeb') {
|
|
log.error('[DICOMSR] DicomWeb server is required!');
|
|
return Promise.reject({});
|
|
}
|
|
|
|
const serverUrl = server.wadoRoot;
|
|
const studies = utils.studyMetadataManager.all();
|
|
|
|
const latestSeries = findMostRecentStructuredReport(studies);
|
|
|
|
if (!latestSeries) return Promise.resolve({});
|
|
|
|
return retrieveMeasurementFromSR(latestSeries, studies, serverUrl);
|
|
};
|
|
|
|
/**
|
|
* Function to be registered into MeasurementAPI to store measurements into DICOM Structured Reports
|
|
*
|
|
* @param {Object} measurementData - OHIF measurementData object
|
|
* @param {Object} filter
|
|
* @param {serverType} server
|
|
* @returns {Object} With message to be displayed on success
|
|
*/
|
|
const storeMeasurements = async (measurementData, filter, server) => {
|
|
log.info('[DICOMSR] storeMeasurements');
|
|
|
|
if (!server || server.type !== 'dicomWeb') {
|
|
log.error('[DICOMSR] DicomWeb server is required!');
|
|
return Promise.reject({});
|
|
}
|
|
|
|
const serverUrl = server.wadoRoot;
|
|
const firstMeasurementKey = Object.keys(measurementData)[0];
|
|
const firstMeasurement = measurementData[firstMeasurementKey][0];
|
|
const StudyInstanceUID =
|
|
firstMeasurement && firstMeasurement.StudyInstanceUID;
|
|
|
|
try {
|
|
await stowSRFromMeasurements(measurementData, serverUrl);
|
|
if (StudyInstanceUID) {
|
|
studies.deleteStudyMetadataPromise(StudyInstanceUID);
|
|
}
|
|
|
|
return {
|
|
message: 'Measurements saved successfully',
|
|
};
|
|
} catch (error) {
|
|
log.error(
|
|
`[DICOMSR] Error while saving the measurements: ${error.message}`
|
|
);
|
|
throw new Error('Error while saving the measurements.');
|
|
}
|
|
};
|
|
|
|
export { retrieveMeasurements, storeMeasurements };
|