Add FHIR Coding Equivalent CQL Code CQL Test

This test uses Encounter.class which is a Coding in R4 to test that the
equivalent (~) operator works on FHIR Coding and CQL Code. The test also
has a version on one of the Encounter classes to test that equivalent
ignores the version of a Coding.

Author: alexanderkiel

modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/measure_test.clj

@@ -937,6 +937,8 @@
 
   (testing-query "q60-medication" 2)
 
+  (testing-query "q61-encounter-class" 2)
+
   (let [result (evaluate "q1" "subject-list")]
     (testing "MeasureReport is valid"
       (is (s/valid? :blaze/resource (:resource result))))
@@ -1199,4 +1201,4 @@
 
 (comment
   (log/set-min-level! :debug)
-  (evaluate "q60-medication"))
+  (evaluate "q61-encounter-class"))

modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q38-di-surv.json

@@ -6,7 +6,6 @@
       "resource": {
         "resourceType": "Patient",
         "id": "0",
-        "gender": "male",
         "birthDate": "2020"
       },
       "request": {
@@ -21,16 +20,13 @@
       },
       "request": {
         "method": "PUT",
-        "url": "Patient/1",
-        "gender": "female",
-        "birthDate": "2019"
+        "url": "Patient/1"
       }
     },
     {
       "resource": {
         "resourceType": "Patient",
         "id": "2",
-        "gender": "male",
         "birthDate": "2019"
       },
       "request": {
@@ -42,7 +38,6 @@
       "resource": {
         "resourceType": "Patient",
         "id": "3",
-        "gender": "female",
         "birthDate": "2018"
       },
       "request": {
@@ -54,7 +49,6 @@
       "resource": {
         "resourceType": "Patient",
         "id": "4",
-        "gender": "male",
         "birthDate": "2000"
       },
       "request": {

modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q61-encounter-class.cql

@@ -0,0 +1,11 @@
+library "q61-encounter-class"
+using FHIR version '4.0.0'
+include FHIRHelpers version '4.0.0'
+
+codesystem foo: 'system-120749'
+
+context Patient
+
+define InInitialPopulation:
+  exists (from [Encounter] E
+    where E.class ~ Code 'code-120753' from foo)

modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q61-encounter-class.json

@@ -0,0 +1,162 @@
+{
+  "resourceType": "Bundle",
+  "type": "transaction",
+  "entry": [
+    {
+      "resource": {
+        "resourceType": "Patient",
+        "id": "0"
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Patient/0"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Patient",
+        "id": "1"
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Patient/1"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Patient",
+        "id": "2"
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Patient/2"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Patient",
+        "id": "3"
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Patient/3"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Encounter",
+        "id": "0",
+        "class": {
+          "system": "system-120749",
+          "code": "code-120753"
+        },
+        "subject": {
+          "reference": "Patient/0"
+        }
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Encounter/0"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Encounter",
+        "id": "1",
+        "class": {
+          "system": "system-120749",
+          "code": "code-120826"
+        },
+        "subject": {
+          "reference": "Patient/1"
+        }
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Encounter/1"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Encounter",
+        "id": "2",
+        "class": {
+          "system": "system-120749",
+          "code": "code-120753",
+          "version": "version-120852"
+        },
+        "subject": {
+          "reference": "Patient/2"
+        }
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Encounter/2"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Encounter",
+        "id": "3",
+        "subject": {
+          "reference": "Patient/3"
+        }
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Encounter/3"
+      }
+    },
+    {
+      "resource": {
+        "resourceType": "Measure",
+        "id": "0",
+        "url": "0",
+        "status": "active",
+        "subjectCodeableConcept": {
+          "coding": [
+            {
+              "system": "http://hl7.org/fhir/resource-types",
+              "code": "Patient"
+            }
+          ]
+        },
+        "library": [
+          "0"
+        ],
+        "scoring": {
+          "coding": [
+            {
+              "system": "http://terminology.hl7.org/CodeSystem/measure-scoring",
+              "code": "cohort"
+            }
+          ]
+        },
+        "group": [
+          {
+            "population": [
+              {
+                "code": {
+                  "coding": [
+                    {
+                      "system": "http://terminology.hl7.org/CodeSystem/measure-population",
+                      "code": "initial-population"
+                    }
+                  ]
+                },
+                "criteria": {
+                  "language": "text/cql-identifier",
+                  "expression": "InInitialPopulation"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "request": {
+        "method": "PUT",
+        "url": "Measure/0"
+      }
+    }
+  ]
+}