include next suggested date in next encounter modal

msupply-foundation · Jan 28, 2025 · 18510e5 · 18510e5
1 parent 269884d
commit 18510e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/client/packages/system/src/Encounter/DetailView/DetailView.tsx b/client/packages/system/src/Encounter/DetailView/DetailView.tsx
@@ -37,6 +37,8 @@ import { getLogicalStatus } from '../utils';
 import { PatientTabValue } from '../../Patient/PatientView/PatientView';
 import { VaccinationCard } from '../../Vaccination/Components/VaccinationCard';
 import { ScheduleNextEncounterModal } from './ScheduleNextEncounterModal';
+import { usePatientVaccineCard } from '../../Vaccination/api/usePatientVaccineCard';
+import { getNextVaccinationEncounterDate } from './helpers';
 
 const getPatientBreadcrumbSuffix = (
   encounter: EncounterFragment,
@@ -166,6 +168,15 @@ export const DetailView: FC = () => {
     isError,
   } = useEncounter.document.byId(id);
 
+  // If this is a vaccination encounter, we want to use the suggested
+  // next vaccination dates for the next encounter
+  const {
+    query: { data: vaccineCard },
+  } = usePatientVaccineCard(encounter?.programEnrolment?.id ?? '');
+  const suggestedNextEncounterDate = getNextVaccinationEncounterDate(
+    vaccineCard?.items ?? []
+  );
+
   const handleSave = useEncounter.document.upsertDocument(
     encounter?.patient.id ?? '',
     encounter?.type ?? ''
@@ -363,6 +374,7 @@ export const DetailView: FC = () => {
               encounterConfig={encounter.document.documentRegistry}
               onClose={nextEncounterModal.toggleOff}
               patientId={encounter.patient.id ?? ''}
+              suggestedDate={suggestedNextEncounterDate}
             />
           )}
           <Toolbar onChange={updateEncounter} encounter={encounter} />

diff --git a/client/packages/system/src/Encounter/DetailView/ScheduleNextEncounterModal.tsx b/client/packages/system/src/Encounter/DetailView/ScheduleNextEncounterModal.tsx
@@ -23,15 +23,18 @@ export const ScheduleNextEncounterModal = ({
   patientId,
   encounterConfig,
   onClose,
+  suggestedDate,
 }: {
   patientId: string;
   encounterConfig: DocumentRegistryFragment;
   onClose: () => void;
+  suggestedDate: Date | null;
 }) => {
   const { user, storeId } = useAuthContext();
   const t = useTranslation();
   const [draft, setDraft] = useState<EncounterSchema>({
     createdDatetime: new Date().toISOString(),
+    startDatetime: suggestedDate?.toISOString(),
     createdBy: { id: user?.id ?? '', username: user?.name ?? '' },
     status: EncounterNodeStatus.Pending,
     location: {