Resolve errors related to converting/uploading eCR FHIR messages (#578)

Updated templates to handle the MedicationStatement.statusCode properly as well as the diagnosticReport.code
CDCgov · May 17, 2023 · 52bfda6 · 52bfda6
1 parent 81fcbbb
commit 52bfda6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/containers/fhir-converter/Templates/eCR/Resource/_DiagnosticReport.liquid b/containers/fhir-converter/Templates/eCR/Resource/_DiagnosticReport.liquid
@@ -13,10 +13,10 @@
         "status":"{{ diagnosticReport.statusCode.code | get_property: 'ValueSet/DiagnosticReportStatus' }}",
         "code":
         {
-            {% if diagReport.code.translation -%}
+            {% if diagnosticReport.code.translation -%}
             {% include 'DataType/CodeableConcept' CodeableConcept: diagnosticReport.code.translation -%}
             {% endif -%}
-            {% if diagReport.code.translation == null -%}
+            {% if diagnosticReport.code.translation == null and diagnosticReport.code -%}
             {% include 'DataType/CodeableConcept' CodeableConcept: diagnosticReport.code -%}
             {% endif -%}
         },

diff --git a/containers/fhir-converter/Templates/eCR/ValueSet/ValueSet.json b/containers/fhir-converter/Templates/eCR/ValueSet/ValueSet.json
@@ -362,8 +362,38 @@
       "aborted": {
         "code": "stopped"
       },
+      "active": {
+        "code": "active"
+      },
+      "completed": {
+        "code": "completed"
+      },
+      "entered-in-error": {
+        "code": "entered-in-error"
+      },
+      "intended": {
+        "code": "intended"
+      },
+      "stopped": {
+        "code": "stopped"
+      },
+      "on-hold": {
+        "code": "on-hold"
+      },
+      "unknown": {
+        "code": "unknown"
+      },
+      "not-taken": {
+        "code": "not-taken"
+      },
+      "draft": {
+        "code": "draft"
+      },
+      "recorded": {
+        "code": "recorded"
+      },
       "__default__": {
-        "code": ""
+        "code": "unknown"
       }
     },
     "ValueSet/NameUse": {
@@ -494,4 +524,4 @@
       }
     }
   }
-}
+}