Skip to content

(feat) O3-3664: enhance visit form to handle deceased patients #2665

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

(feat) O3-3664: enhance visit form to handle deceased patients #2665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ad1ada
feat: enhance visit form to handle deceased patients
amosmachora Aug 11, 2025
0da20f8
refactor: rename second useVisitFormSchemaAndDefaultValues arguement …
amosmachora Aug 15, 2025
06e570c
Merge branch 'main' into feat/past-visit-only-for-deceased-patients
denniskigen Aug 16, 2025
523c1a1
Merge branch 'main' into feat/past-visit-only-for-deceased-patients
denniskigen Aug 18, 2025
fa96fac
Update packages/esm-patient-chart-app/src/visit/visit-form/visit-form…
amosmachora Aug 19, 2025
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
13 changes: 9 additions & 4 deletions packages/esm-patient-chart-app/src/visit/visit-form/visit-form.resource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export function deleteVisitAttribute(visitUuid: string, visitAttributeUuid: stri
});
}

export function useVisitFormSchemaAndDefaultValues(visitToEdit: Visit) {
export function useVisitFormSchemaAndDefaultValues(visitToEdit: Visit, options: { isDeceased: boolean }) {
const { t } = useTranslation();
const { visitAttributeTypes, restrictByVisitLocationTag } = useConfig<ChartConfig>();
const isEmrApiModuleInstalled = useFeatureFlag('emrapi-module');
Expand All @@ -140,8 +140,13 @@ export function useVisitFormSchemaAndDefaultValues(visitToEdit: Visit) {
const startDateTime = convertToDateTimeFields(visitToEdit?.startDatetime ?? now);
const stopDateTime = convertToDateTimeFields(visitToEdit?.stopDatetime ?? now);

const visitStatus: VisitStatus =
visitToEdit == null ? 'new' : visitToEdit.stopDatetime === null ? 'ongoing' : 'past';
const visitStatus: VisitStatus = options.isDeceased
? 'past'
: visitToEdit == null
? 'new'
: visitToEdit.stopDatetime === null
? 'ongoing'
: 'past';

const defaultValues: Partial<VisitFormData> = {
visitStatus,
Expand Down Expand Up @@ -275,7 +280,7 @@ export function useVisitFormSchemaAndDefaultValues(visitToEdit: Visit) {
});

return { visitFormSchema, defaultValues, firstEncounterDateTime, lastEncounterDateTime };
}, [t, visitAttributeTypes, visitToEdit, defaultVisitLocation, emrConfiguration]);
}, [t, visitAttributeTypes, visitToEdit, defaultVisitLocation, emrConfiguration, options.isDeceased]);
}

// Returns a Date object based on date, time and am/pm inputs from user.
Expand Down
6 changes: 5 additions & 1 deletion packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,11 @@ describe('useVisitFormSchemaAndDefaultValues', () => {
result: {
current: { visitFormSchema, defaultValues },
},
} = renderHook(() => useVisitFormSchemaAndDefaultValues(mockPastVisitWithEncounters));
} = renderHook(() =>
useVisitFormSchemaAndDefaultValues(mockPastVisitWithEncounters, {
isDeceased: false,
}),
);

// verify start time set to past end time
const stopDateTime = dayjs(mockPastVisitWithEncounters.stopDatetime);
Expand Down
17 changes: 14 additions & 3 deletions packages/esm-patient-chart-app/src/visit/visit-form/visit-form.workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ const VisitForm: React.FC<VisitFormProps> = ({
const [visitFormCallbacks, setVisitFormCallbacks] = useVisitFormCallbacks();
const [extraVisitInfo, setExtraVisitInfo] = useState(null);

const isDeceased = patient?.deceasedBoolean === true || !!patient?.deceasedDateTime;
const { visitFormSchema, defaultValues, firstEncounterDateTime, lastEncounterDateTime } =
useVisitFormSchemaAndDefaultValues(visitToEdit);
useVisitFormSchemaAndDefaultValues(visitToEdit, { isDeceased });

const methods = useForm<VisitFormData>({
mode: 'all',
Expand Down Expand Up @@ -448,8 +449,18 @@ const VisitForm: React.FC<VisitFormProps> = ({
</ContentSwitcher>
) : (
<ContentSwitcher selectedIndex={selectedIndex} onChange={({ name }) => onChange(name)} size="md">
<Switch name="new" text={t('new', 'New')} />
<Switch name="ongoing" text={t('ongoing', 'Ongoing')} />
<Switch
name="new"
text={t('new', 'New')}
disabled={isDeceased}
title={isDeceased ? t('deceasedPatient', 'This patient is deceased') : ''}
/>
<Switch
name="ongoing"
text={t('ongoing', 'Ongoing')}
disabled={isDeceased}
title={isDeceased ? t('deceasedPatient', 'This patient is deceased') : ''}
/>
<Switch name="past" text={t('inThePast', 'In the past')} />
</ContentSwitcher>
);
Expand Down