Handle empty repeated group header. (#2574)

* empty repeated group header. * Remove unnecessary filter --------- Co-authored-by: Santosh Pingle <[email protected]> Co-authored-by: Jing Tang <[email protected]>
google · Jun 18, 2024 · ae8c9bb · ae8c9bb
1 parent 904b221
commit ae8c9bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -154,11 +154,9 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  }
  // Retain the hierarchy and order of items within the questionnaire as specified in the
  // standard. See https://www.hl7.org/fhir/questionnaireresponse.html#notes.
- questionnaire.item.forEach {
- if (it.type != Questionnaire.QuestionnaireItemType.GROUP || !it.repeats) {
- questionnaireResponse.addItem(it.createQuestionnaireResponseItem())
- }
- }
+ questionnaire.item
+ .filterNot { it.isRepeatedGroup }
+ .forEach { questionnaireResponse.addItem(it.createQuestionnaireResponseItem()) }
  }
  }
  questionnaireResponse.packRepeatedGroups(questionnaire)

diff --git a/...in/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/...in/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -915,7 +915,9 @@ fun Questionnaire.QuestionnaireItemComponent.createQuestionnaireResponseItem():
  !repeats
  ) {
  this@createQuestionnaireResponseItem.item.forEach {
- this.addItem(it.createQuestionnaireResponseItem())
+ if (!it.isRepeatedGroup) {
+ this.addItem(it.createQuestionnaireResponseItem())
+ }
  }
  }
  }