From dddab27abe5e8d2619e4cba9bd1e6607a6f1c857 Mon Sep 17 00:00:00 2001
From: Kenneth Chow <kenneth@skylight.digital>
Date: Thu, 19 Sep 2024 10:42:50 -0500
Subject: [PATCH 1/2] Revising fhirpath and fixing device and elems issue

---
 .../ecr-viewer/src/app/api/fhirPath.yml       |  2 +-
 .../Templates/eCR/Resource/_Device.liquid     | 23 +++++++++++--------
 .../eCR/Resource/_Observation.liquid          |  5 ----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/containers/ecr-viewer/src/app/api/fhirPath.yml b/containers/ecr-viewer/src/app/api/fhirPath.yml
index 7326e85b93..e41128fc50 100644
--- a/containers/ecr-viewer/src/app/api/fhirPath.yml
+++ b/containers/ecr-viewer/src/app/api/fhirPath.yml
@@ -36,7 +36,7 @@ patientGenderIdentity: "Bundle.entry.resource.where(resourceType = 'Patient').ex
 eicrIdentifier: "Bundle.entry.resource.where(resourceType= 'Composition').id"
 eicrCustodianRef: "Bundle.entry.resource.where(resourceType= 'Composition').custodian.reference"
 dateTimeEcrCreated: "Bundle.entry.resource.where(resourceType = 'Composition').date"
-senderSoftware: "Bundle.entry.resource.where(resourceType = 'Device').where(category.coding.code='software').type.coding.display"
+senderSoftware: "Bundle.entry.resource.where(resourceType = 'Device').where(property[0].type.coding.code='software').type.coding.display"
 senderFacilityName: "Bundle.entry.resource.where(resourceType = 'Encounter')[0].location[0].location.display"
 
 # Encounter Info
diff --git a/containers/fhir-converter/Templates/eCR/Resource/_Device.liquid b/containers/fhir-converter/Templates/eCR/Resource/_Device.liquid
index d2251566c7..9043fa5a6f 100644
--- a/containers/fhir-converter/Templates/eCR/Resource/_Device.liquid
+++ b/containers/fhir-converter/Templates/eCR/Resource/_Device.liquid
@@ -26,16 +26,19 @@
                 "value":"{{ author.assignedAuthoringDevice.softwareName._ }}",
             },
         ],
-        "category": {
-            "coding":
-            [
-                {
-                    "system": "http://hl7.org/fhir/device-category",
-                    "code": "software",
-                    "display": "software",
-                },
-            ],
-        },
+        "property": [
+            {
+                "type": {
+                    "coding": [
+                        {
+                            "system": "http://hl7.org/fhir/device-category",
+                            "code": "software",
+                            "display": "software",
+                        },
+                    ]
+                }
+            }
+        ],
     },
     "request":{
         "method":"PUT",
diff --git a/containers/fhir-converter/Templates/eCR/Resource/_Observation.liquid b/containers/fhir-converter/Templates/eCR/Resource/_Observation.liquid
index 63008a2745..805d13b142 100644
--- a/containers/fhir-converter/Templates/eCR/Resource/_Observation.liquid
+++ b/containers/fhir-converter/Templates/eCR/Resource/_Observation.liquid
@@ -138,11 +138,6 @@
                     "note":
                     [
                         {
-                            "elems": [
-                                {
-                                  "elemText": "test",
-                                }
-                            ],
                             {% if valueStringObject != null %}
                               {% if valueStringObject._ != null %}
                                   {% if valueStringObject.br != null %}

From 9382405aa6b4fbc13d9305ade11317c4cb398178 Mon Sep 17 00:00:00 2001
From: Kenneth Chow <kenneth@skylight.digital>
Date: Thu, 19 Sep 2024 10:44:23 -0500
Subject: [PATCH 2/2] fixing test

---
 .../tests/assets/BundleNoActiveProblems.json  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/containers/ecr-viewer/src/app/tests/assets/BundleNoActiveProblems.json b/containers/ecr-viewer/src/app/tests/assets/BundleNoActiveProblems.json
index 9f626a85f7..66d7f5728e 100644
--- a/containers/ecr-viewer/src/app/tests/assets/BundleNoActiveProblems.json
+++ b/containers/ecr-viewer/src/app/tests/assets/BundleNoActiveProblems.json
@@ -1011,15 +1011,19 @@
             "value": "Epic - Version 10.1"
           }
         ],
-        "category": {
-          "coding": [
-            {
-              "system": "http://hl7.org/fhir/device-category",
-              "code": "software",
-              "display": "software"
+        "property": [
+          {
+            "type": {
+              "coding": [
+                {
+                  "system": "http://hl7.org/fhir/device-category",
+                  "code": "software",
+                  "display": "software"
+                }
+              ]
             }
-          ]
-        },
+          }
+        ],
         "owner": {
           "reference": "Organization/c725142c-ed88-5f3c-aa55-6bd2744dc939"
         },