OTR-1954: Add the ability for follow-ups to be billable & attached to a schedule#6785
Merged
OTR-1954: Add the ability for follow-ups to be billable & attached to a schedule#6785
Conversation
Introduces a third visit type that combines follow-up association (partOf) with full appointment lifecycle and all progress note modules. Key changes: - New FollowupSubtype (annotation/scheduled) with FHIR coding system - Follow-up modal now has Scheduled/Annotation radio toggle - Scheduled flow: select parent encounter then reuse standard Add Visit page - create-appointment accepts parentEncounterId, sets partOf + follow-up type - Patient visit history excludes scheduled follow-up appointments from top-level rows, shows them indented under parent - Tracking board shows follow-up indicator icon for scheduled follow-ups - Multiple zambdas updated: isFollowupEncounter filter changed to isAnnotationFollowupEncounter to allow scheduled follow-ups through - Appointment store fetches parent encounter tree for scheduled follow-ups - EncounterSwitcher resets exam observations on encounter switch - Oystehr SDK zambdaApiUrl configured for local development Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
… provider - Radio buttons moved inside the white card for Annotation/Scheduled toggle - Create Follow-Up Visit from progress note menu prepopulates initial visit - Provider prepopulates with logged-in user instead of encounter attender - Annotation form labels updated (date/time/provider) - Location populates instantly from FHIR query Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Unit tests (21): Follow-up subtype helpers — isFollowupEncounter, getFollowupSubtype, isScheduledFollowupEncounter, isAnnotationFollowupEncounter, getEncounterVisitType Component tests (6): AddPatientFollowup — radio toggle rendering, mode switching between Annotation and Scheduled, breadcrumbs E2E tests (1 flow with 7 steps): Full creation flow — navigate to follow-up page, select Scheduled Visit, pick parent encounter, continue to Add Visit, fill walk-in visit form, verify on tracking board, verify indented under parent in patient record Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Test now creates a scheduled follow-up visit through the full UI flow (select parent, fill Add Visit form, submit) and verifies redirect to tracking board and indented display on patient record. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
bxr1nG
requested review from
ValeriyDyachenko,
VladMstv,
bholyshevskyi,
Copilot and
imbenham
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds support for scheduled follow-ups that are billable and attached to a schedule, complementing the existing annotation-based follow-ups. The feature introduces follow-up subtypes ('annotation' and 'scheduled'), allows follow-ups to reference a parent encounter, and implements comprehensive UI/UX changes to support the new workflow.
Changes:
- Renamed
isFollowupEncounter()toisAnnotationFollowupEncounter()across the codebase to distinguish annotation follow-ups from scheduled follow-ups - Added new types and utilities for handling follow-up subtypes (
FollowupSubtype,FOLLOWUP_SUBTYPE_SYSTEM,isScheduledFollowupEncounter,getFollowupSubtype) - Implemented support for creating scheduled follow-ups with parent encounter references (
partOffield) and preventing nesting - Added UI components for selecting follow-up type (annotation vs. scheduled) and parent encounter selection
- Extended appointment and encounter data structures to track follow-up relationships and navigate appropriately
- Updated navigation logic to use parent appointment ID for scheduled follow-ups while preserving specific encounter context
Reviewed changes
Copilot reviewed 51 out of 51 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| packages/utils/lib/fhir/encounter.ts | New types and helper functions for follow-up subtypes |
| packages/utils/lib/fhir/encounter.test.ts | Comprehensive test coverage for new encounter functions |
| packages/zambdas/src/patient/appointment/create-appointment/ | Support for creating scheduled follow-ups with parent encounter validation |
| packages/zambdas/src/ehr/save-followup-encounter/helpers.ts | Updated to handle follow-up subtypes during creation/update |
| packages/zambdas/src/ehr/patient-visit-history/get/index.ts | Tracks scheduled follow-ups separately to exclude from top-level rows |
| apps/ehr/src/features/visits/shared/components/patient/AddPatientFollowup.tsx | New UI for selecting follow-up type |
| apps/ehr/src/features/visits/shared/components/patient/ScheduledFollowupParentSelector.tsx | Component for selecting parent encounter for scheduled follow-ups |
| apps/ehr/src/pages/AddPatient.tsx | Integrated support for scheduled follow-up workflow |
| apps/ehr/src/features/visits/in-person/components/EncounterSwitcher.tsx | Updated to handle scheduled follow-up display and interaction modes |
| apps/ehr/src/components/AppointmentTableRow.tsx | Added visual indicator for follow-up appointments |
| apps/ehr/tests/e2e/specs/in-person/scheduled-followup.spec.ts | Comprehensive E2E test for scheduled follow-up workflow |
| apps/ehr/tests/component/AddPatientFollowup.test.tsx | Component tests for follow-up type selection |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ValeriyDyachenko
approved these changes
Apr 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://linear.app/zapehr/issue/OTR-1954/add-the-ability-for-follow-ups-to-be-billable-and-attached-to-a