Implement the ToConcept Function and Equivalence on Concept

Closes: #1872

modules/cql/src/blaze/elm/code.clj

@@ -2,7 +2,7 @@
   "Implementation of the code type."
   (:require
    [blaze.elm.compiler.core :as core]
-   [blaze.elm.concept :as concept]
+   [blaze.elm.concept :refer [concept]]
    [blaze.elm.protocols :as p]))
 
 (defrecord Code [system version code]
@@ -39,7 +39,7 @@
   (-form [_]
     `(~'code ~system ~version ~code)))
 
-(defn to-code
+(defn code
   "Returns a CQL code with isn't the same as a FHIR code from the database."
   [system version code]
   (->Code system version code))
@@ -48,4 +48,4 @@
 (extend-protocol p/ToConcept
   Code
   (to-concept [x]
-    (concept/to-concept [x])))
+    (concept [x])))

modules/cql/src/blaze/elm/compiler/clinical_values.clj

@@ -7,10 +7,10 @@
    [blaze.anomaly :as ba :refer [throw-anom]]
    [blaze.elm.code :as code]
    [blaze.elm.compiler.core :as core]
-   [blaze.elm.concept :as concept]
+   [blaze.elm.concept :refer [concept]]
    [blaze.elm.date-time :as date-time]
-   [blaze.elm.quantity :as quantity]
-   [blaze.elm.ratio :as ratio]))
+   [blaze.elm.quantity :refer [quantity]]
+   [blaze.elm.ratio :refer [ratio]]))
 
 (defn- find-code-system-def
   "Returns the code-system-def with `name` from `library` or nil if not found."
@@ -30,7 +30,7 @@
    {{system-name :name} :system :keys [code] :as expression}]
   ;; TODO: look into other libraries (:libraryName)
   (if-let [{system :id :keys [version]} (find-code-system-def library system-name)]
-    (code/to-code system version code)
+    (code/code system version code)
     (throw-anom (code-system-not-found-anom system-name context expression))))
 
 ;; 3.2. CodeDef
@@ -51,7 +51,7 @@
              (find-code-def library name)]
     (when code-system-ref
       (when-let [{system :id :keys [version]} (core/compile* context (assoc code-system-ref :type "CodeSystemRef"))]
-        (code/to-code system version code)))))
+        (code/code system version code)))))
 
 ;; 3.4. CodeSystemDef
 ;;
@@ -69,7 +69,7 @@
 
 (defmethod core/compile* :elm.compiler.type/concept
   [context {:keys [codes]}]
-  (concept/to-concept (compile-codes context codes)))
+  (concept (compile-codes context codes)))
 
 ;; 3.7. ConceptDef
 ;;
@@ -85,8 +85,7 @@
 (defmethod core/compile* :elm.compiler.type/concept-ref
   [{:keys [library] :as context} {:keys [name]}]
   (when-let [{codes-refs :code} (find-concept-def library name)]
-    (->> (map #(core/compile* context (assoc % :type "CodeRef")) codes-refs)
-         (concept/to-concept))))
+    (concept (mapv #(core/compile* context (assoc % :type "CodeRef")) codes-refs))))
 
 ;; 3.9. Quantity
 (defmethod core/compile* :elm.compiler.type/quantity
@@ -101,15 +100,13 @@
       ("minute" "minutes") (date-time/period 0 0 (* value 60000))
       ("second" "seconds") (date-time/period 0 0 (* value 1000))
       ("millisecond" "milliseconds") (date-time/period 0 0 value)
-      (quantity/quantity value unit))))
+      (quantity value unit))))
 
 ;; 3.10. Ratio
 (defmethod core/compile* :elm.compiler.type/ratio
   [_ {:keys [numerator denominator]}]
-  (ratio/ratio (quantity/quantity (:value numerator) (or (:unit numerator)
-                                                         "1"))
-               (quantity/quantity (:value denominator) (or (:unit denominator)
-                                                           "1"))))
+  (ratio (quantity (:value numerator) (or (:unit numerator) "1"))
+         (quantity (:value denominator) (or (:unit denominator) "1"))))
 
 ;; 3.11. ValueSetDef
 ;;

modules/cql/src/blaze/elm/compiler/reusing_logic.clj

@@ -9,6 +9,7 @@
    [blaze.elm.code :as code]
    [blaze.elm.compiler.core :as core]
    [blaze.elm.compiler.macros :refer [reify-expr]]
+   [blaze.elm.concept :refer [concept]]
    [blaze.elm.interval :as interval]
    [blaze.elm.protocols :as p]
    [blaze.elm.quantity :as quantity]
@@ -108,6 +109,9 @@
     (-form [_]
       `(~'call "ToQuantity" ~(core/-form operand)))))
 
+(defn- to-code [{:keys [system version code]}]
+  (code/code (type/value system) (type/value version) (type/value code)))
+
 (defn- to-code-function-expr [operand]
   (reify-expr core/Expression
     (-attach-cache [_ cache]
@@ -117,8 +121,7 @@
     (-resolve-params [_ parameters]
       (core/resolve-params-helper to-code-function-expr parameters operand))
     (-eval [_ context resource scope]
-      (let [{:keys [system version code]} (core/-eval operand context resource scope)]
-        (code/to-code (type/value system) (type/value version) (type/value code))))
+      (some-> (core/-eval operand context resource scope) to-code))
     (-form [_]
       `(~'call "ToCode" ~(core/-form operand)))))
 
@@ -187,6 +190,20 @@
     (-form [_]
       `(~'call "ToInterval" ~(core/-form operand)))))
 
+(defn- to-concept-function-expr [operand]
+  (reify-expr core/Expression
+    (-attach-cache [_ cache]
+      (core/attach-cache-helper to-concept-function-expr cache operand))
+    (-resolve-refs [_ expression-defs]
+      (to-concept-function-expr (core/-resolve-refs operand expression-defs)))
+    (-resolve-params [_ parameters]
+      (to-concept-function-expr (core/-resolve-params operand parameters)))
+    (-eval [_ context resource scope]
+      (when-let [{:keys [coding]} (core/-eval operand context resource scope)]
+        (concept (mapv to-code coding))))
+    (-form [_]
+      `(~'call "ToConcept" ~(core/-form operand)))))
+
 (defn- function-def-not-found-anom [context name]
   (ba/incorrect
    (format "Function definition `%s` not found." name)
@@ -224,6 +241,9 @@
       "ToInterval"
       (to-interval-function-expr (first operands))
 
+      "ToConcept"
+      (to-concept-function-expr (first operands))
+
       (compile-function context name operands))))
 
 ;; 9.5 OperandRef

modules/cql/src/blaze/elm/compiler/structured_values.clj

@@ -84,7 +84,7 @@
       (case type
         "{urn:hl7-org:elm-types:r1}Code"
         (let [{:keys [system version code]} elements]
-          (code/to-code system version code))))))
+          (code/code system version code))))))
 
 ;; 2.3. Property
 (defrecord SourcePropertyExpression [source key]

modules/cql/src/blaze/elm/concept.clj

@@ -1,13 +1,37 @@
 (ns blaze.elm.concept
   "Implementation of the concept type."
   (:require
+   [blaze.elm.compiler.core :as core]
    [blaze.elm.protocols :as p]))
 
 (defrecord Concept [codes]
   p/Equivalent
-  ; todo
-  )
-(defn to-concept
+  (equivalent [_ other]
+    (reduce
+     (fn [_ code]
+       (if (some (partial p/equivalent code) (:codes other))
+         (reduced true)
+         false))
+     false
+     codes))
+
+  core/Expression
+  (-static [_]
+    true)
+  (-attach-cache [expr _]
+    [(fn [] [expr])])
+  (-patient-count [_]
+    nil)
+  (-resolve-refs [expr _]
+    expr)
+  (-resolve-params [expr _]
+    expr)
+  (-eval [this _ _ _]
+    this)
+  (-form [_]
+    `(~'concept ~@(map core/-form codes))))
+
+(defn concept
   "Returns a CQL concept"
   [codes]
   (->Concept codes))

modules/cql/src/blaze/elm/list.clj

@@ -2,7 +2,7 @@
   "Implementation of the list type."
   (:require
    [blaze.anomaly :as ba :refer [throw-anom]]
-   [blaze.elm.concept :as concept]
+   [blaze.elm.concept :refer [concept]]
    [blaze.elm.protocols :as p])
   (:import
    [clojure.lang IReduceInit PersistentVector]))
@@ -175,4 +175,4 @@
 (extend-protocol p/ToConcept
   PersistentVector
   (to-concept [x]
-    (concept/to-concept x)))
+    (concept x)))

modules/cql/src/blaze/elm/quantity.clj

@@ -69,7 +69,7 @@
   (-static [_]
     true)
   (-attach-cache [quantity _]
-    [quantity])
+    [(fn [] [quantity])])
   (-patient-count [_]
     nil)
   (-resolve-refs [quantity _]

modules/cql/test/blaze/elm/code_spec.clj

@@ -8,6 +8,6 @@
 (defn code? [x]
   (instance? Code x))
 
-(s/fdef code/to-code
+(s/fdef code/code
   :args (s/cat :system string? :version (s/nilable string?) :code string?)
   :ret code?)