projecttacoma / fqm-execution

fqm-execution is a library that allows users to calculate FHIR-based electronic Clinical Quality Measures (eCQMs) and retrieve the results in a variety of formats

Apache License 2.0

18 stars 6 forks source link

Summary

Fixes #238

Generated HTML sorts statements into population statements, non-functions, and function statements, where non-population statements are also in alphabetical order.

New behavior

HTML output from calculation has appropriately ordered expressions.

Code changes

Calculator.ts - updates to pass the measure through to the HTMLBuilder
HTMLBuilder.ts - adds sortStatements function which sorts the passed statements by population statements, non-functions, and function statements. Measure information is passed through to identify population statements.
DataRequirementsHelper.ts - just a typo update
HTMLBuilder.test.ts - test expression ordering and pass measure through
Adds PopRetrieveFunc elm and expected HTML fixtures for testing: these fixtures include a population, simple retrieval, and function

Testing guidance

npm run check
Testing with measure example input: npm run cli -- -p "ecqm-content-r4-2021/bundles/measure/CervicalCancerScreeningFHIR/CervicalCancerScreeningFHIR-files/tests-denom-EXM124-bundle.json" -m "ecqm-content-r4-2021/bundles/measure/CervicalCancerScreeningFHIR/CervicalCancerScreeningFHIR-bundle.json" -o --debug -> Search output.json file for "html" to find the html in situ or go to the debug/html folder and view any html there in browser to confirm expression order is correct

Coverage report

St.^{:grey_question:}	Category	Percentage	Covered / Total
🟢	Statements	86.44% (+0.02% 🔼)	2218/2566
🟡	Branches	75.25% (+0.07% 🔼)	2037/2707
🟢	Functions	89.32% (+0.56% 🔼)	410/459
🟢	Lines	86.78% (+0.03% 🔼)	2140/2466

St.^{:grey_question:}

Category

Percentage

Covered / Total

🟢

Statements

86.44% (+0.02% 🔼)

2218/2566

🟡

Branches

75.25% (+0.07% 🔼)

2037/2707

🟢

Functions

89.32% (+0.56% 🔼)

410/459

🟢

Lines

86.78% (+0.03% 🔼)

2140/2466

Show files with reduced coverage 🔻

St.^{:grey_question:}

| File | Statements | Branches | Functions | Lines | | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------- | :------------------------------------------------------------- | :------------------------------------------------------------- | :------------------------------------------------------------- | :------------------------------------------------------------- | | 🟢 |

`...` / HTMLBuilder.ts

92.13% (-0.53% 🔻)

74.24% (+5.82% 🔼)

94.87% (+6.64% 🔼)

92.73% (+0.02% 🔼)