Merge pull request #56 from PuraJuniper/SAGE-283-allergy-reaction

SAGE-283-allergy-reaction
TopologyHealth · Mar 29, 2022 · 19009e5 · 19009e5
2 parents 525ec6d + 59db750
commit 19009e5
Show file tree

Hide file tree

Showing 5 changed files with 243 additions and 126 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,11 +4,17 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "command": "npm run dev",
+            "name": "npm run dev",
+            "request": "launch",
+            "type": "node-terminal"
+        },
         {
             "type": "firefox",
             "request": "launch",
             "reAttach": true,
-            "name": "Launch localhost",
+            "name": "ffLaunch",
             "url": "http://localhost:8083",
             "pathMappings": [
                 {
@@ -17,5 +23,12 @@
                 }
             ]
         }
-    ]
+    ],
+    "compounds": [
+        {
+          "name": "Debug",
+          "configurations": ["npm run dev", "ffLaunch"],
+          "stopAll": true
+        }
+      ]
 }
diff --git a/src/helpers/schema-utils.ts b/src/helpers/schema-utils.ts
@@ -57,7 +57,7 @@ export type SageNewResource = {
 
 // type fhirTypeValues = "decimal" | "boolean" | "xhtml" | "base64Binary" | "code" | "uri" | "canonical";
 
-type ProfileDefs = {
+export type ProfileDefs = {
 	'__meta': {
 		baseDefinition: string,
 		id: string,

diff --git a/src/simplified/cql-wizard/cql-generator.ts b/src/simplified/cql-wizard/cql-generator.ts
@@ -148,6 +148,9 @@ export async function generateCqlFromConditions(conditionStates: EditableStateFo
 
                     case "unknown":
                         return null;
+
+                    default:
+                        return null;
                 }
             }
             const clauses = conditionState.curWizState.filters.flatMap(filter => {