[OHIF-288] Rehydrating SRs is missing Labels (#1885)

* WIP

* Finish OHIF-288, need to update dcmjs.

* Remove unused copied resources.

* Cleaned up label import code.

* Update for dcmjs Findings -> Finding.

* Update dcmjs

* Remove debuggers

* Respond to reviewer comments.

* update dcmjs version

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>

platform/core/package.json

@@ -38,7 +38,7 @@
   "dependencies": {
     "@babel/runtime": "7.7.6",
     "ajv": "^6.10.0",
-    "dcmjs": "0.14.2",
+    "dcmjs": "0.16.0",
     "dicomweb-client": "^0.6.0",
     "immer": "6.0.2",
     "isomorphic-base64": "^1.0.2",

platform/core/src/DICOMSR/dataExchange.js

@@ -46,10 +46,12 @@ const retrieveMeasurements = server => {
 /**
  *
  * @param {object[]} measurementData An array of measurements from the measurements service
+ * @param {string[]} additionalFindingTypes toolTypes that should be stored with labels as Findings
+ * as opposed to Finding Sites.
  * that you wish to serialize.
  */
-const downloadReport = measurementData => {
-  const srDataset = generateReport(measurementData);
+const downloadReport = (measurementData, additionalFindingTypes = []) => {
+  const srDataset = generateReport(measurementData, additionalFindingTypes);
   const reportBlob = dcmjs.data.datasetToBlob(srDataset);
 
   //Create a URL for the binary.
@@ -61,10 +63,13 @@ const downloadReport = measurementData => {
  *
  * @param {object[]} measurementData An array of measurements from the measurements service
  * that you wish to serialize.
+ * @param {string[]} additionalFindingTypes toolTypes that should be stored with labels as Findings
  */
-const generateReport = measurementData => {
-  const ids = measurementData.map(md => md.id);
-  const filteredToolState = _getFilteredCornerstoneToolState(ids);
+const generateReport = (measurementData, additionalFindingTypes) => {
+  const filteredToolState = _getFilteredCornerstoneToolState(
+    measurementData,
+    additionalFindingTypes
+  );
 
   const report = MeasurementReport.generateReport(
     filteredToolState,
@@ -79,9 +84,15 @@ const generateReport = measurementData => {
  * @param {object[]} measurementData An array of measurements from the measurements service
  * that you wish to serialize.
  * @param {object} dataSource The dataSource that you wish to use to persist the data.
+ * @param {string[]} additionalFindingTypes toolTypes that should be stored with labels as Findings
+ * as opposed to Finding Sites.
  * @return {object} The naturalized report
  */
-const storeMeasurements = async (measurementData, dataSource) => {
+const storeMeasurements = async (
+  measurementData,
+  dataSource,
+  additionalFindingTypes = []
+) => {
   // TODO -> Eventually use the measurements directly and not the dcmjs adapter,
   // But it is good enough for now whilst we only have cornerstone as a datasource.
   log.info('[DICOMSR] storeMeasurements');
@@ -92,7 +103,10 @@ const storeMeasurements = async (measurementData, dataSource) => {
   }
 
   try {
-    const naturalizedReport = generateReport(measurementData);
+    const naturalizedReport = generateReport(
+      measurementData,
+      additionalFindingTypes
+    );
     const { StudyInstanceUID } = naturalizedReport;
 
     await dataSource.store.dicom(naturalizedReport);
@@ -110,7 +124,12 @@ const storeMeasurements = async (measurementData, dataSource) => {
   }
 };
 
-function _getFilteredCornerstoneToolState(uidFilter) {
+function _getFilteredCornerstoneToolState(
+  measurementData,
+  additionalFindingTypes
+) {
+  const uidFilter = measurementData.map(md => md.id);
+
   const globalToolState = cornerstoneTools.globalImageIdSpecificToolStateManager.saveToolState();
   const filteredToolState = {};
 
@@ -127,9 +146,38 @@ function _getFilteredCornerstoneToolState(uidFilter) {
       };
     }
 
+    const measurmentDataI = measurementData.find(md => md.id === toolDataI.id);
+
     const toolData = imageIdSpecificToolState[toolType].data;
 
-    toolData.push(toolDataI);
+    let finding;
+    const findingSites = [];
+
+    // NOTE -> Any kind of freetext value abuses the DICOM standard,
+    // As CodeValues should map 1:1 with CodeMeanings.
+    // Ideally we would actually use SNOMED codes for this.
+    if (measurmentDataI.label) {
+      if (additionalFindingTypes.includes(toolType)) {
+        finding = {
+          CodeValue: 'CORNERSTONEFREETEXT',
+          CodingSchemeDesignator: 'CST4',
+          CodeMeaning: measurmentDataI.label,
+        };
+      } else {
+        findingSites.push({
+          CodeValue: 'CORNERSTONEFREETEXT',
+          CodingSchemeDesignator: 'CST4',
+          CodeMeaning: measurmentDataI.label,
+        });
+      }
+    }
+
+    const measurement = Object.assign({}, toolDataI, {
+      finding,
+      findingSites,
+    });
+
+    toolData.push(measurement);
   }
 
   const uids = uidFilter.slice();