using fhirpath for evaluation of fhir path

intrahealth · Feb 17, 2023 · c103ecd · c103ecd
1 parent bac5a14
commit c103ecd
Show file tree

Hide file tree

Showing 7 changed files with 335 additions and 223 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@ packaging/ansible/server_cert.pem
 packaging/ansible/server_key.pem
 server/certificates/server_cert.pem.bak
 server/certificates/server_key.pem.bak
-
 # client key/cert examples for ansible
 ansible_key.pem
 ansible_cert.pem
@@ -32,4 +31,4 @@ ansible.p12
 .DS_Store
 
 # venv
-venv/
+venv/
diff --git a/resources/Relationships/PatientRelationship.json b/resources/Relationships/PatientRelationship.json
diff --git a/server/config/decisionRules.json b/server/config/decisionRules.json
diff --git a/server/lib/esMatching.js b/server/lib/esMatching.js
@@ -3,13 +3,12 @@ const request = require('request');
 const URI = require('urijs');
 const async = require('async');
 const _ = require('lodash');
-const Fhir = require('fhir').Fhir;
+const fhirpath = require('fhirpath');
 const fhirWrapper = require('./fhir')();
 const logger = require('./winston');
 const config = require('./config');
 const generalMixin = require('./mixins/generalMixin');
 const axios = require('axios');
-const fhir = new Fhir();
 
 const refreshIndex = (callback) => {
   logger.info('Refreshing index ' + config.get('elastic:index'));
@@ -78,7 +77,7 @@ const buildQuery = (sourceResource, decisionRule) => {
       null_handling_both = decisionRule.null_handling_both;
     }
     let path = rule.espath;
-    let pathValue = fhir.evaluate(sourceResource, rule.fhirpath);
+    let pathValue = fhirpath.evaluate(sourceResource, rule.fhirpath);
     const values = [];
     if (Array.isArray(pathValue) && !(pathValue.length === 1 && pathValue[0] === undefined)) {
       if (pathValue.length === 0) {
@@ -155,7 +154,7 @@ const buildQuery = (sourceResource, decisionRule) => {
       const block = decisionRule.filters[filterField];
       const term = {};
       const path = block.espath;
-      let pathValue = fhir.evaluate(sourceResource, block.fhirpath);
+      let pathValue = fhirpath.evaluate(sourceResource, block.fhirpath);
       if (Array.isArray(pathValue) && !(pathValue.length === 1 && pathValue[0] === undefined)) {
         if (pathValue.length === 0) {
           term[path] = '';

diff --git a/server/lib/tools/cacheFHIR.js b/server/lib/tools/cacheFHIR.js
@@ -2,16 +2,14 @@ const axios = require('axios');
 const async = require('async');
 const URI = require('urijs');
 const moment = require('moment');
+const fhirpath = require('fhirpath');
 const generalMixin = require('../mixins/generalMixin');
-const Fhir = require('fhir').Fhir;
 const fhirWrapper = require('../fhir')();
 const structureDefinition = require('./structureDefinition');
 const config = require('../config');
 const logger = require('../winston');
 const slashes = require('slashes');
 
-const fhir = new Fhir();
-
 const fhirToEsDataType = {
   valueString: 'text',
   valueBoolean: 'boolean',
@@ -605,7 +603,7 @@ const fhir2ES = ({
                       const limits = query.split('=');
                       const limitParameters = limits[0];
                       const limitValue = limits[1];
-                      const resourceValue = fhir.evaluate(
+                      const resourceValue = fhirpath.evaluate(
                         data.resource,
                         limitParameters
                       );
@@ -640,7 +638,7 @@ const fhir2ES = ({
                             fieldAutogenerated = value;
                           }
                         }
-                        const displayData = fhir.evaluate(
+                        const displayData = fhirpath.evaluate(
                           data.resource,
                           fieldName
                         );