android-fhir
android-fhir copied to clipboard
Answer expression extension implementation
Fixes part of #1039 | Depends on #1479
Description Fhir data capture and catalog supporting basic xfhir-query i.e. https://build.fhir.org/ig/HL7/sdc/expressions.html#fhirquery for answer expression. Implement reference data type Implement choice column support
Type Choose one: (Feature
Screenshots (if applicable)
{
"text": "Choose a Patient as Caregiver?",
"type": "reference",
"linkId": "1.1.0", "repeats": true,
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
"valueCodeableConcept": {
"coding": [ {
"system": "http://hl7.org/fhir/questionnaire-item-control",
"code": "check-box", "display": "Checkbox"
} ], "text": "Checkbox"
} },
{
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-answerExpression",
"valueExpression": {
"expression": "Patient?active=true",
"language": "application/x-fhir-query"
}
},
{
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-choiceColumn",
"extension": [
{
"url": "path",
"valueString": "name.given.first() + ' ' + name.family + ' - ' + gender + ' - ' + birthDate.toString() "
},
{
"url": "label",
"valueString": "name"
},
{
"url": "forDisplay",
"valueBoolean": true
}
]
}
]
}
Checklist
- [x] I have read and acknowledged the Code of conduct.
- [x] I have read the Contributing page.
- [x] I have signed the Google Individual CLA, or I am covered by my company's Corporate CLA.
- [x] I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
- [x] I have run
./gradlew spotlessApply
and./gradlew spotlessCheck
to check my code follows the style guide of this project. - [x] I have run
./gradlew check
and./gradlew connectedCheck
to test my changes locally. - [x] I have built and run the demo app(s) to verify my change fixes the issue and/or does not break the demo app(s).
@jingtang10 kindly review the changes
@jingtang10 changes done. Kindly review
Codecov Report
Merging #1480 (7947d11) into master (f22598f) will decrease coverage by
2.36%
. The diff coverage is2.46%
.
@@ Coverage Diff @@
## master #1480 +/- ##
============================================
- Coverage 36.26% 33.89% -2.37%
+ Complexity 330 316 -14
============================================
Files 149 151 +2
Lines 4961 5009 +48
Branches 880 899 +19
============================================
- Hits 1799 1698 -101
- Misses 2922 3071 +149
Partials 240 240
Impacted Files | Coverage Δ | |
---|---|---|
...ogle/android/fhir/datacapture/MoreAnswerOptions.kt | 11.11% <0.00%> (+2.77%) |
:arrow_up: |
...google/android/fhir/datacapture/MoreExpressions.kt | 0.00% <0.00%> (ø) |
|
...re/MoreQuestionnaireResponseItemAnswerComponent.kt | 0.00% <ø> (ø) |
|
...d/fhir/datacapture/QuestionnaireItemEditAdapter.kt | 11.68% <0.00%> (-0.16%) |
:arrow_down: |
...android/fhir/datacapture/QuestionnaireViewModel.kt | 0.00% <0.00%> (ø) |
|
...fhir/datacapture/enablement/EnablementEvaluator.kt | 0.00% <ø> (ø) |
|
...android/fhir/datacapture/mapping/ResourceMapper.kt | 0.00% <0.00%> (ø) |
|
...android/fhir/datacapture/utilities/FhirPathUtil.kt | 0.00% <0.00%> (ø) |
|
...iews/QuestionnaireItemDropDownViewHolderFactory.kt | 61.53% <0.00%> (-1.62%) |
:arrow_down: |
...hir/datacapture/MoreQuestionnaireItemComponents.kt | 15.54% <3.44%> (-2.95%) |
:arrow_down: |
... and 7 more |
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.