sdc-qrf 0.3.27 → 0.3.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/converter/extensions.d.ts +4 -2
- package/dist/converter/extensions.d.ts.map +1 -1
- package/dist/converter/extensions.js +10 -2
- package/dist/converter/extensions.js.map +1 -1
- package/package.json +1 -1
- package/src/converter/__tests__/fce.test.ts +4 -0
- package/src/converter/__tests__/resources/questionnaire_fce/sub-questionnaire.json +22 -0
- package/src/converter/__tests__/resources/questionnaire_fhir/sub-questionnaire.json +32 -0
- package/src/converter/extensions.ts +10 -2
|
@@ -18,7 +18,8 @@ export declare enum ExtensionIdentifier {
|
|
|
18
18
|
MinQuantity = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-minQuantity",
|
|
19
19
|
MaxQuantity = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-maxQuantity",
|
|
20
20
|
ShowOrdinalValue = "http://aidbox.io/questionnaire-showOrdinalValue",
|
|
21
|
-
|
|
21
|
+
PreferredTerminologyServerSDC = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-preferredTerminologyServer",
|
|
22
|
+
PreferredTerminologyServer = "http://hl7.org/fhir/StructureDefinition/preferredTerminologyServer",
|
|
22
23
|
OpenLabel = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-openLabel",
|
|
23
24
|
BackgroundImage = "http://aidbox.io/questionnaire-backgroundImage",
|
|
24
25
|
Language = "http://hl7.org/fhir/StructureDefinition/language",
|
|
@@ -40,7 +41,8 @@ export declare enum ExtensionIdentifier {
|
|
|
40
41
|
HelpText = "https://beda.software/fhir-emr-questionnaire/help-text",
|
|
41
42
|
StopLabel = "https://beda.software/fhir-emr-questionnaire/slider-stop-label",
|
|
42
43
|
Macro = "https://beda.software/fhir-emr-questionnaire/macro",
|
|
43
|
-
RowsNumber = "https://beda.software/fhir-emr-questionnaire/rows-number"
|
|
44
|
+
RowsNumber = "https://beda.software/fhir-emr-questionnaire/rows-number",
|
|
45
|
+
SubQuestionnaire = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire"
|
|
44
46
|
}
|
|
45
47
|
export type ExtensionTransformer = {
|
|
46
48
|
[key in ExtensionIdentifier]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../src/converter/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,OAAO,EAAE,iBAAiB,IAAI,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExF,oBAAY,mBAAmB;IAC3B,MAAM,iEAAiE;IACvE,WAAW,sEAAsE;IACjF,eAAe,0EAA0E;IACzF,IAAI,+DAA+D;IACnE,UAAU,qEAAqE;IAC/E,iBAAiB,4EAA4E;IAC7F,WAAW,wDAAwD;IACnE,UAAU,kDAAkD;IAC5D,SAAS,+EAA+E;IACxF,KAAK,kDAAkD;IACvD,kBAAkB,wFAAwF;IAC1G,qBAAqB,2FAA2F;IAChH,QAAQ,qDAAqD;IAC7D,QAAQ,qDAAqD;IAC7D,WAAW,iFAAiF;IAC5F,WAAW,iFAAiF;IAC5F,gBAAgB,oDAAoD;IACpE,
|
|
1
|
+
{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../src/converter/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,OAAO,EAAE,iBAAiB,IAAI,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExF,oBAAY,mBAAmB;IAC3B,MAAM,iEAAiE;IACvE,WAAW,sEAAsE;IACjF,eAAe,0EAA0E;IACzF,IAAI,+DAA+D;IACnE,UAAU,qEAAqE;IAC/E,iBAAiB,4EAA4E;IAC7F,WAAW,wDAAwD;IACnE,UAAU,kDAAkD;IAC5D,SAAS,+EAA+E;IACxF,KAAK,kDAAkD;IACvD,kBAAkB,wFAAwF;IAC1G,qBAAqB,2FAA2F;IAChH,QAAQ,qDAAqD;IAC7D,QAAQ,qDAAqD;IAC7D,WAAW,iFAAiF;IAC5F,WAAW,iFAAiF;IAC5F,gBAAgB,oDAAoD;IACpE,6BAA6B,gGAAgG;IAC7H,0BAA0B,uEAAuE;IACjG,SAAS,+EAA+E;IACxF,eAAe,mDAAmD;IAClE,QAAQ,qDAAqD;IAC7D,iBAAiB,4EAA4E;IAC7F,qBAAqB,yEAAyE;IAC9F,aAAa,0EAA0E;IAEvF,qBAAqB,2FAA2F;IAChH,cAAc,qEAAqE;IACnF,iBAAiB,uFAAuF;IACxG,YAAY,kFAAkF;IAC9F,oBAAoB,0FAA0F;IAC9G,oBAAoB,0FAA0F;IAC9G,gBAAgB,sFAAsF;IACtG,aAAa,2DAA2D;IACxE,QAAQ,qDAAqD;IAE7D,iBAAiB,sEAAsE;IACvF,WAAW,8DAA8D;IACzE,UAAU,6DAA6D;IACvE,QAAQ,2DAA2D;IACnE,SAAS,mEAAmE;IAC5E,KAAK,uDAAuD;IAC5D,UAAU,6DAA6D;IACvE,gBAAgB,sFAAsF;CACzG;AAED,MAAM,MAAM,oBAAoB,GAAG;KAC9B,GAAG,IAAI,mBAAmB,GACrB;QACI,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,aAAa,EAAE,KAAK,OAAO,CAAC,oBAAoB,CAAC,GAAG,SAAS,CAAC;YAC3F,YAAY,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,aAAa,EAAE,CAAC;SACjE,CAAC;KACL,GACD;QACI,IAAI,EAAE;YACF,SAAS,EAAE,MAAM,aAAa,CAAC;YAC/B,aAAa,EAAE,MAAM,oBAAoB,CAAC;YAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;SAC1B,CAAC;KACL;CACV,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,oBAmPnC,CAAC"}
|
|
@@ -20,7 +20,8 @@ var ExtensionIdentifier;
|
|
|
20
20
|
ExtensionIdentifier["MinQuantity"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-minQuantity";
|
|
21
21
|
ExtensionIdentifier["MaxQuantity"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-maxQuantity";
|
|
22
22
|
ExtensionIdentifier["ShowOrdinalValue"] = "http://aidbox.io/questionnaire-showOrdinalValue";
|
|
23
|
-
ExtensionIdentifier["
|
|
23
|
+
ExtensionIdentifier["PreferredTerminologyServerSDC"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-preferredTerminologyServer";
|
|
24
|
+
ExtensionIdentifier["PreferredTerminologyServer"] = "http://hl7.org/fhir/StructureDefinition/preferredTerminologyServer";
|
|
24
25
|
ExtensionIdentifier["OpenLabel"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-openLabel";
|
|
25
26
|
ExtensionIdentifier["BackgroundImage"] = "http://aidbox.io/questionnaire-backgroundImage";
|
|
26
27
|
ExtensionIdentifier["Language"] = "http://hl7.org/fhir/StructureDefinition/language";
|
|
@@ -43,6 +44,7 @@ var ExtensionIdentifier;
|
|
|
43
44
|
ExtensionIdentifier["StopLabel"] = "https://beda.software/fhir-emr-questionnaire/slider-stop-label";
|
|
44
45
|
ExtensionIdentifier["Macro"] = "https://beda.software/fhir-emr-questionnaire/macro";
|
|
45
46
|
ExtensionIdentifier["RowsNumber"] = "https://beda.software/fhir-emr-questionnaire/rows-number";
|
|
47
|
+
ExtensionIdentifier["SubQuestionnaire"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire";
|
|
46
48
|
})(ExtensionIdentifier || (exports.ExtensionIdentifier = ExtensionIdentifier = {}));
|
|
47
49
|
exports.extensionTransformers = {
|
|
48
50
|
[ExtensionIdentifier.Hidden]: {
|
|
@@ -66,6 +68,9 @@ exports.extensionTransformers = {
|
|
|
66
68
|
[ExtensionIdentifier.RowsNumber]: {
|
|
67
69
|
path: { extension: 'valueInteger', questionnaire: 'rowsNumber' },
|
|
68
70
|
},
|
|
71
|
+
[ExtensionIdentifier.SubQuestionnaire]: {
|
|
72
|
+
path: { extension: 'valueCanonical', questionnaire: 'subQuestionnaire' },
|
|
73
|
+
},
|
|
69
74
|
[ExtensionIdentifier.ReferenceResource]: {
|
|
70
75
|
transform: {
|
|
71
76
|
fromExtensions: (extensions) => {
|
|
@@ -132,8 +137,11 @@ exports.extensionTransformers = {
|
|
|
132
137
|
[ExtensionIdentifier.ShowOrdinalValue]: {
|
|
133
138
|
path: { extension: 'valueBoolean', questionnaire: 'showOrdinalValue' },
|
|
134
139
|
},
|
|
140
|
+
[ExtensionIdentifier.PreferredTerminologyServerSDC]: {
|
|
141
|
+
path: { extension: 'valueUrl', questionnaire: 'preferredTerminologyServer' },
|
|
142
|
+
},
|
|
135
143
|
[ExtensionIdentifier.PreferredTerminologyServer]: {
|
|
136
|
-
path: { extension: '
|
|
144
|
+
path: { extension: 'valueUrl', questionnaire: 'preferredTerminologyServer' },
|
|
137
145
|
},
|
|
138
146
|
[ExtensionIdentifier.OpenLabel]: {
|
|
139
147
|
path: { extension: 'valueString', questionnaire: 'openLabel' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../src/converter/extensions.ts"],"names":[],"mappings":";;;AAIA,IAAY,
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../src/converter/extensions.ts"],"names":[],"mappings":";;;AAIA,IAAY,mBA6CX;AA7CD,WAAY,mBAAmB;IAC3B,8FAAuE,CAAA;IACvE,wGAAiF,CAAA;IACjF,gHAAyF,CAAA;IACzF,0FAAmE,CAAA;IACnE,sGAA+E,CAAA;IAC/E,oHAA6F,CAAA;IAC7F,0FAAmE,CAAA;IACnE,mFAA4D,CAAA;IAC5D,+GAAwF,CAAA;IACxF,8EAAuD,CAAA;IACvD,iIAA0G,CAAA;IAC1G,uIAAgH,CAAA;IAChH,oFAA6D,CAAA;IAC7D,oFAA6D,CAAA;IAC7D,mHAA4F,CAAA;IAC5F,mHAA4F,CAAA;IAC5F,2FAAoE,CAAA;IACpE,oJAA6H,CAAA;IAC7H,wHAAiG,CAAA;IACjG,+GAAwF,CAAA;IACxF,yFAAkE,CAAA;IAClE,oFAA6D,CAAA;IAC7D,oHAA6F,CAAA;IAC7F,qHAA8F,CAAA;IAC9F,8GAAuF,CAAA;IAEvF,uIAAgH,CAAA;IAChH,0GAAmF,CAAA;IACnF,+HAAwG,CAAA;IACxG,qHAA8F,CAAA;IAC9F,qIAA8G,CAAA;IAC9G,qIAA8G,CAAA;IAC9G,6HAAsG,CAAA;IACtG,+FAAwE,CAAA;IACxE,oFAA6D,CAAA;IAE7D,8GAAuF,CAAA;IACvF,gGAAyE,CAAA;IACzE,8FAAuE,CAAA;IACvE,0FAAmE,CAAA;IACnE,mGAA4E,CAAA;IAC5E,mFAA4D,CAAA;IAC5D,8FAAuE,CAAA;IACvE,6HAAsG,CAAA;AAC1G,CAAC,EA7CW,mBAAmB,mCAAnB,mBAAmB,QA6C9B;AAmBY,QAAA,qBAAqB,GAAyB;IACvD,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;QAC1B,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,EAAE;KAC/D;IACD,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE;QAC/B,IAAI,EAAE,EAAE,SAAS,EAAE,sBAAsB,EAAE,aAAa,EAAE,aAAa,EAAE;KAC5E;IACD,CAAC,mBAAmB,CAAC,eAAe,CAAC,EAAE;QACnC,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE;KACxE;IACD,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE;QAC/B,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE;KACnE;IACD,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;QACxB,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE;KAC5D;IACD,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;QAC9B,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE;KACtF;IACD,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;QAC9B,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE;KACnE;IACD,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;QACpC,IAAI,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAE,kBAAkB,EAAE;KAC3E;IACD,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;QACrC,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC3B,IAAI,UAAU,CAAC,CAAC,CAAE,CAAC,SAAS,EAAE,CAAC;oBAC3B,OAAO,EAAE,iBAAiB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7D,CAAC;qBAAM,CAAC;oBACJ,OAAO,EAAE,CAAC;gBACd,CAAC;YACL,CAAC;YACD,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACnB,IAAI,MAAA,IAAI,CAAC,iBAAiB,0CAAE,MAAM,EAAE,CAAC;oBACjC,OAAO;wBACH;4BACI,GAAG,EAAE,mBAAmB,CAAC,iBAAiB;4BAC1C,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;yBACvC;qBACJ,CAAC;gBACN,CAAC;gBAED,OAAO,EAAE,CAAC;YACd,CAAC;SACJ;KACJ;IACD,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;QAC9B,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE;KACnE;IACD,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE;QAC7B,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,WAAW,EAAE;KACrE;IACD,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;QACzB,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE;KAC7D;IACD,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE;QACtC,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE;KAC3E;IACD,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,EAAE,uBAAuB,EAAE;KAC/E;IACD,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAC5B,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAE,EAAE,CAAC;YAC9D,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE;KACJ;IACD,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAC5B,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAE,EAAE,CAAC;YAC9D,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE;KACJ;IACD,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE;QAC/B,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAE,EAAE,CAAC;YACjE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE;KACJ;IACD,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE;QAC/B,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAE,EAAE,CAAC;YACjE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE;KACJ;IACD,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;QACpC,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAE;KACzE;IACD,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,EAAE;QACjD,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,4BAA4B,EAAE;KAC/E;IACD,CAAC,mBAAmB,CAAC,0BAA0B,CAAC,EAAE;QAC9C,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,4BAA4B,EAAE;KAC/E;IACD,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE;QAC7B,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE;KACjE;IACD,CAAC,mBAAmB,CAAC,eAAe,CAAC,EAAE;QACnC,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE;KAC3E;IACD,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE;KAChE;IACD,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;QACrC,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAE;KACvE;IACD,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,mBAAmB,EAAE;KACzE;IACD,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE;QACjC,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE;KACtE;IAED,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,uBAAuB,EAAE;KACjF;IACD,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE;QAClC,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC3B,OAAO;oBACH,cAAc,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;;wBACzC,MAAM,uBAAuB,GAAG,SAAS,CAAC,SAAU,CAAC;wBAErD,OAAO;4BACH,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,CAAE,CAAC,OAAQ;4BACvE,YAAY,EAAE,MAAA,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,cAAc,CAAC,0CACzE,WAAW;4BACjB,QAAQ,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,UAAU,CAAE,CAAC,SAAU;4BACnF,KAAK,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,OAAO,CAAE,CAAC,WAAY;4BAC/E,UAAU,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,CAAE,CAAC,WAAY;yBAC5F,CAAC;oBACN,CAAC,CAAC;iBACL,CAAC;YACN,CAAC;YACD,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACnB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACtB,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;wBAChD,GAAG,EAAE,mBAAmB,CAAC,cAAc;wBACvC,SAAS,EAAE;4BACP;gCACI,GAAG,EAAE,KAAK;gCACV,OAAO,EAAE,cAAc,CAAC,GAAG;6BAC9B;4BACD;gCACI,GAAG,EAAE,cAAc;gCACnB,WAAW,EAAE,cAAc,CAAC,YAAY;6BAC3C;4BACD;gCACI,GAAG,EAAE,UAAU;gCACf,SAAS,EAAE,cAAc,CAAC,QAAQ;6BACrC;4BACD;gCACI,GAAG,EAAE,OAAO;gCACZ,WAAW,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK;6BACrC;4BACD;gCACI,GAAG,EAAE,YAAY;gCACjB,WAAW,EAAE,cAAc,CAAC,UAAU;6BACzC;yBACJ;qBACJ,CAAC,CAAC,CAAC;gBACR,CAAC;gBAED,OAAO,EAAE,CAAC;YACd,CAAC;SACJ;KACJ;IACD,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE;KACxF;IACD,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;QACrC,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,mBAAmB,EAAE;KAC7E;IACD,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE;QACxC,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,sBAAsB,EAAE;KAChF;IACD,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE;QACxC,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,sBAAsB,EAAE;KAChF;IACD,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;QACpC,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE;KAC5E;IACD,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE;QAChC,SAAS,EAAE;YACP,cAAc,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC3B,OAAO;oBACH,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;;wBACvC,MAAM,qBAAqB,GAAG,SAAS,CAAC,SAAU,CAAC;wBAEnD,OAAO;4BACH,UAAU,EACN,MAAA,MAAA,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,CAAC,0CAAE,YAAY,mCAAI,KAAK;4BACxF,IAAI,EAAE,MAAA,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,MAAM,CAAC,0CAAE,WAAW;yBAC7E,CAAC;oBACN,CAAC,CAAC;iBACL,CAAC;YACN,CAAC;YACD,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACnB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACpB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;wBAC5C,GAAG,EAAE,mBAAmB,CAAC,YAAY;wBACrC,SAAS,EAAE;4BACP;gCACI,GAAG,EAAE,YAAY;gCACjB,YAAY,EAAE,YAAY,CAAC,UAAU;6BACxC;4BACD;gCACI,GAAG,EAAE,MAAM;gCACX,WAAW,EAAE,YAAY,CAAC,IAAI;6BACjC;yBACJ;qBACJ,CAAC,CAAC,CAAC;gBACR,CAAC;gBAED,OAAO,EAAE,CAAC;YACd,CAAC;SACJ;KACJ;IACD,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE;QACjC,+FAA+F;QAC/F,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE;KACzE;IAED,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;QACrC,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE;KAC1E;IACD,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE;QAC/B,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE;KAC9D;IACD,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;QAC9B,IAAI,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE;KAC7D;IACD,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE;KAChE;IACD,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE;QAC7B,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE;KACjE;IACD,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;QACzB,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE;KAC7D;CACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -33,6 +33,7 @@ import fce_source_queries from './resources/questionnaire_fce/source_queries.jso
|
|
|
33
33
|
import fce_unit_option from './resources/questionnaire_fce/unit-option.json';
|
|
34
34
|
import fce_vitals from './resources/questionnaire_fce/vitals.json';
|
|
35
35
|
import fce_variable from './resources/questionnaire_fce/variable.json';
|
|
36
|
+
import fce_sub_questionnaire from './resources/questionnaire_fce/sub-questionnaire.json';
|
|
36
37
|
// fhir questionnaire
|
|
37
38
|
import fhir_allergies from './resources/questionnaire_fhir/allergies.json';
|
|
38
39
|
import fhir_beverages from './resources/questionnaire_fhir/beverages.json';
|
|
@@ -60,6 +61,7 @@ import fhir_source_queries from './resources/questionnaire_fhir/source_queries.j
|
|
|
60
61
|
import fhir_unit_option from './resources/questionnaire_fhir/unit-option.json';
|
|
61
62
|
import fhir_vitals from './resources/questionnaire_fhir/vitals.json';
|
|
62
63
|
import fhir_variable from './resources/questionnaire_fhir/variable.json';
|
|
64
|
+
import fhir_sub_questionnaire from './resources/questionnaire_fhir/sub-questionnaire.json';
|
|
63
65
|
// fce questionnaire response
|
|
64
66
|
import fce_allergies_inprogress_qr from './resources/questionnaire_response_fce/allergies_inprogress.json';
|
|
65
67
|
import fce_cardiology_qr from './resources/questionnaire_response_fce/cardiology.json';
|
|
@@ -121,6 +123,7 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
|
|
|
121
123
|
[fhir_constraint, fce_constraint],
|
|
122
124
|
[fhir_unit_option, fce_unit_option],
|
|
123
125
|
[fhir_variable, fce_variable],
|
|
126
|
+
[fhir_sub_questionnaire, fce_sub_questionnaire],
|
|
124
127
|
])('Each FHIR Questionnaire should convert to FCE', async (fhir_questionnaire, fce_questionnaire) => {
|
|
125
128
|
expect(toFirstClassExtension(fhir_questionnaire as FHIRQuestionnaire)).toStrictEqual(fce_questionnaire);
|
|
126
129
|
});
|
|
@@ -152,6 +155,7 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
|
|
|
152
155
|
[fce_constraint, fhir_constraint],
|
|
153
156
|
[fce_unit_option, fhir_unit_option],
|
|
154
157
|
[fce_variable, fhir_variable],
|
|
158
|
+
[fce_sub_questionnaire, fhir_sub_questionnaire],
|
|
155
159
|
])('Each FCE Questionnaire should convert to FHIR', async (fce_questionnaire, fhir_questionnaire) => {
|
|
156
160
|
expect(sortExtensionsList(fromFirstClassExtension(fce_questionnaire as FCEQuestionnaire))).toStrictEqual(
|
|
157
161
|
sortExtensionsList(fhir_questionnaire),
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
{
|
|
2
|
+
"subjectType": ["Encounter", "Patient"],
|
|
3
|
+
"meta": {
|
|
4
|
+
"profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"],
|
|
5
|
+
"lastUpdated": "2023-04-10T03:43:34.792167Z",
|
|
6
|
+
"versionId": "694"
|
|
7
|
+
},
|
|
8
|
+
"name": "SubQuestionnaire",
|
|
9
|
+
"item": [
|
|
10
|
+
{
|
|
11
|
+
"text": "SubQuestionnaire",
|
|
12
|
+
"type": "group",
|
|
13
|
+
"linkId": "sub-questionnaire",
|
|
14
|
+
"subQuestionnaire": "allergies"
|
|
15
|
+
}
|
|
16
|
+
],
|
|
17
|
+
"assembledFrom": "sub-questionnaire",
|
|
18
|
+
"resourceType": "Questionnaire",
|
|
19
|
+
"status": "active",
|
|
20
|
+
"id": "sub-questionnaire",
|
|
21
|
+
"url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/sub-questionnaire"
|
|
22
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
{
|
|
2
|
+
"subjectType": ["Encounter", "Patient"],
|
|
3
|
+
"meta": {
|
|
4
|
+
"profile": ["https://emr-core.beda.software/StructureDefinition/fhir-emr-questionnaire"],
|
|
5
|
+
"lastUpdated": "2023-04-10T03:43:34.792167Z",
|
|
6
|
+
"versionId": "694"
|
|
7
|
+
},
|
|
8
|
+
"name": "SubQuestionnaire",
|
|
9
|
+
"item": [
|
|
10
|
+
{
|
|
11
|
+
"text": "SubQuestionnaire",
|
|
12
|
+
"type": "group",
|
|
13
|
+
"extension": [
|
|
14
|
+
{
|
|
15
|
+
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
|
|
16
|
+
"valueCanonical": "allergies"
|
|
17
|
+
}
|
|
18
|
+
],
|
|
19
|
+
"linkId": "sub-questionnaire"
|
|
20
|
+
}
|
|
21
|
+
],
|
|
22
|
+
"resourceType": "Questionnaire",
|
|
23
|
+
"extension": [
|
|
24
|
+
{
|
|
25
|
+
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
|
|
26
|
+
"valueCanonical": "sub-questionnaire"
|
|
27
|
+
}
|
|
28
|
+
],
|
|
29
|
+
"status": "active",
|
|
30
|
+
"id": "sub-questionnaire",
|
|
31
|
+
"url": "https://aidbox.emr.beda.software/ui/console#/entities/Questionnaire/sub-questionnaire"
|
|
32
|
+
}
|
|
@@ -20,7 +20,8 @@ export enum ExtensionIdentifier {
|
|
|
20
20
|
MinQuantity = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-minQuantity',
|
|
21
21
|
MaxQuantity = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-maxQuantity',
|
|
22
22
|
ShowOrdinalValue = 'http://aidbox.io/questionnaire-showOrdinalValue',
|
|
23
|
-
|
|
23
|
+
PreferredTerminologyServerSDC = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-preferredTerminologyServer',
|
|
24
|
+
PreferredTerminologyServer = 'http://hl7.org/fhir/StructureDefinition/preferredTerminologyServer',
|
|
24
25
|
OpenLabel = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-openLabel',
|
|
25
26
|
BackgroundImage = 'http://aidbox.io/questionnaire-backgroundImage',
|
|
26
27
|
Language = 'http://hl7.org/fhir/StructureDefinition/language',
|
|
@@ -45,6 +46,7 @@ export enum ExtensionIdentifier {
|
|
|
45
46
|
StopLabel = 'https://beda.software/fhir-emr-questionnaire/slider-stop-label',
|
|
46
47
|
Macro = 'https://beda.software/fhir-emr-questionnaire/macro',
|
|
47
48
|
RowsNumber = 'https://beda.software/fhir-emr-questionnaire/rows-number',
|
|
49
|
+
SubQuestionnaire = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire',
|
|
48
50
|
}
|
|
49
51
|
|
|
50
52
|
export type ExtensionTransformer = {
|
|
@@ -86,6 +88,9 @@ export const extensionTransformers: ExtensionTransformer = {
|
|
|
86
88
|
[ExtensionIdentifier.RowsNumber]: {
|
|
87
89
|
path: { extension: 'valueInteger', questionnaire: 'rowsNumber' },
|
|
88
90
|
},
|
|
91
|
+
[ExtensionIdentifier.SubQuestionnaire]: {
|
|
92
|
+
path: { extension: 'valueCanonical', questionnaire: 'subQuestionnaire' },
|
|
93
|
+
},
|
|
89
94
|
[ExtensionIdentifier.ReferenceResource]: {
|
|
90
95
|
transform: {
|
|
91
96
|
fromExtensions: (extensions) => {
|
|
@@ -151,8 +156,11 @@ export const extensionTransformers: ExtensionTransformer = {
|
|
|
151
156
|
[ExtensionIdentifier.ShowOrdinalValue]: {
|
|
152
157
|
path: { extension: 'valueBoolean', questionnaire: 'showOrdinalValue' },
|
|
153
158
|
},
|
|
159
|
+
[ExtensionIdentifier.PreferredTerminologyServerSDC]: {
|
|
160
|
+
path: { extension: 'valueUrl', questionnaire: 'preferredTerminologyServer' },
|
|
161
|
+
},
|
|
154
162
|
[ExtensionIdentifier.PreferredTerminologyServer]: {
|
|
155
|
-
path: { extension: '
|
|
163
|
+
path: { extension: 'valueUrl', questionnaire: 'preferredTerminologyServer' },
|
|
156
164
|
},
|
|
157
165
|
[ExtensionIdentifier.OpenLabel]: {
|
|
158
166
|
path: { extension: 'valueString', questionnaire: 'openLabel' },
|