Skip to content

Commit d294b38

Browse files
alexzautkealexzautke
authored
Merge pull request #993 from FirelyTeam/feature-971
Feature 971
2 parents 84ccd27 + 521e4ea commit d294b38

File tree

646 files changed

+1405427
-14773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

646 files changed

+1405427
-14773
lines changed

‎Cql-Sdk-All.sln‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{B00E560D-A
4545
Demo\cql-demo.props = Demo\cql-demo.props
4646
EndProjectSection
4747
EndProject
48-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Measures.CMS", "Demo\Measures.CMS\Measures.CMS.csproj", "{B1161915-FFB0-412A-9C65-2F4E046FA9B8}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Measures.ecqm-content-qicore-2024", "Demo\Measures.ecqm-content-qicore-2024\Measures.ecqm-content-qicore-2024.csproj", "{B1161915-FFB0-412A-9C65-2F4E046FA9B8}"
4949
ProjectSection(ProjectDependencies) = postProject
5050
{FEF0C134-505D-4206-8630-569A6762F787} = {FEF0C134-505D-4206-8630-569A6762F787}
5151
EndProjectSection
@@ -144,6 +144,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CqlSdkExamples", "Examples\
144144
EndProject
145145
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CqlSdkExamplesPreview", "Examples\CqlSdkExamplesPreview\CqlSdkExamplesPreview.csproj", "{A1234567-89AB-CDEF-1234-567890ABCDEF}"
146146
EndProject
147+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Measures.ecqm-content-cms-2025", "Demo\Measures.ecqm-content-cms-2025\Measures.ecqm-content-cms-2025.csproj", "{4125CA3B-A8E7-23C9-4E7B-DAA8D5226E9E}"
148+
EndProject
149+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Measures.ecqm-content-qicore-2025", "Demo\Measures.ecqm-content-qicore-2025\Measures.ecqm-content-qicore-2025.csproj", "{32AF150E-FA7A-DACF-B262-49754A42D628}"
150+
EndProject
151+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGen", "submodules\Firely.Cql.Sdk.Integration.Runner\CodeGen\CodeGen.csproj", "{A04486DA-33C8-DE9E-ECC7-89456FE7A3B5}"
152+
EndProject
147153
Global
148154
GlobalSection(SolutionConfigurationPlatforms) = preSolution
149155
Debug|Any CPU = Debug|Any CPU
@@ -270,6 +276,18 @@ Global
270276
{A1234567-89AB-CDEF-1234-567890ABCDEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
271277
{A1234567-89AB-CDEF-1234-567890ABCDEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
272278
{A1234567-89AB-CDEF-1234-567890ABCDEF}.Release|Any CPU.Build.0 = Release|Any CPU
279+
{4125CA3B-A8E7-23C9-4E7B-DAA8D5226E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
280+
{4125CA3B-A8E7-23C9-4E7B-DAA8D5226E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
281+
{4125CA3B-A8E7-23C9-4E7B-DAA8D5226E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
282+
{4125CA3B-A8E7-23C9-4E7B-DAA8D5226E9E}.Release|Any CPU.Build.0 = Release|Any CPU
283+
{32AF150E-FA7A-DACF-B262-49754A42D628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
284+
{32AF150E-FA7A-DACF-B262-49754A42D628}.Debug|Any CPU.Build.0 = Debug|Any CPU
285+
{32AF150E-FA7A-DACF-B262-49754A42D628}.Release|Any CPU.ActiveCfg = Release|Any CPU
286+
{32AF150E-FA7A-DACF-B262-49754A42D628}.Release|Any CPU.Build.0 = Release|Any CPU
287+
{A04486DA-33C8-DE9E-ECC7-89456FE7A3B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
288+
{A04486DA-33C8-DE9E-ECC7-89456FE7A3B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
289+
{A04486DA-33C8-DE9E-ECC7-89456FE7A3B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
290+
{A04486DA-33C8-DE9E-ECC7-89456FE7A3B5}.Release|Any CPU.Build.0 = Release|Any CPU
273291
EndGlobalSection
274292
GlobalSection(SolutionProperties) = preSolution
275293
HideSolutionNode = FALSE
@@ -316,9 +334,12 @@ Global
316334
{BAEF695A-5581-B3EE-B352-CBF447240E55} = {1AF2E4B2-99C5-4678-B926-D224CC83A8F7}
317335
{93532653-75AF-025F-00F7-1B34C75DF1C1} = {14ED22C5-F918-42DB-A301-04B3AED51EBC}
318336
{A1234567-89AB-CDEF-1234-567890ABCDEF} = {14ED22C5-F918-42DB-A301-04B3AED51EBC}
337+
{4125CA3B-A8E7-23C9-4E7B-DAA8D5226E9E} = {85401759-2C64-414D-9882-4DB1EA41C2ED}
338+
{32AF150E-FA7A-DACF-B262-49754A42D628} = {85401759-2C64-414D-9882-4DB1EA41C2ED}
339+
{A04486DA-33C8-DE9E-ECC7-89456FE7A3B5} = {0E5F5704-5289-4C65-AD4E-364CD5F60C44}
319340
EndGlobalSection
320341
GlobalSection(ExtensibilityGlobals) = postSolution
321342
SolutionGuid = {366252DE-C2FB-4EAC-96EE-22210BD43DE2}
322-
FileExplorer = |build\|docs\|LibrarySets\|submodules\Firely.Cql.Sdk.Integration.Runner\NodeJsUtils\
343+
FileExplorer = build\|docs\|LibrarySets\|submodules\Firely.Cql.Sdk.Integration.Runner\NodeJsUtils\
323344
EndGlobalSection
324345
EndGlobal

‎Cql-Sdk-Demos-Examples.slnf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
"Demo\\CLI\\CLI.csproj",
2323
"Demo\\Cql\\Cql.csproj",
2424
"Demo\\Measures.Authoring\\Measures.Authoring.csproj",
25-
"Demo\\Measures.CMS\\Measures.CMS.csproj",
2625
"Demo\\Measures.Demo\\Measures.Demo.csproj",
26+
"Demo\\Measures.ecqm-content-cms-2025\\Measures.ecqm-content-cms-2025.csproj",
27+
"Demo\\Measures.ecqm-content-qicore-2024\\Measures.ecqm-content-qicore-2024.csproj",
28+
"Demo\\Measures.ecqm-content-qicore-2025\\Measures.ecqm-content-qicore-2025.csproj",
2729
"Demo\\Test.Measures.Demo\\Test.Measures.Demo.csproj",
2830
"Examples\\CqlSdkExamplesPreview\\CqlSdkExamplesPreview.csproj",
2931
"Examples\\CqlSdkExamples\\CqlSdkExamples.csproj"

‎Cql/CoreTests/Input/ELM/HL7/ConceptDefTest.json‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"library" : {
33
"annotation" : [ {
4-
"translatorVersion" : "3.1.0",
4+
"translatorVersion" : "3.28.0",
55
"translatorOptions" : "EnableLocators,EnableResultTypes",
6+
"signatureLevel" : "All",
67
"type" : "CqlToElmInfo"
78
} ],
89
"identifier" : {
@@ -16,20 +17,23 @@
1617
"usings" : {
1718
"def" : [ {
1819
"localIdentifier" : "System",
19-
"uri" : "urn:hl7-org:elm-types:r1"
20+
"uri" : "urn:hl7-org:elm-types:r1",
21+
"annotation" : [ ]
2022
}, {
2123
"locator" : "3:1-3:26",
2224
"localIdentifier" : "FHIR",
2325
"uri" : "http://hl7.org/fhir",
24-
"version" : "4.0.1"
26+
"version" : "4.0.1",
27+
"annotation" : [ ]
2528
} ]
2629
},
2730
"includes" : {
2831
"def" : [ {
2932
"locator" : "5:1-5:54",
3033
"localIdentifier" : "FHIRHelpers",
3134
"path" : "FHIRHelpers",
32-
"version" : "4.0.1"
35+
"version" : "4.0.1",
36+
"annotation" : [ ]
3337
} ]
3438
},
3539
"codeSystems" : {
@@ -38,7 +42,8 @@
3842
"resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
3943
"name" : "SNOMED",
4044
"id" : "http://snomed.info/sct",
41-
"accessLevel" : "Public"
45+
"accessLevel" : "Public",
46+
"annotation" : [ ]
4247
} ]
4348
},
4449
"codes" : {
@@ -49,10 +54,12 @@
4954
"id" : "44054006",
5055
"display" : "Diabetes Mellitus",
5156
"accessLevel" : "Public",
57+
"annotation" : [ ],
5258
"codeSystem" : {
5359
"locator" : "10:43-10:50",
5460
"resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
55-
"name" : "SNOMED"
61+
"name" : "SNOMED",
62+
"annotation" : [ ]
5663
}
5764
}, {
5865
"locator" : "11:1-11:76",
@@ -61,10 +68,12 @@
6168
"id" : "38341003",
6269
"display" : "Hypertension",
6370
"accessLevel" : "Public",
71+
"annotation" : [ ],
6472
"codeSystem" : {
6573
"locator" : "11:46-11:53",
6674
"resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
67-
"name" : "SNOMED"
75+
"name" : "SNOMED",
76+
"annotation" : [ ]
6877
}
6978
}, {
7079
"locator" : "12:1-12:81",
@@ -73,10 +82,12 @@
7382
"id" : "763158003",
7483
"display" : "Medication Example",
7584
"accessLevel" : "Public",
85+
"annotation" : [ ],
7686
"codeSystem" : {
7787
"locator" : "12:45-12:52",
7888
"resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
79-
"name" : "SNOMED"
89+
"name" : "SNOMED",
90+
"annotation" : [ ]
8091
}
8192
} ]
8293
},
@@ -86,51 +97,66 @@
8697
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
8798
"name" : "Diabetes",
8899
"accessLevel" : "Public",
100+
"annotation" : [ ],
89101
"code" : [ {
90102
"locator" : "17:5-17:23",
91103
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
92-
"name" : "Diabetes Mellitus"
104+
"name" : "Diabetes Mellitus",
105+
"annotation" : [ ]
93106
} ]
94107
}, {
95108
"locator" : "21:1-24:1",
96109
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
97110
"name" : "Hypertension",
98111
"accessLevel" : "Public",
112+
"annotation" : [ ],
99113
"code" : [ {
100114
"locator" : "23:5-23:26",
101115
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
102-
"name" : "Hypertension Example"
116+
"name" : "Hypertension Example",
117+
"annotation" : [ ]
103118
} ]
104119
}, {
105120
"locator" : "27:1-30:1",
106121
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
107122
"name" : "Medication",
108123
"accessLevel" : "Public",
124+
"annotation" : [ ],
109125
"code" : [ {
110126
"locator" : "29:5-29:24",
111127
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
112-
"name" : "Medication Example"
128+
"name" : "Medication Example",
129+
"annotation" : [ ]
113130
} ]
114131
} ]
115132
},
116133
"contexts" : {
117134
"def" : [ {
118135
"locator" : "32:1-32:15",
119-
"name" : "Patient"
136+
"name" : "Patient",
137+
"annotation" : [ ]
120138
} ]
121139
},
122140
"statements" : {
123141
"def" : [ {
124142
"locator" : "32:1-32:15",
125143
"name" : "Patient",
126144
"context" : "Patient",
145+
"annotation" : [ ],
127146
"expression" : {
128147
"type" : "SingletonFrom",
148+
"annotation" : [ ],
149+
"signature" : [ ],
129150
"operand" : {
130151
"locator" : "32:1-32:15",
131152
"dataType" : "{http://hl7.org/fhir}Patient",
132153
"templateId" : "http://hl7.org/fhir/StructureDefinition/Patient",
133-
"type" : "Retrieve"
154+
"type" : "Retrieve",
155+
"annotation" : [ ],
156+
"include" : [ ],
157+
"codeFilter" : [ ],
158+
"dateFilter" : [ ],
159+
"otherFilter" : [ ]
134160
}
135161
}
136162
} ]

‎Cql/CoreTests/Input/ELM/HL7/CqlBooleanTest.json‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"library" : {
33
"annotation" : [ {
4-
"translatorVersion" : "3.1.0",
4+
"translatorVersion" : "3.28.0",
55
"translatorOptions" : "EnableLocators,EnableResultTypes",
6+
"signatureLevel" : "All",
67
"type" : "CqlToElmInfo"
78
} ],
89
"identifier" : {
@@ -16,57 +17,68 @@
1617
"usings" : {
1718
"def" : [ {
1819
"localIdentifier" : "System",
19-
"uri" : "urn:hl7-org:elm-types:r1"
20+
"uri" : "urn:hl7-org:elm-types:r1",
21+
"annotation" : [ ]
2022
} ]
2123
},
2224
"statements" : {
2325
"def" : [ {
2426
"locator" : "3:1-3:46",
2527
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
2628
"name" : "SomethingTrueEqualsTrue",
27-
"context" : "Patient",
29+
"context" : "Unfiltered",
2830
"accessLevel" : "Public",
31+
"annotation" : [ ],
2932
"expression" : {
3033
"locator" : "3:35-3:46",
3134
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
3235
"type" : "Equal",
36+
"annotation" : [ ],
3337
"signature" : [ {
3438
"name" : "{urn:hl7-org:elm-types:r1}Boolean",
35-
"type" : "NamedTypeSpecifier"
39+
"type" : "NamedTypeSpecifier",
40+
"annotation" : [ ]
3641
}, {
3742
"name" : "{urn:hl7-org:elm-types:r1}Boolean",
38-
"type" : "NamedTypeSpecifier"
43+
"type" : "NamedTypeSpecifier",
44+
"annotation" : [ ]
3945
} ],
4046
"operand" : [ {
4147
"locator" : "3:35-3:39",
4248
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
4349
"type" : "Equal",
50+
"annotation" : [ ],
4451
"signature" : [ {
4552
"name" : "{urn:hl7-org:elm-types:r1}Integer",
46-
"type" : "NamedTypeSpecifier"
53+
"type" : "NamedTypeSpecifier",
54+
"annotation" : [ ]
4755
}, {
4856
"name" : "{urn:hl7-org:elm-types:r1}Integer",
49-
"type" : "NamedTypeSpecifier"
57+
"type" : "NamedTypeSpecifier",
58+
"annotation" : [ ]
5059
} ],
5160
"operand" : [ {
5261
"locator" : "3:36",
5362
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
5463
"valueType" : "{urn:hl7-org:elm-types:r1}Integer",
5564
"value" : "1",
56-
"type" : "Literal"
65+
"type" : "Literal",
66+
"annotation" : [ ]
5767
}, {
5868
"locator" : "3:38",
5969
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
6070
"valueType" : "{urn:hl7-org:elm-types:r1}Integer",
6171
"value" : "1",
62-
"type" : "Literal"
72+
"type" : "Literal",
73+
"annotation" : [ ]
6374
} ]
6475
}, {
6576
"locator" : "3:43-3:46",
6677
"resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
6778
"valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
6879
"value" : "true",
69-
"type" : "Literal"
80+
"type" : "Literal",
81+
"annotation" : [ ]
7082
} ]
7183
}
7284
} ]

0 commit comments

Comments
 (0)