diff --git a/.env b/.env
index fcabed6db34..38fd950b0d8 100644
--- a/.env
+++ b/.env
@@ -1,11 +1,10 @@
 # Whitelabelling envs
 
-REACT_APP_TITLE="CARE"
-REACT_APP_META_DESCRIPTION="CoronaSafe Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. CoronaSafe Care is a Digital Public Good recognised by United Nations."
+REACT_APP_TITLE=CARE
+REACT_APP_META_DESCRIPTION=CoronaSafe Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. CoronaSafe Care is a Digital Public Good recognised by United Nations.
 REACT_APP_COVER_IMAGE=https://cdn.coronasafe.network/care_logo.svg
 REACT_APP_COVER_IMAGE_ALT=https://cdn.coronasafe.network/care_logo.svg
-REACT_APP_CONFIG=""
-REACT_PUBLIC_URL="https://care.coronasafe.in"
+REACT_PUBLIC_URL=https://care.coronasafe.in
 
 # Dev envs
 ESLINT_NO_DEV_ERRORS=true
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index 4f23fbe4937..130f360d2ef 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -24,13 +24,22 @@ jobs:
           repository: coronasafe/care
           path: care
 
-      - name: Run docker compose up on care 🐳
-        run: cd care && touch .env && make docker_config_file=docker-compose.pre-built.yaml up && cd .. && sleep 60s
-        # Voluntarily kept 60 seconds delay to wait for migrations to complete.
+      - name: Start care docker containers 🐳
+        run: |
+          cd care
+          make docker_config_file=docker-compose.pre-built.yaml up 
+          while docker compose exec backend bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
+            >&2 echo "Migrations are not yet applied - sleeping"
+            sleep 5
+          done
+          echo "Migrations are applied"
+          cd ..
 
-      - name: Run Django collectstatic and load dummy data on care 🐍
+      - name: Load dummy data into care backend 📂
         run: |
-          docker exec care python manage.py load_dummy_data
+          cd care
+          docker compose exec backend bash -c "python manage.py load_dummy_data"
+          cd ..
 
       - name: Check care is up ♻
         run: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
@@ -92,10 +101,3 @@ jobs:
           name: cypress-screenshots
           path: cypress/screenshots
 
-      # Test run video was always captured, so this action uses "always()" condition
-      - name: Upload cypress videos 📹
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: cypress-videos
-          path: cypress/videos
diff --git a/.gitignore b/.gitignore
index b97356ed20f..4ca589aab39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ public/build-meta.json
 # Using NPM
 yarn.lock
 pnpm-lock.yaml
+bun.lockb
 
 # Cypress
 cypress/downloads
diff --git a/cypress/e2e/assets_spec/asset_homepage.cy.ts b/cypress/e2e/assets_spec/asset_homepage.cy.ts
new file mode 100644
index 00000000000..fa24adf5b21
--- /dev/null
+++ b/cypress/e2e/assets_spec/asset_homepage.cy.ts
@@ -0,0 +1,89 @@
+/// <reference types="cypress" />
+
+import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
+import { AssetQRScanPage } from "../../pageobject/Asset/AssetQRScan";
+import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
+import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import { v4 as uuidv4 } from "uuid";
+
+describe("Asset Tab", () => {
+  const assetSearchPage = new AssetSearchPage();
+  const assetQRScanPage = new AssetQRScanPage();
+  const assetPagination = new AssetPagination();
+  const assetFilters = new AssetFilters();
+  const loginPage = new LoginPage();
+  const assetName = "Dummy Camera 10";
+  const qrCode = uuidv4();
+  const serialNumber = Math.floor(Math.random() * 10 ** 10).toString();
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/assets");
+  });
+
+  // search for a element
+
+  it("Search Asset Name/QR_ID/Serial_number", () => {
+    assetSearchPage.typeSearchKeyword(assetName);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyBadgeContent(assetName);
+    assetSearchPage.clickAssetByName(assetName);
+    assetSearchPage.clickUpdateButton();
+    assetSearchPage.clearAndTypeQRCode(qrCode);
+    assetSearchPage.clearAndTypeSerialNumber(serialNumber);
+    assetSearchPage.clickAssetSubmitButton();
+    assetSearchPage.visitAssetsPage();
+    assetSearchPage.typeSearchKeyword(qrCode);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyAssetListContains(assetName);
+    assetSearchPage.verifyBadgeContent(qrCode);
+    assetSearchPage.typeSearchKeyword(serialNumber);
+    assetSearchPage.verifyAssetListContains(assetName);
+    assetSearchPage.verifyBadgeContent(serialNumber);
+  });
+
+  // scan a asset qr code
+
+  it("Scan Asset QR", () => {
+    assetQRScanPage.scanAssetQR();
+  });
+
+  // filter the asset and verify the badges are there
+
+  it("Filter Asset", () => {
+    assetFilters.filterAssets(
+      "Dummy Facility 1",
+      "INTERNAL",
+      "ACTIVE",
+      "ONVIF Camera",
+      "Camera Loc"
+    );
+    assetFilters.clickadvancefilter();
+    assetFilters.clickslideoverbackbutton(); // to verify the back button doesn't clear applied filters
+    assetFilters.assertFacilityText("Dummy Facility 1");
+    assetFilters.assertAssetTypeText("INTERNAL");
+    assetFilters.assertAssetClassText("ONVIF");
+    assetFilters.assertStatusText("ACTIVE");
+    assetFilters.assertLocationText("Camera Locations");
+    assetFilters.clickadvancefilter();
+    assetFilters.clearFilters();
+  });
+
+  // Verify the pagination in the page
+
+  it("Next/Previous Page", () => {
+    assetPagination.navigateToNextPage();
+    assetPagination.navigateToPreviousPage();
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});
diff --git a/cypress/e2e/assets_spec/asset_tab.cy.ts b/cypress/e2e/assets_spec/asset_tab.cy.ts
deleted file mode 100644
index 0abf11fcaf0..00000000000
--- a/cypress/e2e/assets_spec/asset_tab.cy.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/// <reference types="cypress" />
-
-import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
-import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
-import { AssetQRScanPage } from "../../pageobject/Asset/AssetQRScan";
-import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
-import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
-
-describe("Asset Tab", () => {
-  const assetSearchPage = new AssetSearchPage();
-  const assetQRScanPage = new AssetQRScanPage();
-  const assetPagination = new AssetPagination();
-  const assetFilters = new AssetFilters();
-
-  before(() => {
-    cy.loginByApi("devdistrictadmin", "Coronasafe@123");
-    cy.saveLocalStorage();
-  });
-
-  beforeEach(() => {
-    cy.restoreLocalStorage();
-    cy.awaitUrl("/assets");
-  });
-
-  // search for a element
-
-  it("Search Asset Name", () => {
-    const initialUrl = cy.url();
-    assetSearchPage.typeSearchKeyword("dummy camera 30");
-    assetSearchPage.pressEnter();
-    assetSearchPage.verifyUrlChanged(initialUrl);
-  });
-
-  // scan a asset qr code
-
-  it("Scan Asset QR", () => {
-    assetQRScanPage.scanAssetQR();
-  });
-
-  // filter the asset and verify the badges are there
-
-  it("Filter Asset", () => {
-    assetFilters.filterAssets(
-      "Dummy Facility 1",
-      "INTERNAL",
-      "ACTIVE",
-      "ONVIF Camera"
-    );
-  });
-
-  // Verify the pagination in the page
-
-  it("Next/Previous Page", () => {
-    assetPagination.navigateToNextPage();
-    assetPagination.navigateToPreviousPage();
-  });
-
-  afterEach(() => {
-    cy.saveLocalStorage();
-  });
-});
diff --git a/cypress/pageobject/Asset/AssetFilters.ts b/cypress/pageobject/Asset/AssetFilters.ts
index 57cc893bdb7..a16b61f4fc5 100644
--- a/cypress/pageobject/Asset/AssetFilters.ts
+++ b/cypress/pageobject/Asset/AssetFilters.ts
@@ -3,7 +3,8 @@ export class AssetFilters {
     facilityName: string,
     assetType: string,
     assetStatus: string,
-    assetClass: string
+    assetClass: string,
+    assetLocation: string
   ) {
     cy.contains("Advanced Filters").click();
     cy.get("input[name='Facilities']")
@@ -27,6 +28,42 @@ export class AssetFilters {
       .then(() => {
         cy.get("[role='option']").contains(assetClass).click();
       });
+    cy.get("#Facilities-location")
+      .click()
+      .type(assetLocation)
+      .then(() => {
+        cy.get("[role='option']").contains(assetLocation).click();
+      });
     cy.contains("Apply").click();
   }
+  clearFilters() {
+    cy.intercept("GET", "**/api/v1/asset/**").as("clearAssets");
+    cy.get("#clear-filter").click();
+    cy.wait("@clearAssets").its("response.statusCode").should("eq", 200);
+    cy.url().should("match", /\/assets$/);
+  }
+  clickadvancefilter() {
+    cy.intercept("GET", "**/api/v1/getallfacilities/**").as("advancefilter");
+    cy.get("#advanced-filter").click();
+    cy.wait("@advancefilter").its("response.statusCode").should("eq", 200);
+  }
+  clickslideoverbackbutton() {
+    cy.get("#close-slide-over").click();
+  }
+  // Assertions
+  assertFacilityText(text) {
+    cy.get("[data-testid=Facility]").should("contain", text);
+  }
+  assertAssetTypeText(text) {
+    cy.get("[data-testid='Asset Type']").should("contain", text);
+  }
+  assertAssetClassText(text) {
+    cy.get("[data-testid='Asset Class']").should("contain", text);
+  }
+  assertStatusText(text) {
+    cy.get("[data-testid=Status]").should("contain", text);
+  }
+  assertLocationText(text) {
+    cy.get("[data-testid=Location]").should("contain", text);
+  }
 }
