(feat) O3-4460: Add a duplicate dispense warning with a confirmation modal #350

jwnasambu · 2025-07-23T14:05:39Z

Requirements

This PR has a title that briefly describes the work done, including the ticket number if there is a ticket.
My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
My work includes tests or is validated by existing tests.

Summary

I implemented a functionality that triggers when all key medication details (dose, quantity, duration, dispense date) match an existing dispense record for the patient.

Screenshots

Dispense.mp4

Related Issue

https://openmrs.atlassian.net/browse/O3-4460

Other

mogoodrich · 2025-08-12T14:12:35Z

@jwnasambu happy to review this when it's ready, go ahead and flag me when it's out of the draft state!

jwnasambu · 2025-08-12T18:03:18Z

@mogoodrich Sure! Thanks so much for reaching out. It really means a lot and is so encouraging.

Add missing properties to satisfy PharmacyConfig type

jwnasambu · 2025-08-13T13:29:23Z

@mogoodrich kindly feel free to review my PR at your convinient time please!

denniskigen · 2025-08-13T14:09:25Z

src/forms/duplicate-prescription.modal.tsx

+        </Button>
+        <Button kind="danger" onClick={() => void handleConfirm()} disabled={isProcessing}>
+          {isProcessing ? (
+            <InlineLoading description={`${t('dispensing', 'Dispensing')}...`} />


Suggested change

<InlineLoading description={`${t('dispensing', 'Dispensing')}...`} />

<InlineLoading description={t('dispensing', 'Dispensing')}} />

denniskigen · 2025-08-13T18:27:50Z

src/config-schema.ts

+  checkDuplicateDispense: any;
+  enableDuplicateDispenseCheck: any;


Suggested change

checkDuplicateDispense: any;

enableDuplicateDispenseCheck: any;

enableDuplicateDispenseCheck: false

This should be properly gated behind a config property. So that means we should have a similarly named property in the config schema:

enableDuplicateDispenseCheck: { _type: Type.Boolean, _description: 'Enable or disable duplicate dispense check before submitting the dispense form', _default: false, },

Why do we have two things here ("checkDuplicateDispense" and "enableDuplicateDispenseCheck")?

denniskigen · 2025-08-13T18:28:58Z

src/location/location.resource.test.tsx

  enableStockDispense: false,
  validateBatch: false,
  leftNavMode: 'collapsed',
+  checkDuplicateDispense: false,


Suggested change

checkDuplicateDispense: false,

denniskigen · 2025-08-13T18:30:05Z

src/forms/duplicate-prescription.modal.tsx

+
+interface DuplicatePrescriptionModalProps {
+  onClose: () => void;
+  onConfirm: () => Promise<void> | void;


Suggested change

onConfirm: () => Promise<void> | void;

onConfirm: () => Promise<void>;

denniskigen · 2025-08-13T18:32:50Z

src/forms/duplicate-prescription.modal.tsx

+      showSnackbar({
+        isLowContrast: true,
+        kind: 'success',
+        title: t('dispenseSuccess', 'Dispensing completed successfully'),
+      });
+      onClose();
+    } catch (error) {
+      console.error('Error during dispensing:', error);
+      showSnackbar({
+        isLowContrast: false,
+        kind: 'error',
+        title: t('errorDispensing', 'Error during dispensing'),
+        subtitle: error instanceof Error ? error.message : String(error),
+      });


Suggested change

showSnackbar({

isLowContrast: true,

kind: 'success',

title: t('dispenseSuccess', 'Dispensing completed successfully'),

});

onClose();

} catch (error) {

console.error('Error during dispensing:', error);

showSnackbar({

isLowContrast: false,

kind: 'error',

title: t('errorDispensing', 'Error during dispensing'),

subtitle: error instanceof Error ? error.message : String(error),

});

onClose();

} catch (error) {

console.error('Error during dispensing:', error);

The submit flow in dispense-form.workspace.tsx should own the error and success notifications. That's so that we have a single source of truth and correct timing-success notifications should only be shown after all async steps complete (dispense save, optional stock update, status update, revalidate). The modal cannot reliably know that; showing toasts there risks “premature success.”

Agree, thanks @denniskigen !

denniskigen · 2025-08-13T18:47:00Z

src/forms/dispense-form.workspace.tsx

+            if (medicationDispensePayload && isDuplicateMedication(medicationDispensePayload)) {
+              handleDuplicateMedication();


Suggested change

if (medicationDispensePayload && isDuplicateMedication(medicationDispensePayload)) {

handleDuplicateMedication();

if (

config.enableDuplicateDispenseCheck &&

medicationDispensePayload &&

isDuplicateMedication(medicationDispensePayload)

) {

const match = findDuplicateMedication(medicationDispensePayload);

handleDuplicateMedication({

previousDispenseDate: match?.whenHandedOver,

previousQuantity: match?.quantity?.value,

previousQuantityUnit: match?.quantity?.code ?? match?.quantity?.unit,

previousPerformer: match?.performer?.[0]?.actor?.display,

previousRoute: match?.dosageInstruction?.[0]?.route?.text,

previousSchedule: match?.dosageInstruction?.[0]?.timing?.code?.text,

});

This gates the duplicate dispense check so it only runs when config.enableDuplicateDispenseCheck is truthy. If a check is detected, it finds the matching prior dispense via findDuplicateMedication(medicationDispensePayload). It then launches the duplicate dispense confirmation modal with contextual details.

Nit, but would it be clearer to pull this all out into a separate duplicate check function instead of nesting it within the button onclick?

denniskigen · 2025-08-13T18:48:07Z

src/forms/dispense-form.workspace.tsx

    }
  };

+  const handleDuplicateMedication = () => {


Suggested change

const handleDuplicateMedication = () => {

const handleDuplicateMedication = (opts?: {

previousDispenseDate?: string;

previousQuantity?: number;

previousQuantityUnit?: string;

previousPerformer?: string;

previousRoute?: string;

previousSchedule?: string;

}) => {

denniskigen · 2025-08-13T18:48:33Z

src/forms/dispense-form.workspace.tsx

+  const handleDuplicateMedication = () => {
+    const dispose = showModal('duplicate-prescription-modal', {
+      onClose: () => dispose(),
+      medicationName: medicationDispensePayload?.medicationCodeableConcept?.text || '',


Suggested change

medicationName: medicationDispensePayload?.medicationCodeableConcept?.text || '',

medicationName: medicationDispensePayload?.medicationCodeableConcept?.text || '',

previousDispenseDate: opts?.previousDispenseDate,

previousQuantity: opts?.previousQuantity,

previousQuantityUnit: opts?.previousQuantityUnit,

previousPerformer: opts?.previousPerformer,

previousRoute: opts?.previousRoute,

previousSchedule: opts?.previousSchedule,

denniskigen · 2025-08-13T18:48:50Z

src/forms/dispense-form.workspace.tsx

+      onClose: () => dispose(),
+      medicationName: medicationDispensePayload?.medicationCodeableConcept?.text || '',
+      onConfirm: () => {
+        handleSubmit();


Suggested change

handleSubmit();

handleSubmit();

return Promise.resolve();

denniskigen · 2025-08-13T19:03:47Z

src/forms/dispense-form.workspace.tsx

+  const isDuplicateMedication = (dispense: MedicationDispense): boolean => {
+    const dispenses = medicationRequestBundle?.dispenses ?? [];
+
+    return dispenses.some((existingDispense) => {
+      return (
+        existingDispense.medicationCodeableConcept?.coding?.[0]?.code ===
+          dispense.medicationCodeableConcept?.coding?.[0]?.code &&
+        existingDispense.performer?.[0]?.actor?.reference === dispense.performer?.[0]?.actor?.reference &&
+        existingDispense.quantity?.value === dispense.quantity?.value &&
+        existingDispense.quantity?.code === dispense.quantity?.code &&
+        existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value ===
+          dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value &&
+        existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code ===
+          dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code &&
+        existingDispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code ===
+          dispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code &&
+        existingDispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code ===
+          dispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code
+      );
+    });
+  };


Suggested change

const isDuplicateMedication = (dispense: MedicationDispense): boolean => {

const dispenses = medicationRequestBundle?.dispenses ?? [];

return dispenses.some((existingDispense) => {

return (

existingDispense.medicationCodeableConcept?.coding?.[0]?.code ===

dispense.medicationCodeableConcept?.coding?.[0]?.code &&

existingDispense.performer?.[0]?.actor?.reference === dispense.performer?.[0]?.actor?.reference &&

existingDispense.quantity?.value === dispense.quantity?.value &&

existingDispense.quantity?.code === dispense.quantity?.code &&

existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value ===

dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value &&

existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code ===

dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code &&

existingDispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code ===

dispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code &&

existingDispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code ===

dispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code

);

});

};

const anyCodingOverlap = (

a?: Array<{ system?: string; code?: string }>,

b?: Array<{ system?: string; code?: string }>,

) => (a ?? []).some((c1) => (b ?? []).some((c2) => c1.system === c2.system && c1.code === c2.code));

const normalizeRefToUuid = (ref?: string) => (ref ? getUuidFromReference(ref) : undefined);

const sameQuantity = (

a?: { value?: number; code?: string; unit?: string },

b?: { value?: number; code?: string; unit?: string },

) => {

if (a?.value !== b?.value) {

return false;

}

const aUnit = (a?.code ?? a?.unit ?? '').toLowerCase();

const bUnit = (b?.code ?? b?.unit ?? '').toLowerCase();

return aUnit === bUnit;

};

const equalStrings = (a?: string, b?: string) => (a?.trim().toLowerCase() ?? '') === (b?.trim().toLowerCase() ?? '');

const isDuplicateMedication = (dispense: MedicationDispense): boolean => {

const dispenses = medicationRequestBundle?.dispenses ?? [];

const currentId = dispense?.id;

return dispenses.some((existingDispense) => {

if (mode === 'edit' && existingDispense.id === currentId) {

return false;

}

const sameRx =

normalizeRefToUuid(existingDispense.authorizingPrescription?.[0]?.reference) ===

normalizeRefToUuid(dispense.authorizingPrescription?.[0]?.reference);

const sameMedication =

anyCodingOverlap(

existingDispense.medicationCodeableConcept?.coding,

dispense.medicationCodeableConcept?.coding,

) ||

normalizeRefToUuid(existingDispense.medicationReference?.reference) ===

normalizeRefToUuid(dispense.medicationReference?.reference);

const samePerformer =

normalizeRefToUuid(existingDispense.performer?.[0]?.actor?.reference) ===

normalizeRefToUuid(dispense.performer?.[0]?.actor?.reference);

const sameQty = sameQuantity(existingDispense.quantity, dispense.quantity);

const sameDose = sameQuantity(

existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity,

dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity,

);

const sameRoute =

anyCodingOverlap(

existingDispense.dosageInstruction?.[0]?.route?.coding,

dispense.dosageInstruction?.[0]?.route?.coding,

) ||

equalStrings(

existingDispense.dosageInstruction?.[0]?.route?.text,

dispense.dosageInstruction?.[0]?.route?.text,

);

const sameTiming =

anyCodingOverlap(

existingDispense.dosageInstruction?.[0]?.timing?.code?.coding,

dispense.dosageInstruction?.[0]?.timing?.code?.coding,

) ||

equalStrings(

existingDispense.dosageInstruction?.[0]?.timing?.code?.text,

dispense.dosageInstruction?.[0]?.timing?.code?.text,

);

return sameRx && sameMedication && samePerformer && sameQty && sameDose && sameRoute && sameTiming;

});

};

const findDuplicateMedication = (dispense: MedicationDispense): MedicationDispense | undefined => {

const dispenses = medicationRequestBundle?.dispenses ?? [];

const currentId = dispense?.id;

return dispenses.find((existingDispense) => {

if (mode === 'edit' && existingDispense.id === currentId) {

return false;

}

const sameRx =

normalizeRefToUuid(existingDispense.authorizingPrescription?.[0]?.reference) ===

normalizeRefToUuid(dispense.authorizingPrescription?.[0]?.reference);

const sameMedication =

anyCodingOverlap(

existingDispense.medicationCodeableConcept?.coding,

dispense.medicationCodeableConcept?.coding,

) ||

normalizeRefToUuid(existingDispense.medicationReference?.reference) ===

normalizeRefToUuid(dispense.medicationReference?.reference);

const samePerformer =

normalizeRefToUuid(existingDispense.performer?.[0]?.actor?.reference) ===

normalizeRefToUuid(dispense.performer?.[0]?.actor?.reference);

const sameQty = sameQuantity(existingDispense.quantity, dispense.quantity);

const sameDose = sameQuantity(

existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity,

dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity,

);

const sameRoute =

anyCodingOverlap(

existingDispense.dosageInstruction?.[0]?.route?.coding,

dispense.dosageInstruction?.[0]?.route?.coding,

) ||

equalStrings(

existingDispense.dosageInstruction?.[0]?.route?.text,

dispense.dosageInstruction?.[0]?.route?.text,

);

const sameTiming =

anyCodingOverlap(

existingDispense.dosageInstruction?.[0]?.timing?.code?.coding,

dispense.dosageInstruction?.[0]?.timing?.code?.coding,

) ||

equalStrings(

existingDispense.dosageInstruction?.[0]?.timing?.code?.text,

dispense.dosageInstruction?.[0]?.timing?.code?.text,

);

return sameRx && sameMedication && samePerformer && sameQty && sameDose && sameRoute && sameTiming;

});

};

Maybe this might be a more robust duplicate check:

anyCodingOverlap: Returns true if two CodeableConcept coding arrays share at least one coding with the same system and code.

normalizeRefToUuid: Extracts the UUID from a FHIR reference string (e.g., “Practitioner/uuid” → “uuid”), or undefined if missing.

sameQuantity: Compares two quantities by value and by unit identifier (prefers code, falls back to unit), case-insensitive.

isDuplicateMedication: Detects whether the current dispense matches a prior one for the same prescription by checking:

sameRx: same authorizingPrescription (UUID-normalized)

sameMedication: any overlap in medication codings (system+code) OR same Medication reference UUID

samePerformer: same performer UUID

sameQty and sameDose: value plus code-or-unit

sameRoute and sameTiming: any overlap in codings (system+code) OR equal text when codings are absent

Ignores the current record in edit mode (prevents self-matching)

Submit button logic: If enableDuplicateDispenseCheck is true and a duplicate is detected, it finds the matching prior dispense and opens the confirmation modal with contextual details (date, quantity with human-readable unit, performer, route, schedule). Proceeding triggers the normal submit flow, which owns success/error toasts.

@mogoodrich @dkayiwa @ibacher @mseaton it doesn't look like the backend has a duplicate-dispense enforcement. Should we add server-side validation to prevent exact duplicates for the same authorizingPrescription within a time window? What criteria should it consider? What should it return if a match is found? Should we file a ticket.

Whew, detailed @denniskigen ! I didn't fully review, I assume you have tested? Can we add some unit tests?

Also, do the findDuplicateMedication and isDuplicateMedication have a duplicate code block after the "return dispennses.find() or dispenses.some()" that could be refactored out, or is there a difference I'm missing?

But the biggest thing here: there is no checking of date of dispense as far as I can tell? In the refill use case it would be typical for multiple duplicate dispenses... there should only be a warning if the two duplicates are within some certain timeframe. Not sure what this time frame should be, but we should likely make it configurable.

And regarding the server-side validation, probably a question for @bmamlin (but probably worth discussing outside this PR so as not to clutter). I do think that it might be hard to some with a hard-and-fast validation rule, especially considering inpatient settings where (I assume) there may be multiple dispensing within a single day?

denniskigen · 2025-08-13T19:51:34Z

src/forms/duplicate-prescription.modal.tsx

+        {previousDispenseDate && previousQuantity !== undefined && (
+          <p>
+            {t('previousDispenseDetails', 'Previous dispense on')}{' '}
+            <strong>{new Date(previousDispenseDate).toLocaleDateString()}</strong> {t('withQuantity', 'with quantity')}{' '}
+            <strong>{previousQuantity}</strong>.
+          </p>
+        )}


Suggested change

{previousDispenseDate && previousQuantity !== undefined && (



{t('previousDispenseDetails', 'Previous dispense on')}{' '}

{new Date(previousDispenseDate).toLocaleDateString()} {t('withQuantity', 'with quantity')}{' '}

{previousQuantity}.



)}

{previousDispense ? (

<Tile className={styles.previousDispenseTile}>

<div className={styles.headerRow}>

<Tag type="gray" size="sm">

{t('dispensed', 'Dispensed')}

</Tag>

{medicationName}

</div>

<div className={styles.metaRow}>

{previousPerformer && (



{t('performedBy', 'Performed by')}: {previousPerformer}



)}

{previousPerformer && previousDispenseDate && •}

{previousDispenseDate && {new Date(previousDispenseDate).toLocaleDateString()}}

</div>

<div className={styles.tileContent}>

<MedicationEvent medicationEvent={previousDispense} />

</div>

</Tile>

) : (

<>

{medicationName && (



{t('medication', 'Medication')}: {medicationName}



)}

{previousDispenseDate && previousQuantity !== undefined && (



{t('previousDispenseDetails', 'Previous dispense on')}{' '}

{new Date(previousDispenseDate).toLocaleDateString()}{' '}

{t('withQuantity', 'with quantity')}{' '}



{previousQuantity}

{previousQuantityUnit ? ` ${previousQuantityUnit}` : ''}



.



)}

{previousPerformer && (



{t('performedBy', 'Performed by')}: {previousPerformer}



)}

{previousRoute && (



{t('route', 'Route')}: {previousRoute}



)}

{previousSchedule && (



{t('schedule', 'Schedule')}: {previousSchedule}



)}

</>

)}

We can pass previousQuantityUnit, previousPerformer, previousRoute, previousSchedule, previousDispense as optional props to the DuplicatePrescriptionModal component in the modal registration.

And then you'd have this in duplicate-dispense-modal.scss:

@use '@carbon/layout'; @use '@openmrs/esm-styleguide/src/vars' as *; .previousDispenseTile { padding: layout.$spacing-04 layout.$spacing-05; margin: layout.$spacing-05 0; } .headerRow { display: flex; align-items: center; gap: layout.$spacing-02; } .medicationName { font-weight: 600; } .tileContent { margin-top: layout.$spacing-02; } .metaRow { margin-top: layout.$spacing-02; color: $text-02; display: flex; align-items: center; gap: layout.$spacing-03; font-size: layout.$spacing-04; } .metaDivider { color: $ui-04; }

This would give you something like this:

which gives the pharmacist a clear, compact summary of that prior dispense and quick ways to double‑check, so they can confidently decide to cancel or proceed without leaving the workflow.

We also need to decide whether we want to flag multiple potential matches. We already have all prior dispenses in the bundle, so we can compute and display multiple matches locally. Or would we want to offset this concern to the backend?

We likely should flag multiple matches here. But, again, we want to limit this to a (perhaps configurable) timeframe.

denniskigen · 2025-08-13T20:13:41Z

How should the system deal with potential duplicates created by the user confirming the modal? Should we annotate the dispense record with some additional information?

jwnasambu · 2025-08-14T14:28:24Z

@denniskigen Kindly I haven't pushed the proposed changes as you had suggested during the coffee break session and 03- call as I wait for the review from other members. Kindly let me know when its ready to push the changes just incase other members consent or delay to respond.

@mogoodrich

mogoodrich · 2025-08-14T14:28:59Z

Sorry I'm backlogged with things, will hopefully look at this tomorrow but if you don't hear by next week feel free to ping me again @jwnasambu

mogoodrich

Thanks @jwnasambu and @denniskigen , see my comments... perhaps my biggest comment is that the warning should be limited to a (likely configurable) time window.

mogoodrich · 2025-08-18T19:29:07Z

src/config-schema.ts

+  checkDuplicateDispense: any;
+  enableDuplicateDispenseCheck: any;


Why do we have two things here ("checkDuplicateDispense" and "enableDuplicateDispenseCheck")?

mogoodrich · 2025-08-19T00:46:44Z

src/forms/dispense-form.workspace.tsx

+  const isDuplicateMedication = (dispense: MedicationDispense): boolean => {
+    const dispenses = medicationRequestBundle?.dispenses ?? [];
+
+    return dispenses.some((existingDispense) => {
+      return (
+        existingDispense.medicationCodeableConcept?.coding?.[0]?.code ===
+          dispense.medicationCodeableConcept?.coding?.[0]?.code &&
+        existingDispense.performer?.[0]?.actor?.reference === dispense.performer?.[0]?.actor?.reference &&
+        existingDispense.quantity?.value === dispense.quantity?.value &&
+        existingDispense.quantity?.code === dispense.quantity?.code &&
+        existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value ===
+          dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value &&
+        existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code ===
+          dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code &&
+        existingDispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code ===
+          dispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code &&
+        existingDispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code ===
+          dispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code
+      );
+    });
+  };


Whew, detailed @denniskigen ! I didn't fully review, I assume you have tested? Can we add some unit tests?

Also, do the findDuplicateMedication and isDuplicateMedication have a duplicate code block after the "return dispennses.find() or dispenses.some()" that could be refactored out, or is there a difference I'm missing?

But the biggest thing here: there is no checking of date of dispense as far as I can tell? In the refill use case it would be typical for multiple duplicate dispenses... there should only be a warning if the two duplicates are within some certain timeframe. Not sure what this time frame should be, but we should likely make it configurable.

mogoodrich · 2025-08-19T00:48:03Z

src/forms/dispense-form.workspace.tsx

    }
  };

-  // initialize the internal dispense payload with the dispenses passed in as props


Any particular reason we are removing these comments?

mogoodrich · 2025-08-19T00:48:11Z

src/forms/dispense-form.workspace.tsx

-  // initialize the internal dispense payload with the dispenses passed in as props
  useEffect(() => setMedicationDispensePayload(medicationDispense), [medicationDispense]);
-
-  // check is valid on any changes


Same question here?

mogoodrich · 2025-08-19T00:51:29Z

src/forms/dispense-form.workspace.tsx

+            if (medicationDispensePayload && isDuplicateMedication(medicationDispensePayload)) {
+              handleDuplicateMedication();


Nit, but would it be clearer to pull this all out into a separate duplicate check function instead of nesting it within the button onclick?

mogoodrich · 2025-08-19T00:53:07Z

src/forms/duplicate-prescription.modal.tsx

+      showSnackbar({
+        isLowContrast: true,
+        kind: 'success',
+        title: t('dispenseSuccess', 'Dispensing completed successfully'),
+      });
+      onClose();
+    } catch (error) {
+      console.error('Error during dispensing:', error);
+      showSnackbar({
+        isLowContrast: false,
+        kind: 'error',
+        title: t('errorDispensing', 'Error during dispensing'),
+        subtitle: error instanceof Error ? error.message : String(error),
+      });


Agree, thanks @denniskigen !

mogoodrich · 2025-08-19T00:54:56Z

src/forms/duplicate-prescription.modal.tsx

+        {previousDispenseDate && previousQuantity !== undefined && (
+          <p>
+            {t('previousDispenseDetails', 'Previous dispense on')}{' '}
+            <strong>{new Date(previousDispenseDate).toLocaleDateString()}</strong> {t('withQuantity', 'with quantity')}{' '}
+            <strong>{previousQuantity}</strong>.
+          </p>
+        )}


We likely should flag multiple matches here. But, again, we want to limit this to a (perhaps configurable) timeframe.

mogoodrich · 2025-08-19T00:58:50Z

src/forms/dispense-form.workspace.tsx

+  const isDuplicateMedication = (dispense: MedicationDispense): boolean => {
+    const dispenses = medicationRequestBundle?.dispenses ?? [];
+
+    return dispenses.some((existingDispense) => {
+      return (
+        existingDispense.medicationCodeableConcept?.coding?.[0]?.code ===
+          dispense.medicationCodeableConcept?.coding?.[0]?.code &&
+        existingDispense.performer?.[0]?.actor?.reference === dispense.performer?.[0]?.actor?.reference &&
+        existingDispense.quantity?.value === dispense.quantity?.value &&
+        existingDispense.quantity?.code === dispense.quantity?.code &&
+        existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value ===
+          dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.value &&
+        existingDispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code ===
+          dispense.dosageInstruction?.[0]?.doseAndRate?.[0]?.doseQuantity?.code &&
+        existingDispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code ===
+          dispense.dosageInstruction?.[0]?.route?.coding?.[0]?.code &&
+        existingDispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code ===
+          dispense.dosageInstruction?.[0]?.timing?.code?.coding?.[0]?.code
+      );
+    });
+  };


And regarding the server-side validation, probably a question for @bmamlin (but probably worth discussing outside this PR so as not to clutter). I do think that it might be hard to some with a hard-and-fast validation rule, especially considering inpatient settings where (I assume) there may be multiple dispensing within a single day?

jwnasambu marked this pull request as draft July 23, 2025 14:06

jwnasambu marked this pull request as ready for review August 4, 2025 16:27

jwnasambu closed this Aug 4, 2025

jwnasambu reopened this Aug 4, 2025

jwnasambu closed this Aug 4, 2025

jwnasambu deleted the fix/O3-4460 branch August 4, 2025 16:32

jwnasambu restored the fix/O3-4460 branch August 4, 2025 16:33

jwnasambu reopened this Aug 4, 2025

jwnasambu marked this pull request as draft August 4, 2025 16:34

jwnasambu force-pushed the fix/O3-4460 branch from 9c6a8e4 to ae8344f Compare August 7, 2025 21:59

fix/O3-4460: Missing Warning for Duplicate Medication Dispense

9475527

Add missing properties to satisfy PharmacyConfig type

jwnasambu force-pushed the fix/O3-4460 branch from b60a6a1 to 9475527 Compare August 13, 2025 12:54

jwnasambu marked this pull request as ready for review August 13, 2025 13:28

Merge branch 'main' into fix/O3-4460

d099f3f

jwnasambu requested review from chibongho, denniskigen, ibacher and mogoodrich August 13, 2025 13:29

denniskigen reviewed Aug 13, 2025

View reviewed changes

denniskigen changed the title ~~fix/O3-4460: Missing Warning for Duplicate Medication Dispense~~ (feat) O3-4460: Add a duplicate dispense warning with a confirmation modal Aug 13, 2025

denniskigen requested a review from bmamlin August 14, 2025 13:56

mogoodrich requested changes Aug 19, 2025

View reviewed changes

	<InlineLoading description={`${t('dispensing', 'Dispensing')}...`} />
	<InlineLoading description={t('dispensing', 'Dispensing')}} />

		checkDuplicateDispense: any;
		enableDuplicateDispenseCheck: any;

	checkDuplicateDispense: any;
	enableDuplicateDispenseCheck: any;
	enableDuplicateDispenseCheck: false

	onConfirm: () => Promise<void> \| void;
	onConfirm: () => Promise<void>;

		if (medicationDispensePayload && isDuplicateMedication(medicationDispensePayload)) {
		handleDuplicateMedication();

-            if (medicationDispensePayload && isDuplicateMedication(medicationDispensePayload)) {
-              handleDuplicateMedication();
+            if (
+              config.enableDuplicateDispenseCheck &&
+              medicationDispensePayload &&
+              isDuplicateMedication(medicationDispensePayload)
+            ) {
+              const match = findDuplicateMedication(medicationDispensePayload);
+              handleDuplicateMedication({
+                previousDispenseDate: match?.whenHandedOver,
+                previousQuantity: match?.quantity?.value,
+                previousQuantityUnit: match?.quantity?.code ?? match?.quantity?.unit,
+                previousPerformer: match?.performer?.[0]?.actor?.display,
+                previousRoute: match?.dosageInstruction?.[0]?.route?.text,
+                previousSchedule: match?.dosageInstruction?.[0]?.timing?.code?.text,
+              });

-  const handleDuplicateMedication = () => {
+  const handleDuplicateMedication = (opts?: {
+    previousDispenseDate?: string;
+    previousQuantity?: number;
+    previousQuantityUnit?: string;
+    previousPerformer?: string;
+    previousRoute?: string;
+    previousSchedule?: string;
+  }) => {

-      medicationName: medicationDispensePayload?.medicationCodeableConcept?.text || '',
+      medicationName: medicationDispensePayload?.medicationCodeableConcept?.text || '',
+      previousDispenseDate: opts?.previousDispenseDate,
+      previousQuantity: opts?.previousQuantity,
+      previousQuantityUnit: opts?.previousQuantityUnit,
+      previousPerformer: opts?.previousPerformer,
+      previousRoute: opts?.previousRoute,
+      previousSchedule: opts?.previousSchedule,

-        {previousDispenseDate && previousQuantity !== undefined && (
-          <p>
-            {t('previousDispenseDetails', 'Previous dispense on')}{' '}
-            <strong>{new Date(previousDispenseDate).toLocaleDateString()}</strong> {t('withQuantity', 'with quantity')}{' '}
-            <strong>{previousQuantity}</strong>.
-          </p>
-        )}
+        {previousDispense ? (
+          <Tile className={styles.previousDispenseTile}>
+            <div className={styles.headerRow}>
+              <Tag type="gray" size="sm">
+                {t('dispensed', 'Dispensed')}
+              </Tag>
+              <span className={styles.medicationName}>{medicationName}</span>
+            </div>
+            <div className={styles.metaRow}>
+              {previousPerformer && (
+                <span>
+                  {t('performedBy', 'Performed by')}: <strong>{previousPerformer}</strong>
+                </span>
+              )}
+              {previousPerformer && previousDispenseDate && <span className={styles.metaDivider}>•</span>}
+              {previousDispenseDate && <span>{new Date(previousDispenseDate).toLocaleDateString()}</span>}
+            </div>
+            <div className={styles.tileContent}>
+              <MedicationEvent medicationEvent={previousDispense} />
+            </div>
+          </Tile>
+        ) : (
+          <>
+            {medicationName && (
+              <p>
+                {t('medication', 'Medication')}: <strong>{medicationName}</strong>
+              </p>
+            )}
+            {previousDispenseDate && previousQuantity !== undefined && (
+              <p>
+                {t('previousDispenseDetails', 'Previous dispense on')}{' '}
+                <strong>{new Date(previousDispenseDate).toLocaleDateString()}</strong>{' '}
+                {t('withQuantity', 'with quantity')}{' '}
+                <strong>
+                  {previousQuantity}
+                  {previousQuantityUnit ? ` ${previousQuantityUnit}` : ''}
+                </strong>
+                .
+              </p>
+            )}
+            {previousPerformer && (
+              <p>
+                {t('performedBy', 'Performed by')}: <strong>{previousPerformer}</strong>
+              </p>
+            )}
+            {previousRoute && (
+              <p>
+                {t('route', 'Route')}: <strong>{previousRoute}</strong>
+              </p>
+            )}
+            {previousSchedule && (
+              <p>
+                {t('schedule', 'Schedule')}: <strong>{previousSchedule}</strong>
+              </p>
+            )}
+          </>
+        )}

(feat) O3-4460: Add a duplicate dispense warning with a confirmation modal #350

Are you sure you want to change the base?

(feat) O3-4460: Add a duplicate dispense warning with a confirmation modal #350

Uh oh!

Conversation

jwnasambu commented Jul 23, 2025 • edited by denniskigen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Requirements

Summary

Screenshots

Related Issue

Other

Uh oh!

mogoodrich commented Aug 12, 2025

Uh oh!

jwnasambu commented Aug 12, 2025

Uh oh!

jwnasambu commented Aug 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

denniskigen Aug 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

denniskigen Aug 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

denniskigen Aug 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

denniskigen Aug 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

denniskigen commented Aug 13, 2025

Uh oh!

jwnasambu commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mogoodrich commented Aug 14, 2025

Uh oh!

mogoodrich left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

jwnasambu commented Jul 23, 2025 •

edited by denniskigen

Loading

denniskigen Aug 13, 2025 •

edited

Loading

denniskigen Aug 13, 2025 •

edited

Loading

denniskigen Aug 13, 2025 •

edited

Loading

denniskigen Aug 13, 2025 •

edited

Loading

jwnasambu commented Aug 14, 2025 •

edited

Loading