+ {t("last_administered")}{" "} + {formatDistanceToNow(new Date(lastAdministeredDate))} {t("ago")}{" "} + {t("by")} {formatName(medication.created_by)} +
+ )} ++ {t("prescribed")}{" "} + {formatDistanceToNow( + new Date(medication.authored_on || medication.created_date), + )}{" "} + {t("ago")} {t("by")} {lastAdministeredBy} +
++ {formatDosage(medication.dosage_instruction[0])} +
++ {getFrequencyDisplay(medication.dosage_instruction[0]?.timing) + ?.meaning || "-"} +
++ {medication.dosage_instruction[0]?.route?.display || "Oral"} +
++ {medication.dosage_instruction[0]?.timing?.repeat?.bounds_duration + ?.value || "-"}{" "} + {medication.dosage_instruction[0]?.timing?.repeat?.bounds_duration + ?.unit || ""} +
+{startTimeError}
+ )} +{endTimeError}
} ++ {description || + (searching + ? `No medications match "${searchQuery}"` + : "No medications have been prescribed yet")} +
+- {searching - ? `No medications match "${searchQuery}"` - : "No medications have been prescribed yet"} -
-+
No organizations selected
)} @@ -458,7 +458,7 @@ export default function QuestionnaireEditor({ id }: QuestionnaireEditorProps) {+
A unique URL-friendly identifier for this questionnaire
+
{t("adjust_resource_filters")}
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx index b794b6a99fb..68c7071a3b0 100644 --- a/src/components/ui/button.tsx +++ b/src/components/ui/button.tsx @@ -42,7 +42,7 @@ const buttonVariants = cva( }, }, defaultVariants: { - variant: "default", + variant: "primary", size: "default", }, }, diff --git a/src/components/ui/date-picker.tsx b/src/components/ui/date-picker.tsx index 9e95c5473c6..bdd2f4e17ee 100644 --- a/src/components/ui/date-picker.tsx +++ b/src/components/ui/date-picker.tsx @@ -1,4 +1,5 @@ import { format } from "date-fns"; +import { t } from "i18next"; import { useState } from "react"; import { cn } from "@/lib/utils"; @@ -46,7 +47,7 @@ export function DatePicker({ date, onChange, disabled }: DatePickerProps) { {format(date, "PPP")} ) : ( - Pick a date + {t("pick_a_date")} )} diff --git a/src/components/ui/date-range-picker.tsx b/src/components/ui/date-range-picker.tsx index ffbbf482bce..7c61ec94c2d 100644 --- a/src/components/ui/date-range-picker.tsx +++ b/src/components/ui/date-range-picker.tsx @@ -1,4 +1,5 @@ import { format } from "date-fns"; +import { t } from "i18next"; import * as React from "react"; import { DateRange } from "react-day-picker"; @@ -51,7 +52,7 @@ export function DateRangePicker({ format(date.from, "LLL dd, y") ) ) : ( - Pick a date + {t("pick_a_date")} )} diff --git a/src/pages/Facility/settings/locations/components/LocationCard.tsx b/src/pages/Facility/settings/locations/components/LocationCard.tsx index 60a427a4945..e12d031d6f2 100644 --- a/src/pages/Facility/settings/locations/components/LocationCard.tsx +++ b/src/pages/Facility/settings/locations/components/LocationCard.tsx @@ -82,7 +82,7 @@ export function LocationCard({ location, onEdit, className }: Props) {+
{getLocationFormLabel(location.form)}
diff --git a/src/types/emr/medicationAdministration/medicationAdministration.ts b/src/types/emr/medicationAdministration/medicationAdministration.ts new file mode 100644 index 00000000000..a736846de4a --- /dev/null +++ b/src/types/emr/medicationAdministration/medicationAdministration.ts @@ -0,0 +1,96 @@ +import { UserBareMinimum } from "@/components/Users/models"; + +import { DosageQuantity } from "@/types/emr/medicationRequest"; +import { Code } from "@/types/questionnaire/code"; +import { Quantity } from "@/types/questionnaire/quantity"; + +export const MEDICATION_ADMINISTRATION_STATUS = [ + "completed", + "not_done", + "entered_in_error", + "stopped", + "in_progress", + "on_hold", + "unknown", + "cancelled", +] as const; + +export type MedicationAdministrationStatus = + (typeof MEDICATION_ADMINISTRATION_STATUS)[number]; + +export interface MedicationAdministration { + readonly id?: string; + status: MedicationAdministrationStatus; + status_reason?: Code; + category?: "inpatient" | "outpatient" | "community"; + + medication: Code; + + authored_on?: string; // datetime + occurrence_period_start: string; // datetime + occurrence_period_end?: string; // datetime + recorded?: string; // datetime + + encounter: string; // uuid + request: string; // uuid + + performer?: { + actor: string; // uuid + function: "performer" | "verifier" | "witness"; + }[]; + dosage?: { + text?: string; + site?: Code; + route?: Code; + method?: Code; + dose?: DosageQuantity; + rate?: Quantity; + }; + + note?: string; + + created_by?: UserBareMinimum; + updated_by?: UserBareMinimum; +} + +export interface MedicationAdministrationRequest { + id?: string; + encounter: string; + request: string; + status: MedicationAdministrationStatus; + status_reason?: Code; + medication: Code; + occurrence_period_start: string; + occurrence_period_end?: string; + recorded?: string; + note?: string; + dosage?: { + text?: string; + site?: Code; + route?: Code; + method?: Code; + dose?: DosageQuantity; + rate?: Quantity; + }; +} + +export interface MedicationAdministrationRead { + id: string; + status: MedicationAdministrationStatus; + status_reason?: Code; + medication: Code; + occurrence_period_start: string; + occurrence_period_end?: string; + recorded?: string; + encounter: string; + request: string; + note?: string; + dosage?: { + text?: string; + site?: Code; + route?: Code; + method?: Code; + dose?: DosageQuantity; + rate?: Quantity; + }; +} diff --git a/src/types/emr/medicationAdministration/medicationAdministrationApi.ts b/src/types/emr/medicationAdministration/medicationAdministrationApi.ts new file mode 100644 index 00000000000..77e37c391e2 --- /dev/null +++ b/src/types/emr/medicationAdministration/medicationAdministrationApi.ts @@ -0,0 +1,20 @@ +import { HttpMethod, Type } from "@/Utils/request/api"; +import { PaginatedResponse } from "@/Utils/request/types"; + +import { + MedicationAdministrationRead, + MedicationAdministrationRequest, +} from "./medicationAdministration"; + +export default { + listMedicationAdministrations: { + path: "/api/v1/patient/{patientId}/medication/administration/", + method: HttpMethod.GET, + TRes: Type