feat(Criteria): Add is nodal option to criterias (#51)

Author: igoroctaviano

src/measurements/conformance/criteria/MaxTargets.js

@@ -32,6 +32,14 @@ export const MaxTargetsSchema = {
       minItems: 1,
       uniqueItems: true,
     },
+    isNodal: {
+      label: 'Filter to evaluate only nodal or extranodal measurements',
+      type: 'boolean'
+    },
+    message: {
+      label: 'Message to be displayed in case of nonconformity',
+      type: 'string',
+    }
   },
   required: ['limit'],
 };
@@ -43,6 +51,7 @@ export const MaxTargetsSchema = {
  *   newTarget: Flag to evaluate only new targets (must be evaluated on both)
  *   locationIn: Filter to evaluate only measurements with the specified locations
  *   locationNotIn: Filter to evaluate only measurements without the specified locations
+ *   isNodal: Filter to evaluate only nodal or extranodal measurements
  *   message: Message to be displayed in case of nonconformity
  */
 export class MaxTargetsCriterion extends BaseCriterion {
@@ -56,24 +65,39 @@ export class MaxTargetsCriterion extends BaseCriterion {
     const newTargetNumbers = this.getNewTargetNumbers(data);
     const measurementNumbers = [];
     data.targets.forEach(target => {
-      const { location, measurementNumber, isSplitLesion } = target.measurement;
-      if (isSplitLesion) return;
-      if (options.newTarget && !newTargetNumbers.has(measurementNumber)) return;
+      const { location, measurementNumber, isSplitLesion, isNodal } = target.measurement;
+
+      if (isSplitLesion)
+        return;
+
+      if (typeof isNodal === 'boolean' && typeof options.isNodal === 'boolean' && options.isNodal !== isNodal)
+        return;
+
+      if (options.newTarget && !newTargetNumbers.has(measurementNumber))
+        return;
+
       if (options.locationIn && options.locationIn.indexOf(location) === -1)
         return;
+
       if (options.locationNotIn && options.locationNotIn.indexOf(location) > -1)
         return;
+
       measurementNumbers.push(measurementNumber);
     });
 
+    let lesionType = '';
+    if (typeof options.isNodal === 'boolean') {
+      lesionType = options.isNodal ? 'nodal ' : 'extranodal ';
+    }
+
     let message;
     if (measurementNumbers.length > options.limit) {
       const increment = options.newTarget ? 'new ' : '';
       const plural = options.limit === 1 ? '' : 's';
       const amount = options.limit === 0 ? '' : `more than ${options.limit}`;
       message =
         options.message ||
-        `The study should not have ${amount} ${increment}target${plural}.`;
+        `The study should not have ${amount} ${increment}${lesionType}target${plural}.`;
     }
 
     return this.generateResponse(message);

src/measurements/conformance/criteria/MaxTargetsPerOrgan.js

@@ -12,6 +12,14 @@ export const MaxTargetsPerOrganSchema = {
       label: 'Flag to evaluate only new targets',
       type: 'boolean',
     },
+    isNodal: {
+      label: 'Filter to evaluate only nodal or extranodal measurements',
+      type: 'boolean'
+    },
+    message: {
+      label: 'Message to be displayed in case of nonconformity',
+      type: 'string',
+    }
   },
   required: ['limit'],
 };
@@ -22,6 +30,8 @@ export const MaxTargetsPerOrganSchema = {
  * Options:
  *   limit: Max targets allowed in study
  *   newTarget: Flag to evaluate only new targets (must be evaluated on both)
+ *   isNodal: Filter to evaluate only nodal or extranodal measurements
+ *   message: Message to be displayed in case of nonconformity
  */
 export class MaxTargetsPerOrganCriterion extends BaseCriterion {
   constructor(...props) {
@@ -36,9 +46,13 @@ export class MaxTargetsPerOrganCriterion extends BaseCriterion {
     const newTargetNumbers = this.getNewTargetNumbers(data);
     data.targets.forEach(target => {
       const { measurement } = target;
-      const { location, measurementNumber, isSplitLesion } = measurement;
+      const { location, measurementNumber, isSplitLesion, isNodal } = measurement;
+
+      if (isSplitLesion)
+        return;
 
-      if (isSplitLesion) return;
+      if (typeof isNodal === 'boolean' && typeof options.isNodal === 'boolean' && options.isNodal !== isNodal)
+        return;
 
       if (!targetsPerOrgan[location]) {
         targetsPerOrgan[location] = new Set();
@@ -59,7 +73,7 @@ export class MaxTargetsPerOrganCriterion extends BaseCriterion {
       message =
         options.message ||
         `Each organ should not have more than ${
-          options.limit
+        options.limit
         } ${increment}targets.`;
     }
 

src/measurements/conformance/criteria/MeasurementsLength.js

@@ -63,6 +63,10 @@ export const MeasurementsLengthSchema = {
       minItems: 1,
       uniqueItems: true,
     },
+    isNodal: {
+      label: 'Filter to evaluate only nodal or extranodal measurements',
+      type: 'boolean'
+    },
     message: {
       label: 'Message to be displayed in case of nonconformity',
       type: 'string',
@@ -89,6 +93,7 @@ export const MeasurementsLengthSchema = {
  *   modalityNotIn: Filter to evaluate only measurements without the specified modalities
  *   locationIn: Filter to evaluate only measurements with the specified locations
  *   locationNotIn: Filter to evaluate only measurements without the specified locations
+ *   isNodal: Filter to evaluate only nodal or extranodal measurements
  *   message: Message to be displayed in case of nonconformity
  */
 export class MeasurementsLengthCriterion extends BaseCriterion {
@@ -107,7 +112,7 @@ export class MeasurementsLengthCriterion extends BaseCriterion {
       const { metadata, measurement } = item;
       const { location } = measurement;
 
-      let { longestDiameter, shortestDiameter } = measurement;
+      let { longestDiameter, shortestDiameter, isNodal } = measurement;
       if (measurement.childToolsCount) {
         const child = measurement.bidirectional;
         longestDiameter = (child && child.longestDiameter) || 0;
@@ -118,6 +123,8 @@ export class MeasurementsLengthCriterion extends BaseCriterion {
       const modality = (metadata.getRawValue('x00080060') || '').toUpperCase();
 
       // Stop here if the measurement does not match the modality and location filters
+      if (typeof isNodal === 'boolean' && typeof options.isNodal === 'boolean' && options.isNodal !== isNodal)
+        return;
       if (options.locationIn && options.locationIn.indexOf(location) === -1)
         return;
       if (options.modalityIn && options.modalityIn.indexOf(modality) === -1)