Merge branch 'dev'

Chinlinlee · Feb 6, 2024 · 74e1964 · 74e1964
2 parents 10f02d4 + a772f95
commit 74e1964
Show file tree

Hide file tree

Showing 6 changed files with 324 additions and 369 deletions.
diff --git a/api/FHIRApiService/services/base.service.js b/api/FHIRApiService/services/base.service.js
@@ -88,8 +88,17 @@ class BaseFhirApiService {
             item = handleError.processing(item);
         }
 
-        if ((this.response.getHeader("content-type").includes("xml") ||
-            this.request.get("accept").includes("xml")) ||
+        const xmlContentTypes = [
+            "application/fhir+xml",
+            "application/xml",
+            "xml"
+        ];
+        let firstAcceptType = this.request.headers.accept.split(",").pop();
+
+        if ((
+                this.response.getHeader("content-type").includes("xml") ||
+                xmlContentTypes.includes(firstAcceptType)
+            ) ||
             this.response.locals?._format?.toLowerCase() === "xml"
         ) {
             let fhir = new FHIR();

diff --git a/api/FHIRApiService/services/update.service.js b/api/FHIRApiService/services/update.service.js
@@ -83,7 +83,7 @@ class UpdateService extends BaseFhirApiService {
         return {
             status: true,
             code: 200,
-            result: newDoc.value.getFHIRField()
+            result: newDoc.getFHIRField()
         };
     }