@aehrc/smart-forms-renderer 1.0.0-alpha.32 → 1.0.0-alpha.33
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/lib/components/Renderer/FormBodyPageContainer.js +3 -3
- package/lib/components/Renderer/FormBodyPageContainer.js.map +1 -1
- package/lib/utils/choice.js +4 -15
- package/lib/utils/choice.js.map +1 -1
- package/lib/utils/extractObservation.js +2 -7
- package/lib/utils/extractObservation.js.map +1 -1
- package/lib/utils/initialise.js +3 -6
- package/lib/utils/initialise.js.map +1 -1
- package/lib/utils/valueSet.d.ts +7 -0
- package/lib/utils/valueSet.js +10 -5
- package/lib/utils/valueSet.js.map +1 -1
- package/package.json +2 -2
- package/src/utils/choice.ts +4 -15
- package/src/utils/extractObservation.ts +2 -7
- package/src/utils/initialise.ts +3 -6
- package/src/utils/valueSet.ts +16 -7
|
@@ -30,7 +30,7 @@ function FormBodyPageContainer(props) {
|
|
|
30
30
|
return _jsx(_Fragment, { children: "Unable to load form" });
|
|
31
31
|
}
|
|
32
32
|
const qrItemsByIndex = getQrItemsIndex(qItems, qrItems, indexMap);
|
|
33
|
-
return (_jsx(Grid, { container: true, spacing: 1.5, children: _jsx(TabContext, { value: currentPage.toString(), children: _jsx(Grid, { item: true, xs: 12, md: 12, lg: 12, children: qItems.map((qItem, i) => {
|
|
33
|
+
return (_jsx(Grid, Object.assign({ container: true, spacing: 1.5 }, { children: _jsx(TabContext, Object.assign({ value: currentPage.toString() }, { children: _jsx(Grid, Object.assign({ item: true, xs: 12, md: 12, lg: 12 }, { children: qItems.map((qItem, i) => {
|
|
34
34
|
var _a, _b;
|
|
35
35
|
const qrItem = qrItemsByIndex[i];
|
|
36
36
|
const isNotRepeatGroup = !Array.isArray(qrItem);
|
|
@@ -41,8 +41,8 @@ function FormBodyPageContainer(props) {
|
|
|
41
41
|
}
|
|
42
42
|
const isRepeated = (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false;
|
|
43
43
|
const pageIsMarkedAsComplete = (_b = pages[qItem.linkId].isComplete) !== null && _b !== void 0 ? _b : false;
|
|
44
|
-
return (_jsx(TabPanel, { sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, isRepeated: isRepeated, groupCardElevation: 1, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrGroupChange }) }, qItem.linkId));
|
|
45
|
-
}) }) }) }));
|
|
44
|
+
return (_jsx(TabPanel, Object.assign({ sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel" }, { children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, isRepeated: isRepeated, groupCardElevation: 1, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrGroupChange }) }), qItem.linkId));
|
|
45
|
+
}) })) })) })));
|
|
46
46
|
}
|
|
47
47
|
export default FormBodyPageContainer;
|
|
48
48
|
//# sourceMappingURL=FormBodyPageContainer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormBodyPageContainer.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodyPageContainer.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,IAAI,MAAM,oBAAoB,CAAC;AAEtC,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAK9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAS9E,+DAA+D;AAE/D;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,KAAiC;IAC9D,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAElF,MAAM,KAAK,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAEjE,MAAM,QAAQ,GAA2B,OAAO,CAC9C,GAAG,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EACnC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,qBAAqB,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAElF,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC;IAClC,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAC;IAE3C,SAAS,mBAAmB,CAAC,MAAiC;QAC5D,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,CAAC,CAAC;QACpE,cAAc,CAAC,qBAAqB,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"FormBodyPageContainer.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodyPageContainer.tsx"],"names":[],"mappings":"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"}
|
package/lib/utils/choice.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ChoiceItemControl, ChoiceItemOrientation } from '../interfaces/choice.enum';
|
|
2
2
|
import { isSpecificItemControl } from './itemControl';
|
|
3
|
+
import { getRelevantCodingProperties } from './valueSet';
|
|
3
4
|
/**
|
|
4
5
|
* Convert codings to Questionnaire answer options
|
|
5
6
|
*
|
|
@@ -7,11 +8,7 @@ import { isSpecificItemControl } from './itemControl';
|
|
|
7
8
|
*/
|
|
8
9
|
export function convertCodingsToAnswerOptions(codings) {
|
|
9
10
|
return codings.map((coding) => ({
|
|
10
|
-
valueCoding:
|
|
11
|
-
system: coding.system,
|
|
12
|
-
code: coding.code,
|
|
13
|
-
display: coding.display
|
|
14
|
-
}
|
|
11
|
+
valueCoding: getRelevantCodingProperties(coding)
|
|
15
12
|
}));
|
|
16
13
|
}
|
|
17
14
|
/**
|
|
@@ -24,21 +21,13 @@ export function findInAnswerOptions(options, valueInString) {
|
|
|
24
21
|
if (option.valueCoding) {
|
|
25
22
|
if (valueInString === option.valueCoding.code) {
|
|
26
23
|
return {
|
|
27
|
-
valueCoding:
|
|
28
|
-
system: option.valueCoding.system,
|
|
29
|
-
code: option.valueCoding.code,
|
|
30
|
-
display: option.valueCoding.display
|
|
31
|
-
}
|
|
24
|
+
valueCoding: getRelevantCodingProperties(option.valueCoding)
|
|
32
25
|
};
|
|
33
26
|
}
|
|
34
27
|
// handle case where valueCoding.code is not present
|
|
35
28
|
if (valueInString === option.valueCoding.display) {
|
|
36
29
|
return {
|
|
37
|
-
valueCoding:
|
|
38
|
-
system: option.valueCoding.system,
|
|
39
|
-
code: option.valueCoding.code,
|
|
40
|
-
display: option.valueCoding.display
|
|
41
|
-
}
|
|
30
|
+
valueCoding: getRelevantCodingProperties(option.valueCoding)
|
|
42
31
|
};
|
|
43
32
|
}
|
|
44
33
|
}
|
package/lib/utils/choice.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"choice.js","sourceRoot":"","sources":["../../src/utils/choice.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"choice.js","sourceRoot":"","sources":["../../src/utils/choice.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { readQuestionnaireResponse, transverseQuestionnaire } from './genericRecursive';
|
|
2
2
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
3
|
+
import { getRelevantCodingProperties } from './valueSet';
|
|
3
4
|
/**
|
|
4
5
|
* Extract an array of Observations from a QuestionnaireResponse and its source Questionnaire.
|
|
5
6
|
* @see https://build.fhir.org/ig/HL7/sdc/extraction.html#observation-based-extraction
|
|
@@ -156,13 +157,7 @@ export function createObservation(questionnaireItem, questionnaireResponse, answ
|
|
|
156
157
|
}
|
|
157
158
|
else if (answer.valueCoding) {
|
|
158
159
|
observation.valueCodeableConcept = {
|
|
159
|
-
coding: [
|
|
160
|
-
{
|
|
161
|
-
system: answer.valueCoding.system,
|
|
162
|
-
code: answer.valueCoding.code,
|
|
163
|
-
display: answer.valueCoding.display
|
|
164
|
-
}
|
|
165
|
-
]
|
|
160
|
+
coding: [getRelevantCodingProperties(answer.valueCoding)]
|
|
166
161
|
};
|
|
167
162
|
}
|
|
168
163
|
if (categories.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractObservation.js","sourceRoot":"","sources":["../../src/utils/extractObservation.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"extractObservation.js","sourceRoot":"","sources":["../../src/utils/extractObservation.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/initialise.js
CHANGED
|
@@ -32,6 +32,7 @@ import { createQuestionnaireResponseItemMap } from './questionnaireResponseStore
|
|
|
32
32
|
import { readQuestionnaireResponse } from './genericRecursive';
|
|
33
33
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
34
34
|
import { evaluateInitialTargetConstraints } from './targetConstraint';
|
|
35
|
+
import { getRelevantCodingProperties } from './valueSet';
|
|
35
36
|
/**
|
|
36
37
|
* Initialise a questionnaireResponse from a given questionnaire
|
|
37
38
|
* optionally takes in an existing questionnaireResponse to be initialised
|
|
@@ -145,11 +146,7 @@ function getInitialValueAnswers(qItem) {
|
|
|
145
146
|
.map((option) => {
|
|
146
147
|
if (option.valueCoding) {
|
|
147
148
|
return {
|
|
148
|
-
valueCoding:
|
|
149
|
-
system: option.valueCoding.system,
|
|
150
|
-
code: option.valueCoding.code,
|
|
151
|
-
display: option.valueCoding.display
|
|
152
|
-
}
|
|
149
|
+
valueCoding: getRelevantCodingProperties(option.valueCoding)
|
|
153
150
|
};
|
|
154
151
|
}
|
|
155
152
|
if (option.valueString) {
|
|
@@ -204,7 +201,7 @@ export function parseItemInitialToAnswer(initial) {
|
|
|
204
201
|
return { valueAttachment: initial.valueAttachment };
|
|
205
202
|
}
|
|
206
203
|
if (initial.valueCoding) {
|
|
207
|
-
return { valueCoding: initial.valueCoding };
|
|
204
|
+
return { valueCoding: getRelevantCodingProperties(initial.valueCoding) };
|
|
208
205
|
}
|
|
209
206
|
if (initial.valueQuantity) {
|
|
210
207
|
return { valueQuantity: initial.valueQuantity };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialise.js","sourceRoot":"","sources":["../../src/utils/initialise.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;AAEH,OAAO,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAY7C,OAAO,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,0DAA0D,CAAC;AAC9G,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"initialise.js","sourceRoot":"","sources":["../../src/utils/initialise.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/valueSet.d.ts
CHANGED
|
@@ -12,6 +12,13 @@ export declare function resolveValueSetPromises(valueSetPromises: Record<string,
|
|
|
12
12
|
* @author Sean Fong
|
|
13
13
|
*/
|
|
14
14
|
export declare function getValueSetCodings(valueSet: ValueSet): Coding[];
|
|
15
|
+
/**
|
|
16
|
+
* Retrieves only the relevant properties of a Coding object.
|
|
17
|
+
* Reason: https://tx.ontoserver.csiro.au/fhir returns a Coding with designation element, which is not in the FHIR spec, causing QRs with it to fail validation.
|
|
18
|
+
*
|
|
19
|
+
* @author Sean Fong
|
|
20
|
+
*/
|
|
21
|
+
export declare function getRelevantCodingProperties(coding: Coding): Coding;
|
|
15
22
|
/**
|
|
16
23
|
* Evaluate valueSets in answerExpression with fhirpath
|
|
17
24
|
*
|
package/lib/utils/valueSet.js
CHANGED
|
@@ -112,11 +112,16 @@ export function resolveValueSetPromises(valueSetPromises) {
|
|
|
112
112
|
*/
|
|
113
113
|
export function getValueSetCodings(valueSet) {
|
|
114
114
|
var _a, _b, _c;
|
|
115
|
-
return (
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
115
|
+
return (_c = (_b = (_a = valueSet.expansion) === null || _a === void 0 ? void 0 : _a.contains) === null || _b === void 0 ? void 0 : _b.map((coding) => getRelevantCodingProperties(coding))) !== null && _c !== void 0 ? _c : [];
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Retrieves only the relevant properties of a Coding object.
|
|
119
|
+
* Reason: https://tx.ontoserver.csiro.au/fhir returns a Coding with designation element, which is not in the FHIR spec, causing QRs with it to fail validation.
|
|
120
|
+
*
|
|
121
|
+
* @author Sean Fong
|
|
122
|
+
*/
|
|
123
|
+
export function getRelevantCodingProperties(coding) {
|
|
124
|
+
return Object.assign({ system: coding.system, code: coding.code, display: coding.display }, (coding.extension && { extension: coding.extension }));
|
|
120
125
|
}
|
|
121
126
|
/**
|
|
122
127
|
* Evaluate valueSets in answerExpression with fhirpath
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valueSet.js","sourceRoot":"","sources":["../../src/utils/valueSet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"valueSet.js","sourceRoot":"","sources":["../../src/utils/valueSet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aehrc/smart-forms-renderer",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.33",
|
|
4
4
|
"description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://github.com/aehrc/smart-forms#readme",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aehrc/sdc-populate": "^3.0.
|
|
31
|
+
"@aehrc/sdc-populate": "^3.0.3",
|
|
32
32
|
"@fontsource/material-icons": "^5.2.5",
|
|
33
33
|
"@fontsource/roboto": "^5.2.5",
|
|
34
34
|
"@fontsource/inter": "5.2.5",
|
package/src/utils/choice.ts
CHANGED
|
@@ -24,6 +24,7 @@ import type {
|
|
|
24
24
|
} from 'fhir/r4';
|
|
25
25
|
import { ChoiceItemControl, ChoiceItemOrientation } from '../interfaces/choice.enum';
|
|
26
26
|
import { isSpecificItemControl } from './itemControl';
|
|
27
|
+
import { getRelevantCodingProperties } from './valueSet';
|
|
27
28
|
|
|
28
29
|
/**
|
|
29
30
|
* Convert codings to Questionnaire answer options
|
|
@@ -33,11 +34,7 @@ import { isSpecificItemControl } from './itemControl';
|
|
|
33
34
|
export function convertCodingsToAnswerOptions(codings: Coding[]): QuestionnaireItemAnswerOption[] {
|
|
34
35
|
return codings.map(
|
|
35
36
|
(coding): QuestionnaireItemAnswerOption => ({
|
|
36
|
-
valueCoding:
|
|
37
|
-
system: coding.system,
|
|
38
|
-
code: coding.code,
|
|
39
|
-
display: coding.display
|
|
40
|
-
}
|
|
37
|
+
valueCoding: getRelevantCodingProperties(coding)
|
|
41
38
|
})
|
|
42
39
|
);
|
|
43
40
|
}
|
|
@@ -55,22 +52,14 @@ export function findInAnswerOptions(
|
|
|
55
52
|
if (option.valueCoding) {
|
|
56
53
|
if (valueInString === option.valueCoding.code) {
|
|
57
54
|
return {
|
|
58
|
-
valueCoding:
|
|
59
|
-
system: option.valueCoding.system,
|
|
60
|
-
code: option.valueCoding.code,
|
|
61
|
-
display: option.valueCoding.display
|
|
62
|
-
}
|
|
55
|
+
valueCoding: getRelevantCodingProperties(option.valueCoding)
|
|
63
56
|
};
|
|
64
57
|
}
|
|
65
58
|
|
|
66
59
|
// handle case where valueCoding.code is not present
|
|
67
60
|
if (valueInString === option.valueCoding.display) {
|
|
68
61
|
return {
|
|
69
|
-
valueCoding:
|
|
70
|
-
system: option.valueCoding.system,
|
|
71
|
-
code: option.valueCoding.code,
|
|
72
|
-
display: option.valueCoding.display
|
|
73
|
-
}
|
|
62
|
+
valueCoding: getRelevantCodingProperties(option.valueCoding)
|
|
74
63
|
};
|
|
75
64
|
}
|
|
76
65
|
}
|
|
@@ -9,6 +9,7 @@ import type {
|
|
|
9
9
|
} from 'fhir/r4';
|
|
10
10
|
import { readQuestionnaireResponse, transverseQuestionnaire } from './genericRecursive';
|
|
11
11
|
import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
12
|
+
import { getRelevantCodingProperties } from './valueSet';
|
|
12
13
|
|
|
13
14
|
/**
|
|
14
15
|
* Extract an array of Observations from a QuestionnaireResponse and its source Questionnaire.
|
|
@@ -250,13 +251,7 @@ export function createObservation(
|
|
|
250
251
|
observation.valueInteger = answer.valueInteger;
|
|
251
252
|
} else if (answer.valueCoding) {
|
|
252
253
|
observation.valueCodeableConcept = {
|
|
253
|
-
coding: [
|
|
254
|
-
{
|
|
255
|
-
system: answer.valueCoding.system,
|
|
256
|
-
code: answer.valueCoding.code,
|
|
257
|
-
display: answer.valueCoding.display
|
|
258
|
-
}
|
|
259
|
-
]
|
|
254
|
+
coding: [getRelevantCodingProperties(answer.valueCoding)]
|
|
260
255
|
};
|
|
261
256
|
}
|
|
262
257
|
|
package/src/utils/initialise.ts
CHANGED
|
@@ -38,6 +38,7 @@ import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
|
|
|
38
38
|
import type { TargetConstraint } from '../interfaces/targetConstraint.interface';
|
|
39
39
|
import { evaluateInitialTargetConstraints } from './targetConstraint';
|
|
40
40
|
import type { Variables } from '../interfaces';
|
|
41
|
+
import { getRelevantCodingProperties } from './valueSet';
|
|
41
42
|
|
|
42
43
|
/**
|
|
43
44
|
* Initialise a questionnaireResponse from a given questionnaire
|
|
@@ -190,11 +191,7 @@ function getInitialValueAnswers(qItem: QuestionnaireItem): QuestionnaireResponse
|
|
|
190
191
|
.map((option): QuestionnaireResponseItemAnswer | null => {
|
|
191
192
|
if (option.valueCoding) {
|
|
192
193
|
return {
|
|
193
|
-
valueCoding:
|
|
194
|
-
system: option.valueCoding.system,
|
|
195
|
-
code: option.valueCoding.code,
|
|
196
|
-
display: option.valueCoding.display
|
|
197
|
-
}
|
|
194
|
+
valueCoding: getRelevantCodingProperties(option.valueCoding)
|
|
198
195
|
};
|
|
199
196
|
}
|
|
200
197
|
|
|
@@ -266,7 +263,7 @@ export function parseItemInitialToAnswer(
|
|
|
266
263
|
}
|
|
267
264
|
|
|
268
265
|
if (initial.valueCoding) {
|
|
269
|
-
return { valueCoding: initial.valueCoding };
|
|
266
|
+
return { valueCoding: getRelevantCodingProperties(initial.valueCoding) };
|
|
270
267
|
}
|
|
271
268
|
|
|
272
269
|
if (initial.valueQuantity) {
|
package/src/utils/valueSet.ts
CHANGED
|
@@ -145,13 +145,22 @@ export async function resolveValueSetPromises(
|
|
|
145
145
|
* @author Sean Fong
|
|
146
146
|
*/
|
|
147
147
|
export function getValueSetCodings(valueSet: ValueSet): Coding[] {
|
|
148
|
-
return (
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
148
|
+
return valueSet.expansion?.contains?.map((coding) => getRelevantCodingProperties(coding)) ?? [];
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* Retrieves only the relevant properties of a Coding object.
|
|
153
|
+
* Reason: https://tx.ontoserver.csiro.au/fhir returns a Coding with designation element, which is not in the FHIR spec, causing QRs with it to fail validation.
|
|
154
|
+
*
|
|
155
|
+
* @author Sean Fong
|
|
156
|
+
*/
|
|
157
|
+
export function getRelevantCodingProperties(coding: Coding): Coding {
|
|
158
|
+
return {
|
|
159
|
+
system: coding.system,
|
|
160
|
+
code: coding.code,
|
|
161
|
+
display: coding.display,
|
|
162
|
+
...(coding.extension && { extension: coding.extension })
|
|
163
|
+
};
|
|
155
164
|
}
|
|
156
165
|
|
|
157
166
|
/**
|