Prefill Structured Data; Add Edit Links for Structured

public/locale/en.json

@@ -335,6 +335,8 @@
   "add_new_patient": "Add New Patient",
   "add_new_user": "Add New User",
   "add_notes": "Add notes",
+  "add_notes_about_diagnosis": "Add notes about the diagnosis...",
+  "add_notes_about_symptom": "Add notes about the symptom...",
   "add_organizations": "Add Organizations",
   "add_patient_updates": "Add Patient Updates",
   "add_policy": "Add Insurance Policy",
@@ -383,6 +385,7 @@
   "allow_transfer": "Allow Transfer",
   "allowed_formats_are": "Allowed formats are {{formats}}.",
   "already_a_member": "Already a member?",
+  "already_marked_as_error": "Already marked as error",
   "alternate_phone_number": "Alternate Phone Number",
   "ambulance_driver_name": "Name of ambulance driver",
   "ambulance_number": "Ambulance No",
@@ -1128,6 +1131,7 @@
   "hi__record_not_fetched_title": "This record hasn't been fetched yet",
   "hi__waiting_for_record": "Waiting for the Host HIP to send the record.",
   "hide": "Hide",
+  "hide_notes": "Hide notes",
   "high": "High",
   "history": "History",
   "home_facility": "Home Facility",
@@ -1142,6 +1146,7 @@
   "icmr_specimen_referral_form": "ICMR Specimen Referral Form",
   "immunisation-records": "Immunisation",
   "in_consultation": "In-Consultation",
+  "inactive": "Inactive",
   "incomplete_patient_details_warning": "Patient details are incomplete. Please update the details before proceeding.",
   "inconsistent_dosage_units_error": "Dosage units must be same",
   "indian_mobile": "Indian Mobile",
@@ -1321,6 +1326,7 @@
   "middleware_hostname": "Middleware Hostname",
   "middleware_hostname_example": "e.g. example.ohc.network",
   "middleware_hostname_sourced_from": "Middleware hostname sourced from {{ source }}",
+  "mild": "Mild",
   "min_char_length_error": "Must be at least {{ min_length }} characters",
   "min_password_len_8": "Minimum password length 8",
   "min_time_bw_doses": "Min. time b/w doses",
@@ -1334,6 +1340,7 @@
   "mobile_otp_send_success": "OTP has been sent to the given mobile number.",
   "mobile_otp_verify_error": "Failed to verify mobile number. Please try again later.",
   "mobile_otp_verify_success": "Mobile number has been verified successfully.",
+  "moderate": "Moderate",
   "modification_caution_note": "No modifications possible once added",
   "modified": "Modified",
   "modified_date": "Modified Date",
@@ -1370,6 +1377,7 @@
   "next_week_short": "Next wk",
   "no": "No",
   "no_address_provided": "No address provided",
+  "no_allergies_recorded": "No allergies recorded",
   "no_appointments": "No appointments found",
   "no_attachments_found": "This communication has no attachments.",
   "no_availabilities_yet": "No availabilities yet",
@@ -1706,6 +1714,7 @@
   "record_has_been_deleted_successfully": "Record has been deleted successfully.",
   "record_updates": "Record Updates",
   "recording": "Recording",
+  "recurrence": "Recurrence",
   "redirected_to_create_consultation": "Note: You will be redirected to create consultation form. Please complete the form to finish the transfer process",
   "reference_no": "Reference No",
   "referral_letter": "Referral Letter",
@@ -1718,12 +1727,16 @@
   "register_patient": "Register Patient",
   "reject": "Reject",
   "rejected": "Rejected",
+  "relapse": "Relapse",
   "reload": "Reload",
   "remarks": "Remarks",
   "remarks_placeholder": "Enter remarks",
+  "remission": "Remission",
   "remove": "Remove",
+  "remove_diagnosis": "Remove Diagnosis",
   "remove_medication": "Remove Medication",
   "remove_medication_confirmation": "Are you sure you want to remove {{medication}}?",
+  "remove_symptom": "Remove Symptom",
   "remove_user": "Remove User",
   "remove_user_organization": "Remove User from Organization",
   "remove_user_warn": "Are you sure you want to remove {{firstName}} {{lastName}} from this organization? This action cannot be undone.",
@@ -1760,6 +1773,7 @@
   "reset": "Reset",
   "reset_password": "Reset Password",
   "reset_password_note_self": "Enter your current password, then create and confirm your new password",
+  "resolved": "Resolved",
   "resource": "Resource",
   "resource_approving_facility": "Resource approving facility",
   "resource_created_successfully": "Request created successfully",
@@ -1841,7 +1855,9 @@
   "search_by_phone_number": "Search by Phone Number",
   "search_by_username": "Search by username",
   "search_encounters": "Search Encounters",
+  "search_for_diagnoses_to_add": "Search for diagnoses to add",
   "search_for_facility": "Search for Facility",
+  "search_for_symptoms_to_add": "Search for symptoms to add",
   "search_icd11_placeholder": "Search for ICD-11 Diagnoses",
   "search_investigation_placeholder": "Search Investigation & Groups",
   "search_medication": "Search Medication",
@@ -1928,6 +1944,8 @@
   "set_home_facility": "Set as home facility",
   "set_your_local_language": "Set your local language",
   "settings_and_filters": "Settings and Filters",
+  "severe": "Severe",
+  "severity": "Severity",
   "severity_of_breathlessness": "Severity of Breathlessness",
   "sex": "Sex",
   "shared_by": "Shared By",
@@ -2004,6 +2022,7 @@
   "switch": "Switch",
   "switch_bed": "Switch Bed",
   "switch_camera_is_not_available": "Switch camera is not available.",
+  "symptom": "Symptom",
   "symptoms": "Symptoms",
   "systolic": "Systolic",
   "tachycardia": "Tachycardia",
@@ -2191,6 +2210,7 @@
   "ventilator_oxygen_modality": "Oxygen Modality",
   "ventilator_oxygen_modality_oxygen_rate": "Oxygen Flow Rate",
   "ventilator_spo2": "SpO₂",
+  "verification": "Verification",
   "verification_failed": "Verification Failed",
   "verify": "Verify",
   "verify_and_link": "Verify and Link",

src/Utils/request/api.tsx

@@ -20,7 +20,6 @@ import {
   AppointmentPatientRegister,
 } from "@/pages/Patient/Utils";
 import { Encounter, EncounterEditRequest } from "@/types/emr/encounter";
-import { MedicationRequestRead } from "@/types/emr/medicationRequest";
 import { MedicationStatement } from "@/types/emr/medicationStatement";
 import { PartialPatientModel, Patient } from "@/types/emr/newPatient";
 import {
@@ -646,15 +645,6 @@ const routes = {
     },
   },
 
-  // Medication
-  medicationRequest: {
-    list: {
-      path: "/api/v1/patient/{patientId}/medication/request/",
-      method: "GET",
-      TRes: Type<PaginatedResponse<MedicationRequestRead>>(),
-    },
-  },
-
   medicationStatement: {
     list: {
       path: "/api/v1/patient/{patientId}/medication/statement/",

src/components/Medicine/MedicineAdministrationSheet/index.tsx → src/components/Medicine/MedicationRequestTable/index.tsx

@@ -1,4 +1,6 @@
+import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
+import { PencilIcon } from "lucide-react";
 import { Link } from "raviger";
 import { useState } from "react";
 
@@ -11,18 +13,17 @@ import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 import Loading from "@/components/Common/Loading";
-import { useEncounter } from "@/components/Facility/ConsultationDetails/EncounterContext";
 
-import useSlug from "@/hooks/useSlug";
-
-import routes from "@/Utils/request/api";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import query from "@/Utils/request/query";
 import { classNames } from "@/Utils/utils";
 import { MedicationRequest } from "@/types/emr/medicationRequest";
+import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
 
 interface Props {
   readonly?: boolean;
   facilityId: string;
+  patientId: string;
+  encounterId: string;
 }
 
 const FREQUENCY_DISPLAY: Record<string, { code: string; meaning: string }> = {
@@ -45,21 +46,21 @@ function getFrequencyDisplay(
   return FREQUENCY_DISPLAY[key];
 }
 
-const MedicineAdministrationSheet = ({ facilityId }: Props) => {
-  const encounterId = useSlug("encounter");
-  const { patient } = useEncounter();
+export default function MedicationRequestTable({
+  facilityId,
+  patientId,
+  encounterId,
+}: Props) {
   const [searchQuery, setSearchQuery] = useState("");
 
-  const { data: medications, loading } = useTanStackQueryInstead(
-    routes.medicationRequest.list,
-    {
-      pathParams: { patientId: patient!.id },
-      query: {
-        encounter: encounterId,
-        limit: 100,
-      },
-    },
-  );
+  const { data: medications, isLoading: loading } = useQuery({
+    queryKey: ["medications", patientId],
+    queryFn: query(medicationRequestApi.list, {
+      pathParams: { patientId: patientId },
+      queryParams: { encounter: encounterId },
+    }),
+    enabled: !!patientId,
+  });
 
   const filteredMedications = medications?.results?.filter(
     (med: MedicationRequest) => {
@@ -103,6 +104,14 @@ const MedicineAdministrationSheet = ({ facilityId }: Props) => {
         title="Prescriptions"
         options={
           <div className="flex items-center gap-2">
+            <Button asChild variant="outline" size="sm">
+              <Link
+                href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/medication_request`}
+              >
+                <PencilIcon />
+                Edit
+              </Link>
+            </Button>
             <Button asChild variant="outline" size="sm">
               <Link
                 href={`/facility/${facilityId}/encounter/${encounterId}/prescriptions/print`}
@@ -185,7 +194,7 @@ const MedicineAdministrationSheet = ({ facilityId }: Props) => {
       </div>
     </div>
   );
-};
+}
 
 const PrescriptionEntry = ({
   medication,
@@ -349,5 +358,3 @@ const PrescriptionEntry = ({
     </div>
   );
 };
-
-export default MedicineAdministrationSheet;