Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test branch #23

Merged
merged 26 commits into from
Jul 14, 2022
Merged

Test branch #23

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
20266d1
Starting a packaging script to update the resources from the ELM JSON.
Jun 2, 2022
a8c496a
Updating packager script to also build the js export files.
Jun 3, 2022
180d442
Packager script now updates base64 encoded logic in the json librarie…
Jun 3, 2022
e1bac41
Fixing a bug in the common abnormality recommendation logic, where a
Jun 7, 2022
9cab60a
Adding Rare Abnormality Testing Cases
ptran265 Jun 10, 2022
6e6812f
Refactoring management CQL.
Jun 13, 2022
e58b73c
Updating dashboard CQL to align with React API.
Jun 14, 2022
f03f6bf
Removing debug stubs from CQL and re-exporting
Jun 14, 2022
45f3772
Several updates:
Jun 14, 2022
7aad9d6
Adding rare abnormality test cases
ptran265 Jun 16, 2022
6f9c5b9
Pregnancy updates & refactor.
Jun 21, 2022
93b02ba
Adding shot and long names and values to the dashboard history tables.
Jun 23, 2022
a798b3d
adding more cases and fixing cql bugs
ptran265 Jun 27, 2022
05cb275
merged with rareAbnormalities
ptran265 Jun 27, 2022
213a856
removed apikey
ptran265 Jun 29, 2022
7a12e2e
Updating package.json
Jun 30, 2022
3f5ac5c
modified pathway in package.json and adding further testing I33 and I34
ptran265 Jul 6, 2022
24e4db2
modifying section I3 CQL and test cases
ptran265 Jul 7, 2022
6131eaa
removing 97 typo in management of histology results
ptran265 Jul 11, 2022
351f12c
fixing less than equal sign
ptran265 Jul 11, 2022
f6e4b39
fixing test-cql script to work for windows
ptran265 Jul 11, 2022
375b922
removing test-cql-windows
ptran265 Jul 11, 2022
11433fe
Upgrading encender to version 0.3
Jul 14, 2022
c357d99
Fix apostrophe encoding error when compiling ManageCommonAbnormality.cql
mickohanlon23 Jul 14, 2022
b5f9216
Run packager script to reflect CQL updates from test cases.
mickohanlon23 Jul 14, 2022
4a13b13
Updating cql-testing-framework and updating some of the logic to
Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apply/screening-example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const elmJsonDependencyArray = [
JSON.parse(readFileSync('cql/ScreeningDesExposureLibrary.json')),
JSON.parse(readFileSync('cql/ScreeningImmunocompromisedLibrary.json')),
JSON.parse(readFileSync('cql/ScreeningAverageRiskLibrary.json')),
JSON.parse(readFileSync('cql/DisplayCervicalCancerMedicalHistory.json')),
JSON.parse(readFileSync('cql/DashboardLibrary.json')),
JSON.parse(readFileSync('cql/CCSMCommonFunctions.json')),
JSON.parse(readFileSync('cql/CDSConnectCommonsforFHIRv401.json')),
];
Expand Down
12 changes: 6 additions & 6 deletions cql/AutogeneratedRiskTables.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ include "FHIRHelpers" version '4.0.1' called FHIRHelpers

// METADATA
// Downloaded from: https://cervixca.nlm.nih.gov/RiskTables/
// Date Generated: 10/07/2021 12:35:08
// Date Generated: 31/05/2022 13:25:59
// Number of Risk Tables: 5
// Risk Tables:
// 1 - Screening
// (last downloaded: Tue May 11 06:13:16 2021)
// (last downloaded: Tue May 31 10:30:43 2022)
// 2 - Surveillance
// (last downloaded: Tue May 11 06:13:16 2021)
// (last downloaded: Tue May 31 10:30:43 2022)
// 3 - Colposcopy Results
// (last downloaded: Tue May 11 06:13:16 2021)
// (last downloaded: Tue May 31 10:30:43 2022)
// 4 - Post Colpo Surveillance
// (last downloaded: Tue May 11 06:13:16 2021)
// (last downloaded: Tue May 31 10:30:43 2022)
// 5 - Post Treatment Surveillance
// (last downloaded: Tue May 11 06:13:16 2021)
// (last downloaded: Tue May 31 10:30:43 2022)

// Export Risk Tables
define ClinicalSituations:
Expand Down
2 changes: 1 addition & 1 deletion cql/CCSMCommonFunctions.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ define function DateText(d FHIR.date):
// @param d - a FHIR dateTime to get text for
// @returns {System.String} the text representation of the dateTime
dwwinters marked this conversation as resolved.
Show resolved Hide resolved
define function DateTimeText(d FHIR.dateTime):
ToString(d.value)
First(SplitOnMatches(ToString(d.value), 'T'))

// Returns a text representation of an instant using the CQL `ToString` function.
// @param i - a FHIR instant to get text for
Expand Down
25 changes: 18 additions & 7 deletions cql/CCSMCommonFunctions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,24 @@
"accessLevel" : "Public",
"type" : "FunctionDef",
"expression" : {
"type" : "ToString",
"operand" : {
"path" : "value",
"type" : "Property",
"source" : {
"name" : "d",
"type" : "OperandRef"
"type" : "First",
"source" : {
"type" : "SplitOnMatches",
"stringToSplit" : {
"type" : "ToString",
"operand" : {
"path" : "value",
"type" : "Property",
"source" : {
"name" : "d",
"type" : "OperandRef"
}
}
},
"separatorPattern" : {
"valueType" : "{urn:hl7-org:elm-types:r1}String",
"value" : "T",
"type" : "Literal"
}
}
},
Expand Down
Loading