Code refactor

d-tree-org · Jul 31, 2024 · b311d01 · b311d01
1 parent 2a3732e
commit b311d01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt
@@ -144,9 +144,7 @@ constructor(val fhirEngine: FhirEngine, val transformSupportServices: TransformS
       fhirEngine.get<Task>(id).apply {
         this.status = encounterStatusToTaskStatus(encounterStatus)
         this.lastModified = Date()
-        if (encounterReference != null) {
-          this.encounter = Reference(encounterReference)
-        }
+        this.encounter = Reference(encounterReference)
       }
     resourcesToUpdate.add(task)
     val carePlanId = task.getCarePlanId()

diff --git a/...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt b/...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt
@@ -464,8 +464,7 @@ constructor(
           val taskReference = backReference.asReference(ResourceType.Task)
           val taskID = taskReference.extractId()
           val encounterStatus = resource.status
-          val encounterReference = resource.asReference().extractId().removePrefix("#")
-
+          val encounterReference = resource.logicalId.removePrefix("#")
           fhirCarePlanGenerator.completeTask(taskID, encounterStatus, encounterReference)
         }
       }