Repository: opensrp/fhircore
Issue: Active careplans are no longer showing in questionnaire 

**Describe the bug**
A clear and concise description of what the bug is.
Careplans set as initial expressiona are no longer shoeing up in questionnaires

**To Reproduce**
Steps to reproduce the behavior:
1. Register a person already on ART
2. On their list of tasks, select 'Screening'
3. Select that the patient has interrupted treatment, and that they need a viral load collected (i.e. select any reason besides none of the above)
4. After saving, the list of tasks does not include welcome service and viral load collection
**Expected behavior**
 After saving, the list of tasks should include welcome service and viral load collection
**Screenshots**
If applicable, add screenshots to help explain your problem.

**Smartphone (please complete the following information):**
 - Device: [e.g. Samsung Galaxy A2 emulator]
 - Android version: [e.g. Settings -> About phone -> Android version]
 - Build number: [e.g. Settings -> About phone -> Build number]
 - Version [e.g. 24]

**Additional context**
Add any other context about the problem here.



Changed files:
android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt
android/anc/src/main/java/org/smartregister/fhircore/anc/ui/family/form/FamilyQuestionnaireActivity.kt
android/eir/src/main/java/org/smartregister/fhircore/eir/ui/vaccine/RecordVaccineActivity.kt

diff --git a/android/anc/src/main/java/org/smartregister/fhircore/anc/ui/family/form/FamilyQuestionnaireActivity.kt b/android/anc/src/main/java/org/smartregister/fhircore/anc/ui/family/form/FamilyQuestionnaireActivity.kt
index 6b5c94ff1..85d1bd663 100644
--- a/android/anc/src/main/java/org/smartregister/fhircore/anc/ui/family/form/FamilyQuestionnaireActivity.kt
+++ b/android/anc/src/main/java/org/smartregister/fhircore/anc/ui/family/form/FamilyQuestionnaireActivity.kt
@@ -82,7 +82,10 @@ class FamilyQuestionnaireActivity : QuestionnaireActivity() {
     }
   }
 
-  override fun postSaveSuccessful(questionnaireResponse: QuestionnaireResponse, extras: List<Resource>?) {
+  override fun postSaveSuccessful(
+    questionnaireResponse: QuestionnaireResponse,
+    extras: List<Resource>?
+  ) {
     lifecycleScope.launch {
       val patientId = questionnaireResponse.subject.extractId()
 
diff --git a/android/eir/src/main/java/org/smartregister/fhircore/eir/ui/vaccine/RecordVaccineActivity.kt b/android/eir/src/main/java/org/smartregister/fhircore/eir/ui/vaccine/RecordVaccineActivity.kt
index 40f519e94..a4066978d 100644
--- a/android/eir/src/main/java/org/smartregister/fhircore/eir/ui/vaccine/RecordVaccineActivity.kt
+++ b/android/eir/src/main/java/org/smartregister/fhircore/eir/ui/vaccine/RecordVaccineActivity.kt
@@ -22,7 +22,12 @@ import androidx.lifecycle.lifecycleScope
 import ca.uhn.fhir.parser.IParser
 import javax.inject.Inject
 import kotlinx.coroutines.launch
-import org.hl7.fhir.r4.model.*
+import org.hl7.fhir.r4.model.DateTimeType
+import org.hl7.fhir.r4.model.Immunization
+import org.hl7.fhir.r4.model.PositiveIntType
+import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Reference
+import org.hl7.fhir.r4.model.Resource
 import org.smartregister.fhircore.eir.R
 import org.smartregister.fhircore.eir.data.model.PatientVaccineSummary
 import org.smartregister.fhircore.eir.ui.patient.details.nextDueDateFmt
@@ -77,7 +82,10 @@ class RecordVaccineActivity : QuestionnaireActivity() {
     }
   }
 
-  override fun postSaveSuccessful(questionnaireResponse: QuestionnaireResponse, extras: List<Resource>?) {
+  override fun postSaveSuccessful(
+    questionnaireResponse: QuestionnaireResponse,
+    extras: List<Resource>?
+  ) {
     val nextVaccineDate = savedImmunization.nextDueDateFmt()
     val currentDose = savedImmunization.protocolAppliedFirstRep.doseNumberPositiveIntType.value
 
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt
index 28da5bb9b..8fad19b15 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt
@@ -66,9 +66,9 @@ sealed class ProfileViewData(
     val guardiansRelatedPersonResource = guardians.filterIsInstance<RelatedPerson>()
 
     val populationResources: ArrayList<Resource> by lazy {
-      val resources = carePlans + conditions + guardiansRelatedPersonResource + observations
+      val resources = conditions + guardiansRelatedPersonResource + observations
       val resourcesAsBundle = Bundle().apply { resources.map { this.addEntry().resource = it } }
-      arrayListOf(resourcesAsBundle)
+      arrayListOf(*carePlans.toTypedArray(), resourcesAsBundle)
     }
   }