Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #764 from MeasureAuthoringTool/MAT-7915_runTestCas…
Browse files Browse the repository at this point in the history 
…eIssueWithStrats

MAT-7915 resolve execution result difference in list page and test ca…
  • Loading branch information
@sb-cecilialiu
sb-cecilialiu authored Nov 18, 2024
2 parents ebe3e66 + d194a9a commit ecac28f
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 17 deletions.
7 changes: 4 additions & 3 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

167 changes: 157 additions & 10 deletions src/api/CalculationService.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ describe("CalculationService Tests", () => {
populationValues: undefined,
stratificationValues: undefined,
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

Expand All @@ -357,7 +357,7 @@ describe("CalculationService Tests", () => {
populationValues: [],
stratificationValues: undefined,
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

Expand All @@ -369,7 +369,7 @@ describe("CalculationService Tests", () => {
populationValues: [],
stratificationValues: [],
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

Expand All @@ -389,7 +389,7 @@ describe("CalculationService Tests", () => {
],
stratificationValues: [],
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

Expand Down Expand Up @@ -423,7 +423,7 @@ describe("CalculationService Tests", () => {
],
stratificationValues: [],
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

Expand Down Expand Up @@ -457,7 +457,7 @@ describe("CalculationService Tests", () => {
],
stratificationValues: [],
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(false);
});

Expand Down Expand Up @@ -492,7 +492,7 @@ describe("CalculationService Tests", () => {
},
],
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

Expand Down Expand Up @@ -527,8 +527,155 @@ describe("CalculationService Tests", () => {
},
],
};
const output = calculationService.isGroupPass(groupPop);
expect(output).toEqual(false);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(true);
});

it("Should pass group with stratifications and filter out invalid population values", () => {
const group: Group = {
id: "6734f7e4af7d11385b114b91",
scoring: "Continuous Variable",
populations: [
{
id: "69333bb0-0e65-41ac-9648-8badc3e70c6e",
name: PopulationType.INITIAL_POPULATION,
definition: "Initial Population",
description: "",
},
{
id: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
name: PopulationType.MEASURE_POPULATION,
definition: "Qualifying Encounters",
description: "",
},
{
id: "9a4b1c39-5a94-49b2-ae33-75ec80a5d7d6",
name: PopulationType.MEASURE_POPULATION_OBSERVATION,
definition: "",
description: "",
},
],
measureObservations: [
{
id: "3a429f92-8eb6-456a-bfd4-658458d54885",
definition: "MeasureObservation",

criteriaReference: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
aggregateMethod: "Maximum",
},
],
groupDescription: "",
improvementNotation: "",
rateAggregation: "",
measureGroupTypes: [MeasureGroupTypes.PROCESS],
scoringUnit: "",
stratifications: [
{
id: "a9197a7f-78ca-484c-a84d-05531c1dd9e4",
description: "StratificationOne",
cqlDefinition: "Stratification 1",
associations: [PopulationType.INITIAL_POPULATION],
},
{
id: "c88151f1-83dd-477e-afe7-631e17cec6ff",
description: "StratificationTwo",
cqlDefinition: "Stratification 2",
associations: [PopulationType.MEASURE_POPULATION],
},
],
populationBasis: "Encounter",
};
const groupPop = {
groupId: "6734f7e4af7d11385b114b91",
scoring: "Continuous Variable",
populationBasis: "Encounter",
populationValues: [
{
id: "69333bb0-0e65-41ac-9648-8badc3e70c6e",
criteriaReference: null,
name: PopulationType.INITIAL_POPULATION,
expected: "1",
actual: 1,
},
{
id: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
criteriaReference: null,
name: PopulationType.MEASURE_POPULATION,
expected: "1",
actual: 1,
},
{
id: "measurePopulationObservation0",
criteriaReference: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
name: PopulationType.MEASURE_POPULATION_OBSERVATION,
expected: "02",
actual: 2,
},
],
stratificationValues: [
{
id: "a9197a7f-78ca-484c-a84d-05531c1dd9e4",
name: "Strata-1",
expected: null,
actual: null,
populationValues: [
{
id: "69333bb0-0e65-41ac-9648-8badc3e70c6e",
criteriaReference: null,
name: PopulationType.INITIAL_POPULATION,
expected: "1",
actual: 1,
},
{
id: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
criteriaReference: null,
name: PopulationType.MEASURE_POPULATION,
expected: "1",
actual: 1,
},
{
id: "measurePopulationObservation0",
criteriaReference: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
name: PopulationType.MEASURE_POPULATION_OBSERVATION,
expected: "02",
actual: 0,
},
],
},
{
id: "c88151f1-83dd-477e-afe7-631e17cec6ff",
name: "Strata-2",
expected: null,
actual: null,
populationValues: [
{
id: "69333bb0-0e65-41ac-9648-8badc3e70c6e",
criteriaReference: null,
name: PopulationType.INITIAL_POPULATION,
expected: "0",
actual: 0,
},
{
id: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
criteriaReference: null,
name: PopulationType.MEASURE_POPULATION,
expected: "0",
actual: 0,
},
{
id: "measurePopulationObservation0",
criteriaReference: "60ab5bfd-bd1a-4e53-8cd8-1cb4aae465dd",
name: PopulationType.MEASURE_POPULATION_OBSERVATION,
expected: "02",
actual: 0,
},
],
},
],
};

const output = calculationService.isGroupPass(groupPop, group);
expect(output).toEqual(true);
});

it("should fail group with incorrect measure observations for Ratio", () => {
Expand Down Expand Up @@ -575,7 +722,7 @@ describe("CalculationService Tests", () => {
],
stratificationValues: [],
};
const output = calculationService.isGroupPass(groupPop);
const output = calculationService.isGroupPass(groupPop, {} as Group);
expect(output).toEqual(false);
});
});
Expand Down
43 changes: 39 additions & 4 deletions src/api/CalculationService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
Population,
PopulationExpectedValue,
TestCase,
StratificationExpectedValue,
} from "@madie/madie-models";
import { Bundle, ValueSet } from "fhir/r4";
import * as _ from "lodash";
Expand Down Expand Up @@ -290,7 +291,7 @@ export class CalculationService {
return results;
}

isGroupPass(groupPopulation: GroupPopulation) {
isGroupPass(groupPopulation: GroupPopulation, measureGroup: Group) {
let groupPass = true;
if (groupPopulation) {
const patientBased =
Expand All @@ -312,9 +313,24 @@ export class CalculationService {
}
// verify stratification & stratified populations passing if they exist
if (groupPopulation.stratificationValues) {
return groupPopulation.stratificationValues.every((strata) => {
let validStratPopValues = [];
groupPopulation.stratificationValues.forEach(
(stratValues: StratificationExpectedValue) => {
stratValues.populationValues?.forEach((popValue) => {
const validPopValues = this.getValidStratPopulationValues(
measureGroup,
stratValues.id,
popValue
);
if (validPopValues && validPopValues.length > 0) {
validStratPopValues.push(validPopValues);
}
});
}
);
return validStratPopValues.every((strata) => {
// verify stratified populations passing
return strata.populationValues.every((population) =>
return strata.every((population) =>
this.isValuePass(
population.actual,
population.expected,
Expand All @@ -327,6 +343,24 @@ export class CalculationService {
return groupPass;
}

getValidStratPopulationValues(
measureGroup: Group,
stratId: string,
popValue: PopulationExpectedValue
): PopulationExpectedValue[] {
let valiePopValue = [];
measureGroup?.stratifications?.forEach((strat) => {
if (strat.id === stratId) {
strat.associations?.forEach((association) => {
if (association === popValue.name) {
valiePopValue.push(popValue);
}
});
}
});
return valiePopValue;
}

processTestCaseResults(
testCase: TestCase,
measureGroups: Group[],
Expand Down Expand Up @@ -463,7 +497,8 @@ export class CalculationService {
});
});
// need to do work here.
allGroupsPass = allGroupsPass && this.isGroupPass(tcGroupPopulation);
allGroupsPass =
allGroupsPass && this.isGroupPass(tcGroupPopulation, measureGroup);
}
updatedTestCase.executionStatus = allGroupsPass
? ExecutionStatusType.PASS
Expand Down

0 comments on commit ecac28f

Please sign in to comment.