diff --git a/cypress/pageobject/Asset/AssetSearch.ts b/cypress/pageobject/Asset/AssetSearch.ts
index 315a414a62b..b1ccb2f71c9 100644
--- a/cypress/pageobject/Asset/AssetSearch.ts
+++ b/cypress/pageobject/Asset/AssetSearch.ts
@@ -1,16 +1,24 @@
 export class AssetSearchPage {
   typeSearchKeyword(keyword: string) {
-    cy.get("[name='search']").type(keyword);
+    cy.get("#search").click().clear();
+    cy.get("#search").click().type(keyword);
   }
 
   pressEnter() {
     cy.get("[name='search']").type("{enter}");
   }
 
-  verifyUrlChanged(initialUrl: string) {
-    cy.url().should((currentUrl) => {
-      expect(currentUrl).not.to.equal(initialUrl);
-    });
+  clickAssetByName(assetName: string) {
+    cy.intercept("GET", "**/api/v1/asset/**").as("clearAssets");
+    cy.get("[data-testid='created-asset-list']").contains(assetName).click();
+    cy.wait("@clearAssets").its("response.statusCode").should("eq", 200);
+  }
+
+  verifyBadgeContent(expectedText: string) {
+    cy.get("[data-testid='Name/Serial No./QR ID']").should(
+      "contain",
+      expectedText
+    );
   }
 
   verifyAssetIsPresent(assetName: string) {
@@ -18,4 +26,35 @@ export class AssetSearchPage {
       .first()
       .should("contain", assetName);
   }
+
+  clickUpdateButton() {
+    cy.get("[data-testid='asset-update-button']").contains("Update").click();
+  }
+
+  clearAndTypeQRCode(qrCode: string) {
+    cy.get("#qr_code_id").clear();
+    cy.get("#qr_code_id").click().type(qrCode);
+  }
+
+  clearAndTypeSerialNumber(serialNumber: string) {
+    cy.get("#serial-number").clear();
+    cy.get("#serial-number").click().type(serialNumber);
+  }
+
+  clickAssetSubmitButton() {
+    cy.intercept("GET", "**/api/v1/asset/**").as("getAssets");
+    cy.get("#submit").click();
+    cy.wait("@getAssets").its("response.statusCode").should("eq", 200);
+  }
+
+  visitAssetsPage() {
+    cy.visit("/assets");
+  }
+
+  verifyAssetListContains(dummyCameraText: string) {
+    cy.get("[data-testid='created-asset-list']").should(
+      "contain",
+      dummyCameraText
+    );
+  }
 }
diff --git a/src/CAREUI/interactive/SlideOver.tsx b/src/CAREUI/interactive/SlideOver.tsx
index 3eae13869cb..34e1c615f94 100644
--- a/src/CAREUI/interactive/SlideOver.tsx
+++ b/src/CAREUI/interactive/SlideOver.tsx
@@ -109,6 +109,7 @@ export default function SlideOver({
               >
                 <div className="flex items-center gap-2 p-2 pt-4">
                   <button
+                    id="close-slide-over"
                     className="flex h-8 w-8 items-center justify-center rounded-lg text-2xl hover:bg-black/20"
                     onClick={() => {
                       setOpen(false);
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index 0021b3ddcce..f3ca3b74de2 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -345,6 +345,7 @@ export const ADMITTED_TO = [
   { id: "2", text: "ICU" },
   { id: "6", text: "Bed with oxygen support" },
   { id: "7", text: "Regular" },
+  { id: "None", text: "No bed assigned" },
 ];
 
 export const RESPIRATORY_SUPPORT = [
@@ -992,7 +993,7 @@ export const XLSXAssetImportSchema = {
           return ip;
         },
       },
-      "Config: Camera Access Key": {
+      "Config - Camera Access Key": {
         prop: "camera_access_key",
         type: String,
       },
diff --git a/src/Common/hooks/useAppHistory.ts b/src/Common/hooks/useAppHistory.ts
index 893b1a06cfd..70ad92692de 100644
--- a/src/Common/hooks/useAppHistory.ts
+++ b/src/Common/hooks/useAppHistory.ts
@@ -10,14 +10,12 @@ export default function useAppHistory() {
   const resetHistory = useContext(ResetHistoryContext);
 
   const goBack = (fallbackUrl?: string) => {
-    if (history.length > 1)
-      // Navigate to history present in the app navigation history stack.
-      return navigate(history[1]);
-
     if (fallbackUrl)
-      // Otherwise, use provided fallback url if provided.
+      // use provided fallback url if provided.
       return navigate(fallbackUrl);
-
+    if (history.length > 1)
+      // Otherwise, navigate to history present in the app navigation history stack.
+      return navigate(history[1]);
     // Otherwise, fallback to browser's go back behaviour.
     window.history.back();
   };
diff --git a/src/Components/Assets/AssetFilter.tsx b/src/Components/Assets/AssetFilter.tsx
index b0a870d0e31..4fc4ff6d7f2 100644
--- a/src/Components/Assets/AssetFilter.tsx
+++ b/src/Components/Assets/AssetFilter.tsx
@@ -108,9 +108,9 @@ function AssetFilter(props: any) {
   const applyFilter = () => {
     const data = {
       facility: facilityId,
-      asset_type: asset_type,
-      asset_class: asset_class,
-      status: asset_status,
+      asset_type: asset_type ?? "",
+      asset_class: asset_class ?? "",
+      status: asset_status ?? "",
       location: locationId,
     };
     onChange(data);
@@ -148,7 +148,7 @@ function AssetFilter(props: any) {
         <div className="w-full flex-none">
           <FieldLabel>Location</FieldLabel>
           <LocationSelect
-            name="Facilities"
+            name="Facilities-location"
             setSelected={(selectedId) =>
               handleLocationSelect((selectedId as string) || "")
             }
diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
index 825cee1c848..25f879ddd09 100644
--- a/src/Components/Assets/AssetManage.tsx
+++ b/src/Components/Assets/AssetManage.tsx
@@ -29,7 +29,7 @@ import { useTranslation } from "react-i18next";
 const PageTitle = lazy(() => import("../Common/PageTitle"));
 const Loading = lazy(() => import("../Common/Loading"));
 import * as Notification from "../../Utils/Notifications.js";
-import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import AuthorizeFor, { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import Uptime from "../Common/Uptime";
 import useAuthUser from "../../Common/hooks/useAuthUser";
 import dayjs from "dayjs";
@@ -452,7 +452,7 @@ const AssetManage = (props: AssetManageProps) => {
                   }
                   id="configure-asset"
                   data-testid="asset-configure-button"
-                  authorizeFor={NonReadOnlyUsers}
+                  authorizeFor={AuthorizeFor(["DistrictAdmin", "StateAdmin"])}
                 >
                   <CareIcon className="care-l-setting h-4" />
                   {t("configure")}
diff --git a/src/Components/Assets/AssetsList.tsx b/src/Components/Assets/AssetsList.tsx
index 6183a47783c..3789d7cfd51 100644
--- a/src/Components/Assets/AssetsList.tsx
+++ b/src/Components/Assets/AssetsList.tsx
@@ -324,7 +324,7 @@ const AssetsList = () => {
                     },
                   },
                   {
-                    label: "Export Assets",
+                    label: "Export Assets (JSON)",
                     action: () =>
                       authorizedForImportExport &&
                       listAssets({
@@ -333,7 +333,23 @@ const AssetsList = () => {
                         limit: totalCount,
                       }),
                     type: "json",
-                    filePrefix: `assets_${facility?.name}`,
+                    filePrefix: `assets_${facility?.name ?? "all"}`,
+                    options: {
+                      icon: <CareIcon className="care-l-export" />,
+                      disabled: totalCount === 0 || !authorizedForImportExport,
+                    },
+                  },
+                  {
+                    label: "Export Assets (CSV)",
+                    action: () =>
+                      authorizedForImportExport &&
+                      listAssets({
+                        ...qParams,
+                        csv: true,
+                        limit: totalCount,
+                      }),
+                    type: "csv",
+                    filePrefix: `assets_${facility?.name ?? "all"}`,
                     options: {
                       icon: <CareIcon className="care-l-export" />,
                       disabled: totalCount === 0 || !authorizedForImportExport,
diff --git a/src/Components/Facility/AddLocationForm.tsx b/src/Components/Facility/AddLocationForm.tsx
index d3c64ec9e04..f0dd7893aca 100644
--- a/src/Components/Facility/AddLocationForm.tsx
+++ b/src/Components/Facility/AddLocationForm.tsx
@@ -158,7 +158,7 @@ export const AddLocationForm = (props: LocationFormProps) => {
                 />
               </div>
             </div>
-            <div className="mt-4 flex flex-col gap-3 sm:flex-row sm:justify-between">
+            <div className="mt-4 cui-form-button-group">
               <Cancel
                 onClick={() =>
                   navigate(`/facility/${facilityId}/location`, {
diff --git a/src/Components/Facility/ConsultationCard.tsx b/src/Components/Facility/ConsultationCard.tsx
index 467729f0f73..f6b4484b477 100644
--- a/src/Components/Facility/ConsultationCard.tsx
+++ b/src/Components/Facility/ConsultationCard.tsx
@@ -5,6 +5,7 @@ import ButtonV2 from "../Common/components/ButtonV2";
 import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import RelativeDateUserMention from "../Common/RelativeDateUserMention";
 import useConfig from "../../Common/hooks/useConfig";
+import Chip from "../../CAREUI/display/Chip";
 
 interface ConsultationProps {
   itemData: ConsultationModel;
@@ -70,6 +71,15 @@ export const ConsultationCard = (props: ConsultationProps) => {
               </div>
               <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
                 {formatDateTime(itemData.admission_date)}
+                {itemData.is_readmission && (
+                  <Chip
+                    size="small"
+                    variant="custom"
+                    className="ml-4 border-blue-600 bg-blue-100 text-blue-600"
+                    startIcon="l-repeat"
+                    text="Readmission"
+                  />
+                )}
               </div>
             </div>
           </div>
diff --git a/src/Components/Facility/ConsultationDetails.tsx b/src/Components/Facility/ConsultationDetails.tsx
deleted file mode 100644
index 401f113a812..00000000000
--- a/src/Components/Facility/ConsultationDetails.tsx
+++ /dev/null
@@ -1,1324 +0,0 @@
-import { AssetBedModel, AssetClass, AssetData } from "../Assets/AssetTypes";
-import {
-  CONSULTATION_TABS,
-  DISCHARGE_REASONS,
-  GENDER_TYPES,
-  OptionsType,
-  SYMPTOM_CHOICES,
-} from "../../Common/constants";
-import {
-  BedModel,
-  ConsultationModel,
-  FacilityModel,
-  ICD11DiagnosisModel,
-} from "./models";
-import {
-  getConsultation,
-  getPatient,
-  getPermittedFacility,
-  listAssetBeds,
-} from "../../Redux/actions";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import { lazy, useCallback, useEffect, useState } from "react";
-
-import { ABGPlots } from "./Consultations/ABGPlots";
-import ButtonV2 from "../Common/components/ButtonV2";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import Chip from "../../CAREUI/display/Chip";
-import { DailyRoundsList } from "./Consultations/DailyRoundsList";
-import { DialysisPlots } from "./Consultations/DialysisPlots";
-import DischargeModal from "./DischargeModal";
-import DischargeSummaryModal from "./DischargeSummaryModal";
-import DoctorVideoSlideover from "./DoctorVideoSlideover";
-import { Feed } from "./Consultations/Feed";
-import { FileUpload } from "../Patient/FileUpload";
-import HL7PatientVitalsMonitor from "../VitalsMonitor/HL7PatientVitalsMonitor";
-import InvestigationTab from "./Investigations/investigationsTab";
-import { make as Link } from "../Common/components/Link.bs";
-import { NeurologicalTable } from "./Consultations/NeurologicalTables";
-import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
-import { NursingPlot } from "./Consultations/NursingPlot";
-import { NutritionPlots } from "./Consultations/NutritionPlots";
-import PatientInfoCard from "../Patient/PatientInfoCard";
-import { PatientModel } from "../Patient/models";
-import PrescriptionsTable from "../Medicine/PrescriptionsTable";
-import { PressureSoreDiagrams } from "./Consultations/PressureSoreDiagrams";
-import { PrimaryParametersPlot } from "./Consultations/PrimaryParametersPlot";
-import ReadMore from "../Common/components/Readmore";
-import VentilatorPatientVitalsMonitor from "../VitalsMonitor/VentilatorPatientVitalsMonitor";
-import { VentilatorPlot } from "./Consultations/VentilatorPlot";
-import { formatDate, formatDateTime, relativeTime } from "../../Utils/utils";
-
-import { navigate } from "raviger";
-import { useDispatch } from "react-redux";
-import { useQueryParams } from "raviger";
-import { useTranslation } from "react-i18next";
-import { triggerGoal } from "../Common/Plausible";
-import useVitalsAspectRatioConfig from "../VitalsMonitor/useVitalsAspectRatioConfig";
-import useAuthUser from "../../Common/hooks/useAuthUser";
-import PrescriptionAdministrationsTable from "../Medicine/PrescriptionAdministrationsTable";
-
-const Loading = lazy(() => import("../Common/Loading"));
-const PageTitle = lazy(() => import("../Common/PageTitle"));
-const symptomChoices = [...SYMPTOM_CHOICES];
-
-export const ConsultationDetails = (props: any) => {
-  const { t } = useTranslation();
-  const { facilityId, patientId, consultationId } = props;
-  const tab = props.tab.toUpperCase();
-  const dispatch: any = useDispatch();
-  const [isLoading, setIsLoading] = useState(false);
-  const [showDoctors, setShowDoctors] = useState(false);
-  const [qParams, _] = useQueryParams();
-
-  const [consultationData, setConsultationData] = useState<ConsultationModel>(
-    {} as ConsultationModel
-  );
-  const [patientData, setPatientData] = useState<PatientModel>({});
-  const [openDischargeSummaryDialog, setOpenDischargeSummaryDialog] =
-    useState(false);
-  const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
-  const [showAutomatedRounds, setShowAutomatedRounds] = useState(true);
-
-  const getPatientGender = (patientData: any) =>
-    GENDER_TYPES.find((i) => i.id === patientData.gender)?.text;
-
-  const getPatientAddress = (patientData: any) =>
-    `${patientData.address},\n${patientData.ward_object?.name},\n${patientData.local_body_object?.name},\n${patientData.district_object?.name},\n${patientData.state_object?.name}`;
-
-  const getPatientComorbidities = (patientData: any) => {
-    if (patientData?.medical_history?.length) {
-      const medHis = patientData.medical_history;
-      return medHis.map((item: any) => item.disease).join(", ");
-    } else {
-      return "None";
-    }
-  };
-
-  const [hl7SocketUrl, setHL7SocketUrl] = useState<string>();
-  const [ventilatorSocketUrl, setVentilatorSocketUrl] = useState<string>();
-  const [monitorBedData, setMonitorBedData] = useState<AssetBedModel>();
-  const [ventilatorBedData, setVentilatorBedData] = useState<AssetBedModel>();
-  const authUser = useAuthUser();
-
-  useEffect(() => {
-    if (
-      !consultationData.facility ||
-      !consultationData.current_bed?.bed_object.id
-    )
-      return;
-
-    const fetchData = async () => {
-      const [facilityRes, assetBedRes] = await Promise.all([
-        dispatch(getPermittedFacility(consultationData.facility as any)),
-        dispatch(
-          listAssetBeds({
-            facility: consultationData.facility as any,
-            bed: consultationData.current_bed?.bed_object.id,
-          })
-        ),
-      ]);
-
-      const { middleware_address } = facilityRes.data as FacilityModel;
-      const assetBeds = assetBedRes?.data?.results as AssetBedModel[];
-
-      const monitorBedData = assetBeds?.find(
-        (i) => i.asset_object?.asset_class === AssetClass.HL7MONITOR
-      );
-      setMonitorBedData(monitorBedData);
-      const assetDataForMonitor = monitorBedData?.asset_object;
-      const hl7Meta = assetDataForMonitor?.meta;
-      const hl7Middleware = hl7Meta?.middleware_hostname || middleware_address;
-      if (hl7Middleware && hl7Meta?.local_ip_address) {
-        setHL7SocketUrl(
-          `wss://${hl7Middleware}/observations/${hl7Meta.local_ip_address}`
-        );
-      }
-
-      const consultationBedVentilator =
-        consultationData?.current_bed?.assets_objects?.find(
-          (i) => i.asset_class === AssetClass.VENTILATOR
-        );
-      let ventilatorBedData;
-      if (consultationBedVentilator) {
-        ventilatorBedData = {
-          asset_object: consultationBedVentilator,
-          bed_object: consultationData?.current_bed?.bed_object,
-        } as AssetBedModel;
-      } else {
-        ventilatorBedData = assetBeds?.find(
-          (i) => i.asset_object.asset_class === AssetClass.VENTILATOR
-        );
-      }
-      setVentilatorBedData(ventilatorBedData);
-      const ventilatorMeta = ventilatorBedData?.asset_object?.meta;
-      const ventilatorMiddleware =
-        ventilatorMeta?.middleware_hostname || middleware_address;
-      if (ventilatorMiddleware && ventilatorMeta?.local_ip_address) {
-        setVentilatorSocketUrl(
-          `wss://${ventilatorMiddleware}/observations/${ventilatorMeta?.local_ip_address}`
-        );
-      }
-
-      if (
-        !(hl7Middleware && hl7Meta?.local_ip_address) &&
-        !(ventilatorMiddleware && ventilatorMeta?.local_ip_address)
-      ) {
-        setHL7SocketUrl(undefined);
-        setVentilatorSocketUrl(undefined);
-      }
-    };
-
-    fetchData();
-  }, [consultationData]);
-
-  const fetchData = useCallback(
-    async (status: statusType) => {
-      setIsLoading(true);
-      const res = await dispatch(getConsultation(consultationId));
-      if (!status.aborted) {
-        if (res?.data) {
-          const data: ConsultationModel = {
-            ...res.data,
-            symptoms_text: "",
-          };
-          if (res.data.symptoms?.length) {
-            const symptoms = res.data.symptoms
-              .filter((symptom: number) => symptom !== 9)
-              .map((symptom: number) => {
-                const option = symptomChoices.find((i) => i.id === symptom);
-                return option ? option.text.toLowerCase() : symptom;
-              });
-            data.symptoms_text = symptoms.join(", ");
-          }
-          setConsultationData(data);
-          const id = res.data.patient;
-          const patientRes = await dispatch(getPatient({ id }));
-          if (patientRes?.data) {
-            const patientGender = getPatientGender(patientRes.data);
-            const patientAddress = getPatientAddress(patientRes.data);
-            const patientComorbidities = getPatientComorbidities(
-              patientRes.data
-            );
-            const data = {
-              ...patientRes.data,
-              gender: patientGender,
-              address: patientAddress,
-              comorbidities: patientComorbidities,
-              is_declared_positive: patientRes.data.is_declared_positive
-                ? "Yes"
-                : "No",
-              is_vaccinated: patientData.is_vaccinated ? "Yes" : "No",
-            };
-            setPatientData(data);
-          }
-        } else {
-          navigate("/not-found");
-        }
-        setIsLoading(false);
-      }
-    },
-    [consultationId, dispatch, patientData.is_vaccinated]
-  );
-
-  useAbortableEffect((status: statusType) => {
-    fetchData(status);
-    triggerGoal("Patient Consultation Viewed", {
-      facilityId: facilityId,
-      consultationId: consultationId,
-      userId: authUser.id,
-    });
-  }, []);
-
-  const vitals = useVitalsAspectRatioConfig({
-    default: undefined,
-    md: 8 / 11,
-    lg: 15 / 11,
-    xl: 13 / 11,
-    "2xl": 19 / 11,
-    "3xl": 23 / 11,
-  });
-
-  if (isLoading) {
-    return <Loading />;
-  }
-
-  const tabButtonClasses = (selected: boolean) =>
-    `capitalize min-w-max-content cursor-pointer border-transparent text-gray-700 hover:text-gray-700 hover:border-gray-300 font-bold whitespace-nowrap ${
-      selected === true ? "border-primary-500 text-primary-600 border-b-2" : ""
-    }`;
-
-  const ShowDiagnosis = ({
-    diagnoses = [],
-    label = "Diagnosis",
-    nshow = 2,
-  }: {
-    diagnoses: ICD11DiagnosisModel[] | undefined;
-    label: string;
-    nshow?: number;
-  }) => {
-    const [showMore, setShowMore] = useState(false);
-
-    return diagnoses.length ? (
-      <div className="w-full text-sm">
-        <p className="font-semibold leading-relaxed">{label}</p>
-
-        {diagnoses.slice(0, !showMore ? nshow : undefined).map((diagnosis) => (
-          <p>{diagnosis.label}</p>
-        ))}
-        {diagnoses.length > nshow && (
-          <>
-            {!showMore ? (
-              <a
-                onClick={() => setShowMore(true)}
-                className="cursor-pointer text-sm text-blue-600 hover:text-blue-300"
-              >
-                show more
-              </a>
-            ) : (
-              <a
-                onClick={() => setShowMore(false)}
-                className="cursor-pointer text-sm text-blue-600 hover:text-blue-300"
-              >
-                show less
-              </a>
-            )}
-          </>
-        )}
-      </div>
-    ) : null;
-  };
-
-  return (
-    <div>
-      <DischargeSummaryModal
-        consultation={consultationData}
-        show={openDischargeSummaryDialog}
-        onClose={() => setOpenDischargeSummaryDialog(false)}
-      />
-
-      <DischargeModal
-        show={openDischargeDialog}
-        onClose={() => setOpenDischargeDialog(false)}
-        consultationData={consultationData}
-      />
-
-      <div className="px-2 pb-2">
-        <nav className="relative flex flex-wrap justify-between">
-          <PageTitle
-            title="Patient Dashboard"
-            className="sm:m-0 sm:p-0"
-            crumbsReplacements={{
-              [facilityId]: { name: patientData?.facility_object?.name },
-              [patientId]: { name: patientData?.name },
-              [consultationId]: {
-                name:
-                  consultationData.suggestion === "A"
-                    ? `Admitted on ${formatDateTime(
-                        consultationData.admission_date!
-                      )}`
-                    : consultationData.suggestion_text,
-              },
-            }}
-            breadcrumbs={true}
-            backUrl="/patients"
-          />
-          <div className="-right-6 top-0 flex w-full flex-col space-y-1 sm:w-min sm:flex-row sm:items-center sm:space-y-0 sm:divide-x-2 lg:absolute xl:right-0">
-            {!consultationData.discharge_date && (
-              <div className="flex w-full flex-col px-2 sm:flex-row">
-                <ButtonV2
-                  onClick={() =>
-                    navigate(
-                      `/facility/${patientData.facility}/patient/${patientData.id}/shift/new`
-                    )
-                  }
-                  className="btn btn-primary m-1 w-full hover:text-white"
-                >
-                  <CareIcon className="care-l-ambulance h-5 w-5" />
-                  Shift Patient
-                </ButtonV2>
-                <button
-                  onClick={() => {
-                    triggerGoal("Doctor Connect Clicked", {
-                      consultationId,
-                      facilityId: patientData.facility,
-                      userId: authUser.id,
-                      page: "ConsultationDetails",
-                    });
-                    setShowDoctors(true);
-                  }}
-                  className="btn btn-primary m-1 w-full hover:text-white"
-                >
-                  Doctor Connect
-                </button>
-                {patientData.last_consultation?.id && (
-                  <Link
-                    href={`/facility/${patientData.facility}/patient/${patientData.id}/consultation/${patientData.last_consultation?.id}/feed`}
-                    className="btn btn-primary m-1 w-full hover:text-white"
-                  >
-                    Camera Feed
-                  </Link>
-                )}
-              </div>
-            )}
-            <div className="flex w-full flex-col px-2 sm:flex-row">
-              <Link
-                href={`/facility/${patientData.facility}/patient/${patientData.id}`}
-                className="btn btn-primary m-1 w-full hover:text-white"
-              >
-                Patient Details
-              </Link>
-              <Link
-                href={`/facility/${patientData.facility}/patient/${patientData.id}/notes`}
-                className="btn btn-primary m-1 w-full hover:text-white"
-              >
-                Doctor&apos;s Notes
-              </Link>
-            </div>
-          </div>
-        </nav>
-        <div className="mt-2 flex w-full flex-col md:flex-row">
-          <div className="h-full w-full rounded-lg border bg-white text-black shadow">
-            <PatientInfoCard
-              patient={patientData}
-              consultation={consultationData}
-              fetchPatientData={fetchData}
-              consultationId={consultationId}
-              showAbhaProfile={qParams["show-abha-profile"] === "true"}
-            />
-
-            <div className="flex flex-col justify-between border-t px-4 pt-5 md:flex-row">
-              {consultationData.admitted_to && (
-                <div className="mt-2 rounded-lg border bg-gray-100 p-2 md:mt-0">
-                  <div className="border-b-2 py-1">
-                    Patient
-                    {consultationData.discharge_date
-                      ? " Discharged from"
-                      : " Admitted to"}
-                    <span className="badge badge-pill badge-warning ml-2 font-bold">
-                      {consultationData.admitted_to}
-                    </span>
-                  </div>
-                  {(consultationData.admission_date ??
-                    consultationData.discharge_date) && (
-                    <div className="text-3xl font-bold">
-                      {relativeTime(
-                        consultationData.discharge_date
-                          ? consultationData.discharge_date
-                          : consultationData.admission_date
-                      )}
-                    </div>
-                  )}
-                  <div className="-mt-2 text-xs">
-                    {consultationData.admission_date &&
-                      formatDateTime(consultationData.admission_date)}
-                    {consultationData.discharge_date &&
-                      ` - ${formatDateTime(consultationData.discharge_date)}`}
-                  </div>
-                </div>
-              )}
-            </div>
-
-            <div className="flex flex-col-reverse gap-2 px-4 lg:flex-row">
-              <div className="flex h-full w-3/4 flex-col">
-                {/*consultationData.other_symptoms && (
-                  <div className="capitalize">
-                    <span className="font-semibold leading-relaxed">
-                      Other Symptoms:{" "}
-                    </span>
-                    {consultationData.other_symptoms}
-                  </div>
-                )*/}
-
-                {consultationData.icd11_principal_diagnosis && (
-                  <ShowDiagnosis
-                    label="Principal Diagnosis (as per ICD-11 recommended by WHO)"
-                    diagnoses={[
-                      [
-                        ...(consultationData?.icd11_diagnoses_object ?? []),
-                        ...(consultationData?.icd11_provisional_diagnoses_object ??
-                          []),
-                      ].find(
-                        (d) =>
-                          d.id === consultationData.icd11_principal_diagnosis
-                      )!,
-                    ]}
-                  />
-                )}
-
-                <ShowDiagnosis
-                  diagnoses={
-                    consultationData?.icd11_provisional_diagnoses_object
-                  }
-                  label="Provisional Diagnosis (as per ICD-11 recommended by WHO)"
-                />
-
-                <ShowDiagnosis
-                  diagnoses={[
-                    ...(consultationData?.diagnosis
-                      ? [
-                          {
-                            id: "0",
-                            label: consultationData?.diagnosis,
-                            parentId: null,
-                          },
-                        ]
-                      : []),
-                    ...(consultationData?.icd11_diagnoses_object ?? []),
-                  ]}
-                  label="Diagnosis (as per ICD-11 recommended by WHO)"
-                />
-
-                {(consultationData.verified_by_object ||
-                  consultationData.deprecated_verified_by) && (
-                  <div className="mt-2 text-sm">
-                    <span className="font-semibold leading-relaxed">
-                      Verified By:{" "}
-                    </span>
-                    {consultationData.verified_by_object
-                      ? `${consultationData.verified_by_object.first_name} ${consultationData.verified_by_object.last_name}`
-                      : consultationData.deprecated_verified_by}
-                    <i className="fas fa-check ml-2 fill-current text-lg text-green-500"></i>
-                  </div>
-                )}
-              </div>
-              <div className="flex h-full w-full flex-col justify-end gap-2 text-right lg:flex-row">
-                <ButtonV2 onClick={() => setOpenDischargeSummaryDialog(true)}>
-                  <i className="fas fa-clipboard-list"></i>
-                  <span>{t("discharge_summary")}</span>
-                </ButtonV2>
-
-                <ButtonV2
-                  onClick={() => setOpenDischargeDialog(true)}
-                  disabled={!!consultationData.discharge_date}
-                >
-                  <i className="fas fa-hospital-user"></i>
-                  <span>{t("discharge_from_care")}</span>
-                </ButtonV2>
-              </div>
-            </div>
-            <div className="flex flex-col justify-between gap-2 p-4 md:flex-row">
-              <div className="font-base flex flex-col text-xs leading-relaxed text-gray-700">
-                <div>
-                  <span className="text-gray-900">Created: </span>
-                  {consultationData.created_date
-                    ? formatDateTime(consultationData.created_date)
-                    : "--:--"}{" "}
-                  |
-                </div>
-                {consultationData.created_by && (
-                  <div>
-                    {` ${consultationData.created_by.first_name} ${consultationData.created_by.last_name}  `}
-                    {`@${consultationData.created_by.username} (${consultationData.created_by.user_type})`}
-                  </div>
-                )}
-              </div>
-              <div className="font-base flex flex-col text-xs leading-relaxed text-gray-700 md:text-right">
-                <div>
-                  <span className="text-gray-900">Last Modified: </span>
-                  {consultationData.modified_date
-                    ? formatDateTime(consultationData.modified_date)
-                    : "--:--"}{" "}
-                  |
-                </div>
-                {consultationData.last_edited_by && (
-                  <div>
-                    {` ${consultationData.last_edited_by.first_name} ${consultationData.last_edited_by.last_name}  `}
-                    {`@${consultationData.last_edited_by.username} (${consultationData.last_edited_by.user_type})`}
-                  </div>
-                )}
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div className="mt-4 w-full border-b-2 border-gray-200">
-          <div className="overflow-x-auto sm:flex sm:items-baseline">
-            <div className="mt-4 sm:mt-0">
-              <nav className="flex space-x-6 overflow-x-auto pb-2 pl-2 ">
-                {CONSULTATION_TABS.map((p: OptionsType) => {
-                  if (p.text === "FEED") {
-                    if (
-                      !consultationData?.current_bed?.bed_object?.id ??
-                      consultationData?.discharge_date !== null
-                    )
-                      return null;
-                  }
-                  return (
-                    <Link
-                      key={p.text}
-                      className={tabButtonClasses(tab === p.text)}
-                      href={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/${p.text.toLocaleLowerCase()}`}
-                    >
-                      {p.desc}
-                    </Link>
-                  );
-                })}
-              </nav>
-            </div>
-          </div>
-        </div>
-        {tab === "UPDATES" && (
-          <div className="flex flex-col gap-2">
-            {!consultationData.discharge_date &&
-              hl7SocketUrl &&
-              ventilatorSocketUrl && (
-                <section className="flex w-full flex-col items-stretch overflow-auto rounded-md bg-white shadow-sm lg:flex-row">
-                  <div className="mx-auto flex w-full flex-col justify-between gap-1 rounded bg-[#020617] lg:w-auto lg:min-w-[1280px] lg:flex-row">
-                    <div className="min-h-[400px] flex-1">
-                      <HL7PatientVitalsMonitor
-                        patientAssetBed={{
-                          asset: monitorBedData?.asset_object as AssetData,
-                          bed: monitorBedData?.bed_object as BedModel,
-                          patient: patientData,
-                          meta: monitorBedData?.asset_object?.meta,
-                        }}
-                        socketUrl={hl7SocketUrl}
-                      />
-                    </div>
-                    <div className="min-h-[400px] flex-1">
-                      <VentilatorPatientVitalsMonitor
-                        patientAssetBed={{
-                          asset: ventilatorBedData?.asset_object as AssetData,
-                          bed: ventilatorBedData?.bed_object as BedModel,
-                          patient: patientData,
-                          meta: ventilatorBedData?.asset_object?.meta,
-                        }}
-                        socketUrl={ventilatorSocketUrl}
-                      />
-                    </div>
-                  </div>
-                </section>
-              )}
-            <div className="flex flex-col xl:flex-row">
-              <div className="w-full xl:w-2/3">
-                <PageTitle title="Info" hideBack={true} breadcrumbs={false} />
-                <div className="mt-4 grid gap-4 lg:grid-cols-2">
-                  {!consultationData.discharge_date &&
-                    ((hl7SocketUrl && !ventilatorSocketUrl) ||
-                      (!hl7SocketUrl && ventilatorSocketUrl)) && (
-                      <section className="flex w-full flex-col items-stretch overflow-hidden rounded-md bg-white shadow-sm lg:col-span-2 lg:flex-row">
-                        {(hl7SocketUrl || ventilatorSocketUrl) && (
-                          <div className="mx-auto flex w-full flex-col justify-between gap-1 rounded bg-[#020617] lg:w-auto lg:min-w-[640px] lg:flex-row">
-                            {hl7SocketUrl && (
-                              <div className="min-h-[400px] flex-1">
-                                <HL7PatientVitalsMonitor
-                                  key={`hl7-${hl7SocketUrl}-${vitals.hash}`}
-                                  patientAssetBed={{
-                                    asset:
-                                      monitorBedData?.asset_object as AssetData,
-                                    bed: monitorBedData?.bed_object as BedModel,
-                                    patient: patientData,
-                                    meta: monitorBedData?.asset_object?.meta,
-                                  }}
-                                  socketUrl={hl7SocketUrl}
-                                  config={vitals.config}
-                                />
-                              </div>
-                            )}
-                            {ventilatorSocketUrl && (
-                              <div className="min-h-[400px] flex-1">
-                                <VentilatorPatientVitalsMonitor
-                                  key={`ventilator-${ventilatorSocketUrl}-${vitals.hash}`}
-                                  patientAssetBed={{
-                                    asset:
-                                      ventilatorBedData?.asset_object as AssetData,
-                                    bed: ventilatorBedData?.bed_object as BedModel,
-                                    patient: patientData,
-                                    meta: ventilatorBedData?.asset_object?.meta,
-                                  }}
-                                  socketUrl={ventilatorSocketUrl}
-                                  config={vitals.config}
-                                />
-                              </div>
-                            )}
-                          </div>
-                        )}
-                      </section>
-                    )}
-                  {consultationData.discharge_date && (
-                    <div
-                      className={`gap-4 overflow-hidden rounded-lg bg-white shadow ${
-                        consultationData.discharge_reason === "REC" &&
-                        "lg:col-span-2"
-                      }`}
-                    >
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                          Discharge Information
-                        </h3>
-                        <div className="mt-2 grid gap-4">
-                          <div>
-                            Reason {" - "}
-                            <span className="font-semibold">
-                              {DISCHARGE_REASONS.find(
-                                (d) =>
-                                  d.id === consultationData.discharge_reason
-                              )?.text ?? "--"}
-                            </span>
-                          </div>
-                          {consultationData.discharge_reason === "REF" && (
-                            <div>
-                              Referred Facility {" - "}
-                              <span className="font-semibold">
-                                {consultationData.referred_to_external ||
-                                  consultationData.referred_to_object?.name ||
-                                  "--"}
-                              </span>
-                            </div>
-                          )}
-                          {consultationData.discharge_reason === "REC" && (
-                            <div className="grid gap-4">
-                              <div>
-                                Discharge Date {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.discharge_date
-                                    ? formatDate(
-                                        consultationData.discharge_date
-                                      )
-                                    : "--/--/----"}
-                                </span>
-                              </div>
-                              <div>
-                                Advice {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.discharge_notes ?? "--"}
-                                </span>
-                              </div>
-                              <div className="overflow-x-auto overflow-y-hidden">
-                                <PrescriptionsTable
-                                  consultation_id={consultationData.id ?? ""}
-                                  is_prn={false}
-                                  readonly
-                                  prescription_type="DISCHARGE"
-                                />
-                              </div>
-                              <hr className="my-2 border border-gray-300"></hr>
-                              <div className="overflow-x-auto overflow-y-hidden">
-                                <PrescriptionsTable
-                                  consultation_id={consultationData.id ?? ""}
-                                  is_prn
-                                  readonly
-                                  prescription_type="DISCHARGE"
-                                />
-                              </div>
-                            </div>
-                          )}
-                          {consultationData.discharge_reason === "EXP" && (
-                            <div className="grid gap-4">
-                              <div>
-                                Date of Death {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.death_datetime
-                                    ? formatDateTime(
-                                        consultationData.death_datetime
-                                      )
-                                    : "--:--"}
-                                </span>
-                              </div>
-                              <div>
-                                Cause of death {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.discharge_notes ?? "--"}
-                                </span>
-                              </div>
-                              <div>
-                                Confirmed By {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.death_confirmed_doctor ??
-                                    "--"}
-                                </span>
-                              </div>
-                            </div>
-                          )}
-                          {["REF", "LAMA"].includes(
-                            consultationData.discharge_reason ?? ""
-                          ) && (
-                            <div className="grid gap-4">
-                              <div>
-                                Discharge Date {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.discharge_date
-                                    ? formatDate(
-                                        consultationData.discharge_date
-                                      )
-                                    : "--/--/----"}
-                                </span>
-                              </div>
-                              <div>
-                                Notes {" - "}
-                                <span className="font-semibold">
-                                  {consultationData.discharge_notes ?? "--"}
-                                </span>
-                              </div>
-                            </div>
-                          )}
-                        </div>
-                      </div>
-                    </div>
-                  )}
-                  {consultationData.symptoms_text && (
-                    <div className="overflow-hidden rounded-lg bg-white shadow">
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="mb-4 text-lg font-semibold leading-relaxed text-gray-900">
-                          Symptoms
-                        </h3>
-                        <div className="">
-                          <div className="text-sm font-semibold uppercase">
-                            Last Daily Update
-                          </div>
-                          {consultationData.last_daily_round
-                            ?.additional_symptoms && (
-                            <>
-                              <div className="my-4 flex flex-wrap items-center gap-2">
-                                {consultationData.last_daily_round?.additional_symptoms.map(
-                                  (symptom: any, index: number) => (
-                                    <Chip
-                                      key={index}
-                                      text={
-                                        SYMPTOM_CHOICES.find(
-                                          (choice) => choice.id === symptom
-                                        )?.text ?? "Err. Unknown"
-                                      }
-                                      size="small"
-                                    />
-                                  )
-                                )}
-                              </div>
-                              {consultationData.last_daily_round
-                                ?.other_symptoms && (
-                                <div className="capitalize">
-                                  <div className="text-xs font-semibold">
-                                    Other Symptoms:
-                                  </div>
-                                  {
-                                    consultationData.last_daily_round
-                                      ?.other_symptoms
-                                  }
-                                </div>
-                              )}
-                              <span className="text-xs font-semibold leading-relaxed text-gray-800">
-                                from{" "}
-                                {formatDate(
-                                  consultationData.last_daily_round.created_at
-                                )}
-                              </span>
-                            </>
-                          )}
-                          <hr className="my-4 border border-gray-300" />
-                          <div className="text-sm font-semibold uppercase">
-                            Consultation Update
-                          </div>
-                          <div className="my-4 flex flex-wrap items-center gap-2">
-                            {consultationData.symptoms?.map(
-                              (symptom, index) => (
-                                <Chip
-                                  key={index}
-                                  text={
-                                    SYMPTOM_CHOICES.find(
-                                      (choice) => choice.id === symptom
-                                    )?.text ?? "Err. Unknown"
-                                  }
-                                  size="small"
-                                />
-                              )
-                            )}
-                          </div>
-                          {consultationData.other_symptoms && (
-                            <div className="capitalize">
-                              <div className="text-xs font-semibold">
-                                Other Symptoms:
-                              </div>
-                              {consultationData.other_symptoms}
-                            </div>
-                          )}
-                          <span className="text-xs font-semibold leading-relaxed text-gray-800">
-                            from{" "}
-                            {consultationData.symptoms_onset_date
-                              ? formatDate(consultationData.symptoms_onset_date)
-                              : "--/--/----"}
-                          </span>
-                        </div>
-                      </div>
-                    </div>
-                  )}
-
-                  {consultationData.history_of_present_illness && (
-                    <div className="overflow-hidden rounded-lg bg-white shadow">
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                          History of Present Illness
-                        </h3>
-                        <div className="mt-2">
-                          <ReadMore
-                            text={consultationData.history_of_present_illness}
-                            minChars={250}
-                          />
-                        </div>
-                      </div>
-                    </div>
-                  )}
-
-                  {consultationData.examination_details && (
-                    <div className="overflow-hidden rounded-lg bg-white shadow">
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                          Examination details and Clinical conditions:{" "}
-                        </h3>
-                        <div className="mt-2">
-                          <ReadMore
-                            text={consultationData.examination_details}
-                            minChars={250}
-                          />
-                        </div>
-                      </div>
-                    </div>
-                  )}
-                  {consultationData.treatment_plan && (
-                    <div className="overflow-hidden rounded-lg bg-white shadow">
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                          Treatment Summary
-                        </h3>
-                        <div className="mt-2">
-                          <ReadMore
-                            text={consultationData.treatment_plan}
-                            minChars={250}
-                          />
-                        </div>
-                      </div>
-                    </div>
-                  )}
-                  {consultationData.consultation_notes && (
-                    <div className="overflow-hidden rounded-lg bg-white shadow">
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                          General Instructions
-                        </h3>
-                        <div className="mt-2">
-                          <ReadMore
-                            text={consultationData.consultation_notes}
-                            minChars={250}
-                          />
-                        </div>
-                      </div>
-                    </div>
-                  )}
-
-                  {(consultationData.operation ??
-                    consultationData.special_instruction) && (
-                    <div className="overflow-hidden rounded-lg bg-white shadow">
-                      <div className="px-4 py-5 sm:p-6">
-                        <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                          Notes
-                        </h3>
-                        <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-                          {consultationData.operation && (
-                            <div className="mt-4">
-                              <h5>Operation</h5>
-                              <ReadMore
-                                text={consultationData.operation}
-                                minChars={250}
-                              />
-                            </div>
-                          )}
-
-                          {consultationData.special_instruction && (
-                            <div className="mt-4">
-                              <h5>Special Instruction</h5>
-                              <ReadMore
-                                text={consultationData.special_instruction}
-                                minChars={250}
-                              />
-                            </div>
-                          )}
-                        </div>
-                      </div>
-                    </div>
-                  )}
-                </div>
-                {consultationData.procedure &&
-                  consultationData.procedure.length > 0 && (
-                    <div className="my-4 rounded-lg bg-white p-4 shadow">
-                      <div className="overflow-x-auto">
-                        <table className="min-w-full divide-y divide-gray-200">
-                          <thead>
-                            <tr>
-                              <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
-                                Procedure
-                              </th>
-                              <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
-                                Notes
-                              </th>
-                              <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
-                                Repetitive
-                              </th>
-                              <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
-                                Time / Frequency
-                              </th>
-                            </tr>
-                          </thead>
-                          <tbody className="divide-y divide-gray-200 bg-white">
-                            {consultationData.procedure?.map(
-                              (procedure, index) => (
-                                <tr key={index}>
-                                  <td className="overflow-hidden whitespace-nowrap p-4">
-                                    {procedure.procedure}
-                                  </td>
-                                  <td className="overflow-hidden whitespace-normal p-4">
-                                    {procedure.notes}
-                                  </td>
-                                  <td className="overflow-hidden whitespace-normal p-4">
-                                    {procedure.repetitive ? "Yes" : "No"}
-                                  </td>
-                                  <td className="whitespace-nowrap p-4">
-                                    {procedure.repetitive
-                                      ? procedure.frequency
-                                      : formatDateTime(String(procedure.time))}
-                                  </td>
-                                </tr>
-                              )
-                            )}
-                          </tbody>
-                        </table>
-                      </div>
-                    </div>
-                  )}
-                {consultationData.intubation_start_date && (
-                  <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
-                    <div className="px-4 py-5 sm:p-6">
-                      <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                        Date/Size/LL:{" "}
-                      </h3>
-                      <div className="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
-                        <div className="">
-                          Intubation Date{" - "}
-                          <span className="font-semibold">
-                            {formatDateTime(
-                              consultationData.intubation_start_date
-                            )}
-                          </span>
-                        </div>
-                        <div className="">
-                          Extubation Date{" - "}
-                          <span className="font-semibold">
-                            {consultationData.intubation_end_date &&
-                              formatDateTime(
-                                consultationData.intubation_end_date
-                              )}
-                          </span>
-                        </div>
-                        <div className="">
-                          ETT/TT (mmid){" - "}
-                          <span className="font-semibold">
-                            {consultationData.ett_tt}
-                          </span>
-                        </div>
-                        <div className="">
-                          Cuff Pressure (mmhg){" - "}
-                          <span className="font-semibold">
-                            {consultationData.cuff_pressure}
-                          </span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                )}
-
-                {consultationData.lines?.length > 0 && (
-                  <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
-                    <div className="px-4 py-5 sm:p-6">
-                      <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                        Lines and Catheters
-                      </h3>
-                      <div className="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
-                        {consultationData.lines?.map(
-                          (line: any, idx: number) => (
-                            <div key={idx} className="mt-4">
-                              <h5>{line.type}</h5>
-                              <p className="break-word text-justify">
-                                Details:
-                                <br />
-                                <span>{line.other_type}</span>
-                              </p>
-                              <p>
-                                Insertion Date:{" "}
-                                <span className="font-semibold">
-                                  {formatDateTime(line.start_date)}
-                                </span>
-                              </p>
-                              <p>
-                                Site/Level of Fixation: <br />
-                                <span className="break-word text-justify">
-                                  {line.site}
-                                </span>
-                              </p>
-                            </div>
-                          )
-                        )}
-                      </div>
-                    </div>
-                  </div>
-                )}
-
-                <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
-                  <div className="px-4 py-5 sm:p-6">
-                    <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                      Body Details
-                    </h3>
-                    <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-                      <div>
-                        Gender {" - "}
-                        <span className="font-semibold">
-                          {patientData.gender ?? "-"}
-                        </span>
-                      </div>
-                      <div>
-                        Age {" - "}
-                        <span className="font-semibold">
-                          {patientData.age ?? "-"}
-                        </span>
-                      </div>
-                      <div>
-                        Weight {" - "}
-                        <span className="font-semibold">
-                          {consultationData.weight ?? "-"} Kg
-                        </span>
-                      </div>
-                      <div>
-                        Height {" - "}
-                        <span className="font-semibold">
-                          {consultationData.height ?? "-"} cm
-                        </span>
-                      </div>
-                      <div>
-                        Body Surface Area {" - "}
-                        <span className="font-semibold">
-                          {Math.sqrt(
-                            (Number(consultationData.weight) *
-                              Number(consultationData.height)) /
-                              3600
-                          ).toFixed(2)}{" "}
-                          m<sup>2</sup>
-                        </span>
-                      </div>
-                      <div>
-                        Blood Group {" - "}
-                        <span className="font-semibold">
-                          {patientData.blood_group ?? "-"}
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div className="w-full pl-4 xl:w-1/3">
-                <div className="flex flex-col md:flex-row md:items-center md:justify-between">
-                  <PageTitle title="Update Log" hideBack breadcrumbs={false} />
-                  <div className="mb-[2rem] pl-[1.5rem] md:mb-[0.125rem]">
-                    <input
-                      className="relative float-left ml-[-1.5rem] mr-[6px] mt-[0.15rem] h-[1.125rem] w-[1.125rem] appearance-none rounded-[0.25rem] border-[0.125rem] border-solid border-[rgba(0,0,0,0.25)] bg-white outline-none before:pointer-events-none before:absolute before:h-[0.875rem] before:w-[0.875rem] before:scale-0 before:rounded-full before:bg-transparent before:opacity-0 before:shadow-[0px_0px_0px_13px_transparent] before:content-[''] checked:border-primary checked:bg-primary checked:before:opacity-[0.16] checked:after:absolute checked:after:-mt-px checked:after:ml-[0.25rem] checked:after:block checked:after:h-[0.8125rem] checked:after:w-[0.375rem] checked:after:rotate-45 checked:after:border-[0.125rem] checked:after:border-l-0 checked:after:border-t-0 checked:after:border-solid checked:after:border-white checked:after:bg-transparent checked:after:content-[''] hover:cursor-pointer hover:before:opacity-[0.04] hover:before:shadow-[0px_0px_0px_13px_rgba(0,0,0,0.6)] focus:shadow-none focus:transition-[border-color_0.2s] focus:before:scale-100 focus:before:opacity-[0.12] focus:before:shadow-[0px_0px_0px_13px_rgba(0,0,0,0.6)] focus:before:transition-[box-shadow_0.2s,transform_0.2s] focus:after:absolute focus:after:z-[1] focus:after:block focus:after:h-[0.875rem] focus:after:w-[0.875rem] focus:after:rounded-[0.125rem] focus:after:bg-white focus:after:content-[''] checked:focus:border-primary checked:focus:bg-primary checked:focus:before:scale-100 checked:focus:before:shadow-[0px_0px_0px_13px_#3b71ca] checked:focus:before:transition-[box-shadow_0.2s,transform_0.2s] checked:focus:after:-mt-px checked:focus:after:ml-[0.25rem] checked:focus:after:h-[0.8125rem] checked:focus:after:w-[0.375rem] checked:focus:after:rotate-45 checked:focus:after:rounded-none checked:focus:after:border-[0.125rem] checked:focus:after:border-l-0 checked:focus:after:border-t-0 checked:focus:after:border-solid checked:focus:after:border-white checked:focus:after:bg-transparent"
-                      type="checkbox"
-                      id="automated-rounds-visible-checkbox"
-                      checked={showAutomatedRounds}
-                      onChange={() => setShowAutomatedRounds((s) => !s)}
-                    />
-                    <label
-                      className="inline-block pl-[0.15rem] hover:cursor-pointer"
-                      htmlFor="automated-rounds-visible-checkbox"
-                    >
-                      Show Automated Rounds
-                    </label>
-                  </div>
-                </div>
-                <DailyRoundsList
-                  facilityId={facilityId}
-                  patientId={patientId}
-                  consultationId={consultationId}
-                  consultationData={consultationData}
-                  showAutomatedRounds={showAutomatedRounds}
-                />
-              </div>
-            </div>
-          </div>
-        )}
-        {tab === "FEED" && (
-          <div>
-            <PageTitle
-              title="Camera Feed"
-              breadcrumbs={false}
-              hideBack={true}
-              focusOnLoad={true}
-            />
-            <Feed facilityId={facilityId} consultationId={consultationId} />
-          </div>
-        )}
-        {tab === "SUMMARY" && (
-          <div className="mt-4">
-            <PageTitle
-              title="Primary Parameters Plot"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <PrimaryParametersPlot
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-            ></PrimaryParametersPlot>
-          </div>
-        )}
-        {tab === "MEDICINES" && (
-          <div className="my-4 flex flex-col gap-16">
-            <PrescriptionAdministrationsTable
-              consultation_id={consultationId}
-              readonly={!!consultationData.discharge_date}
-              prn={false}
-            />
-            <PrescriptionAdministrationsTable
-              consultation_id={consultationId}
-              prn={true}
-              readonly={!!consultationData.discharge_date}
-            />
-          </div>
-        )}
-        {tab === "FILES" && (
-          <div>
-            <FileUpload
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-              type="CONSULTATION"
-              hideBack={true}
-              audio={true}
-              unspecified={true}
-            />
-          </div>
-        )}
-
-        {tab === "ABG" && (
-          <div>
-            <PageTitle
-              title="ABG Analysis Plot"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <ABGPlots
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-            ></ABGPlots>
-          </div>
-        )}
-        {tab === "NURSING" && (
-          <div>
-            <PageTitle
-              title="Nursing Analysis"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <NursingPlot
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-            ></NursingPlot>
-          </div>
-        )}
-        {tab === "NEUROLOGICAL_MONITORING" && (
-          <div>
-            <PageTitle
-              title="Neurological Monitoring"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <NeurologicalTable
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-            ></NeurologicalTable>
-          </div>
-        )}
-        {tab === "VENTILATOR" && (
-          <div>
-            <PageTitle
-              title="Respiratory Support"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <VentilatorPlot
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-            ></VentilatorPlot>
-          </div>
-        )}
-        {tab === "NUTRITION" && (
-          <div>
-            <PageTitle title="Nutrition" hideBack={true} breadcrumbs={false} />
-            <NutritionPlots
-              facilityId={facilityId}
-              patientId={patientId}
-              consultationId={consultationId}
-            ></NutritionPlots>
-          </div>
-        )}
-        {tab === "PRESSURE_SORE" && (
-          <div className="mt-4">
-            <PageTitle
-              title="Pressure Sore"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <PressureSoreDiagrams consultationId={consultationId} />
-          </div>
-        )}
-        {tab === "DIALYSIS" && (
-          <div>
-            <PageTitle
-              title="Dialysis Plots"
-              hideBack={true}
-              breadcrumbs={false}
-            />
-            <DialysisPlots consultationId={consultationId}></DialysisPlots>
-          </div>
-        )}
-        {tab === "INVESTIGATIONS" && (
-          <div>
-            <div className="justify-between sm:flex">
-              <PageTitle
-                title="Investigations"
-                hideBack={true}
-                breadcrumbs={false}
-              />
-              <div className="pt-6">
-                <ButtonV2
-                  authorizeFor={NonReadOnlyUsers}
-                  disabled={!patientData.is_active}
-                  onClick={() =>
-                    navigate(
-                      `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/`
-                    )
-                  }
-                >
-                  <CareIcon className="care-l-plus" />
-                  <span>{t("log_lab_results")}</span>
-                </ButtonV2>
-              </div>
-            </div>
-            <InvestigationTab
-              consultationId={consultationId}
-              facilityId={facilityId}
-              patientId={patientId}
-              patientData={patientData}
-            />
-          </div>
-        )}
-      </div>
-
-      <DoctorVideoSlideover
-        facilityId={facilityId}
-        show={showDoctors}
-        setShow={setShowDoctors}
-      />
-    </div>
-  );
-};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
new file mode 100644
index 00000000000..cf0ce7bd6af
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
@@ -0,0 +1,22 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { ABGPlots } from "../Consultations/ABGPlots";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationABGTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <PageTitle
+        title="ABG Analysis Plot"
+        hideBack={true}
+        breadcrumbs={false}
+      />
+      <ABGPlots
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+      ></ABGPlots>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
new file mode 100644
index 00000000000..c3515a80953
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
@@ -0,0 +1,14 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { DialysisPlots } from "../Consultations/DialysisPlots";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationDialysisTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <PageTitle title="Dialysis Plots" hideBack={true} breadcrumbs={false} />
+      <DialysisPlots consultationId={props.consultationId}></DialysisPlots>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
new file mode 100644
index 00000000000..f4fbc08331c
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
@@ -0,0 +1,22 @@
+import { lazy } from "react";
+import { Feed } from "../Consultations/Feed";
+import { ConsultationTabProps } from "./index";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationFeedTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <PageTitle
+        title="Camera Feed"
+        breadcrumbs={false}
+        hideBack={true}
+        focusOnLoad={true}
+      />
+      <Feed
+        facilityId={props.facilityId}
+        consultationId={props.consultationId}
+      />
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationFilesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationFilesTab.tsx
new file mode 100644
index 00000000000..754d4bf7b86
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationFilesTab.tsx
@@ -0,0 +1,18 @@
+import { ConsultationTabProps } from "./index";
+import { FileUpload } from "../../Patient/FileUpload";
+
+export const ConsultationFilesTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <FileUpload
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+        type="CONSULTATION"
+        hideBack={true}
+        audio={true}
+        unspecified={true}
+      />
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationInvestigationsTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationInvestigationsTab.tsx
new file mode 100644
index 00000000000..69b11a30ed5
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationInvestigationsTab.tsx
@@ -0,0 +1,39 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { NonReadOnlyUsers } from "../../../Utils/AuthorizeFor";
+import ButtonV2 from "../../Common/components/ButtonV2";
+import { navigate } from "raviger";
+import CareIcon from "../../../CAREUI/icons/CareIcon";
+import InvestigationTab from "../Investigations/investigationsTab";
+import { t } from "i18next";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+export const ConsultationInvestigationsTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <div className="justify-between sm:flex">
+        <PageTitle title="Investigations" hideBack={true} breadcrumbs={false} />
+        <div className="pt-6">
+          <ButtonV2
+            authorizeFor={NonReadOnlyUsers}
+            disabled={!props.patientData.is_active}
+            onClick={() =>
+              navigate(
+                `/facility/${props.facilityId}/patient/${props.patientId}/consultation/${props.consultationId}/investigation/`
+              )
+            }
+          >
+            <CareIcon className="care-l-plus" />
+            <span>{t("log_lab_results")}</span>
+          </ButtonV2>
+        </div>
+      </div>
+      <InvestigationTab
+        consultationId={props.consultationId}
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        patientData={props.patientData}
+      />
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx
new file mode 100644
index 00000000000..19810102833
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx
@@ -0,0 +1,19 @@
+import { ConsultationTabProps } from "./index";
+import PrescriptionAdministrationsTable from "../../Medicine/PrescriptionAdministrationsTable";
+
+export const ConsultationMedicinesTab = (props: ConsultationTabProps) => {
+  return (
+    <div className="my-4 flex flex-col gap-16">
+      <PrescriptionAdministrationsTable
+        consultation_id={props.consultationId}
+        readonly={!!props.consultationData.discharge_date}
+        prn={false}
+      />
+      <PrescriptionAdministrationsTable
+        consultation_id={props.consultationId}
+        prn={true}
+        readonly={!!props.consultationData.discharge_date}
+      />
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
new file mode 100644
index 00000000000..85f34f0ec63
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
@@ -0,0 +1,24 @@
+import { lazy } from "react";
+import { NeurologicalTable } from "../Consultations/NeurologicalTables";
+import { ConsultationTabProps } from "./index";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationNeurologicalMonitoringTab = (
+  props: ConsultationTabProps
+) => {
+  return (
+    <div>
+      <PageTitle
+        title="Neurological Monitoring"
+        hideBack={true}
+        breadcrumbs={false}
+      />
+      <NeurologicalTable
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+      ></NeurologicalTable>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNeutritionTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNeutritionTab.tsx
new file mode 100644
index 00000000000..69f130aca0d
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNeutritionTab.tsx
@@ -0,0 +1,18 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { NutritionPlots } from "../Consultations/NutritionPlots";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationNeutritionTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <PageTitle title="Nutrition" hideBack={true} breadcrumbs={false} />
+      <NutritionPlots
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+      ></NutritionPlots>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
new file mode 100644
index 00000000000..721ee18d13e
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
@@ -0,0 +1,18 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { NursingPlot } from "../Consultations/NursingPlot";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationNursingTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <PageTitle title="Nursing Analysis" hideBack={true} breadcrumbs={false} />
+      <NursingPlot
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+      ></NursingPlot>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationPressureSoreTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationPressureSoreTab.tsx
new file mode 100644
index 00000000000..05327ca6870
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationPressureSoreTab.tsx
@@ -0,0 +1,14 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { PressureSoreDiagrams } from "../Consultations/PressureSoreDiagrams";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationPressureSoreTab = (props: ConsultationTabProps) => {
+  return (
+    <div className="mt-4">
+      <PageTitle title="Pressure Sore" hideBack={true} breadcrumbs={false} />
+      <PressureSoreDiagrams consultationId={props.consultationId} />
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
new file mode 100644
index 00000000000..69d20dd64c9
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
@@ -0,0 +1,22 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { PrimaryParametersPlot } from "../Consultations/PrimaryParametersPlot";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationSummaryTab = (props: ConsultationTabProps) => {
+  return (
+    <div className="mt-4">
+      <PageTitle
+        title="Primary Parameters Plot"
+        hideBack={true}
+        breadcrumbs={false}
+      />
+      <PrimaryParametersPlot
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+      ></PrimaryParametersPlot>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
new file mode 100644
index 00000000000..705b3d9479a
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -0,0 +1,690 @@
+import { lazy, useEffect, useState } from "react";
+import { ConsultationTabProps } from "./index";
+import { AssetBedModel, AssetClass, AssetData } from "../../Assets/AssetTypes";
+import { useDispatch } from "react-redux";
+import { getPermittedFacility, listAssetBeds } from "../../../Redux/actions";
+import { BedModel, FacilityModel } from "../models";
+import HL7PatientVitalsMonitor from "../../VitalsMonitor/HL7PatientVitalsMonitor";
+import VentilatorPatientVitalsMonitor from "../../VitalsMonitor/VentilatorPatientVitalsMonitor";
+import useVitalsAspectRatioConfig from "../../VitalsMonitor/useVitalsAspectRatioConfig";
+import { DISCHARGE_REASONS, SYMPTOM_CHOICES } from "../../../Common/constants";
+import PrescriptionsTable from "../../Medicine/PrescriptionsTable";
+import Chip from "../../../CAREUI/display/Chip";
+import { formatDate, formatDateTime } from "../../../Utils/utils";
+import ReadMore from "../../Common/components/Readmore";
+import { DailyRoundsList } from "../Consultations/DailyRoundsList";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
+  const dispatch: any = useDispatch();
+  const [showAutomatedRounds, setShowAutomatedRounds] = useState(true);
+  const [hl7SocketUrl, setHL7SocketUrl] = useState<string>();
+  const [ventilatorSocketUrl, setVentilatorSocketUrl] = useState<string>();
+  const [monitorBedData, setMonitorBedData] = useState<AssetBedModel>();
+  const [ventilatorBedData, setVentilatorBedData] = useState<AssetBedModel>();
+
+  const vitals = useVitalsAspectRatioConfig({
+    default: undefined,
+    md: 8 / 11,
+    lg: 15 / 11,
+    xl: 13 / 11,
+    "2xl": 19 / 11,
+    "3xl": 23 / 11,
+  });
+
+  useEffect(() => {
+    if (
+      !props.consultationData.facility ||
+      !props.consultationData.current_bed?.bed_object.id
+    )
+      return;
+
+    const fetchData = async () => {
+      const [facilityRes, assetBedRes] = await Promise.all([
+        dispatch(getPermittedFacility(props.consultationData.facility as any)),
+        dispatch(
+          listAssetBeds({
+            facility: props.consultationData.facility as any,
+            bed: props.consultationData.current_bed?.bed_object.id,
+          })
+        ),
+      ]);
+
+      const { middleware_address } = facilityRes.data as FacilityModel;
+      const assetBeds = assetBedRes?.data?.results as AssetBedModel[];
+
+      const monitorBedData = assetBeds?.find(
+        (i) => i.asset_object?.asset_class === AssetClass.HL7MONITOR
+      );
+      setMonitorBedData(monitorBedData);
+      const assetDataForMonitor = monitorBedData?.asset_object;
+      const hl7Meta = assetDataForMonitor?.meta;
+      const hl7Middleware = hl7Meta?.middleware_hostname || middleware_address;
+      if (hl7Middleware && hl7Meta?.local_ip_address) {
+        setHL7SocketUrl(
+          `wss://${hl7Middleware}/observations/${hl7Meta.local_ip_address}`
+        );
+      }
+
+      const consultationBedVentilator =
+        props.consultationData?.current_bed?.assets_objects?.find(
+          (i) => i.asset_class === AssetClass.VENTILATOR
+        );
+      let ventilatorBedData;
+      if (consultationBedVentilator) {
+        ventilatorBedData = {
+          asset_object: consultationBedVentilator,
+          bed_object: props.consultationData?.current_bed?.bed_object,
+        } as AssetBedModel;
+      } else {
+        ventilatorBedData = assetBeds?.find(
+          (i) => i.asset_object.asset_class === AssetClass.VENTILATOR
+        );
+      }
+      setVentilatorBedData(ventilatorBedData);
+      const ventilatorMeta = ventilatorBedData?.asset_object?.meta;
+      const ventilatorMiddleware =
+        ventilatorMeta?.middleware_hostname || middleware_address;
+      if (ventilatorMiddleware && ventilatorMeta?.local_ip_address) {
+        setVentilatorSocketUrl(
+          `wss://${ventilatorMiddleware}/observations/${ventilatorMeta?.local_ip_address}`
+        );
+      }
+
+      if (
+        !(hl7Middleware && hl7Meta?.local_ip_address) &&
+        !(ventilatorMiddleware && ventilatorMeta?.local_ip_address)
+      ) {
+        setHL7SocketUrl(undefined);
+        setVentilatorSocketUrl(undefined);
+      }
+    };
+
+    fetchData();
+  }, [props.consultationData]);
+
+  return (
+    <div className="flex flex-col gap-2">
+      {!props.consultationData.discharge_date &&
+        hl7SocketUrl &&
+        ventilatorSocketUrl && (
+          <section className="flex w-full flex-col items-stretch overflow-auto rounded-md bg-white shadow-sm lg:flex-row">
+            <div className="mx-auto flex w-full flex-col justify-between gap-1 rounded bg-[#020617] lg:w-auto lg:min-w-[1280px] lg:flex-row">
+              <div className="min-h-[400px] flex-1">
+                <HL7PatientVitalsMonitor
+                  patientAssetBed={{
+                    asset: monitorBedData?.asset_object as AssetData,
+                    bed: monitorBedData?.bed_object as BedModel,
+                    patient: props.patientData,
+                    meta: monitorBedData?.asset_object?.meta,
+                  }}
+                  socketUrl={hl7SocketUrl}
+                />
+              </div>
+              <div className="min-h-[400px] flex-1">
+                <VentilatorPatientVitalsMonitor
+                  patientAssetBed={{
+                    asset: ventilatorBedData?.asset_object as AssetData,
+                    bed: ventilatorBedData?.bed_object as BedModel,
+                    patient: props.patientData,
+                    meta: ventilatorBedData?.asset_object?.meta,
+                  }}
+                  socketUrl={ventilatorSocketUrl}
+                />
+              </div>
+            </div>
+          </section>
+        )}
+      <div className="flex flex-col xl:flex-row">
+        <div className="w-full xl:w-2/3">
+          <PageTitle title="Info" hideBack={true} breadcrumbs={false} />
+          <div className="mt-4 grid gap-4 lg:grid-cols-2">
+            {!props.consultationData.discharge_date &&
+              ((hl7SocketUrl && !ventilatorSocketUrl) ||
+                (!hl7SocketUrl && ventilatorSocketUrl)) && (
+                <section className="flex w-full flex-col items-stretch overflow-hidden rounded-md bg-white shadow-sm lg:col-span-2 lg:flex-row">
+                  {(hl7SocketUrl || ventilatorSocketUrl) && (
+                    <div className="mx-auto flex w-full flex-col justify-between gap-1 rounded bg-[#020617] lg:w-auto lg:min-w-[640px] lg:flex-row">
+                      {hl7SocketUrl && (
+                        <div className="min-h-[400px] flex-1">
+                          <HL7PatientVitalsMonitor
+                            key={`hl7-${hl7SocketUrl}-${vitals.hash}`}
+                            patientAssetBed={{
+                              asset: monitorBedData?.asset_object as AssetData,
+                              bed: monitorBedData?.bed_object as BedModel,
+                              patient: props.patientData,
+                              meta: monitorBedData?.asset_object?.meta,
+                            }}
+                            socketUrl={hl7SocketUrl}
+                            config={vitals.config}
+                          />
+                        </div>
+                      )}
+                      {ventilatorSocketUrl && (
+                        <div className="min-h-[400px] flex-1">
+                          <VentilatorPatientVitalsMonitor
+                            key={`ventilator-${ventilatorSocketUrl}-${vitals.hash}`}
+                            patientAssetBed={{
+                              asset:
+                                ventilatorBedData?.asset_object as AssetData,
+                              bed: ventilatorBedData?.bed_object as BedModel,
+                              patient: props.patientData,
+                              meta: ventilatorBedData?.asset_object?.meta,
+                            }}
+                            socketUrl={ventilatorSocketUrl}
+                            config={vitals.config}
+                          />
+                        </div>
+                      )}
+                    </div>
+                  )}
+                </section>
+              )}
+            {props.consultationData.discharge_date && (
+              <div
+                className={`gap-4 overflow-hidden rounded-lg bg-white shadow ${
+                  props.consultationData.discharge_reason === "REC" &&
+                  "lg:col-span-2"
+                }`}
+              >
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                    Discharge Information
+                  </h3>
+                  <div className="mt-2 grid gap-4">
+                    <div>
+                      Reason {" - "}
+                      <span className="font-semibold">
+                        {DISCHARGE_REASONS.find(
+                          (d) =>
+                            d.id === props.consultationData.discharge_reason
+                        )?.text ?? "--"}
+                      </span>
+                    </div>
+                    {props.consultationData.discharge_reason === "REF" && (
+                      <div>
+                        Referred Facility {" - "}
+                        <span className="font-semibold">
+                          {props.consultationData.referred_to_external ||
+                            props.consultationData.referred_to_object?.name ||
+                            "--"}
+                        </span>
+                      </div>
+                    )}
+                    {props.consultationData.discharge_reason === "REC" && (
+                      <div className="grid gap-4">
+                        <div>
+                          Discharge Date {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.discharge_date
+                              ? formatDate(
+                                  props.consultationData.discharge_date
+                                )
+                              : "--/--/----"}
+                          </span>
+                        </div>
+                        <div>
+                          Advice {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.discharge_notes ?? "--"}
+                          </span>
+                        </div>
+                        <div className="overflow-x-auto overflow-y-hidden">
+                          <PrescriptionsTable
+                            consultation_id={props.consultationData.id ?? ""}
+                            is_prn={false}
+                            readonly
+                            prescription_type="DISCHARGE"
+                          />
+                        </div>
+                        <hr className="my-2 border border-gray-300"></hr>
+                        <div className="overflow-x-auto overflow-y-hidden">
+                          <PrescriptionsTable
+                            consultation_id={props.consultationData.id ?? ""}
+                            is_prn
+                            readonly
+                            prescription_type="DISCHARGE"
+                          />
+                        </div>
+                      </div>
+                    )}
+                    {props.consultationData.discharge_reason === "EXP" && (
+                      <div className="grid gap-4">
+                        <div>
+                          Date of Death {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.death_datetime
+                              ? formatDateTime(
+                                  props.consultationData.death_datetime
+                                )
+                              : "--:--"}
+                          </span>
+                        </div>
+                        <div>
+                          Cause of death {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.discharge_notes ?? "--"}
+                          </span>
+                        </div>
+                        <div>
+                          Confirmed By {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.death_confirmed_doctor ??
+                              "--"}
+                          </span>
+                        </div>
+                      </div>
+                    )}
+                    {["REF", "LAMA"].includes(
+                      props.consultationData.discharge_reason ?? ""
+                    ) && (
+                      <div className="grid gap-4">
+                        <div>
+                          Discharge Date {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.discharge_date
+                              ? formatDate(
+                                  props.consultationData.discharge_date
+                                )
+                              : "--/--/----"}
+                          </span>
+                        </div>
+                        <div>
+                          Notes {" - "}
+                          <span className="font-semibold">
+                            {props.consultationData.discharge_notes ?? "--"}
+                          </span>
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                </div>
+              </div>
+            )}
+            {props.consultationData.symptoms_text && (
+              <div className="overflow-hidden rounded-lg bg-white shadow">
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="mb-4 text-lg font-semibold leading-relaxed text-gray-900">
+                    Symptoms
+                  </h3>
+                  <div className="">
+                    <div className="text-sm font-semibold uppercase">
+                      Last Daily Update
+                    </div>
+                    {props.consultationData.last_daily_round
+                      ?.additional_symptoms && (
+                      <>
+                        <div className="my-4 flex flex-wrap items-center gap-2">
+                          {props.consultationData.last_daily_round?.additional_symptoms.map(
+                            (symptom: any, index: number) => (
+                              <Chip
+                                key={index}
+                                text={
+                                  SYMPTOM_CHOICES.find(
+                                    (choice) => choice.id === symptom
+                                  )?.text ?? "Err. Unknown"
+                                }
+                                size="small"
+                              />
+                            )
+                          )}
+                        </div>
+                        {props.consultationData.last_daily_round
+                          ?.other_symptoms && (
+                          <div className="capitalize">
+                            <div className="text-xs font-semibold">
+                              Other Symptoms:
+                            </div>
+                            {
+                              props.consultationData.last_daily_round
+                                ?.other_symptoms
+                            }
+                          </div>
+                        )}
+                        <span className="text-xs font-semibold leading-relaxed text-gray-800">
+                          from{" "}
+                          {formatDate(
+                            props.consultationData.last_daily_round.created_at
+                          )}
+                        </span>
+                      </>
+                    )}
+                    <hr className="my-4 border border-gray-300" />
+                    <div className="text-sm font-semibold uppercase">
+                      Consultation Update
+                    </div>
+                    <div className="my-4 flex flex-wrap items-center gap-2">
+                      {props.consultationData.symptoms?.map(
+                        (symptom, index) => (
+                          <Chip
+                            key={index}
+                            text={
+                              SYMPTOM_CHOICES.find(
+                                (choice) => choice.id === symptom
+                              )?.text ?? "Err. Unknown"
+                            }
+                            size="small"
+                          />
+                        )
+                      )}
+                    </div>
+                    {props.consultationData.other_symptoms && (
+                      <div className="capitalize">
+                        <div className="text-xs font-semibold">
+                          Other Symptoms:
+                        </div>
+                        {props.consultationData.other_symptoms}
+                      </div>
+                    )}
+                    <span className="text-xs font-semibold leading-relaxed text-gray-800">
+                      from{" "}
+                      {props.consultationData.symptoms_onset_date
+                        ? formatDate(props.consultationData.symptoms_onset_date)
+                        : "--/--/----"}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            )}
+
+            {props.consultationData.history_of_present_illness && (
+              <div className="overflow-hidden rounded-lg bg-white shadow">
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                    History of Present Illness
+                  </h3>
+                  <div className="mt-2">
+                    <ReadMore
+                      text={props.consultationData.history_of_present_illness}
+                      minChars={250}
+                    />
+                  </div>
+                </div>
+              </div>
+            )}
+
+            {props.consultationData.examination_details && (
+              <div className="overflow-hidden rounded-lg bg-white shadow">
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                    Examination details and Clinical conditions:{" "}
+                  </h3>
+                  <div className="mt-2">
+                    <ReadMore
+                      text={props.consultationData.examination_details}
+                      minChars={250}
+                    />
+                  </div>
+                </div>
+              </div>
+            )}
+            {props.consultationData.treatment_plan && (
+              <div className="overflow-hidden rounded-lg bg-white shadow">
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                    Treatment Summary
+                  </h3>
+                  <div className="mt-2">
+                    <ReadMore
+                      text={props.consultationData.treatment_plan}
+                      minChars={250}
+                    />
+                  </div>
+                </div>
+              </div>
+            )}
+            {props.consultationData.consultation_notes && (
+              <div className="overflow-hidden rounded-lg bg-white shadow">
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                    General Instructions
+                  </h3>
+                  <div className="mt-2">
+                    <ReadMore
+                      text={props.consultationData.consultation_notes}
+                      minChars={250}
+                    />
+                  </div>
+                </div>
+              </div>
+            )}
+
+            {(props.consultationData.operation ??
+              props.consultationData.special_instruction) && (
+              <div className="overflow-hidden rounded-lg bg-white shadow">
+                <div className="px-4 py-5 sm:p-6">
+                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                    Notes
+                  </h3>
+                  <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+                    {props.consultationData.operation && (
+                      <div className="mt-4">
+                        <h5>Operation</h5>
+                        <ReadMore
+                          text={props.consultationData.operation}
+                          minChars={250}
+                        />
+                      </div>
+                    )}
+
+                    {props.consultationData.special_instruction && (
+                      <div className="mt-4">
+                        <h5>Special Instruction</h5>
+                        <ReadMore
+                          text={props.consultationData.special_instruction}
+                          minChars={250}
+                        />
+                      </div>
+                    )}
+                  </div>
+                </div>
+              </div>
+            )}
+          </div>
+          {props.consultationData.procedure &&
+            props.consultationData.procedure.length > 0 && (
+              <div className="my-4 rounded-lg bg-white p-4 shadow">
+                <div className="overflow-x-auto">
+                  <table className="min-w-full divide-y divide-gray-200">
+                    <thead>
+                      <tr>
+                        <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
+                          Procedure
+                        </th>
+                        <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
+                          Notes
+                        </th>
+                        <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
+                          Repetitive
+                        </th>
+                        <th className="bg-gray-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-gray-600">
+                          Time / Frequency
+                        </th>
+                      </tr>
+                    </thead>
+                    <tbody className="divide-y divide-gray-200 bg-white">
+                      {props.consultationData.procedure?.map(
+                        (procedure, index) => (
+                          <tr key={index}>
+                            <td className="overflow-hidden whitespace-nowrap p-4">
+                              {procedure.procedure}
+                            </td>
+                            <td className="overflow-hidden whitespace-normal p-4">
+                              {procedure.notes}
+                            </td>
+                            <td className="overflow-hidden whitespace-normal p-4">
+                              {procedure.repetitive ? "Yes" : "No"}
+                            </td>
+                            <td className="whitespace-nowrap p-4">
+                              {procedure.repetitive
+                                ? procedure.frequency
+                                : formatDateTime(String(procedure.time))}
+                            </td>
+                          </tr>
+                        )
+                      )}
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            )}
+          {props.consultationData.intubation_start_date && (
+            <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
+              <div className="px-4 py-5 sm:p-6">
+                <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                  Date/Size/LL:{" "}
+                </h3>
+                <div className="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
+                  <div className="">
+                    Intubation Date{" - "}
+                    <span className="font-semibold">
+                      {formatDateTime(
+                        props.consultationData.intubation_start_date
+                      )}
+                    </span>
+                  </div>
+                  <div className="">
+                    Extubation Date{" - "}
+                    <span className="font-semibold">
+                      {props.consultationData.intubation_end_date &&
+                        formatDateTime(
+                          props.consultationData.intubation_end_date
+                        )}
+                    </span>
+                  </div>
+                  <div className="">
+                    ETT/TT (mmid){" - "}
+                    <span className="font-semibold">
+                      {props.consultationData.ett_tt}
+                    </span>
+                  </div>
+                  <div className="">
+                    Cuff Pressure (mmhg){" - "}
+                    <span className="font-semibold">
+                      {props.consultationData.cuff_pressure}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          )}
+
+          {props.consultationData.lines?.length > 0 && (
+            <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
+              <div className="px-4 py-5 sm:p-6">
+                <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                  Lines and Catheters
+                </h3>
+                <div className="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
+                  {props.consultationData.lines?.map(
+                    (line: any, idx: number) => (
+                      <div key={idx} className="mt-4">
+                        <h5>{line.type}</h5>
+                        <p className="break-word text-justify">
+                          Details:
+                          <br />
+                          <span>{line.other_type}</span>
+                        </p>
+                        <p>
+                          Insertion Date:{" "}
+                          <span className="font-semibold">
+                            {formatDateTime(line.start_date)}
+                          </span>
+                        </p>
+                        <p>
+                          Site/Level of Fixation: <br />
+                          <span className="break-word text-justify">
+                            {line.site}
+                          </span>
+                        </p>
+                      </div>
+                    )
+                  )}
+                </div>
+              </div>
+            </div>
+          )}
+
+          <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
+            <div className="px-4 py-5 sm:p-6">
+              <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
+                Body Details
+              </h3>
+              <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+                <div>
+                  Gender {" - "}
+                  <span className="font-semibold">
+                    {props.patientData.gender ?? "-"}
+                  </span>
+                </div>
+                <div>
+                  Age {" - "}
+                  <span className="font-semibold">
+                    {props.patientData.age ?? "-"}
+                  </span>
+                </div>
+                <div>
+                  Weight {" - "}
+                  <span className="font-semibold">
+                    {props.consultationData.weight ?? "-"} Kg
+                  </span>
+                </div>
+                <div>
+                  Height {" - "}
+                  <span className="font-semibold">
+                    {props.consultationData.height ?? "-"} cm
+                  </span>
+                </div>
+                <div>
+                  Body Surface Area {" - "}
+                  <span className="font-semibold">
+                    {Math.sqrt(
+                      (Number(props.consultationData.weight) *
+                        Number(props.consultationData.height)) /
+                        3600
+                    ).toFixed(2)}{" "}
+                    m<sup>2</sup>
+                  </span>
+                </div>
+                <div>
+                  Blood Group {" - "}
+                  <span className="font-semibold">
+                    {props.patientData.blood_group ?? "-"}
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="w-full pl-4 xl:w-1/3">
+          <div className="flex flex-col md:flex-row md:items-center md:justify-between">
+            <PageTitle title="Update Log" hideBack breadcrumbs={false} />
+            <div className="mb-[2rem] pl-[1.5rem] md:mb-[0.125rem]">
+              <input
+                className="relative float-left ml-[-1.5rem] mr-[6px] mt-[0.15rem] h-[1.125rem] w-[1.125rem] appearance-none rounded-[0.25rem] border-[0.125rem] border-solid border-[rgba(0,0,0,0.25)] bg-white outline-none before:pointer-events-none before:absolute before:h-[0.875rem] before:w-[0.875rem] before:scale-0 before:rounded-full before:bg-transparent before:opacity-0 before:shadow-[0px_0px_0px_13px_transparent] before:content-[''] checked:border-primary checked:bg-primary checked:before:opacity-[0.16] checked:after:absolute checked:after:-mt-px checked:after:ml-[0.25rem] checked:after:block checked:after:h-[0.8125rem] checked:after:w-[0.375rem] checked:after:rotate-45 checked:after:border-[0.125rem] checked:after:border-l-0 checked:after:border-t-0 checked:after:border-solid checked:after:border-white checked:after:bg-transparent checked:after:content-[''] hover:cursor-pointer hover:before:opacity-[0.04] hover:before:shadow-[0px_0px_0px_13px_rgba(0,0,0,0.6)] focus:shadow-none focus:transition-[border-color_0.2s] focus:before:scale-100 focus:before:opacity-[0.12] focus:before:shadow-[0px_0px_0px_13px_rgba(0,0,0,0.6)] focus:before:transition-[box-shadow_0.2s,transform_0.2s] focus:after:absolute focus:after:z-[1] focus:after:block focus:after:h-[0.875rem] focus:after:w-[0.875rem] focus:after:rounded-[0.125rem] focus:after:bg-white focus:after:content-[''] checked:focus:border-primary checked:focus:bg-primary checked:focus:before:scale-100 checked:focus:before:shadow-[0px_0px_0px_13px_#3b71ca] checked:focus:before:transition-[box-shadow_0.2s,transform_0.2s] checked:focus:after:-mt-px checked:focus:after:ml-[0.25rem] checked:focus:after:h-[0.8125rem] checked:focus:after:w-[0.375rem] checked:focus:after:rotate-45 checked:focus:after:rounded-none checked:focus:after:border-[0.125rem] checked:focus:after:border-l-0 checked:focus:after:border-t-0 checked:focus:after:border-solid checked:focus:after:border-white checked:focus:after:bg-transparent"
+                type="checkbox"
+                id="automated-rounds-visible-checkbox"
+                checked={showAutomatedRounds}
+                onChange={() => setShowAutomatedRounds((s) => !s)}
+              />
+              <label
+                className="inline-block pl-[0.15rem] hover:cursor-pointer"
+                htmlFor="automated-rounds-visible-checkbox"
+              >
+                Show Automated Rounds
+              </label>
+            </div>
+          </div>
+          <DailyRoundsList
+            facilityId={props.facilityId}
+            patientId={props.patientId}
+            consultationId={props.consultationId}
+            consultationData={props.consultationData}
+            showAutomatedRounds={showAutomatedRounds}
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
new file mode 100644
index 00000000000..d14b54cc096
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
@@ -0,0 +1,22 @@
+import { lazy } from "react";
+import { ConsultationTabProps } from "./index";
+import { VentilatorPlot } from "../Consultations/VentilatorPlot";
+
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+
+export const ConsultationVentilatorTab = (props: ConsultationTabProps) => {
+  return (
+    <div>
+      <PageTitle
+        title="Respiratory Support"
+        hideBack={true}
+        breadcrumbs={false}
+      />
+      <VentilatorPlot
+        facilityId={props.facilityId}
+        patientId={props.patientId}
+        consultationId={props.consultationId}
+      ></VentilatorPlot>
+    </div>
+  );
+};
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
new file mode 100644
index 00000000000..affdb2756cd
--- /dev/null
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -0,0 +1,501 @@
+import {
+  CONSULTATION_TABS,
+  GENDER_TYPES,
+  OptionsType,
+  SYMPTOM_CHOICES,
+} from "../../../Common/constants";
+import { ConsultationModel, ICD11DiagnosisModel } from "../models";
+import { getConsultation, getPatient } from "../../../Redux/actions";
+import { statusType, useAbortableEffect } from "../../../Common/utils";
+import { lazy, useCallback, useState } from "react";
+
+import ButtonV2 from "../../Common/components/ButtonV2";
+import CareIcon from "../../../CAREUI/icons/CareIcon";
+import DischargeModal from "../DischargeModal";
+import DischargeSummaryModal from "../DischargeSummaryModal";
+import DoctorVideoSlideover from "../DoctorVideoSlideover";
+import { make as Link } from "../../Common/components/Link.bs";
+import PatientInfoCard from "../../Patient/PatientInfoCard";
+import { PatientModel } from "../../Patient/models";
+import { formatDateTime, relativeTime } from "../../../Utils/utils";
+
+import { navigate } from "raviger";
+import { useDispatch } from "react-redux";
+import { useQueryParams } from "raviger";
+import { useTranslation } from "react-i18next";
+import { triggerGoal } from "../../Common/Plausible";
+import useAuthUser from "../../../Common/hooks/useAuthUser";
+import { ConsultationUpdatesTab } from "./ConsultationUpdatesTab";
+import { ConsultationABGTab } from "./ConsultationABGTab";
+import { ConsultationNursingTab } from "./ConsultationNursingTab";
+import { ConsultationFeedTab } from "./ConsultationFeedTab";
+import { ConsultationSummaryTab } from "./ConsultationSummaryTab";
+import { ConsultationFilesTab } from "./ConsultationFilesTab";
+import { ConsultationMedicinesTab } from "./ConsultationMedicinesTab";
+import { ConsultationInvestigationsTab } from "./ConsultationInvestigationsTab";
+import { ConsultationVentilatorTab } from "./ConsultationVentilatorTab";
+import { ConsultationPressureSoreTab } from "./ConsultationPressureSoreTab";
+import { ConsultationDialysisTab } from "./ConsultationDialysisTab";
+import { ConsultationNeurologicalMonitoringTab } from "./ConsultationNeurologicalMonitoringTab";
+
+const Loading = lazy(() => import("../../Common/Loading"));
+const PageTitle = lazy(() => import("../../Common/PageTitle"));
+const symptomChoices = [...SYMPTOM_CHOICES];
+
+export interface ConsultationTabProps {
+  consultationId: string;
+  facilityId: string;
+  patientId: string;
+  consultationData: ConsultationModel;
+  patientData: PatientModel;
+}
+
+export const ConsultationDetails = (props: any) => {
+  const { t } = useTranslation();
+  const { facilityId, patientId, consultationId } = props;
+  const tab = props.tab.toUpperCase();
+  const dispatch: any = useDispatch();
+  const [isLoading, setIsLoading] = useState(false);
+  const [showDoctors, setShowDoctors] = useState(false);
+  const [qParams, _] = useQueryParams();
+
+  const [consultationData, setConsultationData] = useState<ConsultationModel>(
+    {} as ConsultationModel
+  );
+  const [patientData, setPatientData] = useState<PatientModel>({});
+  const [openDischargeSummaryDialog, setOpenDischargeSummaryDialog] =
+    useState(false);
+  const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
+
+  const getPatientGender = (patientData: any) =>
+    GENDER_TYPES.find((i) => i.id === patientData.gender)?.text;
+
+  const getPatientAddress = (patientData: any) =>
+    `${patientData.address},\n${patientData.ward_object?.name},\n${patientData.local_body_object?.name},\n${patientData.district_object?.name},\n${patientData.state_object?.name}`;
+
+  const getPatientComorbidities = (patientData: any) => {
+    if (patientData?.medical_history?.length) {
+      const medHis = patientData.medical_history;
+      return medHis.map((item: any) => item.disease).join(", ");
+    } else {
+      return "None";
+    }
+  };
+
+  const authUser = useAuthUser();
+
+  const fetchData = useCallback(
+    async (status: statusType) => {
+      setIsLoading(true);
+      const res = await dispatch(getConsultation(consultationId));
+      if (!status.aborted) {
+        if (res?.data) {
+          const data: ConsultationModel = {
+            ...res.data,
+            symptoms_text: "",
+          };
+          if (res.data.symptoms?.length) {
+            const symptoms = res.data.symptoms
+              .filter((symptom: number) => symptom !== 9)
+              .map((symptom: number) => {
+                const option = symptomChoices.find((i) => i.id === symptom);
+                return option ? option.text.toLowerCase() : symptom;
+              });
+            data.symptoms_text = symptoms.join(", ");
+          }
+          setConsultationData(data);
+          const id = res.data.patient;
+          const patientRes = await dispatch(getPatient({ id }));
+          if (patientRes?.data) {
+            const patientGender = getPatientGender(patientRes.data);
+            const patientAddress = getPatientAddress(patientRes.data);
+            const patientComorbidities = getPatientComorbidities(
+              patientRes.data
+            );
+            const data = {
+              ...patientRes.data,
+              gender: patientGender,
+              address: patientAddress,
+              comorbidities: patientComorbidities,
+              is_declared_positive: patientRes.data.is_declared_positive
+                ? "Yes"
+                : "No",
+              is_vaccinated: patientData.is_vaccinated ? "Yes" : "No",
+            };
+            setPatientData(data);
+          }
+        } else {
+          navigate("/not-found");
+        }
+        setIsLoading(false);
+      }
+    },
+    [consultationId, dispatch, patientData.is_vaccinated]
+  );
+
+  useAbortableEffect((status: statusType) => {
+    fetchData(status);
+    triggerGoal("Patient Consultation Viewed", {
+      facilityId: facilityId,
+      consultationId: consultationId,
+      userId: authUser.id,
+    });
+  }, []);
+
+  const TABS = {
+    UPDATES: ConsultationUpdatesTab,
+    FEED: ConsultationFeedTab,
+    SUMMARY: ConsultationSummaryTab,
+    MEDICINES: ConsultationMedicinesTab,
+    FILES: ConsultationFilesTab,
+    INVESTIGATIONS: ConsultationInvestigationsTab,
+    ABG: ConsultationABGTab,
+    NURSING: ConsultationNursingTab,
+    NEUROLOGICAL_MONITORING: ConsultationNeurologicalMonitoringTab,
+    VENTILATOR: ConsultationVentilatorTab,
+    NUTRITION: ConsultationNursingTab,
+    PRESSURE_SORE: ConsultationPressureSoreTab,
+    DIALYSIS: ConsultationDialysisTab,
+  };
+
+  const consultationTabProps: ConsultationTabProps = {
+    consultationId,
+    facilityId,
+    patientId,
+    consultationData,
+    patientData,
+  };
+
+  const SelectedTab = TABS[tab];
+
+  if (isLoading) {
+    return <Loading />;
+  }
+
+  const tabButtonClasses = (selected: boolean) =>
+    `capitalize min-w-max-content cursor-pointer border-transparent text-gray-700 hover:text-gray-700 hover:border-gray-300 font-bold whitespace-nowrap ${
+      selected === true ? "border-primary-500 text-primary-600 border-b-2" : ""
+    }`;
+
+  const ShowDiagnosis = ({
+    diagnoses = [],
+    label = "Diagnosis",
+    nshow = 2,
+  }: {
+    diagnoses: ICD11DiagnosisModel[] | undefined;
+    label: string;
+    nshow?: number;
+  }) => {
+    const [showMore, setShowMore] = useState(false);
+
+    return diagnoses.length ? (
+      <div className="w-full text-sm">
+        <p className="font-semibold leading-relaxed">{label}</p>
+
+        {diagnoses.slice(0, !showMore ? nshow : undefined).map((diagnosis) => (
+          <p>{diagnosis.label}</p>
+        ))}
+        {diagnoses.length > nshow && (
+          <>
+            {!showMore ? (
+              <a
+                onClick={() => setShowMore(true)}
+                className="cursor-pointer text-sm text-blue-600 hover:text-blue-300"
+              >
+                show more
+              </a>
+            ) : (
+              <a
+                onClick={() => setShowMore(false)}
+                className="cursor-pointer text-sm text-blue-600 hover:text-blue-300"
+              >
+                show less
+              </a>
+            )}
+          </>
+        )}
+      </div>
+    ) : null;
+  };
+
+  return (
+    <div>
+      <DischargeSummaryModal
+        consultation={consultationData}
+        show={openDischargeSummaryDialog}
+        onClose={() => setOpenDischargeSummaryDialog(false)}
+      />
+
+      <DischargeModal
+        show={openDischargeDialog}
+        onClose={() => setOpenDischargeDialog(false)}
+        consultationData={consultationData}
+      />
+
+      <div className="px-2 pb-2">
+        <nav className="relative flex flex-wrap justify-between">
+          <PageTitle
+            title="Patient Dashboard"
+            className="sm:m-0 sm:p-0"
+            crumbsReplacements={{
+              [facilityId]: { name: patientData?.facility_object?.name },
+              [patientId]: { name: patientData?.name },
+              [consultationId]: {
+                name:
+                  consultationData.suggestion === "A"
+                    ? `Admitted on ${formatDateTime(
+                        consultationData.admission_date!
+                      )}`
+                    : consultationData.suggestion_text,
+              },
+            }}
+            breadcrumbs={true}
+            backUrl="/patients"
+          />
+          <div className="-right-6 top-0 flex w-full flex-col space-y-1 sm:w-min sm:flex-row sm:items-center sm:space-y-0 sm:divide-x-2 lg:absolute xl:right-0">
+            {!consultationData.discharge_date && (
+              <div className="flex w-full flex-col px-2 sm:flex-row">
+                <ButtonV2
+                  onClick={() =>
+                    navigate(
+                      `/facility/${patientData.facility}/patient/${patientData.id}/shift/new`
+                    )
+                  }
+                  className="btn btn-primary m-1 w-full hover:text-white"
+                >
+                  <CareIcon className="care-l-ambulance h-5 w-5" />
+                  Shift Patient
+                </ButtonV2>
+                <button
+                  onClick={() => {
+                    triggerGoal("Doctor Connect Clicked", {
+                      consultationId,
+                      facilityId: patientData.facility,
+                      userId: authUser.id,
+                      page: "ConsultationDetails",
+                    });
+                    setShowDoctors(true);
+                  }}
+                  className="btn btn-primary m-1 w-full hover:text-white"
+                >
+                  Doctor Connect
+                </button>
+                {patientData.last_consultation?.id && (
+                  <Link
+                    href={`/facility/${patientData.facility}/patient/${patientData.id}/consultation/${patientData.last_consultation?.id}/feed`}
+                    className="btn btn-primary m-1 w-full hover:text-white"
+                  >
+                    Camera Feed
+                  </Link>
+                )}
+              </div>
+            )}
+            <div className="flex w-full flex-col px-2 sm:flex-row">
+              <Link
+                href={`/facility/${patientData.facility}/patient/${patientData.id}`}
+                className="btn btn-primary m-1 w-full hover:text-white"
+              >
+                Patient Details
+              </Link>
+              <Link
+                href={`/facility/${patientData.facility}/patient/${patientData.id}/notes`}
+                className="btn btn-primary m-1 w-full hover:text-white"
+              >
+                Doctor&apos;s Notes
+              </Link>
+            </div>
+          </div>
+        </nav>
+        <div className="mt-2 flex w-full flex-col md:flex-row">
+          <div className="h-full w-full rounded-lg border bg-white text-black shadow">
+            <PatientInfoCard
+              patient={patientData}
+              consultation={consultationData}
+              fetchPatientData={fetchData}
+              consultationId={consultationId}
+              showAbhaProfile={qParams["show-abha-profile"] === "true"}
+            />
+
+            <div className="flex flex-col justify-between border-t px-4 pt-5 md:flex-row">
+              {consultationData.admitted_to && (
+                <div className="mt-2 rounded-lg border bg-gray-100 p-2 md:mt-0">
+                  <div className="border-b-2 py-1">
+                    Patient
+                    {consultationData.discharge_date
+                      ? " Discharged from"
+                      : " Admitted to"}
+                    <span className="badge badge-pill badge-warning ml-2 font-bold">
+                      {consultationData.admitted_to}
+                    </span>
+                  </div>
+                  {(consultationData.admission_date ??
+                    consultationData.discharge_date) && (
+                    <div className="text-3xl font-bold">
+                      {relativeTime(
+                        consultationData.discharge_date
+                          ? consultationData.discharge_date
+                          : consultationData.admission_date
+                      )}
+                    </div>
+                  )}
+                  <div className="-mt-2 text-xs">
+                    {consultationData.admission_date &&
+                      formatDateTime(consultationData.admission_date)}
+                    {consultationData.discharge_date &&
+                      ` - ${formatDateTime(consultationData.discharge_date)}`}
+                  </div>
+                </div>
+              )}
+            </div>
+
+            <div className="flex flex-col-reverse gap-2 px-4 lg:flex-row">
+              <div className="flex h-full w-3/4 flex-col">
+                {/*consultationData.other_symptoms && (
+                  <div className="capitalize">
+                    <span className="font-semibold leading-relaxed">
+                      Other Symptoms:{" "}
+                    </span>
+                    {consultationData.other_symptoms}
+                  </div>
+                )*/}
+
+                {consultationData.icd11_principal_diagnosis && (
+                  <ShowDiagnosis
+                    label="Principal Diagnosis (as per ICD-11 recommended by WHO)"
+                    diagnoses={[
+                      [
+                        ...(consultationData?.icd11_diagnoses_object ?? []),
+                        ...(consultationData?.icd11_provisional_diagnoses_object ??
+                          []),
+                      ].find(
+                        (d) =>
+                          d.id === consultationData.icd11_principal_diagnosis
+                      )!,
+                    ]}
+                  />
+                )}
+
+                <ShowDiagnosis
+                  diagnoses={
+                    consultationData?.icd11_provisional_diagnoses_object
+                  }
+                  label="Provisional Diagnosis (as per ICD-11 recommended by WHO)"
+                />
+
+                <ShowDiagnosis
+                  diagnoses={[
+                    ...(consultationData?.diagnosis
+                      ? [
+                          {
+                            id: "0",
+                            label: consultationData?.diagnosis,
+                            parentId: null,
+                          },
+                        ]
+                      : []),
+                    ...(consultationData?.icd11_diagnoses_object ?? []),
+                  ]}
+                  label="Diagnosis (as per ICD-11 recommended by WHO)"
+                />
+
+                {(consultationData.verified_by_object ||
+                  consultationData.deprecated_verified_by) && (
+                  <div className="mt-2 text-sm">
+                    <span className="font-semibold leading-relaxed">
+                      Verified By:{" "}
+                    </span>
+                    {consultationData.verified_by_object
+                      ? `${consultationData.verified_by_object.first_name} ${consultationData.verified_by_object.last_name}`
+                      : consultationData.deprecated_verified_by}
+                    <i className="fas fa-check ml-2 fill-current text-lg text-green-500"></i>
+                  </div>
+                )}
+              </div>
+              <div className="flex h-full w-full flex-col justify-end gap-2 text-right lg:flex-row">
+                <ButtonV2 onClick={() => setOpenDischargeSummaryDialog(true)}>
+                  <i className="fas fa-clipboard-list"></i>
+                  <span>{t("discharge_summary")}</span>
+                </ButtonV2>
+
+                <ButtonV2
+                  onClick={() => setOpenDischargeDialog(true)}
+                  disabled={!!consultationData.discharge_date}
+                >
+                  <i className="fas fa-hospital-user"></i>
+                  <span>{t("discharge_from_care")}</span>
+                </ButtonV2>
+              </div>
+            </div>
+            <div className="flex flex-col justify-between gap-2 p-4 md:flex-row">
+              <div className="font-base flex flex-col text-xs leading-relaxed text-gray-700">
+                <div>
+                  <span className="text-gray-900">Created: </span>
+                  {consultationData.created_date
+                    ? formatDateTime(consultationData.created_date)
+                    : "--:--"}{" "}
+                  |
+                </div>
+                {consultationData.created_by && (
+                  <div>
+                    {` ${consultationData.created_by.first_name} ${consultationData.created_by.last_name}  `}
+                    {`@${consultationData.created_by.username} (${consultationData.created_by.user_type})`}
+                  </div>
+                )}
+              </div>
+              <div className="font-base flex flex-col text-xs leading-relaxed text-gray-700 md:text-right">
+                <div>
+                  <span className="text-gray-900">Last Modified: </span>
+                  {consultationData.modified_date
+                    ? formatDateTime(consultationData.modified_date)
+                    : "--:--"}{" "}
+                  |
+                </div>
+                {consultationData.last_edited_by && (
+                  <div>
+                    {` ${consultationData.last_edited_by.first_name} ${consultationData.last_edited_by.last_name}  `}
+                    {`@${consultationData.last_edited_by.username} (${consultationData.last_edited_by.user_type})`}
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="mt-4 w-full border-b-2 border-gray-200">
+          <div className="overflow-x-auto sm:flex sm:items-baseline">
+            <div className="mt-4 sm:mt-0">
+              <nav className="flex space-x-6 overflow-x-auto pb-2 pl-2 ">
+                {CONSULTATION_TABS.map((p: OptionsType) => {
+                  if (p.text === "FEED") {
+                    if (
+                      !consultationData?.current_bed?.bed_object?.id ??
+                      consultationData?.discharge_date !== null
+                    )
+                      return null;
+                  }
+                  return (
+                    <Link
+                      key={p.text}
+                      className={tabButtonClasses(tab === p.text)}
+                      href={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/${p.text.toLocaleLowerCase()}`}
+                    >
+                      {p.desc}
+                    </Link>
+                  );
+                })}
+              </nav>
+            </div>
+          </div>
+        </div>
+
+        <SelectedTab {...consultationTabProps} />
+      </div>
+
+      <DoctorVideoSlideover
+        facilityId={facilityId}
+        show={showDoctors}
+        setShow={setShowDoctors}
+      />
+    </div>
+  );
+};
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 012ca1d68b2..cc34140e7a9 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -142,6 +142,7 @@ export interface ConsultationModel {
   cause_of_death?: string;
   death_datetime?: string;
   death_confirmed_doctor?: string;
+  is_readmission?: boolean;
 }
 export interface PatientStatsModel {
   id?: number;
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index bdde6f8c7f1..71a3ad08c8c 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -601,6 +601,15 @@ export const PatientManager = () => {
                         text="Review Missed"
                       />
                     )}
+                  {patient.last_consultation?.is_readmission && (
+                    <Chip
+                      size="small"
+                      variant="custom"
+                      className="border-blue-600 bg-blue-100 text-blue-600"
+                      startIcon="l-repeat"
+                      text="Readmission"
+                    />
+                  )}
                   {patient.disease_status === "POSITIVE" && (
                     <Chip
                       size="small"
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index 34e5ed1cb01..3d39f377462 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -374,6 +374,13 @@ export const PatientHome = (props: any) => {
     );
   };
 
+  const isPatientEligibleForNewConsultation = (patientData: PatientModel) => {
+    return !patientData.last_consultation ||
+      patientData.last_consultation?.discharge_date
+      ? true
+      : false;
+  };
+
   return (
     <Page
       title={"Patient Details"}
@@ -1105,23 +1112,31 @@ export const PatientHome = (props: any) => {
               <div
                 className={classNames(
                   "w-full rounded-lg border",
-                  patientData.is_active &&
-                    (!patientData?.last_consultation ||
-                      patientData?.last_consultation?.discharge_date)
+                  isPatientEligibleForNewConsultation(patientData)
                     ? "cursor-pointer border-green-700 hover:bg-primary-400"
                     : "border-gray-700 text-gray-700 hover:cursor-not-allowed"
                 )}
                 onClick={() =>
-                  patientData.is_active &&
-                  (!patientData?.last_consultation ||
-                    patientData?.last_consultation?.discharge_date) &&
+                  isPatientEligibleForNewConsultation(patientData) &&
                   navigate(
                     `/facility/${patientData?.facility}/patient/${id}/consultation`
                   )
                 }
               >
-                <div className="h-full space-y-2 rounded-lg bg-white p-4 shadow">
-                  <div className="text-center">
+                <div
+                  className={classNames(
+                    "h-full space-y-2 rounded-lg bg-white p-4 shadow",
+                    isPatientEligibleForNewConsultation(patientData) &&
+                      "hover:bg-gray-200"
+                  )}
+                >
+                  <div
+                    className={classNames(
+                      "text-center",
+                      isPatientEligibleForNewConsultation(patientData) &&
+                        "text-green-700"
+                    )}
+                  >
                     <span>
                       <CareIcon className="care-l-chat-bubble-user text-5xl" />
                     </span>
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index 9df4c93051a..dbb4aac34ce 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -143,7 +143,7 @@ export default function PatientInfoCard(props: {
                   </div>
                 )}
             </div>
-            <div className="flex flex-col items-center gap-1 sm:flex-row lg:mb-2">
+            <div className="flex flex-col items-center gap-2 sm:flex-row lg:mb-2">
               <Link
                 href={`/facility/${consultation?.facility}`}
                 className="font-semibold text-black hover:text-primary-600"
@@ -177,9 +177,18 @@ export default function PatientInfoCard(props: {
               {consultation?.suggestion === "DC" && (
                 <>
                   <span className="mx-2">•</span>
-                  <span className="space-x-2">
-                    Domiciliary Care{" "}
-                    <CareIcon className="care-l-estate text-base text-gray-700" />
+                  <span>
+                    <CareIcon icon="l-estate" className="mr-1 text-gray-700" />
+                    Domiciliary Care
+                  </span>
+                </>
+              )}
+              {consultation?.is_readmission && (
+                <>
+                  <span className="mx-2">•</span>
+                  <span>
+                    <CareIcon icon="l-repeat" className="mr-1 text-gray-600" />
+                    Readmitted
                   </span>
                 </>
               )}
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index d2e0ca415e3..8625d442f52 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -73,6 +73,8 @@ export default function ManageUsers() {
     name: string;
   }>({ show: false, username: "", name: "" });
 
+  const [weeklyHoursError, setWeeklyHoursError] = useState<string>("");
+
   const extremeSmallScreenBreakpoint = 320;
   const isExtremeSmallScreen =
     width <= extremeSmallScreenBreakpoint ? true : false;
@@ -144,7 +146,10 @@ export default function ManageUsers() {
 
   const handleWorkingHourSubmit = async () => {
     const username = selectedUser;
-    if (!username || weeklyHours < 0 || weeklyHours > 168) return;
+    if (!username || !weeklyHours || weeklyHours < 0 || weeklyHours > 168) {
+      setWeeklyHoursError("Value should be between 0 and 168");
+      return;
+    }
     const res = await dispatch(
       partialUpdateUser(username, {
         weekly_working_hours: weeklyHours,
@@ -163,6 +168,7 @@ export default function ManageUsers() {
       });
     }
     setWeeklyHours(0);
+    setWeeklyHoursError("");
     fetchData({ aborted: false });
   };
 
@@ -493,13 +499,14 @@ export default function ManageUsers() {
       </SlideOverCustom>
       <SlideOverCustom
         open={expandWorkingHours}
-        setOpen={setExpandWorkingHours}
+        setOpen={(state) => {
+          setExpandWorkingHours(state);
+          setWeeklyHours(0);
+          setWeeklyHoursError("");
+        }}
         slideFrom="right"
         title="Average weekly working hours"
         dialogClass="md:w-[400px]"
-        onCloseClick={() => {
-          setWeeklyHours(0);
-        }}
       >
         <div className="px-2">
           <dt className="mb-3 text-sm font-medium leading-5 text-black">
@@ -512,11 +519,7 @@ export default function ManageUsers() {
             onChange={(e) => {
               setWeeklyHours(e.value);
             }}
-            error={
-              weeklyHours < 0 || weeklyHours > 168
-                ? "Average weekly working hours should be between 0 and 168"
-                : ""
-            }
+            error={weeklyHoursError}
             required
             label=""
             type="number"
diff --git a/src/Components/VitalsMonitor/HL7DeviceClient.ts b/src/Components/VitalsMonitor/HL7DeviceClient.ts
index 72f6406193a..7e13622b31f 100644
--- a/src/Components/VitalsMonitor/HL7DeviceClient.ts
+++ b/src/Components/VitalsMonitor/HL7DeviceClient.ts
@@ -1,11 +1,31 @@
 import { EventEmitter } from "events";
 import { VitalsDataBase, VitalsValueBase, VitalsWaveformBase } from "./types";
 
-const WAVEFORM_KEY_MAP: Record<string, EventName> = {
-  II: "ecg-waveform",
-  Pleth: "pleth-waveform",
-  Respiration: "spo2-waveform",
-};
+const ECG_WAVENAME_KEYS = [
+  "I",
+  "II",
+  "III",
+  "aVR",
+  "aVL",
+  "aVF",
+  "V1",
+  "V2",
+  "V3",
+  "V4",
+  "V5",
+  "V6",
+] as const;
+
+const WAVEFORM_KEY_MAP: Record<HL7VitalsWaveformData["wave-name"], EventName> =
+  {
+    Pleth: "pleth-waveform",
+    Respiration: "spo2-waveform",
+
+    // Maps each ECG wave name to the  event "ecg-waveform"
+    ...(Object.fromEntries(
+      ECG_WAVENAME_KEYS.map((key) => [key, "ecg-waveform"])
+    ) as Record<EcgWaveName, EventName>),
+  };
 
 /**
  * Provides the API for connecting to the Vitals Monitor WebSocket and emitting
@@ -74,8 +94,10 @@ export interface HL7VitalsValueData extends VitalsDataBase, VitalsValueBase {
     | "body-temperature2";
 }
 
+type EcgWaveName = (typeof ECG_WAVENAME_KEYS)[number];
+
 export interface HL7VitalsWaveformData extends VitalsWaveformBase {
-  "wave-name": "II" | "Pleth" | "Respiration";
+  "wave-name": EcgWaveName | "Pleth" | "Respiration";
 }
 
 export interface HL7VitalsBloodPressureData extends VitalsDataBase {
diff --git a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
index a340c21e28b..c0b089df8b0 100644
--- a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
+++ b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
@@ -88,7 +88,7 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
           {/* Pulse Rate */}
           <NonWaveformData
             label="ECG"
-            attr={data.pulseRate ?? data.heartRate}
+            attr={data.pulseRate?.value ? data.pulseRate : data.heartRate}
             className="text-green-400"
             suffix={
               <span className="animate-pulse font-sans text-red-500">❤️</span>
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 393b9372ca5..01a91d4ce3a 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -10,7 +10,7 @@ interface Routes {
 
 const routes: Routes = {
   config: {
-    path: import.meta.env.REACT_APP_CONFIG || "/config.json",
+    path: import.meta.env.REACT_APP_CONFIG ?? "/config.json",
     method: "GET",
     noAuth: true,
   },
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 529c2689aed..c899d453626 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -5,7 +5,7 @@ interface ImportMetaEnv {
   readonly REACT_APP_META_DESCRIPTION: string;
   readonly REACT_APP_COVER_IMAGE: string;
   readonly REACT_APP_COVER_IMAGE_ALT: string;
-  readonly REACT_APP_CONFIG: string;
+  readonly REACT_APP_CONFIG: string | undefined;
   readonly REACT_PUBLIC_URL: string;
   readonly REACT_APP_SITE_URL: string;
   readonly REACT_APP_ANALYTICS_SERVER_URL: string;