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.

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

'(fix)O3-2825:Addressing Medication Status Ambiguity in Past Medications #1691

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ const MedicationsDetailsTable: React.FC<ActiveMedicationsProps> = ({
},
];

const isMedicationDiscontinued = (medication) => {
return medication.dateStopped != null;
};

const isMedicationModified = (medication) => {
return medication.modified;
};

const tableRows = medications?.map((medication, id) => ({
id: `${id}`,
details: {
Expand Down Expand Up @@ -131,6 +139,9 @@ const MedicationsDetailsTable: React.FC<ActiveMedicationsProps> = ({
{formatDate(new Date(medication.dateStopped))}
</span>
) : null}
{isMedicationDiscontinued(medication) && !isMedicationModified(medication) && (
<span className={styles.label01}> &mdash; {t('discontinued', 'Discontinued').toUpperCase()}</span>
)}
</p>
</div>
),
Expand Down