Skip to content

Commit 7403e73

Browse files
committed
Incorporated review feedback.
1 parent ca1baa3 commit 7403e73

File tree

2 files changed

+91
-15
lines changed

2 files changed

+91
-15
lines changed

catalog/src/main/assets/layout_review.json

+90-15
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@
5151
],
5252
"required": false,
5353
"linkId": "/59408-5",
54-
"text": "SaO2 % BldA PulseOx"
54+
"text": "SaO2 % BldA PulseOx",
55+
"initial": [
56+
{
57+
"valueDecimal": 98.5
58+
}
59+
]
5560
},
5661
{
5762
"type": "quantity",
@@ -80,7 +85,16 @@
8085
],
8186
"required": false,
8287
"linkId": "/3141-9",
83-
"text": "Weight Measured"
88+
"text": "Weight Measured",
89+
"initial": [
90+
{
91+
"valueQuantity": {
92+
"value": 75,
93+
"unit": "kg",
94+
"code": "3141-9"
95+
}
96+
}
97+
]
8498
},
8599
{
86100
"type": "decimal",
@@ -102,7 +116,12 @@
102116
],
103117
"required": false,
104118
"linkId": "/8287-5",
105-
"text": "Head Circumf OFC by Tape measure"
119+
"text": "Head Circumf OFC by Tape measure",
120+
"initial": [
121+
{
122+
"valueDecimal": 56
123+
}
124+
]
106125
},
107126
{
108127
"type": "quantity",
@@ -145,7 +164,16 @@
145164
],
146165
"required": false,
147166
"linkId": "/8302-2",
148-
"text": "Body height"
167+
"text": "Body height",
168+
"initial": [
169+
{
170+
"valueQuantity": {
171+
"value": 180,
172+
"unit": "cm",
173+
"code": "8302-2"
174+
}
175+
}
176+
]
149177
},
150178
{
151179
"type": "quantity",
@@ -181,7 +209,16 @@
181209
],
182210
"required": false,
183211
"linkId": "/8306-3",
184-
"text": "Body height lying"
212+
"text": "Body height lying",
213+
"initial": [
214+
{
215+
"valueQuantity": {
216+
"value": 180,
217+
"unit": "cm",
218+
"code": "8306-3"
219+
}
220+
}
221+
]
185222
},
186223
{
187224
"type": "decimal",
@@ -203,7 +240,12 @@
203240
],
204241
"required": false,
205242
"linkId": "/8310-5",
206-
"text": "Body temperature"
243+
"text": "Body temperature",
244+
"initial": [
245+
{
246+
"valueDecimal": 37.0
247+
}
248+
]
207249
},
208250
{
209251
"type": "decimal",
@@ -225,7 +267,12 @@
225267
],
226268
"required": false,
227269
"linkId": "/8462-4",
228-
"text": "BP dias"
270+
"text": "BP dias",
271+
"initial": [
272+
{
273+
"valueDecimal": 80
274+
}
275+
]
229276
},
230277
{
231278
"type": "decimal",
@@ -247,7 +294,12 @@
247294
],
248295
"required": false,
249296
"linkId": "/8480-6",
250-
"text": "BP sys"
297+
"text": "BP sys",
298+
"initial": [
299+
{
300+
"valueDecimal": 120
301+
}
302+
]
251303
},
252304
{
253305
"type": "quantity",
@@ -276,7 +328,16 @@
276328
],
277329
"required": false,
278330
"linkId": "/8867-4",
279-
"text": "Heart rate"
331+
"text": "Heart rate",
332+
"initial": [
333+
{
334+
"valueQuantity": {
335+
"value": 72,
336+
"unit": "{beats}/min",
337+
"code": "8867-4"
338+
}
339+
}
340+
]
280341
},
281342
{
282343
"type": "quantity",
@@ -305,7 +366,16 @@
305366
],
306367
"required": false,
307368
"linkId": "/9279-1",
308-
"text": "Resp rate"
369+
"text": "Resp rate",
370+
"initial": [
371+
{
372+
"valueQuantity": {
373+
"value": 16,
374+
"unit": "{breaths}/min",
375+
"code": "9279-1"
376+
}
377+
}
378+
]
309379
},
310380
{
311381
"text": "This panel was created to collect the set of vital sign observations that was originally defined by HITSP and called the \"Vital Sign Result Value Set\" in the C80 Clinical Document and Message Terminology Component (Value Set OID: 2.16.840.1.113883.3.88.12.80.62), but it is not limited for use in that context. This collection includes the standard vital sign measurements (heart and respiratory rate, blood pressure and body temperature) along with measurements for height, weight, head circumference (OFC), and oximetry.",
@@ -416,7 +486,8 @@
416486
"valueCoding": {
417487
"code": "LA10082-8",
418488
"display": "Sometimes"
419-
}
489+
},
490+
"initialSelected": true
420491
},
421492
{
422493
"extension": [
@@ -510,7 +581,8 @@
510581
"valueCoding": {
511582
"code": "LA6752-5",
512583
"display": "Mild"
513-
}
584+
},
585+
"initialSelected": true
514586
},
515587
{
516588
"extension": [
@@ -604,7 +676,8 @@
604676
"valueCoding": {
605677
"code": "LA137-2",
606678
"display": "None"
607-
}
679+
},
680+
"initialSelected": true
608681
},
609682
{
610683
"extension": [
@@ -759,7 +832,8 @@
759832
"valueCoding": {
760833
"code": "LA6751-7",
761834
"display": "Moderate"
762-
}
835+
},
836+
"initialSelected": true
763837
},
764838
{
765839
"extension": [
@@ -853,7 +927,8 @@
853927
"valueCoding": {
854928
"code": "LA6752-5",
855929
"display": "Mild"
856-
}
930+
},
931+
"initialSelected": true
857932
},
858933
{
859934
"extension": [

catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class DemoQuestionnaireFragment : Fragment() {
147147
)
148148
setQuestionnaire(args.questionnaireJsonStringKey!!)
149149
showReviewPageBeforeSubmit(args.enableReviewMode)
150+
showReviewPageFirst(true)
150151
}
151152
.build()
152153
add(R.id.container, questionnaireFragment, QUESTIONNAIRE_FRAGMENT_TAG)

0 commit comments

Comments
 (0)