Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link encounter with task #93

Merged
merged 6 commits into from
Aug 7, 2024
Merged

Link encounter with task #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af2ea25
Link encounter with task
BuchiNy Jul 30, 2024
2a3732e
Update FhirCarePlanGenerator.kt
BuchiNy Jul 30, 2024
b311d01
Code refactor
calmwalija Jul 31, 2024
f372e12
Bug fix: call asReference on encounterReference
calmwalija Jul 31, 2024
e8a11a0
Update QuestionnaireViewModel.kt
BuchiNy Aug 7, 2024
f57392d
removed taskID
BuchiNy Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ import org.hl7.fhir.r4.model.IdType
import org.hl7.fhir.r4.model.Parameters
import org.hl7.fhir.r4.model.PlanDefinition
import org.hl7.fhir.r4.model.Resource
import org.hl7.fhir.r4.model.ResourceType
import org.hl7.fhir.r4.model.StructureMap
import org.hl7.fhir.r4.model.Task
import org.hl7.fhir.r4.utils.FHIRPathEngine
import org.hl7.fhir.r4.utils.StructureMapUtilities
import org.smartregister.fhircore.engine.data.local.DefaultRepository
import org.smartregister.fhircore.engine.util.extension.asReference
import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
import org.smartregister.fhircore.engine.util.extension.getCarePlanId
import org.smartregister.fhircore.engine.util.extension.taskStatusToCarePlanActivityStatus
Expand Down Expand Up @@ -133,12 +135,17 @@ constructor(val fhirEngine: FhirEngine, val transformSupportServices: TransformS
}
}

suspend fun completeTask(id: String, encounterStatus: EncounterStatus?) {
suspend fun completeTask(
id: String,
encounterStatus: EncounterStatus?,
encounterReference: String,
) {
val resourcesToUpdate = mutableListOf<Resource>()
val task =
fhirEngine.get<Task>(id).apply {
this.status = encounterStatusToTaskStatus(encounterStatus)
this.lastModified = Date()
this.encounter = encounterReference.asReference(ResourceType.Encounter)
}
resourcesToUpdate.add(task)
val carePlanId = task.getCarePlanId()
Expand Down
12 changes: 6 additions & 6 deletions ...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,12 @@ constructor(

private suspend fun updateCarePlanAndTask(extras: List<Resource>, backReference: String?) {
if (backReference != null && backReference != "notify") {
extras.forEach {
if (it is Encounter) {
fhirCarePlanGenerator.completeTask(
backReference.asReference(ResourceType.Task).extractId(),
it.status,
)
extras.forEach { resource ->
if (resource is Encounter) {
val taskReference = backReference.asReference(ResourceType.Task).extractId()
val encounterStatus = resource.status
val encounterReference = resource.logicalId.removePrefix("#")
fhirCarePlanGenerator.completeTask(taskReference, encounterStatus, encounterReference)
}
}
}
Expand Down
Loading