diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index 2eb6550cb8b..fb396e9f8a9 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -1,6 +1,6 @@
 export class PatientConsultationPage {
   selectConsultationStatus(status: string) {
-    cy.get("#consultation_status")
+    cy.get("#route_to_facility")
       .click()
       .then(() => {
         cy.get("[role='option']").contains(status).click();
@@ -61,7 +61,7 @@ export class PatientConsultationPage {
       .click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);
-    cy.get("#verified_by")
+    cy.get("#treating_physician")
       .click()
       .type(verificationBy)
       .then(() => {
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index e51494f6bac..61a9cb5c8ba 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -332,14 +332,6 @@ export const CONSULTATION_SUGGESTION = [
   { id: "DD", text: "Declare Death" },
 ];
 
-export const CONSULTATION_STATUS = [
-  { id: "1", text: "Brought Dead" },
-  { id: "2", text: "Transferred from ward" },
-  { id: "3", text: "Transferred from ICU" },
-  { id: "4", text: "Referred from other hospital" },
-  { id: "5", text: "Out-patient (walk in)" },
-];
-
 export const ADMITTED_TO = [
   { id: "1", text: "Isolation" },
   { id: "2", text: "ICU" },
diff --git a/src/Components/Common/RouteToFacilitySelect.tsx b/src/Components/Common/RouteToFacilitySelect.tsx
new file mode 100644
index 00000000000..0f36d632e42
--- /dev/null
+++ b/src/Components/Common/RouteToFacilitySelect.tsx
@@ -0,0 +1,31 @@
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
+import {
+  FormFieldBaseProps,
+  useFormFieldPropsResolver,
+} from "../Form/FormFields/Utils";
+
+export const ROUTE_TO_FACILITY_OPTIONS = {
+  10: "Outpatient/Emergency Room",
+  20: "Referred from another facility",
+  30: "Internal Transfer within the facility",
+};
+
+export type RouteToFacility = keyof typeof ROUTE_TO_FACILITY_OPTIONS;
+
+export const keys = Object.keys(ROUTE_TO_FACILITY_OPTIONS).map((key) =>
+  parseInt(key)
+) as RouteToFacility[];
+
+type Props = FormFieldBaseProps<keyof typeof ROUTE_TO_FACILITY_OPTIONS>;
+
+export default function RouteToFacilitySelect(props: Props) {
+  const field = useFormFieldPropsResolver(props as any);
+
+  return (
+    <SelectFormField
+      {...field}
+      options={keys}
+      optionLabel={(key) => ROUTE_TO_FACILITY_OPTIONS[key]}
+    />
+  );
+}
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 3d3271b16d5..f9f30b6df3b 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -430,14 +430,14 @@ export const ConsultationDetails = (props: any) => {
                   label="Diagnosis (as per ICD-11 recommended by WHO)"
                 />
 
-                {(consultationData.verified_by_object ||
+                {(consultationData.treating_physician_object ||
                   consultationData.deprecated_verified_by) && (
                   <div className="mt-2 text-sm">
                     <span className="font-semibold leading-relaxed">
                       Treating Physician:{" "}
                     </span>
-                    {consultationData.verified_by_object
-                      ? `${consultationData.verified_by_object.first_name} ${consultationData.verified_by_object.last_name}`
+                    {consultationData.treating_physician_object
+                      ? `${consultationData.treating_physician_object.first_name} ${consultationData.treating_physician_object.last_name}`
                       : consultationData.deprecated_verified_by}
                     <i className="fas fa-check ml-2 fill-current text-lg text-green-500"></i>
                   </div>
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 01a5f02b7b1..8dae90d56de 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -2,7 +2,6 @@ import * as Notification from "../../Utils/Notifications.js";
 
 import { BedModel, FacilityModel, ICD11DiagnosisModel } from "./models";
 import {
-  CONSULTATION_STATUS,
   CONSULTATION_SUGGESTION,
   PATIENT_CATEGORIES,
   REVIEW_AT_CHOICES,
@@ -61,6 +60,11 @@ import { useDispatch } from "react-redux";
 import useVisibility from "../../Utils/useVisibility";
 import dayjs from "../../Utils/dayjs";
 import AutocompleteFormField from "../Form/FormFields/Autocomplete.js";
+import RouteToFacilitySelect, {
+  RouteToFacility,
+} from "../Common/RouteToFacilitySelect.js";
+import { LocationSelect } from "../Common/LocationSelect.js";
+import { classNames } from "../../Utils/utils.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
@@ -72,21 +76,26 @@ type FormDetails = {
   other_symptoms: string;
   symptoms_onset_date?: Date;
   suggestion: string;
-  consultation_status: number;
+  route_to_facility?: RouteToFacility;
   patient: string;
   facility: string;
   admitted: BooleanStrings;
   admitted_to: string;
   category: string;
   admission_date?: Date;
+  icu_admission_date?: Date;
   discharge_date: null;
   referred_to?: string;
   referred_to_external?: string;
+  referred_from_facility?: string;
+  referred_from_facility_external?: string;
+  referred_by_external?: string;
+  transferred_from_location?: string;
   icd11_diagnoses_object: ICD11DiagnosisModel[];
   icd11_provisional_diagnoses_object: ICD11DiagnosisModel[];
   icd11_principal_diagnosis?: ICD11DiagnosisModel["id"];
-  verified_by: string;
-  verified_by_object: UserModel | null;
+  treating_physician: string;
+  treating_physician_object: UserModel | null;
   is_kasp: BooleanStrings;
   kasp_enabled_date: null;
   examination_details: string;
@@ -118,21 +127,26 @@ const initForm: FormDetails = {
   other_symptoms: "",
   symptoms_onset_date: undefined,
   suggestion: "A",
-  consultation_status: 0,
+  route_to_facility: undefined,
   patient: "",
   facility: "",
   admitted: "false",
   admitted_to: "",
   category: "",
   admission_date: new Date(),
+  icu_admission_date: undefined,
   discharge_date: null,
   referred_to: "",
   referred_to_external: "",
+  referred_from_facility: "",
+  referred_from_facility_external: "",
+  referred_by_external: "",
+  transferred_from_location: "",
   icd11_diagnoses_object: [],
   icd11_provisional_diagnoses_object: [],
   icd11_principal_diagnosis: undefined,
-  verified_by: "",
-  verified_by_object: null,
+  treating_physician: "",
+  treating_physician_object: null,
   is_kasp: "false",
   kasp_enabled_date: null,
   examination_details: "",
@@ -219,7 +233,9 @@ export const ConsultationForm = (props: any) => {
     initialState
   );
   const [bed, setBed] = useState<BedModel | BedModel[] | null>(null);
-  const [selectedFacility, setSelectedFacility] =
+  const [referredToFacility, setReferredToFacility] =
+    useState<FacilityModel | null>(null);
+  const [referredFromFacility, setReferredFromFacility] =
     useState<FacilityModel | null>(null);
   const [isLoading, setIsLoading] = useState(false);
   const [patientName, setPatientName] = useState("");
@@ -302,26 +318,13 @@ export const ConsultationForm = (props: any) => {
   const isOtherSymptomsSelected = state.form.symptoms.includes(9);
 
   const handleFormFieldChange: FieldChangeEventHandler<unknown> = (event) => {
-    if (event.name === "consultation_status" && event.value === "1") {
-      dispatch({
-        type: "set_form",
-        form: {
-          ...state.form,
-          consultation_status: 1,
-          symptoms: [1],
-          symptoms_onset_date: new Date(),
-          category: "Critical",
-          suggestion: "DD",
-        },
-      });
-    } else if (event.name === "suggestion" && event.value === "DD") {
+    if (event.name === "suggestion" && event.value === "DD") {
       dispatch({
         type: "set_form",
         form: {
           ...state.form,
           suggestion: "DD",
           consultation_notes: "Patient declared dead",
-          verified_by: "Declared Dead",
         },
       });
     } else if (
@@ -360,8 +363,19 @@ export const ConsultationForm = (props: any) => {
       });
       if (res.data.suggestion === "R") {
         if (res.data.referred_to_external)
-          setSelectedFacility({ id: -1, name: res.data.referred_to_external });
-        else setSelectedFacility(res.data.referred_to_object);
+          setReferredToFacility({
+            id: -1,
+            name: res.data.referred_to_external,
+          });
+        else setReferredToFacility(res.data.referred_to_object);
+      }
+      if (res.data.route_to_facility === 20) {
+        if (res.data.referred_from_facility_external)
+          setReferredFromFacility({
+            id: -1,
+            name: res.data.referred_from_facility_external,
+          });
+        else setReferredFromFacility(res.data.referred_from_facility_object);
       }
       if (!status.aborted) {
         if (res?.data) {
@@ -369,6 +383,7 @@ export const ConsultationForm = (props: any) => {
             ...res.data,
             symptoms_onset_date: isoStringToDate(res.data.symptoms_onset_date),
             admission_date: isoStringToDate(res.data.admission_date),
+            icu_admission_date: isoStringToDate(res.data.icu_admission_date),
             admitted: res.data.admitted ? String(res.data.admitted) : "false",
             admitted_to: res.data.admitted_to ? res.data.admitted_to : "",
             category: res.data.category
@@ -381,8 +396,8 @@ export const ConsultationForm = (props: any) => {
             is_kasp: `${res.data.is_kasp}`,
             assigned_to: res.data.assigned_to || "",
             assigned_to_object: res.data.assigned_to_object,
-            verified_by: res.data.verified_by || "",
-            verified_by_object: res.data.verified_by_object,
+            treating_physician: res.data.treating_physician || "",
+            treating_physician_object: res.data.treating_physician_object,
             ett_tt: res.data.ett_tt ? Number(res.data.ett_tt) : 3,
             special_instruction: res.data.special_instruction || "",
             weight: res.data.weight ? res.data.weight : "",
@@ -442,9 +457,9 @@ export const ConsultationForm = (props: any) => {
             invalidForm = true;
           }
           return;
-        case "consultation_status":
+        case "route_to_facility":
           if (!state.form[field]) {
-            errors[field] = "Please select the consultation status";
+            errors[field] = "Field is required";
             invalidForm = true;
           }
           return;
@@ -508,15 +523,30 @@ export const ConsultationForm = (props: any) => {
             invalidForm = true;
           }
           return;
+        case "referred_from_facility":
+          if (
+            state.form.route_to_facility === 20 &&
+            !state.form[field] &&
+            !state.form["referred_from_facility_external"]
+          ) {
+            errors[field] = "Please select the referred from facility";
+            invalidForm = true;
+          }
+          return;
+        case "transferred_from_location":
+          if (state.form.route_to_facility === 30 && !state.form[field]) {
+            errors[field] =
+              "Name of Ward/ICU the patient is being transferred from is required";
+            invalidForm = true;
+          }
+          return;
         case "consultation_notes":
-          if (state.form.consultation_status != 1) {
-            if (!state.form[field]) {
-              errors[field] = "Required *";
-              invalidForm = true;
-            } else if (!state.form[field].replace(/\s/g, "").length) {
-              errors[field] = "Consultation notes can not be empty";
-              invalidForm = true;
-            }
+          if (!state.form[field]) {
+            errors[field] = "Field is required";
+            invalidForm = true;
+          } else if (!state.form[field].replace(/\s/g, "").length) {
+            errors[field] = "Consultation notes can not be empty";
+            invalidForm = true;
           }
           return;
         case "is_telemedicine":
@@ -579,7 +609,7 @@ export const ConsultationForm = (props: any) => {
           return;
         }
 
-        case "verified_by": {
+        case "treating_physician": {
           if (state.form.suggestion !== "DD" && !state.form[field]) {
             errors[field] = "Please fill treating physician";
             invalidForm = true;
@@ -701,7 +731,7 @@ export const ConsultationForm = (props: any) => {
           ? state.form.symptoms_onset_date
           : undefined,
         suggestion: state.form.suggestion,
-        consultation_status: Number(state.form.consultation_status),
+        route_to_facility: state.form.route_to_facility,
         admitted: state.form.suggestion === "A",
         admission_date: ["A", "DC"].includes(state.form.suggestion)
           ? state.form.admission_date
@@ -722,7 +752,7 @@ export const ConsultationForm = (props: any) => {
             (o: ICD11DiagnosisModel) => o.id
           ),
         icd11_principal_diagnosis: state.form.icd11_principal_diagnosis,
-        verified_by: state.form.verified_by,
+        treating_physician: state.form.treating_physician,
         investigation: state.form.InvestigationAdvice,
         procedure: state.form.procedures,
         patient: patientId,
@@ -735,6 +765,24 @@ export const ConsultationForm = (props: any) => {
           state.form.suggestion === "R" && !state.form.referred_to
             ? state.form.referred_to_external
             : undefined,
+        referred_from_facility:
+          state.form.route_to_facility === 20 &&
+          !state.form.referred_from_facility_external
+            ? state.form.referred_from_facility
+            : undefined,
+        referred_from_facility_external:
+          state.form.route_to_facility === 20 &&
+          !state.form.referred_from_facility
+            ? state.form.referred_from_facility_external
+            : undefined,
+        referred_by_external:
+          state.form.route_to_facility === 20
+            ? state.form.referred_by_external
+            : undefined,
+        transferred_from_location:
+          state.form.route_to_facility === 30
+            ? state.form.transferred_from_location
+            : undefined,
         consultation_notes: state.form.consultation_notes,
         is_telemedicine: state.form.is_telemedicine,
         action: state.form.action,
@@ -833,9 +881,11 @@ export const ConsultationForm = (props: any) => {
     );
   };
 
-  const setFacility = (selected: FacilityModel | FacilityModel[] | null) => {
+  const handleReferredToFacilityChange = (
+    selected: FacilityModel | FacilityModel[] | null
+  ) => {
     const selectedFacility = selected as FacilityModel;
-    setSelectedFacility(selectedFacility);
+    setReferredToFacility(selectedFacility);
     const form: FormDetails = { ...state.form };
     if (selectedFacility?.id) {
       if (selectedFacility.id === -1) {
@@ -849,6 +899,24 @@ export const ConsultationForm = (props: any) => {
     dispatch({ type: "set_form", form });
   };
 
+  const handleReferredFromFacilityChange = (
+    selected: FacilityModel | FacilityModel[] | null
+  ) => {
+    const selectedFacility = selected as FacilityModel;
+    setReferredFromFacility(selectedFacility);
+    const form: FormDetails = { ...state.form };
+    if (selectedFacility?.id) {
+      if (selectedFacility.id === -1) {
+        form.referred_from_facility_external = selectedFacility.name ?? "";
+        delete form.referred_from_facility;
+      } else {
+        form.referred_from_facility = selectedFacility.id.toString() || "";
+        delete form.referred_from_facility_external;
+      }
+    }
+    dispatch({ type: "set_form", form });
+  };
+
   const field = (name: string) => {
     return {
       id: name,
@@ -888,9 +956,6 @@ export const ConsultationForm = (props: any) => {
       <div className="top-0 mt-5 flex grow-0 sm:mx-12">
         <div className="fixed hidden h-full w-72 flex-col xl:flex">
           {Object.keys(sections).map((sectionTitle) => {
-            if (state.form.consultation_status === 1) {
-              return null;
-            }
             if (!isUpdate && sectionTitle === "Bed Status") {
               return null;
             }
@@ -932,66 +997,119 @@ export const ConsultationForm = (props: any) => {
                   {sectionTitle("Consultation Details")}
                   <div
                     className="col-span-6"
-                    ref={fieldRef["consultation_status"]}
+                    ref={fieldRef["route_to_facility"]}
                   >
-                    <SelectFormField
+                    <RouteToFacilitySelect
                       required
-                      label="Status during the consultation"
-                      {...selectField("consultation_status")}
-                      options={CONSULTATION_STATUS}
+                      label="Route to Facility"
+                      {...field("route_to_facility")}
+                      disabled={isUpdate}
                     />
                   </div>
 
-                  {String(state.form.consultation_status) !== "1" && (
+                  {state.form.route_to_facility === 20 && (
                     <>
-                      <div className="col-span-6" ref={fieldRef["symptoms"]}>
-                        <SymptomsSelect
-                          required
-                          label="Symptoms"
-                          {...field("symptoms")}
+                      <div
+                        id="referred_from_facility"
+                        className="col-span-6 mb-5 md:col-span-3"
+                        ref={fieldRef["referred_from_facility"]}
+                      >
+                        <FieldLabel required>
+                          Name of the referring Facility
+                        </FieldLabel>
+                        <FacilitySelect
+                          name="referred_from_facility"
+                          searchAll={true}
+                          selected={referredFromFacility}
+                          setSelected={handleReferredFromFacilityChange}
+                          freeText={true}
+                          errors={state.errors.referred_from_facility}
                         />
                       </div>
-                      {isOtherSymptomsSelected && (
-                        <div
-                          className="col-span-6"
-                          ref={fieldRef["other_symptoms"]}
-                        >
-                          <TextAreaFormField
-                            {...field("other_symptoms")}
-                            label="Other symptom details"
-                            required
-                            placeholder="Enter details of other symptoms here"
-                          />
-                        </div>
-                      )}
-
-                      {hasSymptoms && (
-                        <div
-                          className="col-span-6"
-                          ref={fieldRef["symptoms_onset_date"]}
-                        >
-                          <DateFormField
-                            {...field("symptoms_onset_date")}
-                            disableFuture
-                            required
-                            label="Date of onset of the symptoms"
-                            position="LEFT"
-                          />
-                        </div>
-                      )}
                       <div
-                        className="col-span-6"
-                        ref={fieldRef["history_of_present_illness"]}
+                        className="col-span-6 md:col-span-3"
+                        ref={fieldRef["referred_by_external"]}
                       >
-                        <TextAreaFormField
-                          {...field("history_of_present_illness")}
-                          label="History of present illness"
-                          placeholder="Optional information"
+                        <TextFormField
+                          label="Name of the referring Doctor"
+                          placeholder="Enter name of the referring doctor"
+                          {...field("referred_by_external")}
                         />
                       </div>
                     </>
                   )}
 
+                  {state.form.route_to_facility === 30 && (
+                    <div
+                      className="col-span-6"
+                      ref={fieldRef["transferred_from_location"]}
+                    >
+                      <FieldLabel required>
+                        Name of Ward/ICU the patient is shifted from
+                      </FieldLabel>
+                      <LocationSelect
+                        name="transferred_from_location"
+                        setSelected={(location) =>
+                          field("transferred_from_location").onChange({
+                            name: "transferred_from_location",
+                            value: location,
+                          })
+                        }
+                        selected={field("transferred_from_location").value}
+                        showAll={false}
+                        multiple={false}
+                        facilityId={facilityId}
+                        errors={state.errors.transferred_from_location ?? ""}
+                      />
+                    </div>
+                  )}
+
+                  <div className="col-span-6" ref={fieldRef["symptoms"]}>
+                    <SymptomsSelect
+                      required
+                      label="Symptoms"
+                      {...field("symptoms")}
+                    />
+                  </div>
+                  {isOtherSymptomsSelected && (
+                    <div
+                      className="col-span-6"
+                      ref={fieldRef["other_symptoms"]}
+                    >
+                      <TextAreaFormField
+                        {...field("other_symptoms")}
+                        label="Other symptom details"
+                        required
+                        placeholder="Enter details of other symptoms here"
+                      />
+                    </div>
+                  )}
+
+                  {hasSymptoms && (
+                    <div
+                      className="col-span-6"
+                      ref={fieldRef["symptoms_onset_date"]}
+                    >
+                      <DateFormField
+                        {...field("symptoms_onset_date")}
+                        disableFuture
+                        required
+                        label="Date of onset of the symptoms"
+                        position="LEFT"
+                      />
+                    </div>
+                  )}
+                  <div
+                    className="col-span-6"
+                    ref={fieldRef["history_of_present_illness"]}
+                  >
+                    <TextAreaFormField
+                      {...field("history_of_present_illness")}
+                      label="History of present illness"
+                      placeholder="Optional information"
+                    />
+                  </div>
+
                   <div
                     className="col-span-6"
                     ref={fieldRef["examination_details"]}
@@ -1046,32 +1164,26 @@ export const ConsultationForm = (props: any) => {
                     </div>
                   </div>
 
-                  {String(state.form.consultation_status) !== "1" && (
-                    <div className="col-span-6" ref={fieldRef["category"]}>
-                      <PatientCategorySelect
-                        labelSuffix={
-                          disabledFields.includes("category") && (
-                            <p className="text-xs font-medium text-warning-500">
-                              A daily round already exists.
-                            </p>
-                          )
-                        }
-                        required
-                        label="Category"
-                        {...field("category")}
-                      />
-                    </div>
-                  )}
+                  <div className="col-span-6" ref={fieldRef["category"]}>
+                    <PatientCategorySelect
+                      labelSuffix={
+                        disabledFields.includes("category") && (
+                          <p className="text-xs font-medium text-warning-500">
+                            A daily round already exists.
+                          </p>
+                        )
+                      }
+                      required
+                      label="Category"
+                      {...field("category")}
+                    />
+                  </div>
 
-                  <div
-                    className="col-span-6"
-                    ref={fieldRef["consultation_status"]}
-                  >
+                  <div className="col-span-6" ref={fieldRef["suggestion"]}>
                     <SelectFormField
                       required
                       label="Decision after consultation"
                       {...selectField("suggestion")}
-                      disabled={String(state.form.consultation_status) === "1"}
                       options={CONSULTATION_SUGGESTION.filter(
                         ({ deprecated }) => !deprecated
                       )}
@@ -1088,8 +1200,8 @@ export const ConsultationForm = (props: any) => {
                       <FacilitySelect
                         name="referred_to"
                         searchAll={true}
-                        selected={selectedFacility}
-                        setSelected={setFacility}
+                        selected={referredToFacility}
+                        setSelected={handleReferredToFacilityChange}
                         freeText={true}
                         errors={state.errors.referred_to}
                       />
@@ -1140,40 +1252,74 @@ export const ConsultationForm = (props: any) => {
                   )}
 
                   {["A", "DC"].includes(state.form.suggestion) && (
-                    <>
+                    <div
+                      className={classNames(
+                        "col-span-6",
+                        state.form.route_to_facility &&
+                          [20, 30].includes(state.form.route_to_facility) &&
+                          "md:col-span-3"
+                      )}
+                      ref={fieldRef["admission_date"]}
+                    >
+                      <TextFormField
+                        {...field("admission_date")}
+                        required
+                        label={
+                          state.form.suggestion === "DC"
+                            ? "Date & Time of Domiciliary Care commencement"
+                            : "Date & Time of Admission to the Facility"
+                        }
+                        type="datetime-local"
+                        value={dayjs(state.form.admission_date).format(
+                          "YYYY-MM-DDTHH:mm"
+                        )}
+                        max={dayjs().format("YYYY-MM-DDTHH:mm")}
+                      />
+                    </div>
+                  )}
+
+                  {state.form.route_to_facility &&
+                    [20, 30].includes(state.form.route_to_facility) && (
                       <div
-                        className="col-span-6"
-                        ref={fieldRef["admission_date"]}
+                        className={classNames(
+                          "col-span-6",
+                          ["A", "DC"].includes(state.form.suggestion) &&
+                            "md:col-span-3"
+                        )}
+                        ref={fieldRef["icu_admission_date"]}
                       >
-                        <DateFormField
-                          {...field("admission_date")}
-                          required
-                          disableFuture
-                          label={
-                            state.form.suggestion === "A"
-                              ? "Date of Admission"
-                              : "Domiciliary Care Start Date"
+                        <TextFormField
+                          {...field("icu_admission_date")}
+                          label="Date & Time  of admission to the ICU"
+                          type="datetime-local"
+                          value={
+                            state.form.icu_admission_date &&
+                            dayjs(state.form.icu_admission_date).format(
+                              "YYYY-MM-DDTHH:mm"
+                            )
                           }
-                          position="LEFT"
+                          max={dayjs(state.form.admission_date).format(
+                            "YYYY-MM-DDTHH:mm"
+                          )}
                         />
                       </div>
-
-                      {!isUpdate && (
-                        <div className="col-span-6 mb-6" ref={fieldRef["bed"]}>
-                          <FieldLabel>Bed</FieldLabel>
-                          <BedSelect
-                            name="bed"
-                            setSelected={setBed}
-                            selected={bed}
-                            error=""
-                            multiple={false}
-                            unoccupiedOnly={true}
-                            facility={facilityId}
-                          />
-                        </div>
-                      )}
-                    </>
+                    )}
+
+                  {["A", "DC"].includes(state.form.suggestion) && !isUpdate && (
+                    <div className="col-span-6 mb-6" ref={fieldRef["bed"]}>
+                      <FieldLabel>Bed</FieldLabel>
+                      <BedSelect
+                        name="bed"
+                        setSelected={setBed}
+                        selected={bed}
+                        error=""
+                        multiple={false}
+                        unoccupiedOnly={true}
+                        facility={facilityId}
+                      />
+                    </div>
                   )}
+
                   <div className="col-span-6 mb-6" ref={fieldRef["patient_no"]}>
                     <TextFormField
                       {...field("patient_no")}
@@ -1232,155 +1378,149 @@ export const ConsultationForm = (props: any) => {
                 </div>
 
                 <div className="grid grid-cols-1 gap-4 gap-x-6">
-                  {String(state.form.consultation_status) !== "1" && (
+                  {sectionTitle("Treatment Plan")}
+                  {state.form.suggestion !== "DD" && (
                     <>
-                      {sectionTitle("Treatment Plan")}
-                      {state.form.suggestion !== "DD" && (
-                        <>
-                          <div
-                            id="investigation"
-                            className="col-span-6"
-                            ref={fieldRef["investigation"]}
-                          >
-                            <FieldLabel>Investigations Suggestions</FieldLabel>
-                            <InvestigationBuilder
-                              investigations={state.form.InvestigationAdvice}
-                              setInvestigations={(investigations) => {
-                                handleFormFieldChange({
-                                  name: "InvestigationAdvice",
-                                  value: investigations,
-                                });
-                              }}
-                            />
-                            <FieldErrorText
-                              error={state.errors.investigation}
-                            />
-                          </div>
-                          <div
-                            id="procedure"
-                            className="col-span-6"
-                            ref={fieldRef["procedure"]}
-                          >
-                            <FieldLabel>Procedures</FieldLabel>
-                            <ProcedureBuilder
-                              procedures={state.form.procedures}
-                              setProcedures={(procedures) => {
-                                handleFormFieldChange({
-                                  name: "procedures",
-                                  value: procedures,
-                                });
-                              }}
-                            />
-                            <FieldErrorText error={state.errors.procedure} />
-                          </div>
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["treatment_plan"]}
-                          >
-                            <TextAreaFormField
-                              {...field("treatment_plan")}
-                              label="Treatment Plan / Treatment Summary"
-                              placeholder="Optional information"
-                            />
-                          </div>
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["consultation_notes"]}
-                          >
-                            <TextAreaFormField
-                              label="General Instructions (Advice)"
-                              required
-                              placeholder="Consultation Notes"
-                              {...field("consultation_notes")}
-                            />
-                          </div>
-
-                          {kasp_enabled && (
-                            <CheckBoxFormField
-                              {...field("is_kasp")}
-                              className="flex-1"
-                              required
-                              label={kasp_string}
-                              onChange={handleFormFieldChange}
-                            />
-                          )}
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["special_instruction"]}
-                          >
-                            <TextAreaFormField
-                              label="Special Instructions"
-                              placeholder="Optional information"
-                              {...field("special_instruction")}
-                            />
-                          </div>
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["verified_by"]}
-                          >
-                            <UserAutocompleteFormField
-                              name={"verified_by"}
-                              label="Treating Physician"
-                              placeholder="Attending Doctors Name and Designation"
-                              required
-                              value={state.form.verified_by_object ?? undefined}
-                              onChange={handleDoctorSelect}
-                              showActiveStatus
-                              userType={"Doctor"}
-                              homeFacility={facilityId}
-                              error={state.errors.verified_by}
-                            />
-                          </div>
-
-                          <div className="col-span-6 flex flex-col gap-3 md:flex-row">
-                            <div
-                              ref={fieldRef["review_interval"]}
-                              className="flex-1"
-                            >
-                              <SelectFormField
-                                {...selectField("review_interval")}
-                                label="Review After"
-                                options={REVIEW_AT_CHOICES}
-                                position="above"
-                              />
-                            </div>
-                            <div className="flex-1" ref={fieldRef["action"]}>
-                              <SelectFormField
-                                {...selectField("action")}
-                                label="Action"
-                                position="above"
-                                options={TELEMEDICINE_ACTIONS}
-                                optionLabel={(option) => option.desc}
-                                optionDescription={() => ""}
-                              />
-                            </div>
-                          </div>
-
-                          <CheckBoxFormField
-                            className="col-span-6"
-                            {...field("is_telemedicine")}
-                            value={JSON.parse(state.form.is_telemedicine)}
-                            label="Is Telemedicine required for the patient?"
+                      <div
+                        id="investigation"
+                        className="col-span-6"
+                        ref={fieldRef["investigation"]}
+                      >
+                        <FieldLabel>Investigations Suggestions</FieldLabel>
+                        <InvestigationBuilder
+                          investigations={state.form.InvestigationAdvice}
+                          setInvestigations={(investigations) => {
+                            handleFormFieldChange({
+                              name: "InvestigationAdvice",
+                              value: investigations,
+                            });
+                          }}
+                        />
+                        <FieldErrorText error={state.errors.investigation} />
+                      </div>
+                      <div
+                        id="procedure"
+                        className="col-span-6"
+                        ref={fieldRef["procedure"]}
+                      >
+                        <FieldLabel>Procedures</FieldLabel>
+                        <ProcedureBuilder
+                          procedures={state.form.procedures}
+                          setProcedures={(procedures) => {
+                            handleFormFieldChange({
+                              name: "procedures",
+                              value: procedures,
+                            });
+                          }}
+                        />
+                        <FieldErrorText error={state.errors.procedure} />
+                      </div>
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["treatment_plan"]}
+                      >
+                        <TextAreaFormField
+                          {...field("treatment_plan")}
+                          label="Treatment Plan / Treatment Summary"
+                          placeholder="Optional information"
+                        />
+                      </div>
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["consultation_notes"]}
+                      >
+                        <TextAreaFormField
+                          label="General Instructions (Advice)"
+                          required
+                          placeholder="Consultation Notes"
+                          {...field("consultation_notes")}
+                        />
+                      </div>
+
+                      {kasp_enabled && (
+                        <CheckBoxFormField
+                          {...field("is_kasp")}
+                          className="flex-1"
+                          required
+                          label={kasp_string}
+                          onChange={handleFormFieldChange}
+                        />
+                      )}
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["special_instruction"]}
+                      >
+                        <TextAreaFormField
+                          label="Special Instructions"
+                          placeholder="Optional information"
+                          {...field("special_instruction")}
+                        />
+                      </div>
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["treating_physician"]}
+                      >
+                        <UserAutocompleteFormField
+                          name={"treating_physician"}
+                          label="Treating Physician"
+                          placeholder="Attending Doctors Name and Designation"
+                          required
+                          value={
+                            state.form.treating_physician_object ?? undefined
+                          }
+                          onChange={handleDoctorSelect}
+                          showActiveStatus
+                          userType={"Doctor"}
+                          homeFacility={facilityId}
+                          error={state.errors.treating_physician}
+                        />
+                      </div>
+
+                      <div className="col-span-6 flex flex-col gap-3 md:flex-row">
+                        <div
+                          ref={fieldRef["review_interval"]}
+                          className="flex-1"
+                        >
+                          <SelectFormField
+                            {...selectField("review_interval")}
+                            label="Review After"
+                            options={REVIEW_AT_CHOICES}
+                            position="above"
                           />
+                        </div>
+                        <div className="flex-1" ref={fieldRef["action"]}>
+                          <SelectFormField
+                            {...selectField("action")}
+                            label="Action"
+                            position="above"
+                            options={TELEMEDICINE_ACTIONS}
+                            optionLabel={(option) => option.desc}
+                            optionDescription={() => ""}
+                          />
+                        </div>
+                      </div>
 
-                          {JSON.parse(state.form.is_telemedicine) && (
-                            <div
-                              className="col-span-6 flex-[2]"
-                              ref={fieldRef["assigned_to"]}
-                            >
-                              <UserAutocompleteFormField
-                                showActiveStatus
-                                value={
-                                  state.form.assigned_to_object ?? undefined
-                                }
-                                onChange={handleDoctorSelect}
-                                userType={"Doctor"}
-                                name={"assigned_to"}
-                                label="Assigned to"
-                              />
-                            </div>
-                          )}
-                        </>
+                      <CheckBoxFormField
+                        className="col-span-6"
+                        {...field("is_telemedicine")}
+                        value={JSON.parse(state.form.is_telemedicine)}
+                        label="Is Telemedicine required for the patient?"
+                      />
+
+                      {JSON.parse(state.form.is_telemedicine) && (
+                        <div
+                          className="col-span-6 flex-[2]"
+                          ref={fieldRef["assigned_to"]}
+                        >
+                          <UserAutocompleteFormField
+                            showActiveStatus
+                            value={state.form.assigned_to_object ?? undefined}
+                            onChange={handleDoctorSelect}
+                            userType={"Doctor"}
+                            name={"assigned_to"}
+                            label="Assigned to"
+                          />
+                        </div>
                       )}
                     </>
                   )}
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index de2c6af698a..d0c730bab39 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -3,6 +3,7 @@ import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { NormalPrescription, PRNPrescription } from "../Medicine/models";
 import { AssetData } from "../Assets/AssetTypes";
 import { UserBareMinimum } from "../Users/models";
+import { RouteToFacility } from "../Common/RouteToFacilitySelect";
 
 export interface LocalBodyModel {
   name: string;
@@ -83,6 +84,7 @@ export type PatientCategory =
 
 export interface ConsultationModel {
   admission_date?: string;
+  icu_admission_date?: string;
   admitted?: boolean;
   test_id?: string;
   admitted_to?: string;
@@ -102,12 +104,18 @@ export interface ConsultationModel {
   other_symptoms?: string;
   patient?: string;
   treatment_plan?: string;
-  referred_to?: number | null;
+  referred_to?: FacilityModel["id"];
   referred_to_object?: FacilityModel;
   referred_to_external?: string;
+  referred_from_facility?: FacilityModel["id"];
+  referred_from_facility_object?: FacilityModel;
+  referred_from_facility_external?: string;
+  referred_by_external?: string;
+  transferred_from_location?: LocationModel["id"];
+  transferred_from_location_object?: LocationModel;
   suggestion?: string;
   patient_no?: string;
-  consultation_status?: number;
+  route_to_facility?: RouteToFacility;
   is_kasp?: boolean;
   kasp_enabled_date?: string;
   diagnosis?: string;
@@ -115,8 +123,8 @@ export interface ConsultationModel {
   icd11_provisional_diagnoses_object?: ICD11DiagnosisModel[];
   icd11_principal_diagnosis?: ICD11DiagnosisModel["id"];
   deprecated_verified_by?: string;
-  verified_by?: string;
-  verified_by_object?: UserBareMinimum;
+  treating_physician?: UserBareMinimum["id"];
+  treating_physician_object?: UserBareMinimum;
   suggestion_text?: string;
   symptoms?: Array<number>;
   symptoms_text?: string;