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

Print Prescription cleanup #9991

Merged
merged 1 commit into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@
"comments": "Comments",
"communication__sent_to_hcx": "Sent communication to HCX",
"completed": "Completed",
"computer_generated_prescription": "This is a computer generated prescription.",
"configure": "Configure",
"configure_facility": "Configure Facility",
"confirm": "Confirm",
Expand Down Expand Up @@ -865,6 +866,7 @@
"encounter_class__obsenc": "Observation",
"encounter_class__planned": "Planned",
"encounter_class__vr": "Virtual",
"encounter_date": "Encounter Date",
"encounter_date_field_label__A": "Date & Time of Admission to the Facility",
"encounter_date_field_label__DC": "Date & Time of Domiciliary Care commencement",
"encounter_date_field_label__DD": "Date & Time of Consultation",
Expand Down Expand Up @@ -1064,6 +1066,7 @@
"general_info_detail": "Provide the patient's personal details, including name, date of birth, gender, and contact information for accurate identification and communication.",
"generate_link_abha": "Generate/Link ABHA Number",
"generate_report": "Generate Report",
"generated_on": "Generated on:",
"generated_summary_caution": "This is a computer generated summary using the information captured in the CARE system.",
"generating": "Generating",
"generating_discharge_summary": "Generating discharge summary",
Expand Down Expand Up @@ -1288,6 +1291,7 @@
"medication_taken_between": "Medication Taken Between",
"medicine": "Medicine",
"medicine_administration_history": "Medicine Administration History",
"medicine_prescription": "Medicine Prescription",
"medicines_administered": "Medicine(s) administered",
"medicines_administered_error": "Error administering medicine(s)",
"member_id_required": "Member Id is required",
Expand Down Expand Up @@ -1370,6 +1374,7 @@
"no_log_update_delta": "No changes since previous log update",
"no_log_updates": "No log updates found",
"no_medical_history_available": "No Medical History Available",
"no_medications_found_for_this_encounter": "No medications found for this encounter.",
"no_notices_for_you": "No notices for you.",
"no_observations": "No Observations",
"no_ongoing_medications": "No Ongoing Medications",
Expand Down Expand Up @@ -1613,6 +1618,7 @@
"prescription_logs": "Prescription Logs",
"prescription_medication": "Prescription Medication",
"prescription_medications": "Prescription Medications",
"prescriptions": "Prescriptions",
"prescriptions__dosage_frequency": "Dosage & Frequency",
"prescriptions__medicine": "Medicine",
"prescriptions__route": "Route",
Expand All @@ -1627,6 +1633,7 @@
"principal": "Principal",
"principal_diagnosis": "Principal diagnosis",
"print": "Print",
"print_prescriptions": "Print Prescriptions",
"print_referral_letter": "Print Referral Letter",
"priority": "Priority",
"prn_prescription": "PRN Prescription",
Expand Down
2 changes: 1 addition & 1 deletion src/CAREUI/misc/PrintPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function PrintPreview(props: Props) {

return (
<Page title={props.title}>
<div className="mx-auto my-8 w-[50rem]">
<div className="mx-auto my-8 w-[50rem] border rounded-xl border-gray-200 shadow-2xl overflow-hidden">
<div className="top-0 z-20 flex gap-2 bg-secondary-100 px-2 py-4 xl:absolute xl:right-6 xl:top-8 xl:justify-end">
<Button variant="primary" disabled={props.disabled} onClick={print}>
<CareIcon icon="l-print" className="text-lg" />
Expand Down
4 changes: 2 additions & 2 deletions src/Utils/request/api.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
AppointmentPatientRegister,
} from "@/pages/Patient/Utils";
import { Encounter, EncounterEditRequest } from "@/types/emr/encounter";
import { MedicationRequest } from "@/types/emr/medicationRequest";
import { MedicationRequestRead } from "@/types/emr/medicationRequest";
import { MedicationStatement } from "@/types/emr/medicationStatement";
import { PartialPatientModel, Patient } from "@/types/emr/newPatient";
import {
Expand Down Expand Up @@ -650,7 +650,7 @@ const routes = {
list: {
path: "/api/v1/patient/{patientId}/medication/request/",
method: "GET",
TRes: Type<PaginatedResponse<MedicationRequest>>(),
TRes: Type<PaginatedResponse<MedicationRequestRead>>(),
},
},

Expand Down
Loading
Loading