adding conditional feedback

FHIR · Sep 16, 2024 · d032ee8 · d032ee8
1 parent c3b1785
commit d032ee8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/export/ValueSetExporter.ts b/src/export/ValueSetExporter.ts
@@ -184,7 +184,7 @@ export class ValueSetExporter {
               this.addConceptComposeElement(composeElement, valueSet.compose.include);
             }
           } else {
-            if (composeElement.valueSet?.length != 0) {
+            if (composeElement.valueSet?.length !== 0 || composeElement.system != undefined) {
               valueSet.compose.include.push(composeElement);
             }
           }

diff --git a/test/export/ValueSetExporter.test.ts b/test/export/ValueSetExporter.test.ts
@@ -478,6 +478,7 @@ describe('ValueSetExporter', () => {
     valueSet.id = 'dinner-vs';
     const component = new ValueSetConceptComponentRule(true);
     component.from = {
+      system: 'http://food.org/food1',
       valueSets: [
         'http://food.org/food/ValueSet/hot-food',
         'http://food.org/food/ValueSet/cold-food',
@@ -488,6 +489,7 @@ describe('ValueSetExporter', () => {
     };
     const component2 = new ValueSetConceptComponentRule(true);
     component2.from = {
+      system: 'http://food.org/food2',
       valueSets: ['DinnerVS', 'http://hl7.org/fhir/us/minimal/ValueSet/dinner-vs', 'dinner-vs']
     };
     valueSet.rules.push(component);
@@ -504,10 +506,14 @@ describe('ValueSetExporter', () => {
       compose: {
         include: [
           {
+            system: 'http://food.org/food1',
             valueSet: [
               'http://food.org/food/ValueSet/hot-food',
               'http://food.org/food/ValueSet/cold-food'
             ]
+          },
+          {
+            system: 'http://food.org/food2'
           }
         ]
       }