Handled observation function unique names for patient based measures

projecttacoma · Mar 5, 2024 · 44b1a29 · 44b1a29
1 parent da53798
commit 44b1a29
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/dist/browser.js b/dist/browser.js
@@ -529,9 +529,9 @@ module.exports = class CalculatorHelpers {
 
   // Returns a JSON function to add to the ELM before ELM JSON is used to calculate results for patient based measures
   // This ELM template was generated by the CQL-to-ELM Translation Service.
-  static generatePatientELMJSONFunction(functionName) {
+  static generatePatientELMJSONFunction(functionName, index) {
     const elmFunction = {
-      name: `obs_func_${functionName}`,
+      name: `obs_func_${functionName}_${index}`,
       context: 'Patient',
       accessLevel: 'Public',
       expression: {
@@ -1787,7 +1787,7 @@ module.exports = class Calculator {
         const funcName = obs.observation_function.statement_name;
         const param = obs.observation_parameter.statement_name;
         generatedELMJSON = (measure.calculation_method === 'PATIENT' && !measure.composite)
-          ? CalculatorHelpers.generatePatientELMJSONFunction(funcName)
+          ? CalculatorHelpers.generatePatientELMJSONFunction(funcName, index)
           : CalculatorHelpers.generateEpisodeELMJSONFunction(funcName, param, index);
         // Save the name of the generated define statement, so we can check
         // its result later in the CQL calculation process. These added

diff --git a/lib/helpers/calculator_helpers.js b/lib/helpers/calculator_helpers.js
@@ -523,9 +523,9 @@ module.exports = class CalculatorHelpers {
 
   // Returns a JSON function to add to the ELM before ELM JSON is used to calculate results for patient based measures
   // This ELM template was generated by the CQL-to-ELM Translation Service.
-  static generatePatientELMJSONFunction(functionName) {
+  static generatePatientELMJSONFunction(functionName, index) {
     const elmFunction = {
-      name: `obs_func_${functionName}`,
+      name: `obs_func_${functionName}_${index}`,
       context: 'Patient',
       accessLevel: 'Public',
       expression: {

diff --git a/lib/models/calculator.js b/lib/models/calculator.js
@@ -95,7 +95,7 @@ module.exports = class Calculator {
         const funcName = obs.observation_function.statement_name;
         const param = obs.observation_parameter.statement_name;
         generatedELMJSON = (measure.calculation_method === 'PATIENT' && !measure.composite)
-          ? CalculatorHelpers.generatePatientELMJSONFunction(funcName)
+          ? CalculatorHelpers.generatePatientELMJSONFunction(funcName, index)
           : CalculatorHelpers.generateEpisodeELMJSONFunction(funcName, param, index);
         // Save the name of the generated define statement, so we can check
         // its result later in the CQL calculation process. These added

diff --git a/yarn.lock b/yarn.lock
@@ -1707,7 +1707,7 @@ elliptic@^6.5.3, elliptic@^6.5.4:
 
 emitter-component@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.2.tgz#d65af5833dc7c682fd0ade35f902d16bc4bad772"
+  resolved "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.2.tgz"
   integrity sha512-QdXO3nXOzZB4pAjM0n6ZE+R9/+kPpECA/XSELIcc54NeYVnBqIk+4DFiBgK+8QbV3mdvTG6nedl7dTYgO+5wDw==
 
 emittery@^0.13.1: