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

Workflow: Optional Encounter ID and Search By URL expansion #1741

Merged
merged 12 commits into from
Dec 5, 2022
Merged

Workflow: Optional Encounter ID and Search By URL expansion #1741

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a9ba529
Encounter ID is not required.
vitorpamplona Dec 1, 2022
a6a84be
spotless apply
vitorpamplona Dec 2, 2022
c5b541c
Allowing test cases without encounterID
vitorpamplona Dec 2, 2022
29e61d1
Adding a test case that does not use Encounter.
vitorpamplona Dec 2, 2022
80fda64
Creating the test case call through the FhirOperator and without it.
vitorpamplona Dec 2, 2022
f56ca50
Enabling searchByUrl for all Resource types.
vitorpamplona Dec 2, 2022
ab58782
Spotless check
vitorpamplona Dec 2, 2022
8c2bfbd
Merge remote-tracking branch 'origin/HEAD' into encounterIdNotRequired
vitorpamplona Dec 2, 2022
be29421
Removing unnecessary import.
vitorpamplona Dec 2, 2022
f7538bd
Merge branch 'master' into encounterIdNotRequired
vitorpamplona Dec 2, 2022
7736ab0
Merge branch 'master' into encounterIdNotRequired
vitorpamplona Dec 5, 2022
a4025ab
Merge branch 'master' into encounterIdNotRequired
vitorpamplona Dec 5, 2022
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
10 changes: 9 additions & 1 deletion workflow/src/main/java/com/google/android/fhir/workflow/FhirOperator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,15 @@ class FhirOperator(fhirContext: FhirContext, fhirEngine: FhirEngine) {
)
}

fun generateCarePlan(planDefinitionId: String, patientId: String, encounterId: String): CarePlan {
fun generateCarePlan(planDefinitionId: String, patientId: String): CarePlan {
vitorpamplona marked this conversation as resolved.
Show resolved Hide resolved
return generateCarePlan(planDefinitionId, patientId, encounterId = null)
}

fun generateCarePlan(
planDefinitionId: String,
patientId: String,
encounterId: String?
): CarePlan {
return planDefinitionProcessor.apply(
IdType("PlanDefinition", planDefinitionId),
patientId,
Expand Down