Medication Request | Convert dosage instruction to array #9665
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -75,7 +75,7 @@ export default function PrescriptionDetailCard({ | |
| {prescription.category === "discharge" && | ||
| `${t("discharge")} `} | ||
| {t( | ||
| prescription.dosage_instruction[0].as_needed_boolean | ||
| ? "prn_prescription" | ||
| : "prescription", | ||
| )} | ||
|
|
@@ -146,30 +146,31 @@ export default function PrescriptionDetailCard({ | |
| </div> | ||
| </Detail> | ||
|
|
||
| {prescription.dosage_instruction[0].dose_and_rate?.dose_range && ( | ||
| <> | ||
| <Detail className="col-span-5" label={t("start_dosage")}> | ||
| {displayQuantity( | ||
| prescription.dosage_instruction[0].dose_and_rate?.dose_range | ||
| ?.low as Quantity, | ||
| )} | ||
| </Detail> | ||
| <Detail className="col-span-5" label={t("target_dosage")}> | ||
| {displayQuantity( | ||
| prescription.dosage_instruction[0].dose_and_rate?.dose_range | ||
| ?.high as Quantity, | ||
| )} | ||
| </Detail> | ||
| </> | ||
| )} | ||
|
|
||
| {prescription.dosage_instruction[0].dose_and_rate | ||
| ?.dose_quantity && ( | ||
| <Detail | ||
| className="col-span-10 sm:col-span-6 md:col-span-4" | ||
| label={t("dosage")} | ||
| > | ||
| {displayQuantity( | ||
| prescription.dosage_instruction[0].dose_and_rate | ||
| ?.dose_quantity as Quantity, | ||
| )} | ||
| </Detail> | ||
|
|
@@ -179,19 +180,19 @@ export default function PrescriptionDetailCard({ | |
| className="col-span-10 break-all sm:col-span-6" | ||
| label={t("route")} | ||
| > | ||
| {displayCode(prescription.dosage_instruction[0].route)} | ||
| </Detail> | ||
|
|
||
| {prescription.dosage_instruction[0].as_needed_boolean ? ( | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Validate PRN fields together Also applies to: 191-191 |
||
| <Detail | ||
| className="col-span-10 md:col-span-4" | ||
| label={t("indicator")} | ||
| > | ||
| {displayCode(prescription.dosage_instruction[0].as_needed_for)} | ||
| </Detail> | ||
| ) : ( | ||
| <Detail className="col-span-5" label={t("frequency")}> | ||
| {displayTiming(prescription.dosage_instruction[0].timing)} | ||
| </Detail> | ||
| )} | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,19 +91,19 @@ export default function PrescriptionsTable({ | |
| ...obj, | ||
| medicine: displayCode(obj.medication), | ||
| route__pretty: | ||
| obj.dosage_instruction[0].route && | ||
| displayCode(obj.dosage_instruction[0].route), | ||
| frequency__pretty: | ||
| obj.dosage_instruction[0].timing && | ||
| displayTiming(obj.dosage_instruction[0].timing), | ||
| max_dose_per_period__pretty: | ||
| obj.dosage_instruction[0].max_dose_per_period && | ||
| displayDoseRange( | ||
| obj.dosage_instruction[0].max_dose_per_period, | ||
| ), | ||
| indicator: | ||
| obj.dosage_instruction[0].as_needed_for && | ||
| displayCode(obj.dosage_instruction[0].as_needed_for), | ||
|
Comment on lines
+94
to
+106
There was a problem hiding this comment. 🛠️ Refactor suggestion Guard against empty dosage_instruction arrays All these references to - route__pretty:
- obj.dosage_instruction[0].route &&
- displayCode(obj.dosage_instruction[0].route),
+ route__pretty:
+ obj.dosage_instruction?.length &&
+ obj.dosage_instruction[0].route &&
+ displayCode(obj.dosage_instruction[0].route),Apply a similar pattern for the other properties (
|
||
| })) || [] | ||
| } | ||
| objectKeys={Object.values(tkeys)} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect"; | |
| import { | ||
| MEDICATION_REQUEST_INTENT, | ||
| MedicationRequest, | ||
| MedicationRequestDosageInstruction, | ||
| MedicationRequestIntent, | ||
| } from "@/types/emr/medicationRequest"; | ||
| import { Code } from "@/types/questionnaire/code"; | ||
|
|
@@ -41,7 +42,7 @@ const MEDICATION_REQUEST_INITIAL_VALUE: MedicationRequest = { | |
| do_not_perform: false, | ||
| medication: undefined, | ||
| authored_on: new Date().toISOString(), | ||
| dosage_instruction: [], | ||
| }; | ||
|
|
||
| export function MedicationRequestQuestion({ | ||
|
|
@@ -56,7 +57,11 @@ export function MedicationRequestQuestion({ | |
| const handleAddMedication = (medication: Code) => { | ||
| const newMedications: MedicationRequest[] = [ | ||
| ...medications, | ||
| { | ||
| ...MEDICATION_REQUEST_INITIAL_VALUE, | ||
| medication, | ||
| dosage_instruction: [], | ||
| }, | ||
| ]; | ||
| updateQuestionnaireResponseCB({ | ||
| ...questionnaireResponse, | ||
|
|
@@ -138,12 +143,12 @@ export const MedicationRequestItem: React.FC<{ | |
| onRemove?: () => void; | ||
| index?: number; | ||
| }> = ({ medication, disabled, onUpdate, onRemove, index = 0 }) => { | ||
| const dosageInstruction = medication.dosage_instruction[0]; | ||
| const handleUpdateDosageInstruction = ( | ||
| updates: Partial<MedicationRequestDosageInstruction>, | ||
| ) => { | ||
| onUpdate?.({ | ||
| dosage_instruction: [{ ...dosageInstruction, ...updates }], | ||
| }); | ||
| }; | ||
|
|
||
|
|
@@ -198,7 +203,7 @@ export const MedicationRequestItem: React.FC<{ | |
| <QuantityInput | ||
| units={DOSAGE_UNITS} | ||
| quantity={ | ||
| medication.dosage_instruction[0]?.dose_and_rate?.dose_quantity | ||
| } | ||
| onChange={(value) => | ||
| handleUpdateDosageInstruction({ | ||
|
|
@@ -212,7 +217,7 @@ export const MedicationRequestItem: React.FC<{ | |
| <Label className="mb-1 block text-sm font-medium">Route</Label> | ||
| <ValueSetSelect | ||
| system="system-route" | ||
| value={medication.dosage_instruction[0]?.route} | ||
| onSelect={(route) => handleUpdateDosageInstruction({ route })} | ||
| placeholder="Select route" | ||
| disabled={disabled} | ||
|
|
@@ -224,7 +229,7 @@ export const MedicationRequestItem: React.FC<{ | |
| </Label> | ||
| <ValueSetSelect | ||
| system="system-administration-method" | ||
| value={medication.dosage_instruction[0]?.method} | ||
| onSelect={(method) => handleUpdateDosageInstruction({ method })} | ||
| placeholder="Select method" | ||
| disabled={disabled} | ||
|
|
@@ -238,7 +243,7 @@ export const MedicationRequestItem: React.FC<{ | |
| <Label className="mb-1 block text-sm font-medium pr-4">Site</Label> | ||
| <ValueSetSelect | ||
| system="system-body-site" | ||
| value={medication.dosage_instruction[0]?.site} | ||
| onSelect={(site) => handleUpdateDosageInstruction({ site })} | ||
| placeholder="Select site" | ||
| disabled={disabled} | ||
|
|
@@ -249,12 +254,14 @@ export const MedicationRequestItem: React.FC<{ | |
| <div className="flex items-center gap-2 mt-2"> | ||
| <Checkbox | ||
| id={`prn-checkbox-${medication.medication?.code}`} | ||
| checked={ | ||
| medication.dosage_instruction[0]?.as_needed_boolean ?? false | ||
| } | ||
| onCheckedChange={(checked) => | ||
| handleUpdateDosageInstruction({ | ||
| as_needed_boolean: !!checked, | ||
| as_needed_for: checked | ||
| ? medication.dosage_instruction[0]?.as_needed_for | ||
| : undefined, | ||
| }) | ||
| } | ||
|
|
@@ -265,12 +272,12 @@ export const MedicationRequestItem: React.FC<{ | |
| </Label> | ||
| </div> | ||
|
|
||
| {medication.dosage_instruction[0]?.as_needed_boolean ? ( | ||
| <div className="flex gap-2"> | ||
| <div className="flex-1"> | ||
| <ValueSetSelect | ||
| system="system-as-needed-reason" | ||
| value={medication.dosage_instruction[0]?.as_needed_for} | ||
| onSelect={(reason) => | ||
| handleUpdateDosageInstruction({ as_needed_for: reason }) | ||
| } | ||
|
|
@@ -320,13 +327,17 @@ export const MedicationRequestItem: React.FC<{ | |
| </Label> | ||
| <ValueSetSelect | ||
| system="system-additional-instruction" | ||
| value={ | ||
| medication.dosage_instruction[0]?.additional_instruction?.[0] | ||
| } | ||
| onSelect={(additionalInstruction) => | ||
| onUpdate?.({ | ||
| dosage_instruction: [ | ||
| { | ||
| ...medication.dosage_instruction[0], | ||
| additional_instruction: [additionalInstruction], | ||
| }, | ||
| ], | ||
| }) | ||
| } | ||
| disabled={disabled} | ||
|
|
@@ -343,7 +354,7 @@ export const MedicationRequestItem: React.FC<{ | |
| }; | ||
|
|
||
| const reverseFrequencyOption = ( | ||
| option: MedicationRequest["dosage_instruction"][0]["timing"], | ||
| ) => { | ||
| return Object.entries(FREQUENCY_OPTIONS).find( | ||
| ([, value]) => | ||
|
|
@@ -395,6 +406,6 @@ const FREQUENCY_OPTIONS = { | |
| string, | ||
| { | ||
| display: string; | ||
| timing: MedicationRequest["dosage_instruction"][0]["timing"]; | ||
| } | ||
| >; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Check for potential index error when accessing the first dosage instruction
Referencing
dosage_instruction[0]could lead to runtime errors if the array is empty. A simple guard check is recommended: