diff --git a/public/locale/en.json b/public/locale/en.json
index 70b63168575..40bf5df4216 100644
--- a/public/locale/en.json
+++ b/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",
@@ -385,6 +387,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",
@@ -490,6 +493,7 @@
   "bed_type__500": "Others",
   "before": "before",
   "beta": "beta",
+  "biologic": "Biologic",
   "bladder": "Bladder",
   "blood_group": "Blood Group",
   "blood_group_is_required": "Blood group is required",
@@ -984,9 +988,9 @@
   "enter_valid_dob": "Enter a valid date of birth",
   "enter_valid_dob_age": "Please enter an age greater than 15 years",
   "enter_year_of_birth_to_verify": "Enter year of birth to verify",
-  "entered-in-error": "Entered in error",
   "entered_in_error": "Entered in Error",
   "entered_in_error_warning": "This action cannot be undone. The appointment will be marked as entered in error and removed from the system.",
+  "environment": "Environment",
   "error_404": "Error 404",
   "error_deleting_shifting": "Error while deleting Shifting record",
   "error_fetching_facility_data": "Error while fetching facility data",
@@ -1076,6 +1080,7 @@
   "filter_by_date": "Filter by Date",
   "filters": "Filters",
   "first_name": "First Name",
+  "food": "Food",
   "footer_body": "Open Healthcare Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. Open Healthcare Network CARE is a Digital Public Good recognised by the United Nations.",
   "forget_password": "Forgot password?",
   "forget_password_instruction": "Enter your username, and if it exists, we will send you a link to reset your password.",
@@ -1127,7 +1132,7 @@
   "hearing": "We are hearing you...",
   "help_confirmed": "There is sufficient diagnostic and/or clinical evidence to treat this as a confirmed condition.",
   "help_differential": "One of a set of potential (and typically mutually exclusive) diagnoses asserted to further guide the diagnostic process and preliminary treatment.",
-  "help_entered-in-error": "The statement was entered in error and is not valid.",
+  "help_entered_in_error": "The statement was entered in error and is not valid.",
   "help_provisional": "This is a tentative diagnosis - still a candidate that is under consideration.",
   "help_refuted": "This condition has been ruled out by subsequent diagnostic and clinical evidence.",
   "help_unconfirmed": "There is not sufficient diagnostic and/or clinical evidence to treat this as a confirmed condition.",
@@ -1140,6 +1145,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",
@@ -1154,6 +1160,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",
@@ -1336,6 +1343,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",
@@ -1349,6 +1357,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",
@@ -1730,6 +1739,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",
@@ -1742,13 +1752,17 @@
   "register_patient": "Register Patient",
   "reject": "Reject",
   "rejected": "Rejected",
+  "relapse": "Relapse",
   "related_person": "Related Person",
   "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.",
@@ -1789,6 +1803,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",
@@ -1870,7 +1885,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",
@@ -1958,6 +1975,7 @@
   "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",
@@ -2094,6 +2112,7 @@
   "type_to_search": "Type to search",
   "type_your_comment": "Type your comment",
   "type_your_reason_here": "Type your reason here",
+  "unable_to_assess": "Unable to Assess",
   "unable_to_get_current_position": "Unable to get current position.",
   "unable_to_get_location: ": "Unable to get location: ",
   "unassign": "Unassign",
@@ -2245,6 +2264,7 @@
   "video_conference_link": "Video Conference Link",
   "view": "View",
   "view_abdm_records": "View ABDM Records",
+  "view_all": "view all",
   "view_all_details": "View All Details",
   "view_and_manage_patient_encounters": "View and manage patient encounters",
   "view_asset": "View Assets",
diff --git a/public/locale/hi.json b/public/locale/hi.json
index 3d70a55ee82..13a9b43e422 100644
--- a/public/locale/hi.json
+++ b/public/locale/hi.json
@@ -342,7 +342,7 @@
   "encounter_suggestion_edit_disallowed": "संपादन परामर्श में इस विकल्प पर स्विच करने की अनुमति नहीं है",
   "enter_file_name": "फ़ाइल का नाम दर्ज करें",
   "enter_valid_age": "कृपया वैध आयु दर्ज करें",
-  "entered-in-error": "त्रुटिवश प्रविष्ट हुआ",
+  "entered_in_error": "त्रुटिवश प्रविष्ट हुआ",
   "error_404": "त्रुटि 404",
   "error_deleting_shifting": "शिफ्टिंग रिकॉर्ड हटाते समय त्रुटि",
   "error_while_deleting_record": "रिकॉर्ड हटाते समय त्रुटि हुई",
@@ -392,7 +392,7 @@
   "goal": "हमारा लक्ष्य डिजिटल उपकरणों का उपयोग करके सार्वजनिक स्वास्थ्य सेवाओं की गुणवत्ता और पहुंच में निरंतर सुधार करना है।",
   "help_confirmed": "इस स्थिति को पुष्ट मानने के लिए पर्याप्त नैदानिक और/या नैदानिक साक्ष्य मौजूद हैं।",
   "help_differential": "संभावित (और आमतौर पर परस्पर अनन्य) निदानों के एक समूह में से एक, जो निदान प्रक्रिया और प्रारंभिक उपचार को आगे बढ़ाने के लिए निर्देशित किया जाता है।",
-  "help_entered-in-error": "यह कथन गलती से दर्ज किया गया है और मान्य नहीं है।",
+  "help_entered_in_error": "यह कथन गलती से दर्ज किया गया है और मान्य नहीं है।",
   "help_provisional": "यह एक अस्थायी निदान है - अभी भी इस पर विचार किया जा रहा है।",
   "help_refuted": "बाद के निदानात्मक और नैदानिक साक्ष्यों से इस स्थिति को खारिज कर दिया गया है।",
   "help_unconfirmed": "इसे एक पुष्ट स्थिति मानने के लिए पर्याप्त नैदानिक और/या नैदानिक साक्ष्य उपलब्ध नहीं हैं।",
diff --git a/public/locale/kn.json b/public/locale/kn.json
index ee7d126a69f..7056c325648 100644
--- a/public/locale/kn.json
+++ b/public/locale/kn.json
@@ -344,7 +344,7 @@
   "encounter_suggestion_edit_disallowed": "ಸಂಪಾದನೆ ಸಮಾಲೋಚನೆಯಲ್ಲಿ ಈ ಆಯ್ಕೆಗೆ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ",
   "enter_file_name": "ಫೈಲ್ ಹೆಸರನ್ನು ನಮೂದಿಸಿ",
   "enter_valid_age": "ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ವಯಸ್ಸನ್ನು ನಮೂದಿಸಿ",
-  "entered-in-error": "ತಪ್ಪಾಗಿ ನಮೂದಿಸಲಾಗಿದೆ",
+  "entered_in_error": "ತಪ್ಪಾಗಿ ನಮೂದಿಸಲಾಗಿದೆ",
   "error_404": "ದೋಷ 404",
   "error_deleting_shifting": "ಶಿಫ್ಟಿಂಗ್ ರೆಕಾರ್ಡ್ ಅನ್ನು ಅಳಿಸುವಾಗ ದೋಷ",
   "error_while_deleting_record": "ದಾಖಲೆಯನ್ನು ಅಳಿಸುವಾಗ ದೋಷ",
@@ -394,7 +394,7 @@
   "goal": "ಡಿಜಿಟಲ್ ಉಪಕರಣಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಸಾರ್ವಜನಿಕ ಆರೋಗ್ಯ ಸೇವೆಗಳ ಗುಣಮಟ್ಟ ಮತ್ತು ಪ್ರವೇಶವನ್ನು ನಿರಂತರವಾಗಿ ಸುಧಾರಿಸುವುದು ನಮ್ಮ ಗುರಿಯಾಗಿದೆ",
   "help_confirmed": "ಇದನ್ನು ದೃಢಪಡಿಸಿದ ಸ್ಥಿತಿ ಎಂದು ಪರಿಗಣಿಸಲು ಸಾಕಷ್ಟು ರೋಗನಿರ್ಣಯ ಮತ್ತು/ಅಥವಾ ಕ್ಲಿನಿಕಲ್ ಪುರಾವೆಗಳಿವೆ.",
   "help_differential": "ರೋಗನಿರ್ಣಯ ಪ್ರಕ್ರಿಯೆ ಮತ್ತು ಪ್ರಾಥಮಿಕ ಚಿಕಿತ್ಸೆಯನ್ನು ಮತ್ತಷ್ಟು ಮಾರ್ಗದರ್ಶನ ಮಾಡಲು ಸಮರ್ಥಿಸಲಾದ ಸಂಭಾವ್ಯ (ಮತ್ತು ಸಾಮಾನ್ಯವಾಗಿ ಪರಸ್ಪರ ಪ್ರತ್ಯೇಕವಾದ) ರೋಗನಿರ್ಣಯಗಳ ಒಂದು ಸೆಟ್.",
-  "help_entered-in-error": "ಹೇಳಿಕೆಯನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಲಾಗಿದೆ ಮತ್ತು ಮಾನ್ಯವಾಗಿಲ್ಲ.",
+  "help_entered_in_error": "ಹೇಳಿಕೆಯನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಲಾಗಿದೆ ಮತ್ತು ಮಾನ್ಯವಾಗಿಲ್ಲ.",
   "help_provisional": "ಇದು ತಾತ್ಕಾಲಿಕ ರೋಗನಿರ್ಣಯ - ಇನ್ನೂ ಪರಿಗಣನೆಯಲ್ಲಿರುವ ಅಭ್ಯರ್ಥಿ.",
   "help_refuted": "ನಂತರದ ರೋಗನಿರ್ಣಯ ಮತ್ತು ಕ್ಲಿನಿಕಲ್ ಪುರಾವೆಗಳಿಂದ ಈ ಸ್ಥಿತಿಯನ್ನು ತಳ್ಳಿಹಾಕಲಾಗಿದೆ.",
   "help_unconfirmed": "ಇದನ್ನು ದೃಢಪಡಿಸಿದ ಸ್ಥಿತಿ ಎಂದು ಪರಿಗಣಿಸಲು ಸಾಕಷ್ಟು ರೋಗನಿರ್ಣಯ ಮತ್ತು/ಅಥವಾ ವೈದ್ಯಕೀಯ ಪುರಾವೆಗಳಿಲ್ಲ.",
diff --git a/public/locale/ml.json b/public/locale/ml.json
index 37b1c5eb29b..0447dc62c21 100644
--- a/public/locale/ml.json
+++ b/public/locale/ml.json
@@ -901,7 +901,7 @@
   "enter_valid_dob": "ഒരു സാധുവായ ജനനത്തീയതി നൽകുക",
   "enter_valid_dob_age": "ദയവായി 15 വയസ്സിൽ കൂടുതലുള്ള ഒരു പ്രായം നൽകുക",
   "enter_year_of_birth_to_verify": "സ്ഥിരീകരിക്കാൻ ജനന വർഷം നൽകുക",
-  "entered-in-error": "തെറ്റായി നൽകി",
+  "entered_in_error": "തെറ്റായി നൽകി",
   "entered_in_error": "പിശകിൽ പ്രവേശിച്ചു",
   "error_404": "പിശക് 404",
   "error_deleting_shifting": "ഷിഫ്റ്റിംഗ് റെക്കോർഡ് ഇല്ലാതാക്കുന്നതിൽ പിശക്",
@@ -1015,7 +1015,7 @@
   "hearing": "ഞങ്ങൾ പറയുന്നത് കേൾക്കുന്നു...",
   "help_confirmed": "ഇത് ഒരു സ്ഥിരീകരിച്ച അവസ്ഥയായി കണക്കാക്കാൻ മതിയായ ഡയഗ്നോസ്റ്റിക് കൂടാതെ/അല്ലെങ്കിൽ ക്ലിനിക്കൽ തെളിവുകൾ ഉണ്ട്.",
   "help_differential": "രോഗനിർണ്ണയ പ്രക്രിയയ്ക്കും പ്രാഥമിക ചികിത്സയ്ക്കും കൂടുതൽ മാർഗ്ഗനിർദ്ദേശം നൽകുന്നതിന് സാധ്യതയുള്ള (സാധാരണയായി പരസ്പരവിരുദ്ധമായ) രോഗനിർണയങ്ങളിൽ ഒന്ന്.",
-  "help_entered-in-error": "പ്രസ്‌താവന തെറ്റായി നൽകിയതിനാൽ സാധുതയില്ല.",
+  "help_entered_in_error": "പ്രസ്‌താവന തെറ്റായി നൽകിയതിനാൽ സാധുതയില്ല.",
   "help_provisional": "ഇതൊരു താൽക്കാലിക രോഗനിർണയമാണ് - ഇപ്പോഴും പരിഗണനയിലിരിക്കുന്ന ഒരു സ്ഥാനാർത്ഥി.",
   "help_refuted": "തുടർന്നുള്ള ഡയഗ്നോസ്റ്റിക്, ക്ലിനിക്കൽ തെളിവുകൾ വഴി ഈ അവസ്ഥ ഒഴിവാക്കിയിട്ടുണ്ട്.",
   "help_unconfirmed": "ഇത് ഒരു സ്ഥിരീകരിച്ച അവസ്ഥയായി കണക്കാക്കാൻ മതിയായ ഡയഗ്നോസ്റ്റിക് കൂടാതെ/അല്ലെങ്കിൽ ക്ലിനിക്കൽ തെളിവുകൾ ഇല്ല.",
diff --git a/public/locale/ta.json b/public/locale/ta.json
index b077e77a1da..f792cb7cefd 100644
--- a/public/locale/ta.json
+++ b/public/locale/ta.json
@@ -343,7 +343,7 @@
   "encounter_suggestion_edit_disallowed": "திருத்த ஆலோசனையில் இந்த விருப்பத்திற்கு மாற அனுமதிக்கப்படவில்லை",
   "enter_file_name": "கோப்பு பெயரை உள்ளிடவும்",
   "enter_valid_age": "செல்லுபடியாகும் வயதை உள்ளிடவும்",
-  "entered-in-error": "தவறுதலாக உள்ளிடப்பட்டது",
+  "entered_in_error": "தவறுதலாக உள்ளிடப்பட்டது",
   "error_404": "பிழை 404",
   "error_deleting_shifting": "பதிவை மாற்றுவதில் பிழை",
   "error_while_deleting_record": "பதிவை நீக்குவதில் பிழை",
@@ -393,7 +393,7 @@
   "goal": "டிஜிட்டல் கருவிகளைப் பயன்படுத்தி பொது சுகாதார சேவைகளின் தரம் மற்றும் அணுகல்தன்மையை தொடர்ந்து மேம்படுத்துவதே எங்கள் குறிக்கோள்.",
   "help_confirmed": "இதை உறுதிப்படுத்தப்பட்ட நிலையாகக் கருதுவதற்கு போதுமான நோயறிதல் மற்றும்/அல்லது மருத்துவ சான்றுகள் உள்ளன.",
   "help_differential": "சாத்தியமான (மற்றும் பொதுவாக பரஸ்பரம் பிரத்தியேகமான) நோயறிதல்களின் தொகுப்பில் ஒன்று கண்டறியும் செயல்முறை மற்றும் பூர்வாங்க சிகிச்சையை மேலும் வழிகாட்டும்.",
-  "help_entered-in-error": "அறிக்கை பிழையாக உள்ளிடப்பட்டது, அது செல்லாது.",
+  "help_entered_in_error": "அறிக்கை பிழையாக உள்ளிடப்பட்டது, அது செல்லாது.",
   "help_provisional": "இது ஒரு தற்காலிக நோயறிதல் - இன்னும் ஒரு வேட்பாளர் பரிசீலனையில் உள்ளது.",
   "help_refuted": "இந்த நிலை அடுத்தடுத்த நோயறிதல் மற்றும் மருத்துவ சான்றுகளால் நிராகரிக்கப்பட்டது.",
   "help_unconfirmed": "இதை உறுதிப்படுத்தப்பட்ட நிலையாகக் கருதுவதற்கு போதுமான நோயறிதல் மற்றும்/அல்லது மருத்துவ சான்றுகள் இல்லை.",
diff --git a/src/Utils/request/api.tsx b/src/Utils/request/api.tsx
index 0288e107edf..0e3aab2f217 100644
--- a/src/Utils/request/api.tsx
+++ b/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/",
diff --git a/src/components/Common/ComboboxQuantityInput.tsx b/src/components/Common/ComboboxQuantityInput.tsx
index db7b8caa4d2..19674422d81 100644
--- a/src/components/Common/ComboboxQuantityInput.tsx
+++ b/src/components/Common/ComboboxQuantityInput.tsx
@@ -50,6 +50,7 @@ export function ComboboxQuantityInput({
   const showDropdown = /^\d+$/.test(inputValue);
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (disabled) return;
     const value = e.target.value;
     if (value === "" || /^\d+$/.test(value)) {
       setInputValue(value);
@@ -65,7 +66,7 @@ export function ComboboxQuantityInput({
   };
 
   const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (!showDropdown) return;
+    if (disabled || !showDropdown) return;
 
     if (e.key === "ArrowDown") {
       e.preventDefault();
@@ -102,7 +103,7 @@ export function ComboboxQuantityInput({
 
   return (
     <div className="relative flex w-full lg:max-w-[200px] flex-col gap-1">
-      <Popover open={open && showDropdown} onOpenChange={setOpen}>
+      <Popover open={!disabled && open && showDropdown} onOpenChange={setOpen}>
         <PopoverTrigger asChild>
           <div className="relative">
             <Input
diff --git a/src/components/Facility/ConsultationDetails/EncounterContext.tsx b/src/components/Facility/ConsultationDetails/EncounterContext.tsx
deleted file mode 100644
index 07d76a7f538..00000000000
--- a/src/components/Facility/ConsultationDetails/EncounterContext.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { ReactNode, createContext, useContext, useState } from "react";
-
-import { Encounter } from "@/types/emr/encounter";
-import { Patient } from "@/types/emr/newPatient";
-
-interface EncounterContextBase {
-  encounter?: Encounter;
-  patient?: Patient;
-}
-
-type EncounterContextType<T> = EncounterContextBase &
-  T & {
-    setValue: <K extends keyof (EncounterContextBase & T)>(
-      key: K,
-      value: (EncounterContextBase & T)[K],
-    ) => void;
-  };
-
-const EncounterContext = createContext<
-  EncounterContextType<object> | undefined
->(undefined);
-
-export const useEncounter = <T extends object = object>() => {
-  const context = useContext(EncounterContext);
-
-  if (!context) {
-    throw new Error(
-      "'useEncounter' must be used within 'EncounterProvider' only",
-    );
-  }
-
-  return context as EncounterContextType<T>;
-};
-
-interface EncounterProviderProps<T extends object> {
-  children: ReactNode;
-  initialContext?: Partial<EncounterContextBase & T>;
-}
-
-export const EncounterProvider = <T extends object = object>({
-  children,
-  initialContext = {},
-}: EncounterProviderProps<T>) => {
-  const [state, setState] = useState<EncounterContextBase & T>(
-    initialContext as EncounterContextBase & T,
-  );
-
-  const setValue = <K extends keyof (EncounterContextBase & T)>(
-    key: K,
-    value: (EncounterContextBase & T)[K],
-  ) => {
-    setState((prevState) => ({
-      ...prevState,
-      [key]: value,
-    }));
-  };
-
-  return (
-    <EncounterContext.Provider
-      value={
-        {
-          ...state,
-          setValue,
-        } as EncounterContextType<T>
-      }
-    >
-      {children}
-    </EncounterContext.Provider>
-  );
-};
diff --git a/src/components/Medicine/MedicineAdministrationSheet/index.tsx b/src/components/Medicine/MedicationRequestTable/index.tsx
similarity index 84%
rename from src/components/Medicine/MedicineAdministrationSheet/index.tsx
rename to src/components/Medicine/MedicationRequestTable/index.tsx
index 652ccc20605..2d9309abc81 100644
--- a/src/components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/components/Medicine/MedicationRequestTable/index.tsx
@@ -1,3 +1,5 @@
+import { useQuery } from "@tanstack/react-query";
+import { PencilIcon } from "lucide-react";
 import { Link } from "raviger";
 import { useState } from "react";
 
@@ -10,35 +12,34 @@ import { ScrollArea, ScrollBar } 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 { MedicationsTable } from "@/components/Medicine/MedicationsTable";
 
-import useSlug from "@/hooks/useSlug";
-
-import routes from "@/Utils/request/api";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import query from "@/Utils/request/query";
 import { MedicationRequestRead } from "@/types/emr/medicationRequest";
+import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
 
 interface Props {
   readonly?: boolean;
   facilityId: string;
+  patientId: string;
+  encounterId: string;
 }
 
-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: ["medication_requests", patientId],
+    queryFn: query(medicationRequestApi.list, {
+      pathParams: { patientId: patientId },
+      queryParams: { encounter: encounterId },
+    }),
+    enabled: !!patientId,
+  });
 
   const filteredMedications = medications?.results?.filter(
     (med: MedicationRequestRead) => {
@@ -82,6 +83,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`}
@@ -161,6 +170,4 @@ const MedicineAdministrationSheet = ({ facilityId }: Props) => {
       </div>
     </div>
   );
-};
-
-export default MedicineAdministrationSheet;
+}
diff --git a/src/components/Medicine/MedicineAdministrationSheet/utils.ts b/src/components/Medicine/MedicationRequestTable/utils.ts
similarity index 100%
rename from src/components/Medicine/MedicineAdministrationSheet/utils.ts
rename to src/components/Medicine/MedicationRequestTable/utils.ts
diff --git a/src/components/Patient/MedicationStatementList.tsx b/src/components/Patient/MedicationStatementList.tsx
index 19610079e8d..9d2549eb3ba 100644
--- a/src/components/Patient/MedicationStatementList.tsx
+++ b/src/components/Patient/MedicationStatementList.tsx
@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { cn } from "@/lib/utils";
-
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
@@ -28,13 +28,87 @@ interface MedicationStatementListProps {
   patientId: string;
 }
 
+interface MedicationRowProps {
+  statement: any;
+  isEnteredInError?: boolean;
+  index: number;
+}
+
+function MedicationRow({
+  statement,
+  isEnteredInError,
+  index,
+}: MedicationRowProps) {
+  return (
+    <TableRow
+      key={index}
+      className={isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined}
+    >
+      <TableCell className="font-medium">
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-60 truncate">
+            <p>{statement.medication.display ?? statement.medication.code}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.medication.display ?? statement.medication.code}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+      <TableCell>
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-36 truncate">
+            <p>{statement.dosage_text}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.dosage_text}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+      <TableCell>
+        <Badge
+          variant={isEnteredInError ? "destructive" : "outline"}
+          className="whitespace-nowrap capitalize"
+        >
+          {statement.status}
+        </Badge>
+      </TableCell>
+      <TableCell className="whitespace-nowrap">
+        {[statement.effective_period?.start, statement.effective_period?.end]
+          .map((date) => formatDateTime(date))
+          .join(" - ")}
+      </TableCell>
+      <TableCell>
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-60 truncate">
+            <p>{statement.reason}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.reason}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+      <TableCell>
+        <Tooltip>
+          <TooltipTrigger asChild className="max-w-60 truncate">
+            <p>{statement.note}</p>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{statement.note}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TableCell>
+    </TableRow>
+  );
+}
+
 export function MedicationStatementList({
   patientId,
 }: MedicationStatementListProps) {
   const { t } = useTranslation();
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: medications, isLoading } = useQuery({
-    queryKey: ["medication_statement", patientId],
+    queryKey: ["medication_statements", patientId],
     queryFn: query(routes.medicationStatement.list, {
       pathParams: { patientId },
     }),
@@ -53,7 +127,16 @@ export function MedicationStatementList({
     );
   }
 
-  if (!medications?.results?.length) {
+  const filteredMedications = medications?.results?.filter(
+    (medication) =>
+      showEnteredInError || medication.status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = medications?.results?.some(
+    (medication) => medication.status === "entered_in_error",
+  );
+
+  if (!filteredMedications?.length) {
     return (
       <Card>
         <CardHeader>
@@ -66,22 +149,11 @@ export function MedicationStatementList({
     );
   }
 
-  const getStatusBadgeStyle = (status: string | undefined) => {
-    switch (status?.toLowerCase()) {
-      case "active":
-        return "bg-green-100 text-green-800 border-green-200";
-      case "on_hold":
-        return "bg-gray-100 text-gray-800 border-blue-200";
-      default:
-        return "bg-gray-100 text-gray-800 border-gray-200";
-    }
-  };
-
   return (
     <Card className="p-0">
       <CardHeader className="px-4 py-0 pt-4">
         <CardTitle>
-          {t("ongoing_medications")} ({medications.count})
+          {t("ongoing_medications")} ({filteredMedications.length})
         </CardTitle>
       </CardHeader>
       <CardContent className="p-2">
@@ -97,77 +169,34 @@ export function MedicationStatementList({
             </TableRow>
           </TableHeader>
           <TableBody>
-            {medications.results.map((statement, index) => (
-              <TableRow key={index}>
-                <TableCell className="font-medium">
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-60 truncate">
-                      <p>
-                        {statement.medication.display ??
-                          statement.medication.code}
-                      </p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>
-                        {statement.medication.display ??
-                          statement.medication.code}
-                      </p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-                <TableCell>
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-36 truncate">
-                      <p>{statement.dosage_text}</p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>{statement.dosage_text}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-                <TableCell>
-                  <Badge
-                    variant="outline"
-                    className={cn(
-                      "whitespace-nowrap capitalize",
-                      getStatusBadgeStyle(statement.status),
-                    )}
-                  >
-                    {statement.status}
-                  </Badge>
-                </TableCell>
-                <TableCell className="whitespace-nowrap">
-                  {[
-                    statement.effective_period?.start,
-                    statement.effective_period?.end,
-                  ]
-                    .map((date) => formatDateTime(date))
-                    .join(" - ")}
-                </TableCell>
-                <TableCell>
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-60 truncate">
-                      <p>{statement.reason ?? "-"}</p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>{statement.reason ?? "Not Specified"}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-                <TableCell>
-                  <Tooltip>
-                    <TooltipTrigger asChild className="max-w-60 truncate">
-                      <p>{statement.note ?? "-"}</p>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      <p>{statement.note ?? "Not Specified"}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TableCell>
-              </TableRow>
-            ))}
+            {filteredMedications.map((statement, index) => {
+              const isEnteredInError = statement.status === "entered_in_error";
+
+              return (
+                <>
+                  <MedicationRow
+                    key={statement.id}
+                    statement={statement}
+                    isEnteredInError={isEnteredInError}
+                    index={index}
+                  />
+                </>
+              );
+            })}
           </TableBody>
         </Table>
+        {hasEnteredInErrorRecords && !showEnteredInError && (
+          <div className="flex justify-start">
+            <Button
+              variant="ghost"
+              size="xs"
+              onClick={() => setShowEnteredInError(true)}
+              className="text-xs underline text-gray-500"
+            >
+              {t("view_all")}
+            </Button>
+          </div>
+        )}
       </CardContent>
     </Card>
   );
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx
index f03788afd24..8e1a9686a90 100644
--- a/src/components/Patient/allergy/list.tsx
+++ b/src/components/Patient/allergy/list.tsx
@@ -1,7 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
+import { PencilIcon } from "lucide-react";
+import { Link } from "raviger";
+import { ReactNode, useState } from "react";
 
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
@@ -16,16 +20,22 @@ import {
 import { Avatar } from "@/components/Common/Avatar";
 
 import query from "@/Utils/request/query";
-import { formatName } from "@/Utils/utils";
 import { AllergyIntolerance } from "@/types/emr/allergyIntolerance/allergyIntolerance";
 import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
 
 interface AllergyListProps {
+  facilityId?: string;
   patientId: string;
   encounterId?: string;
 }
 
-export function AllergyList({ patientId, encounterId }: AllergyListProps) {
+export function AllergyList({
+  facilityId,
+  patientId,
+  encounterId,
+}: AllergyListProps) {
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
+
   const { data: allergies, isLoading } = useQuery({
     queryKey: ["allergies", patientId, encounterId],
     queryFn: query(allergyIntoleranceApi.getAllergy, {
@@ -36,27 +46,38 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) {
 
   if (isLoading) {
     return (
-      <Card>
-        <CardHeader>
-          <CardTitle>{t("allergies")}</CardTitle>
-        </CardHeader>
-        <CardContent>
+      <AllergyListLayout
+        facilityId={facilityId}
+        patientId={patientId}
+        encounterId={encounterId}
+      >
+        <CardContent className="px-2 pb-2">
           <Skeleton className="h-[100px] w-full" />
         </CardContent>
-      </Card>
+      </AllergyListLayout>
     );
   }
 
-  if (!allergies?.results?.length) {
+  const filteredAllergies = allergies?.results?.filter(
+    (allergy) =>
+      showEnteredInError || allergy.verification_status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = allergies?.results?.some(
+    (allergy) => allergy.verification_status === "entered_in_error",
+  );
+
+  if (!filteredAllergies?.length) {
     return (
-      <Card>
-        <CardHeader>
-          <CardTitle>{t("allergies")}</CardTitle>
-        </CardHeader>
-        <CardContent>
+      <AllergyListLayout
+        facilityId={facilityId}
+        patientId={patientId}
+        encounterId={encounterId}
+      >
+        <CardContent className="px-2 pb-2">
           <p className="text-muted-foreground">{t("no_allergies_recorded")}</p>
         </CardContent>
-      </Card>
+      </AllergyListLayout>
     );
   }
 
@@ -84,68 +105,146 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) {
     }
   };
 
+  interface AllergyRowProps {
+    allergy: AllergyIntolerance;
+    isEnteredInError?: boolean;
+  }
+
+  function AllergyRow({ allergy, isEnteredInError }: AllergyRowProps) {
+    return (
+      <TableRow
+        className={isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined}
+      >
+        <TableCell className="font-medium">{allergy.code.display}</TableCell>
+        <TableCell>
+          <Badge
+            variant="outline"
+            className={`whitespace-nowrap ${getCategoryBadgeStyle(
+              allergy.category ?? "",
+            )}`}
+          >
+            {t(allergy.category)}
+          </Badge>
+        </TableCell>
+        <TableCell>
+          <Badge
+            variant="outline"
+            className={`whitespace-nowrap ${getStatusBadgeStyle(
+              allergy.clinical_status,
+            )}`}
+          >
+            {t(allergy.clinical_status)}
+          </Badge>
+        </TableCell>
+        <TableCell>
+          <Badge variant="secondary" className="whitespace-nowrap">
+            {t(allergy.criticality)}
+          </Badge>
+        </TableCell>
+        <TableCell>
+          <Badge
+            variant={isEnteredInError ? "destructive" : "outline"}
+            className="whitespace-nowrap capitalize"
+          >
+            {t(allergy.verification_status)}
+          </Badge>
+        </TableCell>
+        <TableCell className="whitespace-nowrap flex items-center gap-2">
+          <Avatar
+            name={allergy.created_by.username}
+            className="w-4 h-4"
+            imageUrl={allergy.created_by.profile_picture_url}
+          />
+          <span className="text-sm">{allergy.created_by.username}</span>
+        </TableCell>
+      </TableRow>
+    );
+  }
+
   return (
-    <Card className="p-0">
-      <CardHeader className="px-4 py-0 pt-4">
+    <AllergyListLayout
+      facilityId={facilityId}
+      patientId={patientId}
+      encounterId={encounterId}
+    >
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead>{t("allergen")}</TableHead>
+            <TableHead>{t("category")}</TableHead>
+            <TableHead>{t("status")}</TableHead>
+            <TableHead>{t("criticality")}</TableHead>
+            <TableHead>{t("verification")}</TableHead>
+            <TableHead>{t("created_by")}</TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {/* Valid entries */}
+          {filteredAllergies
+            .filter(
+              (allergy) => allergy.verification_status !== "entered_in_error",
+            )
+            .map((allergy) => (
+              <AllergyRow key={allergy.id} allergy={allergy} />
+            ))}
+
+          {/* Entered in error entries */}
+          {showEnteredInError &&
+            filteredAllergies
+              .filter(
+                (allergy) => allergy.verification_status === "entered_in_error",
+              )
+              .map((allergy) => (
+                <AllergyRow
+                  key={allergy.id}
+                  allergy={allergy}
+                  isEnteredInError
+                />
+              ))}
+        </TableBody>
+      </Table>
+      {hasEnteredInErrorRecords && !showEnteredInError && (
+        <div className="flex justify-start">
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setShowEnteredInError(true)}
+            className="text-xs underline text-gray-500"
+          >
+            {t("view_all")}
+          </Button>
+        </div>
+      )}
+    </AllergyListLayout>
+  );
+}
+
+const AllergyListLayout = ({
+  facilityId,
+  patientId,
+  encounterId,
+  children,
+}: {
+  facilityId?: string;
+  patientId: string;
+  encounterId?: string;
+  children: ReactNode;
+}) => {
+  return (
+    <Card>
+      <CardHeader className="px-4 py-0 pt-4 flex justify-between flex-row">
         <CardTitle>{t("allergies")}</CardTitle>
+        {facilityId && encounterId && (
+          <Link
+            href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/allergy_intolerance`}
+            className="flex items-center gap-1 text-sm hover:text-gray-500"
+          >
+            <PencilIcon size={12} />
+            {t("edit")}
+          </Link>
+        )}
       </CardHeader>
-      <CardContent className="p-2">
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>{t("allergen")}</TableHead>
-              <TableHead>{t("category")}</TableHead>
-              <TableHead>{t("status")}</TableHead>
-              <TableHead>{t("criticality")}</TableHead>
-              <TableHead>{t("created_by")}</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {allergies.results.map((allergy: AllergyIntolerance) => (
-              <TableRow key={allergy.id}>
-                <TableCell className="font-medium">
-                  {allergy.code.display}
-                </TableCell>
-                <TableCell>
-                  <Badge
-                    variant="outline"
-                    className={`whitespace-nowrap ${getCategoryBadgeStyle(
-                      allergy.category ?? "",
-                    )}`}
-                  >
-                    {allergy.category}
-                  </Badge>
-                </TableCell>
-                <TableCell>
-                  <Badge
-                    variant="outline"
-                    className={`whitespace-nowrap ${getStatusBadgeStyle(
-                      allergy.clinical_status,
-                    )}`}
-                  >
-                    {allergy.clinical_status}
-                  </Badge>
-                </TableCell>
-                <TableCell>
-                  <Badge variant="secondary" className="whitespace-nowrap">
-                    {allergy.criticality}
-                  </Badge>
-                </TableCell>
-                <TableCell className="whitespace-nowrap flex items-center gap-2">
-                  <Avatar
-                    name={allergy.created_by.username}
-                    className="w-4 h-4"
-                    imageUrl={allergy.created_by.profile_picture_url}
-                  />
-                  <span className="text-sm">
-                    {formatName(allergy.created_by)}
-                  </span>
-                </TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
-}
+};
diff --git a/src/components/Patient/diagnosis/DiagnosisTable.tsx b/src/components/Patient/diagnosis/DiagnosisTable.tsx
index 4646c028a9e..d9134f6d0c8 100644
--- a/src/components/Patient/diagnosis/DiagnosisTable.tsx
+++ b/src/components/Patient/diagnosis/DiagnosisTable.tsx
@@ -54,46 +54,61 @@ export function DiagnosisTable({
         </TableHeader>
       )}
       <TableBody>
-        {diagnoses.map((diagnosis: Diagnosis, index) => (
-          <TableRow key={index}>
-            <TableCell className="font-medium">
-              {diagnosis.code.display}
-            </TableCell>
-            <TableCell>
-              <Badge
-                variant="outline"
-                className={`whitespace-nowrap ${getStatusBadgeStyle(diagnosis.clinical_status)}`}
+        {diagnoses.map((diagnosis: Diagnosis, index) => {
+          const isEnteredInError =
+            diagnosis.verification_status === "entered_in_error";
+
+          return (
+            <>
+              <TableRow
+                key={index}
+                className={
+                  isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined
+                }
               >
-                {diagnosis.clinical_status}
-              </Badge>
-            </TableCell>
-            <TableCell>
-              <Badge variant="secondary" className="whitespace-nowrap">
-                {diagnosis.verification_status}
-              </Badge>
-            </TableCell>
-            <TableCell className="whitespace-nowrap">
-              {diagnosis.onset?.onset_datetime
-                ? new Date(diagnosis.onset.onset_datetime).toLocaleDateString()
-                : "-"}
-            </TableCell>
-            <TableCell className="max-w-[200px] truncate">
-              {diagnosis.note || "-"}
-            </TableCell>
-            <TableCell className="whitespace-nowrap ">
-              <div className="flex items-center gap-2">
-                <Avatar
-                  name={formatName(diagnosis.created_by)}
-                  className="w-4 h-4"
-                  imageUrl={diagnosis.created_by?.profile_picture_url}
-                />
-                <span className="text-sm">
-                  {formatName(diagnosis.created_by)}
-                </span>
-              </div>
-            </TableCell>
-          </TableRow>
-        ))}
+                <TableCell className="font-medium">
+                  {diagnosis.code.display}
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant="outline"
+                    className={`whitespace-nowrap ${getStatusBadgeStyle(diagnosis.clinical_status)}`}
+                  >
+                    {t(diagnosis.clinical_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant={isEnteredInError ? "destructive" : "outline"}
+                    className="whitespace-nowrap capitalize"
+                  >
+                    {t(diagnosis.verification_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell className="whitespace-nowrap">
+                  {diagnosis.onset?.onset_datetime
+                    ? new Date(
+                        diagnosis.onset.onset_datetime,
+                      ).toLocaleDateString()
+                    : "-"}
+                </TableCell>
+                <TableCell className="max-w-[200px] truncate">
+                  {diagnosis.note || "-"}
+                </TableCell>
+                <TableCell className="whitespace-nowrap flex items-center gap-2">
+                  <Avatar
+                    name={formatName(diagnosis.created_by)}
+                    className="w-4 h-4"
+                    imageUrl={diagnosis.created_by?.profile_picture_url}
+                  />
+                  <span className="text-sm">
+                    {formatName(diagnosis.created_by)}
+                  </span>
+                </TableCell>
+              </TableRow>
+            </>
+          );
+        })}
       </TableBody>
     </Table>
   );
diff --git a/src/components/Patient/diagnosis/list.tsx b/src/components/Patient/diagnosis/list.tsx
index 0df139f098f..d0e8c4acede 100644
--- a/src/components/Patient/diagnosis/list.tsx
+++ b/src/components/Patient/diagnosis/list.tsx
@@ -1,5 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
+import { PencilIcon } from "lucide-react";
+import { Link } from "raviger";
+import { ReactNode, useState } from "react";
 
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 
@@ -11,9 +16,16 @@ import { DiagnosisTable } from "./DiagnosisTable";
 interface DiagnosisListProps {
   patientId: string;
   encounterId?: string;
+  facilityId?: string;
 }
 
-export function DiagnosisList({ patientId, encounterId }: DiagnosisListProps) {
+export function DiagnosisList({
+  patientId,
+  encounterId,
+  facilityId,
+}: DiagnosisListProps) {
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
+
   const { data: diagnoses, isLoading } = useQuery({
     queryKey: ["diagnosis", patientId, encounterId],
     queryFn: query(diagnosisApi.listDiagnosis, {
@@ -24,38 +36,100 @@ export function DiagnosisList({ patientId, encounterId }: DiagnosisListProps) {
 
   if (isLoading) {
     return (
-      <Card>
-        <CardHeader>
-          <CardTitle>Diagnoses</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <Skeleton className="h-[100px] w-full" />
-        </CardContent>
-      </Card>
+      <DiagnosisListLayout
+        facilityId={facilityId}
+        patientId={patientId}
+        encounterId={encounterId}
+      >
+        <Skeleton className="h-[100px] w-full" />
+      </DiagnosisListLayout>
     );
   }
 
-  if (!diagnoses?.results?.length) {
+  const filteredDiagnoses = diagnoses?.results?.filter(
+    (diagnosis) =>
+      showEnteredInError ||
+      diagnosis.verification_status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = diagnoses?.results?.some(
+    (diagnosis) => diagnosis.verification_status === "entered_in_error",
+  );
+
+  if (!filteredDiagnoses?.length) {
     return (
-      <Card>
-        <CardHeader>
-          <CardTitle>Diagnoses</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <p className="text-muted-foreground">No diagnoses recorded</p>
-        </CardContent>
-      </Card>
+      <DiagnosisListLayout
+        facilityId={facilityId}
+        patientId={patientId}
+        encounterId={encounterId}
+      >
+        <p className="text-muted-foreground">{t("no_diagnoses_recorded")}</p>
+      </DiagnosisListLayout>
     );
   }
 
   return (
-    <Card className="p-0">
-      <CardHeader className="px-4 py-0 pt-4">
-        <CardTitle>Diagnoses</CardTitle>
+    <DiagnosisListLayout
+      facilityId={facilityId}
+      patientId={patientId}
+      encounterId={encounterId}
+    >
+      <DiagnosisTable
+        diagnoses={[
+          ...filteredDiagnoses.filter(
+            (diagnosis) => diagnosis.verification_status !== "entered_in_error",
+          ),
+          ...(showEnteredInError
+            ? filteredDiagnoses.filter(
+                (diagnosis) =>
+                  diagnosis.verification_status === "entered_in_error",
+              )
+            : []),
+        ]}
+      />
+
+      {hasEnteredInErrorRecords && !showEnteredInError && (
+        <div className="flex justify-start">
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setShowEnteredInError(true)}
+            className="text-xs underline text-gray-500"
+          >
+            {t("view_all")}
+          </Button>
+        </div>
+      )}
+    </DiagnosisListLayout>
+  );
+}
+
+const DiagnosisListLayout = ({
+  facilityId,
+  patientId,
+  encounterId,
+  children,
+}: {
+  facilityId?: string;
+  patientId: string;
+  encounterId?: string;
+  children: ReactNode;
+}) => {
+  return (
+    <Card>
+      <CardHeader className="px-4 py-0 pt-4 flex justify-between flex-row">
+        <CardTitle>{t("diagnoses")}</CardTitle>
+        {facilityId && encounterId && (
+          <Link
+            href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/diagnosis`}
+            className="flex items-center gap-1 text-sm hover:text-gray-500"
+          >
+            <PencilIcon size={12} />
+            {t("edit")}
+          </Link>
+        )}
       </CardHeader>
-      <CardContent className="p-2">
-        <DiagnosisTable diagnoses={diagnoses.results} />
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
-}
+};
diff --git a/src/components/Patient/symptoms/SymptomTable.tsx b/src/components/Patient/symptoms/SymptomTable.tsx
index c9c10266368..b95e518d99d 100644
--- a/src/components/Patient/symptoms/SymptomTable.tsx
+++ b/src/components/Patient/symptoms/SymptomTable.tsx
@@ -48,52 +48,73 @@ export function SymptomTable({
             <TableHead>{t("status")}</TableHead>
             <TableHead>{t("severity")}</TableHead>
             <TableHead>{t("onset")}</TableHead>
+            <TableHead>{t("verification")}</TableHead>
             <TableHead>{t("notes")}</TableHead>
             <TableHead>{t("created_by")}</TableHead>
           </TableRow>
         </TableHeader>
       )}
       <TableBody>
-        {symptoms.map((symptom: Symptom, index: number) => (
-          <TableRow key={index}>
-            <TableCell className="font-medium">
-              {symptom.code.display}
-            </TableCell>
-            <TableCell>
-              <Badge
-                variant="outline"
-                className={`whitespace-nowrap ${getStatusBadgeStyle(symptom.clinical_status)}`}
+        {symptoms.map((symptom: Symptom, index: number) => {
+          const isEnteredInError =
+            symptom.verification_status === "entered_in_error";
+
+          return (
+            <>
+              <TableRow
+                key={index}
+                className={
+                  isEnteredInError ? "opacity-50 bg-gray-50/50" : undefined
+                }
               >
-                {symptom.clinical_status}
-              </Badge>
-            </TableCell>
-            <TableCell>
-              <Badge variant="secondary" className="whitespace-nowrap">
-                {symptom.severity}
-              </Badge>
-            </TableCell>
-            <TableCell className="whitespace-nowrap">
-              {symptom.onset?.onset_datetime
-                ? new Date(symptom.onset.onset_datetime).toLocaleDateString()
-                : "-"}
-            </TableCell>
-            <TableCell className="max-w-[200px] truncate">
-              {symptom.note || "-"}
-            </TableCell>
-            <TableCell className="whitespace-nowrap">
-              <div className="flex items-center gap-2">
-                <Avatar
-                  name={formatName(symptom.created_by)}
-                  className="w-4 h-4"
-                  imageUrl={symptom.created_by?.profile_picture_url}
-                />
-                <span className="text-sm">
-                  {formatName(symptom.created_by)}
-                </span>
-              </div>
-            </TableCell>
-          </TableRow>
-        ))}
+                <TableCell className="font-medium">
+                  {symptom.code.display}
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant="outline"
+                    className={`whitespace-nowrap ${getStatusBadgeStyle(symptom.clinical_status)}`}
+                  >
+                    {t(symptom.clinical_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell>
+                  <Badge variant={"secondary"} className="whitespace-nowrap">
+                    {t(symptom.severity)}
+                  </Badge>
+                </TableCell>
+                <TableCell className="whitespace-nowrap">
+                  {symptom.onset?.onset_datetime
+                    ? new Date(
+                        symptom.onset.onset_datetime,
+                      ).toLocaleDateString()
+                    : "-"}
+                </TableCell>
+                <TableCell>
+                  <Badge
+                    variant={isEnteredInError ? "destructive" : "outline"}
+                    className="whitespace-nowrap capitalize"
+                  >
+                    {t(symptom.verification_status)}
+                  </Badge>
+                </TableCell>
+                <TableCell className="max-w-[200px] truncate">
+                  {symptom.note || "-"}
+                </TableCell>
+                <TableCell className="whitespace-nowrap flex items-center gap-2">
+                  <Avatar
+                    name={formatName(symptom.created_by)}
+                    className="w-4 h-4"
+                    imageUrl={symptom.created_by?.profile_picture_url}
+                  />
+                  <span className="text-sm">
+                    {formatName(symptom.created_by)}
+                  </span>
+                </TableCell>
+              </TableRow>
+            </>
+          );
+        })}
       </TableBody>
     </Table>
   );
diff --git a/src/components/Patient/symptoms/list.tsx b/src/components/Patient/symptoms/list.tsx
index 20914788f00..24f7a8142c8 100644
--- a/src/components/Patient/symptoms/list.tsx
+++ b/src/components/Patient/symptoms/list.tsx
@@ -1,5 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
+import { PencilIcon } from "lucide-react";
+import { Link } from "raviger";
+import { ReactNode, useState } from "react";
 
+import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 
@@ -11,9 +16,16 @@ import { SymptomTable } from "./SymptomTable";
 interface SymptomsListProps {
   patientId: string;
   encounterId?: string;
+  facilityId?: string;
 }
 
-export function SymptomsList({ patientId, encounterId }: SymptomsListProps) {
+export function SymptomsList({
+  patientId,
+  encounterId,
+  facilityId,
+}: SymptomsListProps) {
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
+
   const { data: symptoms, isLoading } = useQuery({
     queryKey: ["symptoms", patientId, encounterId],
     queryFn: query(symptomApi.listSymptoms, {
@@ -24,38 +36,98 @@ export function SymptomsList({ patientId, encounterId }: SymptomsListProps) {
 
   if (isLoading) {
     return (
-      <Card>
-        <CardHeader>
-          <CardTitle>Symptoms</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <Skeleton className="h-[100px] w-full" />
-        </CardContent>
-      </Card>
+      <SymptomListLayout
+        facilityId={facilityId}
+        patientId={patientId}
+        encounterId={encounterId}
+      >
+        <Skeleton className="h-[100px] w-full" />
+      </SymptomListLayout>
     );
   }
 
-  if (!symptoms?.results?.length) {
+  const filteredSymptoms = symptoms?.results?.filter(
+    (symptom) =>
+      showEnteredInError || symptom.verification_status !== "entered_in_error",
+  );
+
+  const hasEnteredInErrorRecords = symptoms?.results?.some(
+    (symptom) => symptom.verification_status === "entered_in_error",
+  );
+
+  if (!filteredSymptoms?.length) {
     return (
-      <Card>
-        <CardHeader>
-          <CardTitle>Symptoms</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <p className="text-muted-foreground">No symptoms recorded</p>
-        </CardContent>
-      </Card>
+      <SymptomListLayout
+        facilityId={facilityId}
+        patientId={patientId}
+        encounterId={encounterId}
+      >
+        <p className="text-muted-foreground">{t("no_symptoms_recorded")}</p>
+      </SymptomListLayout>
     );
   }
 
   return (
-    <Card className="p-0">
-      <CardHeader className="px-4 py-0 pt-4">
-        <CardTitle>Symptoms</CardTitle>
+    <SymptomListLayout
+      facilityId={facilityId}
+      patientId={patientId}
+      encounterId={encounterId}
+    >
+      <SymptomTable
+        symptoms={[
+          ...filteredSymptoms.filter(
+            (symptom) => symptom.verification_status !== "entered_in_error",
+          ),
+          ...(showEnteredInError
+            ? filteredSymptoms.filter(
+                (symptom) => symptom.verification_status === "entered_in_error",
+              )
+            : []),
+        ]}
+      />
+
+      {hasEnteredInErrorRecords && !showEnteredInError && (
+        <div className="flex justify-start">
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setShowEnteredInError(true)}
+            className="text-xs underline text-gray-500"
+          >
+            {t("view_all")}
+          </Button>
+        </div>
+      )}
+    </SymptomListLayout>
+  );
+}
+
+const SymptomListLayout = ({
+  facilityId,
+  patientId,
+  encounterId,
+  children,
+}: {
+  facilityId?: string;
+  patientId: string;
+  encounterId?: string;
+  children: ReactNode;
+}) => {
+  return (
+    <Card>
+      <CardHeader className="px-4 py-0 pt-4 flex justify-between flex-row">
+        <CardTitle>{t("symptoms")}</CardTitle>
+        {facilityId && (
+          <Link
+            href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/symptom`}
+            className="flex items-center gap-1 text-sm hover:text-gray-500"
+          >
+            <PencilIcon size={12} />
+            {t("edit")}
+          </Link>
+        )}
       </CardHeader>
-      <CardContent className="p-2">
-        <SymptomTable symptoms={symptoms.results} />
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
-}
+};
diff --git a/src/components/Questionnaire/QuestionRenderer.tsx b/src/components/Questionnaire/QuestionRenderer.tsx
index b4f5168c60e..284e1cf616f 100644
--- a/src/components/Questionnaire/QuestionRenderer.tsx
+++ b/src/components/Questionnaire/QuestionRenderer.tsx
@@ -3,7 +3,10 @@ import { useEffect, useRef } from "react";
 import { cn } from "@/lib/utils";
 
 import { QuestionValidationError } from "@/types/questionnaire/batch";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import {
   Question,
   StructuredQuestionType,
@@ -20,7 +23,7 @@ const FULL_WIDTH_QUESTION_TYPES: StructuredQuestionType[] = [
 interface QuestionRendererProps {
   questions: Question[];
   responses: QuestionnaireResponse[];
-  onResponseChange: (responses: QuestionnaireResponse[]) => void;
+  onResponseChange: (values: ResponseValue[], questionId: string) => void;
   errors: QuestionValidationError[];
   clearError: (questionId: string) => void;
   disabled?: boolean;
@@ -53,19 +56,6 @@ export function QuestionRenderer({
     }
   }, [activeGroupId]);
 
-  const handleResponseChange = (updatedResponse: QuestionnaireResponse) => {
-    const newResponses = [...responses];
-    const index = newResponses.findIndex(
-      (r) => r.question_id === updatedResponse.question_id,
-    );
-    if (index !== -1) {
-      newResponses[index] = updatedResponse;
-    } else {
-      newResponses.push(updatedResponse);
-    }
-    onResponseChange(newResponses);
-  };
-
   const shouldBeFullWidth = (question: Question): boolean =>
     question.type === "structured" &&
     !!question.structured_type &&
@@ -86,7 +76,7 @@ export function QuestionRenderer({
             question={question}
             encounterId={encounterId}
             questionnaireResponses={responses}
-            updateQuestionnaireResponseCB={handleResponseChange}
+            updateQuestionnaireResponseCB={onResponseChange}
             errors={errors}
             clearError={clearError}
             disabled={disabled}
diff --git a/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx b/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx
index 6e8364937f4..8270ae98c71 100644
--- a/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/AllergyQuestion.tsx
@@ -15,7 +15,6 @@ import {
   LeafIcon,
 } from "lucide-react";
 import React, { useEffect, useState } from "react";
-import { toast } from "sonner";
 
 import { Button } from "@/components/ui/button";
 import {
@@ -47,19 +46,28 @@ import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect";
 
 import query from "@/Utils/request/query";
 import {
+  ALLERGY_VERIFICATION_STATUS,
   AllergyIntolerance,
   AllergyIntoleranceRequest,
+  AllergyVerificationStatus,
 } from "@/types/emr/allergyIntolerance/allergyIntolerance";
 import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import { Question } from "@/types/questionnaire/question";
 
 interface AllergyQuestionProps {
   patientId: string;
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -117,25 +125,23 @@ export function AllergyQuestion({
     queryKey: ["allergies", patientId],
     queryFn: query(allergyIntoleranceApi.getAllergy, {
       pathParams: { patientId },
+      queryParams: {
+        limit: 100,
+      },
     }),
   });
 
   useEffect(() => {
-    if (patientAllergies?.results && !allergies.length) {
-      updateQuestionnaireResponseCB({
-        ...questionnaireResponse,
-        values: [
+    if (patientAllergies?.results) {
+      updateQuestionnaireResponseCB(
+        [
           {
             type: "allergy_intolerance",
             value: patientAllergies.results.map(convertToAllergyRequest),
           },
         ],
-      });
-      if (patientAllergies.count > patientAllergies.results.length) {
-        toast.info(
-          `Showing first ${patientAllergies.results.length} of ${patientAllergies.count} allergies`,
-        );
-      }
+        questionnaireResponse.question_id,
+      );
     }
   }, [patientAllergies]);
 
@@ -144,18 +150,43 @@ export function AllergyQuestion({
       ...allergies,
       { ...ALLERGY_INITIAL_VALUE, code },
     ] as AllergyIntoleranceRequest[];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "allergy_intolerance", value: newAllergies }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "allergy_intolerance", value: newAllergies }],
+      questionnaireResponse.question_id,
+    );
   };
 
   const handleRemoveAllergy = (index: number) => {
-    const newAllergies = allergies.filter((_, i) => i !== index);
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "allergy_intolerance", value: newAllergies }],
-    });
+    const allergy = allergies[index];
+    if (allergy.id) {
+      // For existing records, update verification status to entered_in_error
+      const newAllergies = allergies.map((a, i) =>
+        i === index
+          ? { ...a, verification_status: "entered_in_error" as const }
+          : a,
+      ) as AllergyIntoleranceRequest[];
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "allergy_intolerance",
+            value: newAllergies,
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    } else {
+      // For new records, remove them completely
+      const newAllergies = allergies.filter((_, i) => i !== index);
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "allergy_intolerance",
+            value: newAllergies,
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    }
   };
 
   const handleUpdateAllergy = (
@@ -165,10 +196,10 @@ export function AllergyQuestion({
     const newAllergies = allergies.map((allergy, i) =>
       i === index ? { ...allergy, ...updates } : allergy,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "allergy_intolerance", value: newAllergies }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "allergy_intolerance", value: newAllergies }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -212,11 +243,13 @@ export function AllergyQuestion({
               <div
                 key={index}
                 className={`p-3 space-y-3 ${
-                  allergy.clinical_status === "inactive"
-                    ? "opacity-60"
-                    : allergy.clinical_status === "resolved"
-                      ? "line-through"
-                      : ""
+                  allergy.verification_status === "entered_in_error"
+                    ? "opacity-40 pointer-events-none"
+                    : allergy.clinical_status === "inactive"
+                      ? "opacity-60"
+                      : allergy.clinical_status === "resolved"
+                        ? "line-through"
+                        : ""
                 }`}
               >
                 <div className="flex items-center justify-between">
@@ -226,7 +259,7 @@ export function AllergyQuestion({
                       onValueChange={(value) =>
                         handleUpdateAllergy(index, { category: value })
                       }
-                      disabled={disabled}
+                      disabled={disabled || !!allergy.id}
                     >
                       <SelectTrigger className="h-8 w-[32px] px-0 [&>svg]:hidden flex items-center justify-center">
                         <SelectValue>
@@ -337,7 +370,7 @@ export function AllergyQuestion({
                       <SelectContent>
                         <SelectItem value="low">Low</SelectItem>
                         <SelectItem value="high">High</SelectItem>
-                        <SelectItem value="unable-to-assess">
+                        <SelectItem value="unable_to_assess">
                           Unable to Assess
                         </SelectItem>
                       </SelectContent>
@@ -350,7 +383,8 @@ export function AllergyQuestion({
                       value={allergy.verification_status}
                       onValueChange={(value) =>
                         handleUpdateAllergy(index, {
-                          verification_status: value,
+                          verification_status:
+                            value as AllergyVerificationStatus,
                         })
                       }
                       disabled={disabled}
@@ -359,9 +393,13 @@ export function AllergyQuestion({
                         <SelectValue placeholder="Verify" />
                       </SelectTrigger>
                       <SelectContent>
-                        <SelectItem value="confirmed">Confirmed</SelectItem>
-                        <SelectItem value="unconfirmed">Unconfirmed</SelectItem>
-                        <SelectItem value="refuted">Refuted</SelectItem>
+                        {Object.entries(ALLERGY_VERIFICATION_STATUS).map(
+                          ([value, label]) => (
+                            <SelectItem key={value} value={value}>
+                              {label}
+                            </SelectItem>
+                          ),
+                        )}
                       </SelectContent>
                     </Select>
                   </div>
@@ -426,11 +464,13 @@ const AllergyTableRow = ({
   const [showNotes, setShowNotes] = useState(allergy.note !== undefined);
 
   const rowClassName = `group ${
-    allergy.clinical_status === "inactive"
-      ? "opacity-60"
-      : allergy.clinical_status === "resolved"
-        ? "line-through"
-        : ""
+    allergy.verification_status === "entered_in_error"
+      ? "opacity-40 pointer-events-none"
+      : allergy.clinical_status === "inactive"
+        ? "opacity-60"
+        : allergy.clinical_status === "resolved"
+          ? "line-through"
+          : ""
   }`;
 
   const handleNotesToggle = () => {
@@ -450,7 +490,7 @@ const AllergyTableRow = ({
           <Select
             value={allergy.category}
             onValueChange={(value) => onUpdate?.({ category: value })}
-            disabled={disabled}
+            disabled={disabled || !!allergy.id}
           >
             <SelectTrigger className="h-7 w-[32px] px-0 [&>svg]:hidden flex items-center justify-center">
               <SelectValue
@@ -493,25 +533,33 @@ const AllergyTableRow = ({
             <SelectContent>
               <SelectItem value="low">Low</SelectItem>
               <SelectItem value="high">High</SelectItem>
-              <SelectItem value="unable-to-assess">Unable to Assess</SelectItem>
+              <SelectItem value="unable_to_assess">Unable to Assess</SelectItem>
             </SelectContent>
           </Select>
         </TableCell>
         <TableCell className="min-w-[85px] py-1 px-0.5">
           <Select
             value={allergy.verification_status}
-            onValueChange={(value) =>
-              onUpdate?.({ verification_status: value })
-            }
+            onValueChange={(value) => {
+              if (value in ALLERGY_VERIFICATION_STATUS) {
+                onUpdate?.({
+                  verification_status: value as AllergyVerificationStatus,
+                });
+              }
+            }}
             disabled={disabled}
           >
             <SelectTrigger className="h-7 w-[85px] px-1">
               <SelectValue placeholder="Verify" />
             </SelectTrigger>
             <SelectContent>
-              <SelectItem value="confirmed">Confirmed</SelectItem>
-              <SelectItem value="unconfirmed">Unconfirmed</SelectItem>
-              <SelectItem value="refuted">Refuted</SelectItem>
+              {Object.entries(ALLERGY_VERIFICATION_STATUS).map(
+                ([value, label]) => (
+                  <SelectItem key={value} value={value}>
+                    {label}
+                  </SelectItem>
+                ),
+              )}
             </SelectContent>
           </Select>
         </TableCell>
diff --git a/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx b/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx
index 916f97018e5..7f30558df4f 100644
--- a/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/AppointmentQuestion.tsx
@@ -33,7 +33,11 @@ import { UserBase } from "@/types/user/user";
 interface FollowUpVisitQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -54,15 +58,16 @@ export function AppointmentQuestion({
 
   const handleUpdate = (updates: Partial<CreateAppointmentQuestion>) => {
     const appointment = { ...value, ...updates };
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "appointment",
           value: [appointment] as unknown as ResponseValue["value"],
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const facilityId = useSlug("facility");
diff --git a/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx b/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx
index b2b094790b4..fb360302835 100644
--- a/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/BooleanQuestion.tsx
@@ -1,13 +1,20 @@
 import { Label } from "@/components/ui/label";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 
 interface BooleanQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
 }
@@ -24,15 +31,16 @@ export function BooleanQuestion({
       value={questionnaireResponse.values[0]?.value?.toString()}
       onValueChange={(value) => {
         clearError();
-        updateQuestionnaireResponseCB({
-          ...questionnaireResponse,
-          values: [
+        updateQuestionnaireResponseCB(
+          [
             {
               type: "boolean",
               value: value === "true",
             },
           ],
-        });
+          questionnaireResponse.question_id,
+          questionnaireResponse.note,
+        );
       }}
       disabled={disabled}
     >
diff --git a/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx b/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx
index 4c0f7259bef..95475f7acc5 100644
--- a/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/ChoiceQuestion.tsx
@@ -9,14 +9,19 @@ import {
 } from "@/components/ui/select";
 
 import { properCase } from "@/Utils/utils";
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { AnswerOption, Question } from "@/types/questionnaire/question";
 
 interface ChoiceQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
   updateQuestionnaireResponseCB: (
-    questionnaireResponse: QuestionnaireResponse,
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
   ) => void;
   disabled?: boolean;
   withLabel?: boolean;
@@ -43,10 +48,11 @@ export const ChoiceQuestion = memo(function ChoiceQuestion({
       value: newValue,
     };
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: newValues,
-    });
+    updateQuestionnaireResponseCB(
+      newValues,
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx b/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
index b20629e171c..9fa2e201157 100644
--- a/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
@@ -13,11 +13,18 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface DateTimeQuestionProps {
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
   classes?: string;
@@ -43,15 +50,16 @@ export function DateTimeQuestion({
       date.setMinutes(currentValue.getMinutes());
     }
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "dateTime",
           value: date.toISOString(),
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const handleTimeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -62,15 +70,17 @@ export function DateTimeQuestion({
     date.setHours(hours);
     date.setMinutes(minutes);
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
+        ...questionnaireResponse.values,
         {
           type: "dateTime",
           value: date.toISOString(),
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const formatTime = (date: Date | undefined) => {
diff --git a/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx b/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx
index af85d52b152..b4aab2c07c4 100644
--- a/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/DiagnosisQuestion.tsx
@@ -3,7 +3,12 @@ import {
   MinusCircledIcon,
   Pencil2Icon,
 } from "@radix-ui/react-icons";
-import React, { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { format } from "date-fns";
+import { t } from "i18next";
+import React, { useEffect, useState } from "react";
+
+import { cn } from "@/lib/utils";
 
 import { Button } from "@/components/ui/button";
 import {
@@ -25,77 +30,168 @@ import {
 
 import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect";
 
+import query from "@/Utils/request/query";
 import {
   DIAGNOSIS_CLINICAL_STATUS,
   DIAGNOSIS_VERIFICATION_STATUS,
   Diagnosis,
+  DiagnosisRequest,
 } from "@/types/emr/diagnosis/diagnosis";
+import diagnosisApi from "@/types/emr/diagnosis/diagnosisApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface DiagnosisQuestionProps {
+  patientId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
-const DIAGNOSIS_INITIAL_VALUE: Partial<Diagnosis> = {
+const DIAGNOSIS_INITIAL_VALUE: Omit<DiagnosisRequest, "encounter"> = {
   code: { code: "", display: "", system: "" },
   clinical_status: "active",
   verification_status: "confirmed",
   onset: { onset_datetime: new Date().toISOString().split("T")[0] },
 };
 
+function convertToDiagnosisRequest(diagnosis: Diagnosis): DiagnosisRequest {
+  return {
+    id: diagnosis.id,
+    code: diagnosis.code,
+    clinical_status: diagnosis.clinical_status,
+    verification_status: diagnosis.verification_status,
+    onset: diagnosis.onset
+      ? {
+          ...diagnosis.onset,
+          onset_datetime: diagnosis.onset.onset_datetime
+            ? format(new Date(diagnosis.onset.onset_datetime), "yyyy-MM-dd")
+            : "",
+        }
+      : undefined,
+    recorded_date: diagnosis.recorded_date,
+    note: diagnosis.note,
+    encounter: "", // This will be set when submitting the form
+  };
+}
+
 export function DiagnosisQuestion({
+  patientId,
   questionnaireResponse,
   updateQuestionnaireResponseCB,
   disabled,
 }: DiagnosisQuestionProps) {
   const diagnoses =
-    (questionnaireResponse.values?.[0]?.value as Diagnosis[]) || [];
+    (questionnaireResponse.values?.[0]?.value as DiagnosisRequest[]) || [];
+
+  const { data: patientDiagnoses } = useQuery({
+    queryKey: ["diagnoses", patientId],
+    queryFn: query(diagnosisApi.listDiagnosis, {
+      pathParams: { patientId },
+      queryParams: {
+        limit: 100,
+      },
+    }),
+  });
+
+  useEffect(() => {
+    if (patientDiagnoses?.results) {
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "diagnosis",
+            value: patientDiagnoses.results.map(convertToDiagnosisRequest),
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    }
+  }, [patientDiagnoses]);
 
   const handleAddDiagnosis = (code: Code) => {
     const newDiagnoses = [
       ...diagnoses,
       { ...DIAGNOSIS_INITIAL_VALUE, code },
-    ] as Diagnosis[];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "diagnosis", value: newDiagnoses }],
-    });
+    ] as DiagnosisRequest[];
+    updateQuestionnaireResponseCB(
+      [
+        {
+          type: "diagnosis",
+          value: newDiagnoses,
+        },
+      ],
+      questionnaireResponse.question_id,
+    );
   };
 
   const handleRemoveDiagnosis = (index: number) => {
-    const newDiagnoses = diagnoses.filter((_, i) => i !== index);
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "diagnosis", value: newDiagnoses }],
-    });
+    const diagnosis = diagnoses[index];
+    if (diagnosis.id) {
+      // For existing records, update verification status to entered_in_error
+      const newDiagnoses = diagnoses.map((d, i) =>
+        i === index
+          ? { ...d, verification_status: "entered_in_error" as const }
+          : d,
+      ) as DiagnosisRequest[];
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "diagnosis",
+            value: newDiagnoses,
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    } else {
+      // For new records, remove them completely
+      const newDiagnoses = diagnoses.filter((_, i) => i !== index);
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "diagnosis",
+            value: newDiagnoses,
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    }
   };
 
   const handleUpdateDiagnosis = (
     index: number,
-    updates: Partial<Diagnosis>,
+    updates: Partial<DiagnosisRequest>,
   ) => {
     const newDiagnoses = diagnoses.map((diagnosis, i) =>
       i === index ? { ...diagnosis, ...updates } : diagnosis,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "diagnosis", value: newDiagnoses }],
-    });
+    updateQuestionnaireResponseCB(
+      [
+        {
+          type: "diagnosis",
+          value: newDiagnoses,
+        },
+      ],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
-    <>
+    <div className="space-y-2">
       {diagnoses.length > 0 && (
         <div className="rounded-lg border">
           <div className="hidden md:grid md:grid-cols-12 items-center gap-4 p-3 bg-gray-50 text-sm font-medium text-gray-500">
-            <div className="col-span-5">Diagnosis</div>
-            <div className="col-span-2 text-center">Onset Date</div>
-            <div className="col-span-2 text-center">Status</div>
-            <div className="col-span-2 text-center">Verification</div>
-            <div className="col-span-1 text-center">Action</div>
+            <div className="col-span-5">{t("diagnosis")}</div>
+            <div className="col-span-2 text-center">{t("date")}</div>
+            <div className="col-span-2 text-center">{t("status")}</div>
+            <div className="col-span-2 text-center">{t("verification")}</div>
+            <div className="col-span-1 text-center">{t("action")}</div>
           </div>
           <div className="divide-y divide-gray-200">
             {diagnoses.map((diagnosis, index) => (
@@ -112,18 +208,18 @@ export function DiagnosisQuestion({
       )}
       <ValueSetSelect
         system="system-condition-code"
-        placeholder="Search for diagnoses to add"
+        placeholder={t("search_for_diagnoses_to_add")}
         onSelect={handleAddDiagnosis}
         disabled={disabled}
       />
-    </>
+    </div>
   );
 }
 
 interface DiagnosisItemProps {
-  diagnosis: Diagnosis;
+  diagnosis: DiagnosisRequest;
   disabled?: boolean;
-  onUpdate?: (diagnosis: Partial<Diagnosis>) => void;
+  onUpdate?: (diagnosis: Partial<DiagnosisRequest>) => void;
   onRemove?: () => void;
 }
 
@@ -133,10 +229,15 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
   onUpdate,
   onRemove,
 }) => {
-  const [showNotes, setShowNotes] = useState(false);
+  const [showNotes, setShowNotes] = useState(Boolean(diagnosis.note));
 
   return (
-    <div className="group hover:bg-gray-50">
+    <div
+      className={cn("group hover:bg-gray-50", {
+        "opacity-40 pointer-events-none":
+          diagnosis.verification_status === "entered_in_error",
+      })}
+    >
       <div className="py-1 px-2 space-y-2 md:space-y-0 md:grid md:grid-cols-12 md:items-center md:gap-4">
         <div className="flex items-center justify-between md:col-span-5">
           <div
@@ -160,7 +261,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
               <DropdownMenuContent align="end">
                 <DropdownMenuItem onClick={() => setShowNotes(!showNotes)}>
                   <Pencil2Icon className="h-4 w-4 mr-2" />
-                  {showNotes ? "Hide Notes" : "Add Notes"}
+                  {showNotes ? t("hide_notes") : t("add_notes")}
                 </DropdownMenuItem>
                 <DropdownMenuSeparator />
                 <DropdownMenuItem
@@ -168,7 +269,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
                   onClick={onRemove}
                 >
                   <MinusCircledIcon className="h-4 w-4 mr-2" />
-                  Remove Diagnosis
+                  {t("remove_diagnosis")}
                 </DropdownMenuItem>
               </DropdownMenuContent>
             </DropdownMenu>
@@ -176,7 +277,9 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
         </div>
         <div className="grid grid-cols-2 gap-2 md:col-span-6 md:grid-cols-3 md:gap-4">
           <div className="col-span-2 md:col-span-1">
-            <Label className="text-xs text-gray-500 md:hidden">Date</Label>
+            <Label className="text-xs text-gray-500 md:hidden">
+              {t("date")}
+            </Label>
             <Input
               type="date"
               value={diagnosis.onset?.onset_datetime || ""}
@@ -185,23 +288,25 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
                   onset: { onset_datetime: e.target.value },
                 })
               }
-              disabled={disabled}
+              disabled={disabled || !!diagnosis.id}
               className="h-8 md:h-9"
             />
           </div>
           <div>
-            <Label className="text-xs text-gray-500 md:hidden">Status</Label>
+            <Label className="text-xs text-gray-500 md:hidden">
+              {t("status")}
+            </Label>
             <Select
               value={diagnosis.clinical_status}
               onValueChange={(value) =>
                 onUpdate?.({
-                  clinical_status: value as Diagnosis["clinical_status"],
+                  clinical_status: value as DiagnosisRequest["clinical_status"],
                 })
               }
               disabled={disabled}
             >
               <SelectTrigger className="h-8 md:h-9">
-                <SelectValue placeholder="Status" />
+                <SelectValue placeholder={t("status_placeholder")} />
               </SelectTrigger>
               <SelectContent>
                 {DIAGNOSIS_CLINICAL_STATUS.map((status) => (
@@ -210,7 +315,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
                     value={status}
                     className="capitalize"
                   >
-                    {status.replace(/_/g, " ")}
+                    {t(status)}
                   </SelectItem>
                 ))}
               </SelectContent>
@@ -218,20 +323,20 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
           </div>
           <div>
             <Label className="text-xs text-gray-500 md:hidden">
-              Verification
+              {t("verification")}
             </Label>
             <Select
               value={diagnosis.verification_status}
               onValueChange={(value) =>
                 onUpdate?.({
                   verification_status:
-                    value as Diagnosis["verification_status"],
+                    value as DiagnosisRequest["verification_status"],
                 })
               }
               disabled={disabled}
             >
               <SelectTrigger className="h-8 md:h-9">
-                <SelectValue placeholder="Verification" />
+                <SelectValue placeholder={t("verification_placeholder")} />
               </SelectTrigger>
               <SelectContent>
                 {DIAGNOSIS_VERIFICATION_STATUS.map((status) => (
@@ -240,7 +345,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
                     value={status}
                     className="capitalize"
                   >
-                    {status.replace(/_/g, " ")}
+                    {t(status)}
                   </SelectItem>
                 ))}
               </SelectContent>
@@ -262,7 +367,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
             <DropdownMenuContent align="end">
               <DropdownMenuItem onClick={() => setShowNotes(!showNotes)}>
                 <Pencil2Icon className="h-4 w-4 mr-2" />
-                {showNotes ? "Hide Notes" : "Add Notes"}
+                {showNotes ? t("hide_notes") : t("add_notes")}
               </DropdownMenuItem>
               <DropdownMenuSeparator />
               <DropdownMenuItem
@@ -270,7 +375,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
                 onClick={onRemove}
               >
                 <MinusCircledIcon className="h-4 w-4 mr-2" />
-                Remove Diagnosis
+                {t("remove_diagnosis")}
               </DropdownMenuItem>
             </DropdownMenuContent>
           </DropdownMenu>
@@ -280,7 +385,7 @@ const DiagnosisItem: React.FC<DiagnosisItemProps> = ({
         <div className="px-3 pb-3">
           <Input
             type="text"
-            placeholder="Add notes about the diagnosis..."
+            placeholder={t("add_notes_about_diagnosis")}
             value={diagnosis.note || ""}
             onChange={(e) => onUpdate?.({ note: e.target.value })}
             disabled={disabled}
diff --git a/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx b/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx
index 61cc44e4a95..315221b64de 100644
--- a/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/EncounterQuestion.tsx
@@ -40,7 +40,11 @@ interface EncounterQuestionProps {
   question: Question;
   encounterId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
   organizations?: string[];
@@ -124,10 +128,10 @@ export function EncounterQuestion({
       value: [encounterRequest] as unknown as typeof responseValue.value,
     };
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [responseValue],
-    });
+    updateQuestionnaireResponseCB(
+      [responseValue],
+      questionnaireResponse.question_id,
+    );
   };
 
   if (isLoading) {
diff --git a/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx b/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
index f078fa982a2..fb2fb85fd54 100644
--- a/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
@@ -1,6 +1,7 @@
 import { MinusCircledIcon, Pencil2Icon } from "@radix-ui/react-icons";
+import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -36,6 +37,12 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 import { ComboboxQuantityInput } from "@/components/Common/ComboboxQuantityInput";
 import { MultiValueSetSelect } from "@/components/Medicine/MultiValueSetSelect";
@@ -44,6 +51,7 @@ import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect";
 
 import useBreakpoints from "@/hooks/useBreakpoints";
 
+import query from "@/Utils/request/query";
 import {
   DoseRange,
   MEDICATION_REQUEST_INTENT,
@@ -54,12 +62,21 @@ import {
   UCUM_TIME_UNITS,
   parseMedicationStringToRequest,
 } from "@/types/emr/medicationRequest";
+import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface MedicationRequestQuestionProps {
+  patientId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -67,10 +84,30 @@ export function MedicationRequestQuestion({
   questionnaireResponse,
   updateQuestionnaireResponseCB,
   disabled,
+  patientId,
 }: MedicationRequestQuestionProps) {
   const medications =
     (questionnaireResponse.values?.[0]?.value as MedicationRequest[]) || [];
 
+  const { data: patientMedications } = useQuery({
+    queryKey: ["medication_requests", patientId],
+    queryFn: query(medicationRequestApi.list, {
+      pathParams: { patientId },
+      queryParams: {
+        limit: 100,
+      },
+    }),
+  });
+
+  useEffect(() => {
+    if (patientMedications?.results) {
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_request", value: patientMedications.results }],
+        questionnaireResponse.question_id,
+      );
+    }
+  }, [patientMedications]);
+
   const [expandedMedicationIndex, setExpandedMedicationIndex] = useState<
     number | null
   >(null);
@@ -88,15 +125,10 @@ export function MedicationRequestQuestion({
         authored_on: new Date().toISOString(),
       },
     ];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_request",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_request", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
     setExpandedMedicationIndex(newMedications.length - 1);
   };
 
@@ -107,13 +139,28 @@ export function MedicationRequestQuestion({
   const confirmRemoveMedication = () => {
     if (medicationToDelete === null) return;
 
-    const newMedications = medications.filter(
-      (_, i) => i !== medicationToDelete,
-    );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "medication_request", value: newMedications }],
-    });
+    const medication = medications[medicationToDelete];
+    if (medication.id) {
+      // For existing records, update status to entered_in_error
+      const newMedications = medications.map((med, i) =>
+        i === medicationToDelete
+          ? { ...med, status: "entered_in_error" as const }
+          : med,
+      );
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_request", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
+    } else {
+      // For new records, remove them completely
+      const newMedications = medications.filter(
+        (_, i) => i !== medicationToDelete,
+      );
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_request", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
+    }
     setMedicationToDelete(null);
   };
 
@@ -125,15 +172,10 @@ export function MedicationRequestQuestion({
       i === index ? { ...medication, ...updates } : medication,
     );
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_request",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_request", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -257,18 +299,32 @@ export function MedicationRequestQuestion({
                                 <Pencil2Icon className="h-4 w-4" />
                               </Button>
                             )}
-                            <Button
-                              variant="ghost"
-                              size="icon"
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                handleRemoveMedication(index);
-                              }}
-                              disabled={disabled}
-                              className="h-8 w-8"
-                            >
-                              <MinusCircledIcon className="h-4 w-4" />
-                            </Button>
+                            <TooltipProvider>
+                              <Tooltip>
+                                <TooltipTrigger asChild>
+                                  <Button
+                                    variant="ghost"
+                                    size="icon"
+                                    onClick={(e) => {
+                                      e.stopPropagation();
+                                      handleRemoveMedication(index);
+                                    }}
+                                    disabled={
+                                      disabled ||
+                                      medication.status === "entered_in_error"
+                                    }
+                                    className="h-8 w-8"
+                                  >
+                                    <MinusCircledIcon className="h-4 w-4" />
+                                  </Button>
+                                </TooltipTrigger>
+                                <TooltipContent>
+                                  {medication.status === "entered_in_error"
+                                    ? t("medication_already_marked_as_error")
+                                    : t("remove_medication")}
+                                </TooltipContent>
+                              </Tooltip>
+                            </TooltipProvider>
                           </div>
                         </div>
                         <CollapsibleContent>
@@ -330,6 +386,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
   const [showDosageDialog, setShowDosageDialog] = useState(false);
   const desktopLayout = useBreakpoints({ lg: true, default: false });
   const dosageInstruction = medication.dosage_instruction[0];
+  const isReadOnly = !!medication.id;
 
   const handleUpdateDosageInstruction = (
     updates: Partial<MedicationRequestDosageInstruction>,
@@ -368,7 +425,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                 },
               }));
             }}
-            disabled={disabled}
+            disabled={disabled || isReadOnly}
           />
         </div>
         <div>
@@ -385,7 +442,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                 },
               }));
             }}
-            disabled={disabled || !localDoseRange.low.value}
+            disabled={disabled || !localDoseRange.low.value || isReadOnly}
           />
         </div>
         <div className="flex justify-end gap-2">
@@ -414,7 +471,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               !localDoseRange.low.value ||
               !localDoseRange.high.value ||
               !localDoseRange.low.unit ||
-              !localDoseRange.high.unit
+              !localDoseRange.high.unit ||
+              isReadOnly
             }
           >
             {t("save")}
@@ -443,7 +501,15 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
   };
 
   return (
-    <div className="grid grid-cols-1 lg:grid-cols-[280px,180px,170px,160px,300px,180px,250px,180px,160px,200px,180px,48px] border-b hover:bg-gray-50/50">
+    <div
+      className={cn(
+        "grid grid-cols-1 lg:grid-cols-[280px,180px,170px,160px,300px,180px,250px,180px,160px,200px,180px,48px] border-b hover:bg-gray-50/50",
+        {
+          "opacity-40 pointer-events-none":
+            medication.status === "entered_in_error",
+        },
+      )}
+    >
       {/* Medicine Name */}
       <div className="lg:p-4 lg:px-2 lg:py-1 flex items-center justify-between lg:justify-start lg:col-span-1 lg:border-r font-medium overflow-hidden text-sm">
         <span className="break-words line-clamp-2 hidden lg:block">
@@ -480,7 +546,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                     },
                   });
                 }}
-                disabled={disabled}
+                disabled={disabled || isReadOnly}
               />
               <div className="flex justify-end">
                 <Button
@@ -488,6 +554,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                   size="icon"
                   className="h-3 w-3 rounded-full hover:bg-transparent"
                   onClick={handleDoseRangeClick}
+                  disabled={disabled || isReadOnly}
                 >
                   +
                 </Button>
@@ -547,7 +614,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               });
             }
           }}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         >
           <SelectTrigger className="h-9 text-sm">
             <SelectValue placeholder={t("select_frequency")} />
@@ -595,7 +662,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               disabled={
                 disabled ||
                 !dosageInstruction?.timing?.repeat ||
-                dosageInstruction?.as_needed_boolean
+                dosageInstruction?.as_needed_boolean ||
+                isReadOnly
               }
               className="h-9 text-sm"
             />
@@ -624,7 +692,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
             disabled={
               disabled ||
               !dosageInstruction?.timing?.repeat ||
-              dosageInstruction?.as_needed_boolean
+              dosageInstruction?.as_needed_boolean ||
+              isReadOnly
             }
           >
             <SelectTrigger className="h-9 text-sm w-24">
@@ -671,7 +740,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
                 },
               },
             ]}
-            disabled={disabled}
+            disabled={disabled || isReadOnly}
           />
         ) : (
           <ValueSetSelect
@@ -683,7 +752,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               })
             }
             placeholder={t("select_additional_instructions")}
-            disabled={disabled}
+            disabled={disabled || isReadOnly}
           />
         )}
       </div>
@@ -695,7 +764,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           value={dosageInstruction?.route}
           onSelect={(route) => handleUpdateDosageInstruction({ route })}
           placeholder={t("select_route")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         />
       </div>
       {/* Site */}
@@ -706,7 +775,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           value={dosageInstruction?.site}
           onSelect={(site) => handleUpdateDosageInstruction({ site })}
           placeholder={t("select_site")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           wrapTextForSmallScreen={true}
         />
       </div>
@@ -718,7 +787,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           value={dosageInstruction?.method}
           onSelect={(method) => handleUpdateDosageInstruction({ method })}
           placeholder={t("select_method")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           count={20}
         />
       </div>
@@ -730,7 +799,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
           onValueChange={(value: MedicationRequestIntent) =>
             onUpdate?.({ intent: value })
           }
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         >
           <SelectTrigger className="h-9 text-sm capitalize">
             <SelectValue
@@ -762,7 +831,7 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
             if (!date) return;
             onUpdate?.({ authored_on: date.toISOString() });
           }}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         />
       </div>
       {/* Notes */}
@@ -791,8 +860,8 @@ const MedicationRequestGridRow: React.FC<MedicationRequestGridRowProps> = ({
               values: [],
               note: medication.note,
             }}
-            updateQuestionnaireResponseCB={(response) => {
-              onUpdate?.({ note: response.note });
+            handleUpdateNote={(note) => {
+              onUpdate?.({ note: note });
             }}
             disabled={disabled}
           />
diff --git a/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx b/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx
index 6f58f874125..936a2b3b0b3 100644
--- a/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/MedicationStatementQuestion.tsx
@@ -1,5 +1,7 @@
 import { MinusCircledIcon, Pencil2Icon } from "@radix-ui/react-icons";
-import React, { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import React, { useEffect } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { cn } from "@/lib/utils";
@@ -32,26 +34,40 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 import { NotesInput } from "@/components/Questionnaire/QuestionTypes/NotesInput";
 import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect";
 
 import useBreakpoints from "@/hooks/useBreakpoints";
 
+import query from "@/Utils/request/query";
 import {
   MEDICATION_STATEMENT_STATUS,
   MedicationStatementInformationSourceType,
   MedicationStatementRequest,
   MedicationStatementStatus,
 } from "@/types/emr/medicationStatement";
+import medicationStatementApi from "@/types/emr/medicationStatement/medicationStatementApi";
 import { Code } from "@/types/questionnaire/code";
 import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import { ResponseValue } from "@/types/questionnaire/form";
 import { Question } from "@/types/questionnaire/question";
 
 interface MedicationStatementQuestionProps {
+  patientId: string;
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -73,6 +89,7 @@ export function MedicationStatementQuestion({
   questionnaireResponse,
   updateQuestionnaireResponseCB,
   disabled,
+  patientId,
 }: MedicationStatementQuestionProps) {
   const { t } = useTranslation();
   const desktopLayout = useBreakpoints({ lg: true, default: false });
@@ -87,20 +104,34 @@ export function MedicationStatementQuestion({
     (questionnaireResponse.values?.[0]
       ?.value as MedicationStatementRequest[]) || [];
 
+  const { data: patientMedications } = useQuery({
+    queryKey: ["medication_statements", patientId],
+    queryFn: query(medicationStatementApi.list, {
+      pathParams: { patientId },
+      queryParams: {
+        limit: 100,
+      },
+    }),
+  });
+
+  useEffect(() => {
+    if (patientMedications?.results) {
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_statement", value: patientMedications.results }],
+        questionnaireResponse.question_id,
+      );
+    }
+  }, [patientMedications]);
+
   const handleAddMedication = (medication: Code) => {
     const newMedications: MedicationStatementRequest[] = [
       ...medications,
       { ...MEDICATION_STATEMENT_INITIAL_VALUE, medication },
     ];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_statement",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_statement", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
     setExpandedMedicationIndex(newMedications.length - 1);
   };
 
@@ -111,13 +142,28 @@ export function MedicationStatementQuestion({
   const confirmRemoveMedication = () => {
     if (medicationToDelete === null) return;
 
-    const newMedications = medications.filter(
-      (_, i) => i !== medicationToDelete,
-    );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "medication_statement", value: newMedications }],
-    });
+    const medication = medications[medicationToDelete];
+    if (medication.id) {
+      // For existing records, update status to entered_in_error
+      const newMedications = medications.map((med, i) =>
+        i === medicationToDelete
+          ? { ...med, status: "entered_in_error" as const }
+          : med,
+      );
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_statement", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
+    } else {
+      // For new records, remove them completely
+      const newMedications = medications.filter(
+        (_, i) => i !== medicationToDelete,
+      );
+      updateQuestionnaireResponseCB(
+        [{ type: "medication_statement", value: newMedications }],
+        questionnaireResponse.question_id,
+      );
+    }
     setMedicationToDelete(null);
   };
 
@@ -129,15 +175,10 @@ export function MedicationStatementQuestion({
       i === index ? { ...medication, ...updates } : medication,
     );
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
-        {
-          type: "medication_statement",
-          value: newMedications,
-        },
-      ],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "medication_statement", value: newMedications }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
@@ -249,18 +290,32 @@ export function MedicationStatementQuestion({
                                 <Pencil2Icon className="h-4 w-4" />
                               </Button>
                             )}
-                            <Button
-                              variant="ghost"
-                              size="icon"
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                handleRemoveMedication(index);
-                              }}
-                              disabled={disabled}
-                              className="h-8 w-8"
-                            >
-                              <MinusCircledIcon className="h-4 w-4" />
-                            </Button>
+                            <TooltipProvider>
+                              <Tooltip>
+                                <TooltipTrigger asChild>
+                                  <Button
+                                    variant="ghost"
+                                    size="icon"
+                                    onClick={(e) => {
+                                      e.stopPropagation();
+                                      handleRemoveMedication(index);
+                                    }}
+                                    disabled={
+                                      disabled ||
+                                      medication.status === "entered_in_error"
+                                    }
+                                    className="h-8 w-8"
+                                  >
+                                    <MinusCircledIcon className="h-4 w-4" />
+                                  </Button>
+                                </TooltipTrigger>
+                                <TooltipContent>
+                                  {medication.status === "entered_in_error"
+                                    ? t("medication_already_marked_as_error")
+                                    : t("remove_medication")}
+                                </TooltipContent>
+                              </Tooltip>
+                            </TooltipProvider>
                           </div>
                         </div>
                         <CollapsibleContent>
@@ -272,6 +327,7 @@ export function MedicationStatementQuestion({
                                 handleUpdateMedication(index, updates)
                               }
                               onRemove={() => handleRemoveMedication(index)}
+                              index={index}
                             />
                           </div>
                         </CollapsibleContent>
@@ -284,6 +340,7 @@ export function MedicationStatementQuestion({
                           handleUpdateMedication(index, updates)
                         }
                         onRemove={() => handleRemoveMedication(index)}
+                        index={index}
                       />
                     )}
                   </React.Fragment>
@@ -311,6 +368,7 @@ interface MedicationStatementGridRowProps {
   disabled?: boolean;
   onUpdate?: (medication: Partial<MedicationStatementRequest>) => void;
   onRemove?: () => void;
+  index: number;
 }
 
 const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
@@ -318,17 +376,26 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
   disabled,
   onUpdate,
   onRemove,
+  index,
 }) => {
   const { t } = useTranslation();
   const desktopLayout = useBreakpoints({ lg: true, default: false });
+  const isReadOnly = !!medication.id;
 
   return (
-    <div className="grid grid-cols-1 lg:grid-cols-[300px,180px,170px,250px,260px,190px,200px,48px] border-b hover:bg-gray-50/50 gap-2 lg:gap-0">
-      {/* Medicine Name */}
-      <div className="lg:px-2 lg:py-1 flex items-center justify-between lg:justify-start lg:col-span-1 lg:border-r font-medium overflow-hidden text-sm">
-        <span className="break-words line-clamp-2 hidden lg:block">
-          {medication.medication?.display}
-        </span>
+    <div
+      className={cn(
+        "grid grid-cols-1 lg:grid-cols-[300px,180px,170px,250px,260px,190px,200px,48px] border-b hover:bg-gray-50/50",
+        {
+          "opacity-40 pointer-events-none":
+            medication.status === "entered_in_error",
+        },
+      )}
+    >
+      <div className="lg:p-4 lg:px-2 lg:py-1 flex items-center justify-between lg:justify-start lg:col-span-1 lg:border-r font-medium overflow-hidden text-sm">
+        <h4 className="text-base font-semibold break-words line-clamp-2 hidden lg:block">
+          {index + 1}. {medication.medication?.display}
+        </h4>
       </div>
 
       {/* Source */}
@@ -339,7 +406,7 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
           onValueChange={(value: MedicationStatementInformationSourceType) =>
             onUpdate?.({ information_source: value })
           }
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
         >
           <SelectTrigger className="h-9 text-sm capitalize">
             <SelectValue />
@@ -410,7 +477,7 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
           value={medication.dosage_text || ""}
           onChange={(e) => onUpdate?.({ dosage_text: e.target.value })}
           placeholder={t("enter_dosage_instructions")}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           className="h-9 text-sm"
         />
       </div>
@@ -448,7 +515,7 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
           placeholder={t("reason_for_medication")}
           value={medication.reason || ""}
           onChange={(e) => onUpdate?.({ reason: e.target.value })}
-          disabled={disabled}
+          disabled={disabled || isReadOnly}
           className="h-9 text-sm"
         />
       </div>
@@ -479,8 +546,8 @@ const MedicationStatementGridRow: React.FC<MedicationStatementGridRowProps> = ({
               values: [],
               note: medication.note,
             }}
-            updateQuestionnaireResponseCB={(response) => {
-              onUpdate?.({ note: response.note });
+            handleUpdateNote={(note) => {
+              onUpdate?.({ note: note });
             }}
             disabled={disabled}
           />
diff --git a/src/components/Questionnaire/QuestionTypes/NotesInput.tsx b/src/components/Questionnaire/QuestionTypes/NotesInput.tsx
index e6ec41120c0..5cbec9d3a5a 100644
--- a/src/components/Questionnaire/QuestionTypes/NotesInput.tsx
+++ b/src/components/Questionnaire/QuestionTypes/NotesInput.tsx
@@ -14,14 +14,14 @@ import type { QuestionnaireResponse } from "@/types/questionnaire/form";
 
 interface NotesInputProps {
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  handleUpdateNote: (note: string) => void;
   disabled?: boolean;
   className?: string;
 }
 
 export function NotesInput({
   questionnaireResponse,
-  updateQuestionnaireResponseCB,
+  handleUpdateNote,
   disabled,
   className,
 }: NotesInputProps) {
@@ -50,12 +50,7 @@ export function NotesInput({
         <PopoverContent className="bg-yellow-100 border border-yellow-200 text-gray-900 shadow-lg p-2">
           <Textarea
             value={notes}
-            onChange={(e) =>
-              updateQuestionnaireResponseCB({
-                ...questionnaireResponse,
-                note: e.target.value,
-              })
-            }
+            onChange={(e) => handleUpdateNote(e.target.value)}
             className=" border-yellow-200 focus-visible:border-yellow-300 focus-visible:ring-yellow-300"
             placeholder="Add notes..."
             disabled={disabled}
diff --git a/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx b/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx
index 4d890da2732..7e7b19a7a18 100644
--- a/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/NumberQuestion.tsx
@@ -1,12 +1,19 @@
 import { Input } from "@/components/ui/input";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 
 interface NumberQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -21,15 +28,16 @@ export function NumberQuestion({
     const numericValue =
       question.type === "decimal" ? parseFloat(value) : parseInt(value);
 
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "number",
           value: emptyValue ? undefined : numericValue,
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx b/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx
index f615964eeec..aeb8704b699 100644
--- a/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx
+++ b/src/components/Questionnaire/QuestionTypes/QuestionGroup.tsx
@@ -5,7 +5,10 @@ import { cn } from "@/lib/utils";
 import { QuestionLabel } from "@/components/Questionnaire/QuestionLabel";
 
 import { QuestionValidationError } from "@/types/questionnaire/batch";
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { EnableWhen, Question } from "@/types/questionnaire/question";
 
 import { QuestionInput } from "./QuestionInput";
@@ -14,7 +17,11 @@ interface QuestionGroupProps {
   question: Question;
   encounterId?: string;
   questionnaireResponses: QuestionnaireResponse[];
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   errors: QuestionValidationError[];
   clearError: (questionId: string) => void;
   disabled?: boolean;
diff --git a/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx b/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
index 87c913dbee7..b5e99f8da6c 100644
--- a/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
+++ b/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
@@ -32,7 +32,9 @@ interface QuestionInputProps {
   questionnaireResponses: QuestionnaireResponse[];
   encounterId?: string;
   updateQuestionnaireResponseCB: (
-    questionnaireResponse: QuestionnaireResponse,
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
   ) => void;
   errors: QuestionValidationError[];
   clearError: () => void;
@@ -61,20 +63,21 @@ export function QuestionInput({
   }
 
   const handleAddValue = () => {
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [...questionnaireResponse.values, { type: "string", value: "" }],
-    });
+    updateQuestionnaireResponseCB(
+      [...questionnaireResponse.values, { type: "string", value: "" }],
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   const removeValue = (index: number) => {
     const updatedValues = questionnaireResponse.values.filter(
       (_, i) => i !== index,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: updatedValues,
-    });
+    updateQuestionnaireResponseCB(
+      updatedValues,
+      questionnaireResponse.question_id,
+    );
   };
 
   const renderSingleInput = (index: number = 0) => {
@@ -193,9 +196,13 @@ export function QuestionInput({
                         "mt-2": question.type === "text",
                       })}
                       questionnaireResponse={questionnaireResponse}
-                      updateQuestionnaireResponseCB={
-                        updateQuestionnaireResponseCB
-                      }
+                      handleUpdateNote={(note) => {
+                        updateQuestionnaireResponseCB(
+                          [...questionnaireResponse.values],
+                          questionnaireResponse.question_id,
+                          note,
+                        );
+                      }}
                       disabled={disabled}
                     />
                   )}
@@ -219,7 +226,13 @@ export function QuestionInput({
             </Button>
             <NotesInput
               questionnaireResponse={questionnaireResponse}
-              updateQuestionnaireResponseCB={updateQuestionnaireResponseCB}
+              handleUpdateNote={(note) => {
+                updateQuestionnaireResponseCB(
+                  [...questionnaireResponse.values],
+                  questionnaireResponse.question_id,
+                  note,
+                );
+              }}
               disabled={disabled}
             />
           </div>
diff --git a/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx b/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx
index bf0b7e98e8a..94eba927251 100644
--- a/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/SymptomQuestion.tsx
@@ -5,7 +5,12 @@ import {
   MinusCircledIcon,
   Pencil2Icon,
 } from "@radix-ui/react-icons";
-import React, { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { format } from "date-fns";
+import { t } from "i18next";
+import React, { useCallback, useEffect, useState } from "react";
+
+import { cn } from "@/lib/utils";
 
 import { Button } from "@/components/ui/button";
 import {
@@ -16,7 +21,6 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
 import {
   Select,
   SelectContent,
@@ -27,18 +31,28 @@ import {
 
 import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect";
 
+import query from "@/Utils/request/query";
 import {
   SYMPTOM_CLINICAL_STATUS,
   SYMPTOM_SEVERITY,
   Symptom,
   SymptomRequest,
 } from "@/types/emr/symptom/symptom";
+import symptomApi from "@/types/emr/symptom/symptomApi";
 import { Code } from "@/types/questionnaire/code";
-import { QuestionnaireResponse } from "@/types/questionnaire/form";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 
 interface SymptomQuestionProps {
+  patientId: string;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
 }
 
@@ -50,62 +64,318 @@ const SYMPTOM_INITIAL_VALUE: Omit<SymptomRequest, "encounter"> = {
   onset: { onset_datetime: new Date().toISOString().split("T")[0] },
 };
 
+function convertToSymptomRequest(symptom: Symptom): SymptomRequest {
+  return {
+    id: symptom.id,
+    code: symptom.code,
+    clinical_status: symptom.clinical_status,
+    verification_status: symptom.verification_status,
+    severity: symptom.severity,
+    onset: symptom.onset
+      ? {
+          ...symptom.onset,
+          onset_datetime: symptom.onset.onset_datetime
+            ? format(new Date(symptom.onset.onset_datetime), "yyyy-MM-dd")
+            : "",
+        }
+      : undefined,
+    recorded_date: symptom.recorded_date,
+    note: symptom.note,
+    encounter: "", // This will be set when submitting the form
+  };
+}
+
+interface SymptomRowProps {
+  symptom: SymptomRequest;
+  index: number;
+  disabled?: boolean;
+  onUpdate: (index: number, updates: Partial<SymptomRequest>) => void;
+  onRemove: (index: number) => void;
+}
+
+function SymptomActionsMenu({
+  showNotes,
+  verificationStatus,
+  disabled,
+  onToggleNotes,
+  onRemove,
+}: {
+  showNotes: boolean;
+  verificationStatus: string;
+  disabled?: boolean;
+  onToggleNotes: () => void;
+  onRemove: () => void;
+}) {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button
+          variant="ghost"
+          size="icon"
+          disabled={disabled}
+          className="h-8 w-8"
+        >
+          <DotsVerticalIcon className="h-4 w-4" />
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end">
+        <DropdownMenuItem onClick={onToggleNotes}>
+          <Pencil2Icon className="h-4 w-4 mr-2" />
+          {showNotes ? t("hide_notes") : t("add_notes")}
+        </DropdownMenuItem>
+        <DropdownMenuSeparator />
+        <DropdownMenuItem
+          className="text-destructive focus:text-destructive"
+          onClick={onRemove}
+          disabled={verificationStatus === "entered_in_error"}
+        >
+          <MinusCircledIcon className="h-4 w-4 mr-2" />
+          {verificationStatus === "entered_in_error"
+            ? t("already_marked_as_error")
+            : t("remove_symptom")}
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+const SymptomRow = React.memo(function SymptomRow({
+  symptom,
+  index,
+  disabled,
+  onUpdate,
+  onRemove,
+}: SymptomRowProps) {
+  const [showNotes, setShowNotes] = useState(Boolean(symptom.note));
+
+  const handleDateChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) =>
+      onUpdate(index, {
+        onset: { onset_datetime: e.target.value },
+      }),
+    [index, onUpdate],
+  );
+
+  const handleStatusChange = useCallback(
+    (value: string) =>
+      onUpdate(index, {
+        clinical_status: value as SymptomRequest["clinical_status"],
+      }),
+    [index, onUpdate],
+  );
+
+  const handleSeverityChange = useCallback(
+    (value: string) =>
+      onUpdate(index, {
+        severity: value as SymptomRequest["severity"],
+      }),
+    [index, onUpdate],
+  );
+
+  const handleNotesChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) =>
+      onUpdate(index, { note: e.target.value }),
+    [index, onUpdate],
+  );
+
+  const handleRemove = useCallback(() => onRemove(index), [index, onRemove]);
+  const handleToggleNotes = useCallback(() => setShowNotes((n) => !n), []);
+
+  return (
+    <div
+      className={cn("group hover:bg-gray-50", {
+        "opacity-40 pointer-events-none":
+          symptom.verification_status === "entered_in_error",
+      })}
+    >
+      <div className="py-1 px-2 space-y-2 md:space-y-0 md:grid md:grid-cols-12 md:items-center md:gap-4">
+        <div className="flex items-center justify-between md:col-span-5">
+          <div
+            className="font-medium text-sm truncate"
+            title={symptom.code.display}
+          >
+            {symptom.code.display}
+          </div>
+        </div>
+        <div className="col-span-2">
+          <div className="block text-sm font-medium text-gray-500 mb-1 md:hidden">
+            {t("date")}
+          </div>
+          <Input
+            type="date"
+            value={symptom.onset?.onset_datetime || ""}
+            onChange={handleDateChange}
+            disabled={disabled || !!symptom.id}
+            className="h-8 md:h-9"
+          />
+        </div>
+        <div className="col-span-2">
+          <div className="block text-sm font-medium text-gray-500 mb-1 md:hidden">
+            {t("status")}
+          </div>
+          <Select
+            value={symptom.clinical_status}
+            onValueChange={handleStatusChange}
+            disabled={disabled}
+          >
+            <SelectTrigger className="h-8 md:h-9">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {SYMPTOM_CLINICAL_STATUS.map((status) => (
+                <SelectItem key={status} value={status}>
+                  {t(status)}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="col-span-2">
+          <div className="block text-sm font-medium text-gray-500 mb-1 md:hidden">
+            {t("severity")}
+          </div>
+          <Select
+            value={symptom.severity}
+            onValueChange={handleSeverityChange}
+            disabled={disabled}
+          >
+            <SelectTrigger className="h-8 md:h-9">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {SYMPTOM_SEVERITY.map((severity) => (
+                <SelectItem key={severity} value={severity}>
+                  {t(severity)}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="col-span-1 flex justify-center">
+          <SymptomActionsMenu
+            showNotes={showNotes}
+            verificationStatus={symptom.verification_status}
+            disabled={disabled}
+            onToggleNotes={handleToggleNotes}
+            onRemove={handleRemove}
+          />
+        </div>
+      </div>
+      {showNotes && (
+        <div className="px-3 pb-3">
+          <Input
+            type="text"
+            placeholder={t("add_notes_about_symptom")}
+            value={symptom.note || ""}
+            onChange={handleNotesChange}
+            disabled={disabled}
+          />
+        </div>
+      )}
+    </div>
+  );
+});
+
 export function SymptomQuestion({
+  patientId,
   questionnaireResponse,
   updateQuestionnaireResponseCB,
   disabled,
 }: SymptomQuestionProps) {
   const symptoms =
-    (questionnaireResponse.values?.[0]?.value as Symptom[]) || [];
+    (questionnaireResponse.values?.[0]?.value as SymptomRequest[]) || [];
+
+  const { data: patientSymptoms } = useQuery({
+    queryKey: ["symptoms", patientId],
+    queryFn: query(symptomApi.listSymptoms, {
+      pathParams: { patientId },
+      queryParams: {
+        limit: 100,
+      },
+    }),
+  });
+
+  useEffect(() => {
+    if (patientSymptoms?.results) {
+      updateQuestionnaireResponseCB(
+        [
+          {
+            type: "symptom",
+            value: patientSymptoms.results.map(convertToSymptomRequest),
+          },
+        ],
+        questionnaireResponse.question_id,
+      );
+    }
+  }, [patientSymptoms]);
 
   const handleAddSymptom = (code: Code) => {
     const newSymptoms = [
       ...symptoms,
       { ...SYMPTOM_INITIAL_VALUE, code },
-    ] as Symptom[];
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "symptom", value: newSymptoms }],
-    });
+    ] as SymptomRequest[];
+    updateQuestionnaireResponseCB(
+      [{ type: "symptom", value: newSymptoms }],
+      questionnaireResponse.question_id,
+    );
   };
 
   const handleRemoveSymptom = (index: number) => {
-    const newSymptoms = symptoms.filter((_, i) => i !== index);
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "symptom", value: newSymptoms }],
-    });
+    const symptom = symptoms[index];
+    if (symptom.id) {
+      // For existing records, update verification status to entered_in_error
+      const newSymptoms = symptoms.map((s, i) =>
+        i === index
+          ? { ...s, verification_status: "entered_in_error" as const }
+          : s,
+      );
+      updateQuestionnaireResponseCB(
+        [{ type: "symptom", value: newSymptoms }],
+        questionnaireResponse.question_id,
+      );
+    } else {
+      // For new records, remove them completely
+      const newSymptoms = symptoms.filter((_, i) => i !== index);
+      updateQuestionnaireResponseCB(
+        [{ type: "symptom", value: newSymptoms }],
+        questionnaireResponse.question_id,
+      );
+    }
   };
 
-  const handleUpdateSymptom = (index: number, updates: Partial<Symptom>) => {
+  const handleUpdateSymptom = (
+    index: number,
+    updates: Partial<SymptomRequest>,
+  ) => {
     const newSymptoms = symptoms.map((symptom, i) =>
       i === index ? { ...symptom, ...updates } : symptom,
     );
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [{ type: "symptom", value: newSymptoms }],
-    });
+    updateQuestionnaireResponseCB(
+      [{ type: "symptom", value: newSymptoms }],
+      questionnaireResponse.question_id,
+    );
   };
 
   return (
-    <>
+    <div className="space-y-2">
       {symptoms.length > 0 && (
         <div className="rounded-lg border">
           <div className="hidden md:grid md:grid-cols-12 items-center gap-4 p-3 bg-gray-50 text-sm font-medium text-gray-500">
-            <div className="col-span-5">Symptom</div>
-            <div className="col-span-2 text-center">Date</div>
-            <div className="col-span-2 text-center">Status</div>
-            <div className="col-span-2 text-center">Severity</div>
-            <div className="col-span-1 text-center">Action</div>
+            <div className="col-span-5">{t("symptom")}</div>
+            <div className="col-span-2 text-center">{t("date")}</div>
+            <div className="col-span-2 text-center">{t("status")}</div>
+            <div className="col-span-2 text-center">{t("severity")}</div>
+            <div className="col-span-1 text-center">{t("action")}</div>
           </div>
           <div className="divide-y divide-gray-200">
             {symptoms.map((symptom, index) => (
-              <SymptomItem
+              <SymptomRow
                 key={index}
                 symptom={symptom}
+                index={index}
                 disabled={disabled}
-                onUpdate={(updates) => handleUpdateSymptom(index, updates)}
-                onRemove={() => handleRemoveSymptom(index)}
+                onUpdate={handleUpdateSymptom}
+                onRemove={handleRemoveSymptom}
               />
             ))}
           </div>
@@ -113,176 +383,10 @@ export function SymptomQuestion({
       )}
       <ValueSetSelect
         system="system-condition-code"
-        placeholder="Search for symptoms to add"
+        placeholder={t("search_for_symptoms_to_add")}
         onSelect={handleAddSymptom}
         disabled={disabled}
       />
-    </>
-  );
-}
-
-interface SymptomItemProps {
-  symptom: Symptom;
-  disabled?: boolean;
-  onUpdate?: (symptom: Partial<Symptom>) => void;
-  onRemove?: () => void;
-}
-
-const SymptomItem: React.FC<SymptomItemProps> = ({
-  symptom,
-  disabled,
-  onUpdate,
-  onRemove,
-}) => {
-  const [showNotes, setShowNotes] = useState(false);
-
-  return (
-    <div className="group hover:bg-gray-50">
-      <div className="py-1 px-2 space-y-2 md:space-y-0 md:grid md:grid-cols-12 md:items-center md:gap-4">
-        <div className="flex items-center justify-between md:col-span-5">
-          <div
-            className="font-medium text-sm truncate"
-            title={symptom.code.display}
-          >
-            {symptom.code.display}
-          </div>
-          <div className="md:hidden">
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  disabled={disabled}
-                  className="h-8 w-8"
-                >
-                  <DotsVerticalIcon className="h-4 w-4" />
-                </Button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={() => setShowNotes(!showNotes)}>
-                  <Pencil2Icon className="h-4 w-4 mr-2" />
-                  {showNotes ? "Hide Notes" : "Add Notes"}
-                </DropdownMenuItem>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem
-                  className="text-destructive focus:text-destructive"
-                  onClick={onRemove}
-                >
-                  <MinusCircledIcon className="h-4 w-4 mr-2" />
-                  Remove Symptom
-                </DropdownMenuItem>
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </div>
-        </div>
-        <div className="grid grid-cols-2 gap-2 md:col-span-6 md:grid-cols-3 md:gap-4">
-          <div className="col-span-2 md:col-span-1">
-            <Label className="text-xs text-gray-500 md:hidden">Date</Label>
-            <Input
-              type="date"
-              value={symptom.onset?.onset_datetime || ""}
-              onChange={(e) =>
-                onUpdate?.({
-                  onset: { onset_datetime: e.target.value },
-                })
-              }
-              disabled={disabled}
-              className="h-8 md:h-9"
-            />
-          </div>
-          <div>
-            <Label className="text-xs text-gray-500 md:hidden">Status</Label>
-            <Select
-              value={symptom.clinical_status}
-              onValueChange={(value) =>
-                onUpdate?.({
-                  clinical_status: value as Symptom["clinical_status"],
-                })
-              }
-              disabled={disabled}
-            >
-              <SelectTrigger className="h-8 md:h-9">
-                <SelectValue placeholder="Status" />
-              </SelectTrigger>
-              <SelectContent>
-                {SYMPTOM_CLINICAL_STATUS.map((status) => (
-                  <SelectItem
-                    key={status}
-                    value={status}
-                    className="capitalize"
-                  >
-                    {status.replace(/_/g, " ")}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          <div>
-            <Label className="text-xs text-gray-500 md:hidden">Severity</Label>
-            <Select
-              value={symptom.severity}
-              onValueChange={(value) =>
-                onUpdate?.({ severity: value as Symptom["severity"] })
-              }
-              disabled={disabled}
-            >
-              <SelectTrigger className="h-8 md:h-9">
-                <SelectValue placeholder="Severity" />
-              </SelectTrigger>
-              <SelectContent>
-                {SYMPTOM_SEVERITY.map((severity) => (
-                  <SelectItem
-                    key={severity}
-                    value={severity}
-                    className="capitalize"
-                  >
-                    {severity}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-        </div>
-        <div className="hidden md:block md:col-span-1/2">
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                disabled={disabled}
-                className="h-9 w-9"
-              >
-                <DotsVerticalIcon className="h-4 w-4" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-              <DropdownMenuItem onClick={() => setShowNotes(!showNotes)}>
-                <Pencil2Icon className="h-4 w-4 mr-2" />
-                {showNotes ? "Hide Notes" : "Add Notes"}
-              </DropdownMenuItem>
-              <DropdownMenuSeparator />
-              <DropdownMenuItem
-                className="text-destructive focus:text-destructive"
-                onClick={onRemove}
-              >
-                <MinusCircledIcon className="h-4 w-4 mr-2" />
-                Remove Symptom
-              </DropdownMenuItem>
-            </DropdownMenuContent>
-          </DropdownMenu>
-        </div>
-      </div>
-      {showNotes && (
-        <div className="px-3 pb-3">
-          <Input
-            type="text"
-            placeholder="Add notes about the symptom..."
-            value={symptom.note || ""}
-            onChange={(e) => onUpdate?.({ note: e.target.value })}
-            disabled={disabled}
-          />
-        </div>
-      )}
     </div>
   );
-};
+}
diff --git a/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx b/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx
index fabd509328a..7f39b457b54 100644
--- a/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/TextQuestion.tsx
@@ -1,13 +1,20 @@
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 
 interface TextQuestionProps {
   question: Question;
   questionnaireResponse: QuestionnaireResponse;
-  updateQuestionnaireResponseCB: (response: QuestionnaireResponse) => void;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
   disabled?: boolean;
   clearError: () => void;
 }
@@ -21,15 +28,16 @@ export function TextQuestion({
 }: TextQuestionProps) {
   const handleChange = (value: string) => {
     clearError();
-    updateQuestionnaireResponseCB({
-      ...questionnaireResponse,
-      values: [
+    updateQuestionnaireResponseCB(
+      [
         {
           type: "string",
           value,
         },
       ],
-    });
+      questionnaireResponse.question_id,
+      questionnaireResponse.note,
+    );
   };
 
   return (
diff --git a/src/components/Questionnaire/QuestionnaireForm.tsx b/src/components/Questionnaire/QuestionnaireForm.tsx
index 19b7f2a6770..f7b7ac2770a 100644
--- a/src/components/Questionnaire/QuestionnaireForm.tsx
+++ b/src/components/Questionnaire/QuestionnaireForm.tsx
@@ -1,4 +1,4 @@
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { t } from "i18next";
 import { useNavigationPrompt } from "raviger";
 import { useEffect, useState } from "react";
@@ -22,7 +22,10 @@ import {
   QuestionValidationError,
   ValidationErrorResponse,
 } from "@/types/questionnaire/batch";
-import type { QuestionnaireResponse } from "@/types/questionnaire/form";
+import type {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
 import type { Question } from "@/types/questionnaire/question";
 import { QuestionnaireDetail } from "@/types/questionnaire/questionnaire";
 import questionnaireApi from "@/types/questionnaire/questionnaireApi";
@@ -64,11 +67,13 @@ export function QuestionnaireForm({
   onCancel,
   facilityId,
 }: QuestionnaireFormProps) {
+  const queryClient = useQueryClient();
   const [isDirty, setIsDirty] = useState(false);
   const [questionnaireForms, setQuestionnaireForms] = useState<
     QuestionnaireFormState[]
   >([]);
   const [activeQuestionnaireId, setActiveQuestionnaireId] = useState<string>();
+
   const [activeGroupId, setActiveGroupId] = useState<string>();
   const [isInitialized, setIsInitialized] = useState(false);
 
@@ -87,6 +92,15 @@ export function QuestionnaireForm({
   const { mutate: submitBatch, isPending } = useMutation({
     mutationFn: mutate(routes.batchRequest, { silent: true }),
     onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["allergies", patientId] });
+      queryClient.invalidateQueries({ queryKey: ["symptoms", patientId] });
+      queryClient.invalidateQueries({ queryKey: ["diagnoses", patientId] });
+      queryClient.invalidateQueries({
+        queryKey: ["medication_statements", patientId],
+      });
+      queryClient.invalidateQueries({
+        queryKey: ["medication_requests", patientId],
+      });
       toast.success(t("questionnaire_submitted_successfully"));
       onSubmit?.();
     },
@@ -101,7 +115,7 @@ export function QuestionnaireForm({
 
   // TODO: Use useBlocker hook after switching to tanstack router
   // https://tanstack.com/router/latest/docs/framework/react/guide/navigation-blocking#how-do-i-use-navigation-blocking
-  useNavigationPrompt(isDirty, t("unsaved_changes"));
+  useNavigationPrompt(isDirty && !import.meta.env.DEV, t("unsaved_changes"));
 
   useEffect(() => {
     if (!isInitialized && questionnaireSlug) {
@@ -403,11 +417,23 @@ export function QuestionnaireForm({
               encounterId={encounterId}
               questions={form.questionnaire.questions}
               responses={form.responses}
-              onResponseChange={(responses) => {
+              onResponseChange={(
+                values: ResponseValue[],
+                questionId: string,
+                note?: string,
+              ) => {
                 setQuestionnaireForms((existingForms) =>
                   existingForms.map((formItem) =>
                     formItem.questionnaire.id === form.questionnaire.id
-                      ? { ...formItem, responses, errors: [] }
+                      ? {
+                          ...formItem,
+                          responses: formItem.responses.map((r) =>
+                            r.question_id === questionId
+                              ? { ...r, values, note: note }
+                              : r,
+                          ),
+                          errors: [],
+                        }
                       : formItem,
                   ),
                 );
diff --git a/src/components/Questionnaire/data/StructuredFormData.tsx b/src/components/Questionnaire/data/StructuredFormData.tsx
index 7a5aca3c248..918d2a1561f 100644
--- a/src/components/Questionnaire/data/StructuredFormData.tsx
+++ b/src/components/Questionnaire/data/StructuredFormData.tsx
@@ -40,7 +40,91 @@ const medication_request_questionnaire: QuestionnaireDetail = {
   tags: [],
 };
 
+const allergy_intolerance_questionnaire: QuestionnaireDetail = {
+  id: "allergy_intolerance",
+  slug: "allergy_intolerance",
+  version: "0.0.1",
+  title: "Allergy Intolerance",
+  status: "active",
+  subject_type: "patient",
+  questions: [
+    {
+      id: "allergy_intolerance",
+      text: "Allergy Intolerance",
+      type: "structured",
+      structured_type: "allergy_intolerance",
+      link_id: "1.1",
+      required: true,
+    },
+  ],
+  tags: [],
+};
+
+const medication_statement_questionnaire: QuestionnaireDetail = {
+  id: "medication_statement",
+  slug: "medication_statement",
+  version: "0.0.1",
+  title: "Medication Statement",
+  status: "active",
+  subject_type: "patient",
+  questions: [
+    {
+      id: "medication_statement",
+      text: "Medication Statement",
+      type: "structured",
+      structured_type: "medication_statement",
+      link_id: "1.1",
+      required: true,
+    },
+  ],
+  tags: [],
+};
+
+const diagnosis_questionnaire: QuestionnaireDetail = {
+  id: "diagnosis",
+  slug: "diagnosis",
+  version: "0.0.1",
+  title: "Diagnosis",
+  status: "active",
+  subject_type: "patient",
+  questions: [
+    {
+      id: "diagnosis",
+      text: "Diagnosis",
+      type: "structured",
+      structured_type: "diagnosis",
+      link_id: "1.1",
+      required: true,
+    },
+  ],
+  tags: [],
+};
+
+const symptom_questionnaire: QuestionnaireDetail = {
+  id: "symptom",
+  slug: "symptom",
+  version: "0.0.1",
+  title: "Symptom",
+  status: "active",
+  subject_type: "patient",
+  questions: [
+    {
+      id: "symptom",
+      text: "Symptom",
+      type: "structured",
+      structured_type: "symptom",
+      link_id: "1.1",
+      required: true,
+    },
+  ],
+  tags: [],
+};
+
 export const FIXED_QUESTIONNAIRES: Record<string, QuestionnaireDetail> = {
   encounter: encounterQuestionnaire,
   medication_request: medication_request_questionnaire,
+  allergy_intolerance: allergy_intolerance_questionnaire,
+  medication_statement: medication_statement_questionnaire,
+  diagnosis: diagnosis_questionnaire,
+  symptom: symptom_questionnaire,
 };
diff --git a/src/components/Questionnaire/structured/handlers.ts b/src/components/Questionnaire/structured/handlers.ts
index 8e5fdba0078..86fd15d4e96 100644
--- a/src/components/Questionnaire/structured/handlers.ts
+++ b/src/components/Questionnaire/structured/handlers.ts
@@ -80,47 +80,38 @@ const handlers: {
     },
   },
   symptom: {
-    getRequests: (symptoms, { patientId, encounterId }) =>
-      symptoms.map((symptom) => {
-        const body: RequestTypeFor<"symptom"> = {
-          clinical_status: symptom.clinical_status,
-          verification_status: symptom.verification_status,
-          code: symptom.code,
-          severity: symptom.severity,
-          onset: symptom.onset,
-          recorded_date: symptom.recorded_date,
-          note: symptom.note,
-          encounter: encounterId,
-        };
-
-        return {
-          url: `/api/v1/patient/${patientId}/symptom/`,
+    getRequests: (symptoms, { patientId, encounterId }) => {
+      return [
+        {
+          url: `/api/v1/patient/${patientId}/symptom/upsert/`,
           method: "POST",
-          body,
+          body: {
+            datapoints: symptoms.map((symptom) => ({
+              ...symptom,
+              encounter: encounterId,
+            })),
+          },
           reference_id: "symptom",
-        };
-      }),
+        },
+      ];
+    },
   },
   diagnosis: {
-    getRequests: (diagnoses, { patientId, encounterId }) =>
-      diagnoses.map((diagnosis) => {
-        const body: RequestTypeFor<"diagnosis"> = {
-          clinical_status: diagnosis.clinical_status,
-          verification_status: diagnosis.verification_status,
-          code: diagnosis.code,
-          onset: diagnosis.onset,
-          recorded_date: diagnosis.recorded_date,
-          note: diagnosis.note,
-          encounter: encounterId,
-        };
-
-        return {
-          url: `/api/v1/patient/${patientId}/diagnosis/`,
+    getRequests: (diagnoses, { patientId, encounterId }) => {
+      return [
+        {
+          url: `/api/v1/patient/${patientId}/diagnosis/upsert/`,
           method: "POST",
-          body,
+          body: {
+            datapoints: diagnoses.map((diagnosis) => ({
+              ...diagnosis,
+              encounter: encounterId,
+            })),
+          },
           reference_id: "diagnosis",
-        };
-      }),
+        },
+      ];
+    },
   },
   encounter: {
     getRequests: (encounters, { patientId, encounterId }) => {
diff --git a/src/components/Questionnaire/structured/types.ts b/src/components/Questionnaire/structured/types.ts
index d1a6c10ee8a..457afc1af45 100644
--- a/src/components/Questionnaire/structured/types.ts
+++ b/src/components/Questionnaire/structured/types.ts
@@ -1,9 +1,9 @@
 import { AllergyIntoleranceRequest } from "@/types/emr/allergyIntolerance/allergyIntolerance";
-import { Diagnosis, DiagnosisRequest } from "@/types/emr/diagnosis/diagnosis";
+import { DiagnosisRequest } from "@/types/emr/diagnosis/diagnosis";
 import { Encounter, EncounterEditRequest } from "@/types/emr/encounter";
 import { MedicationRequest } from "@/types/emr/medicationRequest";
 import { MedicationStatementRequest } from "@/types/emr/medicationStatement";
-import { Symptom, SymptomRequest } from "@/types/emr/symptom/symptom";
+import { SymptomRequest } from "@/types/emr/symptom/symptom";
 import { StructuredQuestionType } from "@/types/questionnaire/question";
 import {
   AppointmentCreateRequest,
@@ -14,9 +14,9 @@ import {
 export interface StructuredDataMap {
   allergy_intolerance: AllergyIntoleranceRequest;
   medication_request: MedicationRequest;
+  symptom: SymptomRequest;
+  diagnosis: DiagnosisRequest;
   medication_statement: MedicationStatementRequest;
-  symptom: Symptom;
-  diagnosis: Diagnosis;
   encounter: Encounter;
   appointment: CreateAppointmentQuestion;
 }
@@ -25,9 +25,9 @@ export interface StructuredDataMap {
 export interface StructuredRequestMap {
   allergy_intolerance: { datapoints: AllergyIntoleranceRequest[] };
   medication_request: { datapoints: MedicationRequest[] };
+  symptom: { datapoints: SymptomRequest[] };
+  diagnosis: { datapoints: DiagnosisRequest[] };
   medication_statement: { datapoints: MedicationStatementRequest[] };
-  symptom: SymptomRequest;
-  diagnosis: DiagnosisRequest;
   encounter: EncounterEditRequest;
   appointment: AppointmentCreateRequest;
 }
diff --git a/src/components/ui/date-time-picker.tsx b/src/components/ui/date-time-picker.tsx
index e4874613c3c..26c93552596 100644
--- a/src/components/ui/date-time-picker.tsx
+++ b/src/components/ui/date-time-picker.tsx
@@ -73,9 +73,9 @@ export function DateTimePicker({
         >
           <CalendarIcon className="mr-2 h-4 w-4" />
           {value ? (
-            format(value, "MM/dd/yyyy hh:mm aa")
+            format(value, "dd/MM/yyyy hh:mm aa")
           ) : (
-            <span>MM/DD/YYYY hh:mm aa</span>
+            <span>DD/MM/YYYY hh:mm aa</span>
           )}
         </Button>
       </PopoverTrigger>
diff --git a/src/pages/Encounters/EncounterShow.tsx b/src/pages/Encounters/EncounterShow.tsx
index f68c01a6725..5776ed85fe8 100644
--- a/src/pages/Encounters/EncounterShow.tsx
+++ b/src/pages/Encounters/EncounterShow.tsx
@@ -6,7 +6,6 @@ import Loading from "@/components/Common/Loading";
 import PageHeadTitle from "@/components/Common/PageHeadTitle";
 import PageTitle from "@/components/Common/PageTitle";
 import ErrorPage from "@/components/ErrorPages/DefaultErrorPage";
-import { EncounterProvider } from "@/components/Facility/ConsultationDetails/EncounterContext";
 import PatientInfoCard from "@/components/Patient/PatientInfoCard";
 
 import { useCareAppConsultationTabs } from "@/hooks/useCareApps";
@@ -177,12 +176,7 @@ export const EncounterShow = (props: Props) => {
     }`;
 
   return (
-    <EncounterProvider
-      initialContext={{
-        encounter: encounterData,
-        patient: encounterData.patient,
-      }}
-    >
+    <div>
       <nav className="relative flex flex-wrap items-start justify-between">
         <PageTitle
           title={t("encounter")}
@@ -288,6 +282,6 @@ export const EncounterShow = (props: Props) => {
           <SelectedTab {...encounterTabProps} />
         </div>
       </div>
-    </EncounterProvider>
+    </div>
   );
 };
diff --git a/src/pages/Encounters/PrintPrescription.tsx b/src/pages/Encounters/PrintPrescription.tsx
index 7ea1057101b..6341474223f 100644
--- a/src/pages/Encounters/PrintPrescription.tsx
+++ b/src/pages/Encounters/PrintPrescription.tsx
@@ -12,6 +12,7 @@ import query from "@/Utils/request/query";
 import { formatPatientAge } from "@/Utils/utils";
 import { Encounter } from "@/types/emr/encounter";
 import { MedicationRequestRead } from "@/types/emr/medicationRequest";
+import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
 
 export const PrintPrescription = (props: {
   facilityId: string;
@@ -29,8 +30,8 @@ export const PrintPrescription = (props: {
   });
 
   const { data: medications } = useQuery({
-    queryKey: ["medications", encounter?.patient?.id],
-    queryFn: query(api.medicationRequest.list, {
+    queryKey: ["medication_requests", encounter?.patient?.id],
+    queryFn: query(medicationRequestApi.list, {
       pathParams: { patientId: encounter?.patient?.id || "" },
       queryParams: { encounter: encounterId, limit: 50, offset: 0 },
     }),
diff --git a/src/pages/Encounters/tabs/EncounterMedicinesTab.tsx b/src/pages/Encounters/tabs/EncounterMedicinesTab.tsx
index a7b8202cb1e..6d5ce4c0606 100644
--- a/src/pages/Encounters/tabs/EncounterMedicinesTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterMedicinesTab.tsx
@@ -1,11 +1,15 @@
-import MedicineAdministrationSheet from "@/components/Medicine/MedicineAdministrationSheet";
+import MedicationRequestTable from "@/components/Medicine/MedicationRequestTable";
 
 import { EncounterTabProps } from "@/pages/Encounters/EncounterShow";
 
 export const EncounterMedicinesTab = (props: EncounterTabProps) => {
   return (
     <div className="flex flex-col gap-16">
-      <MedicineAdministrationSheet facilityId={props.facilityId} />
+      <MedicationRequestTable
+        facilityId={props.facilityId}
+        patientId={props.patient.id}
+        encounterId={props.encounter.id}
+      />
     </div>
   );
 };
diff --git a/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx b/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx
index 72de24a181b..d3ace63e672 100644
--- a/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx
@@ -7,6 +7,7 @@ import { SymptomsList } from "@/components/Patient/symptoms/list";
 import { EncounterTabProps } from "@/pages/Encounters/EncounterShow";
 
 export const EncounterUpdatesTab = ({
+  facilityId,
   encounter,
   patient,
 }: EncounterTabProps) => {
@@ -18,17 +19,29 @@ export const EncounterUpdatesTab = ({
         <div className="flex-1 space-y-4">
           {/* Allergies Section */}
           <div>
-            <AllergyList patientId={patient.id} encounterId={encounter.id} />
+            <AllergyList
+              facilityId={facilityId}
+              patientId={patient.id}
+              encounterId={encounter.id}
+            />
           </div>
 
           {/* Symptoms Section */}
           <div>
-            <SymptomsList patientId={patient.id} encounterId={encounter.id} />
+            <SymptomsList
+              patientId={patient.id}
+              encounterId={encounter.id}
+              facilityId={facilityId}
+            />
           </div>
 
           {/* Diagnoses Section */}
           <div>
-            <DiagnosisList patientId={patient.id} encounterId={encounter.id} />
+            <DiagnosisList
+              patientId={patient.id}
+              encounterId={encounter.id}
+              facilityId={facilityId}
+            />
           </div>
 
           {/* Questionnaire Responses Section */}
diff --git a/src/types/emr/allergyIntolerance/allergyIntolerance.ts b/src/types/emr/allergyIntolerance/allergyIntolerance.ts
index f87b09e1d82..6693664b0b5 100644
--- a/src/types/emr/allergyIntolerance/allergyIntolerance.ts
+++ b/src/types/emr/allergyIntolerance/allergyIntolerance.ts
@@ -1,14 +1,29 @@
 import { Code } from "@/types/questionnaire/code";
 import { UserBase } from "@/types/user/user";
 
+export type AllergyVerificationStatus =
+  | "unconfirmed"
+  | "confirmed"
+  | "refuted"
+  | "presumed"
+  | "entered_in_error";
+
+export type AllergyClinicalStatus = "active" | "inactive" | "resolved";
+export type AllergyCategory =
+  | "food"
+  | "medication"
+  | "environment"
+  | "biologic";
+export type AllergyCriticality = "low" | "high" | "unable_to_assess";
+
 // Base type for allergy data
 export interface AllergyIntolerance {
   id: string;
   code: Code;
-  clinical_status: string;
-  verification_status: string;
-  category: string;
-  criticality: string;
+  clinical_status: AllergyClinicalStatus;
+  verification_status: AllergyVerificationStatus;
+  category: AllergyCategory;
+  criticality: AllergyCriticality;
   last_occurrence?: string;
   note?: string;
   created_by: UserBase;
@@ -20,8 +35,8 @@ export interface AllergyIntolerance {
 // Added optional id here as this type is used only in one place
 export interface AllergyIntoleranceRequest {
   id?: string;
-  clinical_status: string;
-  verification_status: string;
+  clinical_status: AllergyClinicalStatus;
+  verification_status: AllergyVerificationStatus;
   category: string;
   criticality: string;
   code: Code;
@@ -29,3 +44,11 @@ export interface AllergyIntoleranceRequest {
   note?: string;
   encounter: string;
 }
+
+export const ALLERGY_VERIFICATION_STATUS = {
+  unconfirmed: "Unconfirmed",
+  confirmed: "Confirmed",
+  refuted: "Refuted",
+  presumed: "Presumed",
+  entered_in_error: "Entered in Error",
+};
diff --git a/src/types/emr/diagnosis/diagnosis.ts b/src/types/emr/diagnosis/diagnosis.ts
index b16634373be..29f7b250778 100644
--- a/src/types/emr/diagnosis/diagnosis.ts
+++ b/src/types/emr/diagnosis/diagnosis.ts
@@ -19,7 +19,7 @@ export const DIAGNOSIS_VERIFICATION_STATUS = [
   "differential",
   "confirmed",
   "refuted",
-  "entered-in-error",
+  "entered_in_error",
 ] as const;
 
 export type DiagnosisVerificationStatus =
@@ -33,6 +33,7 @@ export type Onset = {
 };
 
 export interface Diagnosis {
+  id: string;
   code: Code;
   clinical_status: DiagnosisClinicalStatus;
   verification_status: DiagnosisVerificationStatus;
@@ -44,6 +45,7 @@ export interface Diagnosis {
 }
 
 export interface DiagnosisRequest {
+  id?: string;
   clinical_status: DiagnosisClinicalStatus;
   verification_status: DiagnosisVerificationStatus;
   code: Code;
diff --git a/src/types/emr/medicationRequest/medicationRequestApi.ts b/src/types/emr/medicationRequest/medicationRequestApi.ts
new file mode 100644
index 00000000000..5fe8c146b1f
--- /dev/null
+++ b/src/types/emr/medicationRequest/medicationRequestApi.ts
@@ -0,0 +1,14 @@
+import { Type } from "@/Utils/request/api";
+import { PaginatedResponse } from "@/Utils/request/types";
+import { MedicationRequestRead } from "@/types/emr/medicationRequest";
+
+const medicationRequestApi = {
+  // Medication
+  list: {
+    path: "/api/v1/patient/{patientId}/medication/request/",
+    method: "GET",
+    TRes: Type<PaginatedResponse<MedicationRequestRead>>(),
+  },
+} as const;
+
+export default medicationRequestApi;
diff --git a/src/types/emr/medicationStatement.ts b/src/types/emr/medicationStatement.ts
index 15639d1f20b..a357ddab63c 100644
--- a/src/types/emr/medicationStatement.ts
+++ b/src/types/emr/medicationStatement.ts
@@ -41,9 +41,11 @@ export type MedicationStatement = {
 };
 
 export type MedicationStatementRequest = {
+  id?: string;
   status: MedicationStatementStatus;
   reason?: string;
   medication: Code;
+  encounter?: string; // UUID
   dosage_text: string;
   effective_period?: Period;
   information_source: MedicationStatementInformationSourceType;
diff --git a/src/types/emr/medicationStatement/medicationStatementApi.ts b/src/types/emr/medicationStatement/medicationStatementApi.ts
new file mode 100644
index 00000000000..68736e4ab13
--- /dev/null
+++ b/src/types/emr/medicationStatement/medicationStatementApi.ts
@@ -0,0 +1,13 @@
+import { Type } from "@/Utils/request/api";
+import { PaginatedResponse } from "@/Utils/request/types";
+import { MedicationStatement } from "@/types/emr/medicationStatement";
+
+const medicationStatementApi = {
+  list: {
+    path: "/api/v1/patient/{patientId}/medication/statement/",
+    method: "GET",
+    TRes: Type<PaginatedResponse<MedicationStatement>>(),
+  },
+} as const;
+
+export default medicationStatementApi;
diff --git a/src/types/emr/symptom/symptom.ts b/src/types/emr/symptom/symptom.ts
index 38a7d75c781..d064fd320e4 100644
--- a/src/types/emr/symptom/symptom.ts
+++ b/src/types/emr/symptom/symptom.ts
@@ -18,7 +18,7 @@ export const SYMPTOM_VERIFICATION_STATUS = [
   "differential",
   "confirmed",
   "refuted",
-  "entered-in-error",
+  "entered_in_error",
 ] as const;
 
 export type SymptomVerificationStatus =
@@ -36,10 +36,11 @@ type Onset = {
 };
 
 export interface Symptom {
+  id: string;
   code: Code;
   clinical_status: SymptomClinicalStatus;
   verification_status: SymptomVerificationStatus;
-  severity?: SymptomSeverity;
+  severity: SymptomSeverity;
   onset?: Onset;
   recorded_date?: string;
   note?: string;
@@ -48,10 +49,11 @@ export interface Symptom {
 }
 
 export interface SymptomRequest {
+  id?: string;
   clinical_status: SymptomClinicalStatus;
   verification_status: SymptomVerificationStatus;
   code: Code;
-  severity?: SymptomSeverity;
+  severity: SymptomSeverity;
   onset?: Onset;
   recorded_date?: string;
   note?: string;
diff --git a/src/types/emr/symptom/symptomApi.ts b/src/types/emr/symptom/symptomApi.ts
index 4ddaeead93f..4b91791e504 100644
--- a/src/types/emr/symptom/symptomApi.ts
+++ b/src/types/emr/symptom/symptomApi.ts
@@ -1,7 +1,7 @@
 import { HttpMethod, Type } from "@/Utils/request/api";
 import { PaginatedResponse } from "@/Utils/request/types";
 
-import { Symptom } from "./symptom";
+import { Symptom, SymptomRequest } from "./symptom";
 
 export default {
   listSymptoms: {
@@ -14,4 +14,10 @@ export default {
     method: HttpMethod.GET,
     TRes: Type<Symptom>(),
   },
+  upsertSymptoms: {
+    path: "/api/v1/patient/{patientId}/symptom/upsert/",
+    method: HttpMethod.POST,
+    TRes: Type<Symptom[]>(),
+    TBody: Type<{ datapoints: SymptomRequest[] }>(),
+  },
 };
diff --git a/src/types/questionnaire/form.ts b/src/types/questionnaire/form.ts
index 12a53b9b562..e634aa749fc 100644
--- a/src/types/questionnaire/form.ts
+++ b/src/types/questionnaire/form.ts
@@ -1,9 +1,9 @@
 import { AllergyIntoleranceRequest } from "@/types/emr/allergyIntolerance/allergyIntolerance";
-import { Diagnosis } from "@/types/emr/diagnosis/diagnosis";
+import { DiagnosisRequest } from "@/types/emr/diagnosis/diagnosis";
 import { Encounter } from "@/types/emr/encounter";
 import { MedicationRequest } from "@/types/emr/medicationRequest";
 import { MedicationStatementRequest } from "@/types/emr/medicationStatement";
-import { Symptom } from "@/types/emr/symptom/symptom";
+import { SymptomRequest } from "@/types/emr/symptom/symptom";
 import { Code } from "@/types/questionnaire/code";
 import { Quantity } from "@/types/questionnaire/quantity";
 import { StructuredQuestionType } from "@/types/questionnaire/question";
@@ -31,8 +31,8 @@ export type ResponseValue = {
     | AllergyIntoleranceRequest[]
     | MedicationRequest[]
     | MedicationStatementRequest[]
-    | Symptom[]
-    | Diagnosis[]
+    | SymptomRequest[]
+    | DiagnosisRequest[]
     | Encounter
     | CreateAppointmentQuestion;
   value_code?: Code;