Order population expressions for HTML output

projecttacoma · Jul 6, 2023 · 9e6c6e9 · 9e6c6e9
1 parent a977000
commit 9e6c6e9
Show file tree

Hide file tree

Showing 2 changed files with 121 additions and 8 deletions.
diff --git a/src/calculation/HTMLBuilder.ts b/src/calculation/HTMLBuilder.ts
@@ -92,23 +92,49 @@ Handlebars.registerHelper('highlightCoverage', (localId, context) => {
  */
 export function sortStatements(measure: fhir4.Measure, groupId: string, statements: StatementResult[]) {
  const group = measure.group?.find(g => g.id === groupId) || measure.group?.[0];
- const populationSet = new Set(group?.population?.map(p => p.criteria.expression));
+ const populationOrder = [
+ 'initial-population',
+ 'denominator',
+ 'denominator-exclusion',
+ 'denominator-exception',
+ 'numerator',
+ 'numerator-exclusion',
+ 'measure-population',
+ 'measure-population-exclusion',
+ 'measure-observation'
+ ];
+
+ const populationIdentifiers: Record<string, string> = {};
+ group?.population?.forEach(p => {
+ if (p.code?.coding?.[0].code !== undefined) {
+ populationIdentifiers[p.criteria.expression as string] = p.code.coding[0].code as string;
+ }
+ });
+
+ function populationCompare(a: StatementResult, b: StatementResult) {
+ return (
+ populationOrder.indexOf(populationIdentifiers[a.statementName]) -
+ populationOrder.indexOf(populationIdentifiers[b.statementName])
+ );
+ }
+
  function alphaCompare(a: StatementResult, b: StatementResult) {
  return a.statementName <= b.statementName ? -1 : 1;
  }
+
  statements.sort((a, b) => {
+ // if population statement, leave order or send to beginning
+ if (Object.keys(populationIdentifiers).includes(a.statementName)) {
+ return Object.keys(populationIdentifiers).includes(b.statementName) ? populationCompare(a, b) : -1;
+ }
+ if (Object.keys(populationIdentifiers).includes(b.statementName)) return 1;
+
  // if function, alphabetize or send to end
  if (a.isFunction) {
  return b.isFunction ? alphaCompare(a, b) : 1;
  }
  if (b.isFunction) return -1;
 
- // if population statement, leave order or send to beginning
- if (populationSet.has(a.statementName)) {
- return populationSet.has(b.statementName) ? 0 : -1;
- }
- if (populationSet.has(b.statementName)) return 1;
-
  // if no function or population statement, alphabetize
  return alphaCompare(a, b);
  });

diff --git a/test/unit/HTMLBuilder.test.ts b/test/unit/HTMLBuilder.test.ts
@@ -5,7 +5,8 @@ import {
  cqlLogicClauseTrueStyle,
  cqlLogicClauseFalseStyle,
  cqlLogicClauseCoveredStyle,
- calculateClauseCoverage
+ calculateClauseCoverage,
+ sortStatements
 } from '../../src/calculation/HTMLBuilder';
 import {
  StatementResult,
@@ -28,6 +29,7 @@ describe('HTMLBuilder', () => {
  const falseStyleString = objToCSS(cqlLogicClauseFalseStyle);
  const coverageStyleString = objToCSS(cqlLogicClauseCoveredStyle);
  const simpleMeasure = getJSONFixture('measure/simple-measure.json') as fhir4.Measure;
+ const cvMeasure = getJSONFixture('measure/cv-measure.json') as fhir4.Measure;
  const singlePopMeasure = <fhir4.Measure>{
  resourceType: 'Measure',
  status: 'unknown',
@@ -303,4 +305,89 @@ describe('HTMLBuilder', () => {
  expect(res.indexOf('ipp')).toBeLessThan(res.indexOf('SimpleVSRetrieve'));
  expect(res.indexOf('SimpleVSRetrieve')).toBeLessThan(res.indexOf('A Function'));
  });
+
+ test('sortStatements orders population statements in specified order, then other, then function for a proportion boolean measure', () => {
+ statementResults = [
+ {
+ libraryName: 'Test',
+ statementName: 'A Function',
+ localId: 'test-id-1',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE,
+ isFunction: true
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'SimpleVSRetrieve',
+ localId: 'test-id-2',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'Numerator',
+ localId: 'test-id-3',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'Initial Population',
+ localId: 'test-id-4',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'Denominator Exclusion',
+ localId: 'test-id-5',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ }
+ ];
+ sortStatements(simpleMeasure, 'test', statementResults);
+ expect(statementResults[0].statementName === 'Initial Population');
+ expect(statementResults[1].statementName === 'Denominator Exclusion');
+ expect(statementResults[2].statementName === 'Numerator');
+ expect(statementResults[3].statementName === 'SimpleVSRetrieve');
+ expect(statementResults[4].statementName === 'A Function');
+ });
+
+ test('sortStatements orders population statements in specified order, then other, then function for a continuous-variable boolean measure', () => {
+ statementResults = [
+ {
+ libraryName: 'Test',
+ statementName: 'Measure Population Exclusions',
+ localId: 'test-id-1',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'Initial Population',
+ localId: 'test-id-2',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'MeasureObservation',
+ localId: 'test-id-3',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE,
+ isFunction: true
+ },
+ {
+ libraryName: 'Test',
+ statementName: 'Measure Population',
+ final: FinalResult.FALSE,
+ relevance: Relevance.TRUE
+ }
+ ];
+ sortStatements(cvMeasure, 'test', statementResults);
+ expect(statementResults[0].statementName === 'Initial Population');
+ expect(statementResults[1].statementName === 'Measure Population');
+ expect(statementResults[2].statementName === 'Measure Population Exclusions');
+ expect(statementResults[3].statementName === 'MeasureObservation');
+ });
 });