fix: 2965 Correct Parsing Logic for Qualitative Instance Level SR

OHIF · Oct 6, 2022 · a368453 · a368453
1 parent 7f9014e
commit a368453
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/platform/core/src/DICOMSR/SCOORD3D/parseSCOORD3D.js b/platform/core/src/DICOMSR/SCOORD3D/parseSCOORD3D.js
@@ -1,5 +1,6 @@
 import { ImageSet } from '../../classes';
 import getMeasurements from './utils/getMeasurements';
+import getReferencedImagesList from './utils/getReferencedImagesList';
 import isRehydratable from './utils/isRehydratable';
 import addMeasurement from './utils/addMeasurement';
 
@@ -26,6 +27,7 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
 
     const { ContentSequence } = firstInstance;
 
+    srDisplaySet.referencedImages = getReferencedImagesList(ContentSequence);
     srDisplaySet.measurements = getMeasurements(ContentSequence);
     const mappings = MeasurementService.getSourceMappings(
       'CornerstoneTools',

diff --git a/platform/core/src/DICOMSR/SCOORD3D/utils/getReferencedImagesList.js b/platform/core/src/DICOMSR/SCOORD3D/utils/getReferencedImagesList.js
@@ -10,7 +10,7 @@ const getReferencedImagesList = ImagingMeasurementReportContentSequence => {
       CodeNameCodeSequenceValues.ImageLibrary
   );
 
-  if (!ImageLibrary.ContentSequence) {
+  if (!ImageLibrary || !ImageLibrary.ContentSequence) {
     return referencedImages;
   }
 
@@ -22,6 +22,10 @@ const getReferencedImagesList = ImagingMeasurementReportContentSequence => {
       CodeNameCodeSequenceValues.ImageLibraryGroup
   );
 
+  if (!ImageLibraryGroup || !ImageLibraryGroup.ContentSequence) {
+    return referencedImages;
+  }
+
   getSequenceAsArray(ImageLibraryGroup.ContentSequence).forEach(item => {
     const { ReferencedSOPSequence } = item;
     if (ReferencedSOPSequence) {