From f712fa33e44f4b1017bc53b632d0a38a5e279dfb Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Mon, 20 May 2024 07:23:39 +0530
Subject: [PATCH 1/5] New Cypress Test | Titrated dosage and Individual
 administration | Patient Prescription Module (#7803)

* Titrated dosage

* fix flaky test
---
 .../patient_spec/patient_prescription.cy.ts   | 56 +++++++++++++++++--
 .../pageobject/Patient/PatientPrescription.ts | 34 +++++++++--
 .../Medicine/CreatePrescriptionForm.tsx       |  1 +
 .../Medicine/ManagePrescriptions.tsx          |  5 +-
 .../AdministrationEventCell.tsx               |  1 +
 .../MedicineAdministrationSheet/index.tsx     |  1 +
 .../Medicine/PrescriptionBuilder.tsx          |  2 +-
 .../Medicine/PrescriptionDetailCard.tsx       |  1 +
 8 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/patient_spec/patient_prescription.cy.ts b/cypress/e2e/patient_spec/patient_prescription.cy.ts
index 3cf5a1ba5aa..d9a7bf7a080 100644
--- a/cypress/e2e/patient_spec/patient_prescription.cy.ts
+++ b/cypress/e2e/patient_spec/patient_prescription.cy.ts
@@ -5,6 +5,11 @@ import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 const patientPrescription = new PatientPrescription();
 const loginPage = new LoginPage();
 const patientPage = new PatientPage();
+const medicineName = "DOLO";
+const medicineBaseDosage = "4";
+const medicineTargetDosage = "9";
+const medicineFrequency = "Twice daily";
+const medicineAdministerNote = "Medicine Administration Note";
 
 describe("Patient Medicine Administration", () => {
   before(() => {
@@ -18,15 +23,54 @@ describe("Patient Medicine Administration", () => {
     cy.awaitUrl("/patients");
   });
 
+  it("Add a new titrated medicine for a patient | Individual Administeration |", () => {
+    patientPage.visitPatient("Dummy Patient 5");
+    patientPrescription.visitMedicineTab();
+    patientPrescription.visitEditPrescription();
+    patientPrescription.clickAddPrescription();
+    patientPrescription.interceptMedibase();
+    patientPrescription.selectMedicinebox();
+    patientPrescription.selectMedicine(medicineName);
+    patientPrescription.clickTitratedDosage();
+    patientPrescription.enterDosage(medicineBaseDosage);
+    patientPrescription.enterTargetDosage(medicineTargetDosage);
+    patientPrescription.selectDosageFrequency(medicineFrequency);
+    cy.submitButton("Submit");
+    cy.verifyNotification("Medicine prescribed");
+    cy.closeNotification();
+    // Administer the medicine in edit form
+    patientPrescription.clickAdministerButton();
+    patientPrescription.enterAdministerDosage(medicineBaseDosage);
+    patientPrescription.enterAdministerNotes(medicineAdministerNote);
+    cy.submitButton("Administer Medicine");
+    cy.verifyNotification("Medicine(s) administered");
+    cy.closeNotification();
+    // Verify the Reflection on the Medicine
+    cy.verifyContentPresence("#medicine-preview", [
+      medicineName,
+      medicineBaseDosage,
+      medicineTargetDosage,
+    ]);
+    patientPrescription.clickReturnToDashboard();
+    // Go to medicine tab and administer it again
+    patientPrescription.visitMedicineTab();
+    cy.verifyAndClickElement("#0", medicineName);
+    cy.submitButton("Administer");
+    patientPrescription.enterAdministerDosage(medicineBaseDosage);
+    cy.submitButton("Administer Medicine");
+    cy.verifyNotification("Medicine(s) administered");
+  });
+
   it("Add a new medicine for a patient and verify the duplicate medicine validation", () => {
     patientPage.visitPatient("Dummy Patient 4");
     patientPrescription.visitMedicineTab();
+    patientPrescription.visitEditPrescription();
     patientPrescription.clickAddPrescription();
     patientPrescription.interceptMedibase();
     patientPrescription.selectMedicinebox();
-    patientPrescription.selectMedicine("DOLO");
-    patientPrescription.enterDosage("4");
-    patientPrescription.selectDosageFrequency("Twice daily");
+    patientPrescription.selectMedicine(medicineName);
+    patientPrescription.enterDosage(medicineBaseDosage);
+    patientPrescription.selectDosageFrequency(medicineFrequency);
     cy.submitButton("Submit");
     cy.verifyNotification("Medicine prescribed");
     cy.closeNotification();
@@ -34,9 +78,9 @@ describe("Patient Medicine Administration", () => {
     patientPrescription.clickAddPrescription();
     patientPrescription.interceptMedibase();
     patientPrescription.selectMedicinebox();
-    patientPrescription.selectMedicine("DOLO");
-    patientPrescription.enterDosage("4");
-    patientPrescription.selectDosageFrequency("Twice daily");
+    patientPrescription.selectMedicine(medicineName);
+    patientPrescription.enterDosage(medicineBaseDosage);
+    patientPrescription.selectDosageFrequency(medicineFrequency);
     cy.submitButton("Submit");
     cy.verifyNotification(
       "Medicine - This medicine is already prescribed to this patient. Please discontinue the existing prescription to prescribe again.",
diff --git a/cypress/pageobject/Patient/PatientPrescription.ts b/cypress/pageobject/Patient/PatientPrescription.ts
index dc4163e4823..a4b92b0a5fa 100644
--- a/cypress/pageobject/Patient/PatientPrescription.ts
+++ b/cypress/pageobject/Patient/PatientPrescription.ts
@@ -1,8 +1,10 @@
 export class PatientPrescription {
   clickAddPrescription() {
-    cy.contains("button", "Add Prescription Medication")
-      .should("be.visible")
-      .click();
+    cy.get("#add-prescription").scrollIntoView();
+    cy.verifyAndClickElement(
+      "#add-prescription",
+      "Add Prescription Medication",
+    );
   }
 
   interceptMedibase() {
@@ -16,6 +18,15 @@ export class PatientPrescription {
     );
   }
 
+  clickTitratedDosage() {
+    cy.get("#titrated-dosage").click();
+  }
+
+  clickAdministerButton() {
+    cy.get("#administer-medicine").should("be.visible");
+    cy.verifyAndClickElement("#administer-medicine", "Administer");
+  }
+
   selectMedicinebox() {
     cy.get(
       "div#medicine_object input[placeholder='Select'][role='combobox']",
@@ -30,6 +41,18 @@ export class PatientPrescription {
     cy.get("#base_dosage").type(doseAmount, { force: true });
   }
 
+  enterAdministerDosage(dosage: string) {
+    cy.get("#dosage").type(dosage);
+  }
+
+  enterAdministerNotes(notes: string) {
+    cy.get("#administration_notes").type(notes);
+  }
+
+  enterTargetDosage(targetDosage: string) {
+    cy.get("#target_dosage").type(targetDosage, { force: true });
+  }
+
   selectDosageFrequency(frequency: string) {
     cy.clickAndSelectOption("#frequency", frequency);
   }
@@ -54,7 +77,10 @@ export class PatientPrescription {
   visitMedicineTab() {
     cy.get("#consultation_tab_nav").scrollIntoView();
     cy.get("#consultation_tab_nav").contains("Medicines").click();
-    cy.get("a[href='prescriptions']").first().click();
+  }
+
+  visitEditPrescription() {
+    cy.get("#edit-prescription").click();
   }
 }
 export default PatientPrescription;
diff --git a/src/Components/Medicine/CreatePrescriptionForm.tsx b/src/Components/Medicine/CreatePrescriptionForm.tsx
index b918d5781fe..173f5163427 100644
--- a/src/Components/Medicine/CreatePrescriptionForm.tsx
+++ b/src/Components/Medicine/CreatePrescriptionForm.tsx
@@ -64,6 +64,7 @@ export default function CreatePrescriptionForm(props: {
           {props.prescription.dosage_type !== "PRN" &&
             props.prescription.prescription_type !== "DISCHARGE" && (
               <CheckBoxFormField
+                id="titrated-dosage"
                 label={t("titrate_dosage")}
                 name="Titrate Dosage"
                 value={field("dosage_type").value === "TITRATED"}
diff --git a/src/Components/Medicine/ManagePrescriptions.tsx b/src/Components/Medicine/ManagePrescriptions.tsx
index 12ed0712533..f581f3e2121 100644
--- a/src/Components/Medicine/ManagePrescriptions.tsx
+++ b/src/Components/Medicine/ManagePrescriptions.tsx
@@ -11,7 +11,10 @@ export default function ManagePrescriptions() {
 
   return (
     <Page title={t("manage_prescriptions")}>
-      <div className="mx-auto flex w-full max-w-4xl flex-col gap-10 rounded bg-white p-6 transition-all sm:rounded-xl sm:p-12">
+      <div
+        className="mx-auto flex w-full max-w-4xl flex-col gap-10 rounded bg-white p-6 transition-all sm:rounded-xl sm:p-12"
+        id="medicine-preview"
+      >
         <div className="flex flex-col gap-10 divide-y-2 divide-dashed divide-gray-600">
           <div>
             <h3 className="mb-4 text-lg font-semibold">
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
index b13e05b5b58..0949189d96d 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
@@ -62,6 +62,7 @@ export default function AdministrationEventCell({
           />
         </DialogModal>
         <button
+          id="administration-symbol"
           className="scale-100 transition-transform duration-200 ease-in-out hover:scale-110"
           onClick={() => setShowTimeline(true)}
         >
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 4c054edcaf3..c1917cef41d 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -91,6 +91,7 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           !!data?.results && (
             <>
               <ButtonV2
+                id="edit-prescription"
                 variant="secondary"
                 border
                 href="prescriptions"
diff --git a/src/Components/Medicine/PrescriptionBuilder.tsx b/src/Components/Medicine/PrescriptionBuilder.tsx
index bd7701e3e62..d5388dfa44a 100644
--- a/src/Components/Medicine/PrescriptionBuilder.tsx
+++ b/src/Components/Medicine/PrescriptionBuilder.tsx
@@ -82,7 +82,7 @@ export default function PrescriptionBuilder({
         className="mt-4 w-full bg-gray-200 text-gray-700 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900"
         disabled={disabled}
       >
-        <div className="flex w-full justify-start gap-2">
+        <div className="flex w-full justify-start gap-2" id="add-prescription">
           <CareIcon icon="l-plus" className="text-lg" />
           <span className="font-bold">
             {t(is_prn ? "add_prn_prescription" : "add_prescription_medication")}
diff --git a/src/Components/Medicine/PrescriptionDetailCard.tsx b/src/Components/Medicine/PrescriptionDetailCard.tsx
index e68f995b0b6..166408e6292 100644
--- a/src/Components/Medicine/PrescriptionDetailCard.tsx
+++ b/src/Components/Medicine/PrescriptionDetailCard.tsx
@@ -58,6 +58,7 @@ export default function PrescriptionDetailCard({
               prescription.prescription_type !== "DISCHARGE" && (
                 <div className="flex flex-col-reverse items-end gap-2 sm:flex-row">
                   <ButtonV2
+                    id="administer-medicine"
                     disabled={prescription.discontinued}
                     onClick={props.onAdministerClick}
                     type="button"

From aa7d7aa4de5c6442a8fc39a62dd7a2884fc21eaf Mon Sep 17 00:00:00 2001
From: Khavin Shankar <khavinshankar@gmail.com>
Date: Mon, 20 May 2024 20:07:41 +0530
Subject: [PATCH 2/5] Abdm improvements (#7861)

---
 .../hooks/useNotificationSubscriptionState.ts | 55 +++++++++++++++++++
 src/Components/ABDM/ABDMFacilityRecords.tsx   | 15 ++++-
 src/Components/ABDM/FetchRecordsModal.tsx     | 30 +++++++++-
 .../Facility/PatientNotesSlideover.tsx        | 36 ++++--------
 4 files changed, 108 insertions(+), 28 deletions(-)
 create mode 100644 src/Common/hooks/useNotificationSubscriptionState.ts

diff --git a/src/Common/hooks/useNotificationSubscriptionState.ts b/src/Common/hooks/useNotificationSubscriptionState.ts
new file mode 100644
index 00000000000..b7927e0cc70
--- /dev/null
+++ b/src/Common/hooks/useNotificationSubscriptionState.ts
@@ -0,0 +1,55 @@
+import { useEffect, useState } from "react";
+import routes from "../../Redux/api";
+import request from "../../Utils/request/request";
+import useAuthUser from "./useAuthUser";
+import * as Sentry from "@sentry/browser";
+
+export type NotificationSubscriptionState =
+  | "unsubscribed"
+  | "subscribed"
+  | "subscribed_on_other_device"
+  | "subscribed"
+  | "pending"
+  | "error";
+
+/**
+ * This is a temporary hook and will be removed in the future.
+ *
+ * This hook is used to get the initial notification subscription state of the user.
+ * @returns NotificationSubscriptionState
+ */
+export default function useNotificationSubscriptionState(
+  dependencies: any[] = [],
+) {
+  const { username } = useAuthUser();
+  const [subscriptionState, setSubscriptionState] =
+    useState<NotificationSubscriptionState>("pending");
+
+  const getSubscriptionState = async () => {
+    try {
+      const res = await request(routes.getUserPnconfig, {
+        pathParams: { username },
+      });
+
+      const reg = await navigator.serviceWorker.ready;
+      const subscription = await reg.pushManager.getSubscription();
+
+      if (!subscription && !res.data?.pf_endpoint) {
+        setSubscriptionState("unsubscribed");
+      } else if (subscription?.endpoint !== res.data?.pf_endpoint) {
+        setSubscriptionState("subscribed_on_other_device");
+      } else {
+        setSubscriptionState("subscribed");
+      }
+    } catch (error) {
+      setSubscriptionState("error");
+      Sentry.captureException(error);
+    }
+  };
+
+  useEffect(() => {
+    getSubscriptionState();
+  }, [username, ...dependencies]);
+
+  return subscriptionState;
+}
diff --git a/src/Components/ABDM/ABDMFacilityRecords.tsx b/src/Components/ABDM/ABDMFacilityRecords.tsx
index 8178e037a7f..96040905d6c 100644
--- a/src/Components/ABDM/ABDMFacilityRecords.tsx
+++ b/src/Components/ABDM/ABDMFacilityRecords.tsx
@@ -4,6 +4,8 @@ import useQuery from "../../Utils/request/useQuery";
 import { formatDateTime } from "../../Utils/utils";
 import Loading from "../Common/Loading";
 import Page from "../Common/components/Page";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import ButtonV2 from "../Common/components/ButtonV2";
 
 interface IProps {
   facilityId: string;
@@ -21,7 +23,11 @@ const TableHeads = [
 ];
 
 export default function ABDMFacilityRecords({ facilityId }: IProps) {
-  const { data: consentsResult, loading } = useQuery(routes.abha.listConsents, {
+  const {
+    data: consentsResult,
+    loading,
+    refetch,
+  } = useQuery(routes.abha.listConsents, {
     query: { facility: facilityId, ordering: "-created_date" },
   });
 
@@ -53,6 +59,13 @@ export default function ABDMFacilityRecords({ facilityId }: IProps) {
                         scope="col"
                         className="sticky right-0 top-0 py-3.5 pl-3 pr-4 sm:pr-6"
                       >
+                        <ButtonV2
+                          onClick={() => refetch()}
+                          ghost
+                          className="max-w-2xl text-sm text-gray-700 hover:text-gray-900"
+                        >
+                          <CareIcon icon="l-refresh" /> Refresh
+                        </ButtonV2>
                         <span className="sr-only">View</span>
                       </th>
                     </tr>
diff --git a/src/Components/ABDM/FetchRecordsModal.tsx b/src/Components/ABDM/FetchRecordsModal.tsx
index 8273a9763f1..950b69611c4 100644
--- a/src/Components/ABDM/FetchRecordsModal.tsx
+++ b/src/Components/ABDM/FetchRecordsModal.tsx
@@ -21,6 +21,7 @@ import CircularProgress from "../Common/components/CircularProgress.js";
 import CareIcon from "../../CAREUI/icons/CareIcon.js";
 import { classNames } from "../../Utils/utils.js";
 import { ConsentHIType, ConsentPurpose } from "./types/consent.js";
+import useNotificationSubscriptionState from "../../Common/hooks/useNotificationSubscriptionState.js";
 
 const getDate = (value: any) =>
   value && dayjs(value).isValid() && dayjs(value).toDate();
@@ -46,6 +47,9 @@ export default function FetchRecordsModal({ patient, show, onClose }: IProps) {
     dayjs().add(30, "day").toDate(),
   );
   const [errors, setErrors] = useState<any>({});
+  const notificationSubscriptionState = useNotificationSubscriptionState([
+    show,
+  ]);
 
   useMessageListener((data) => {
     if (data.type === "MESSAGE" && data.from === "patients/on_find") {
@@ -62,7 +66,23 @@ export default function FetchRecordsModal({ patient, show, onClose }: IProps) {
   });
 
   return (
-    <DialogModal title="Fetch Records over ABDM" show={show} onClose={onClose}>
+    <DialogModal
+      className="max-w-xl"
+      fixedWidth={false}
+      title="Fetch Records over ABDM"
+      show={show}
+      onClose={onClose}
+    >
+      {["unsubscribed", "subscribed_on_other_device"].includes(
+        notificationSubscriptionState,
+      ) && (
+        <p className="my-4 text-sm text-warning-600">
+          <CareIcon icon="l-exclamation-triangle" className="h-4 w-4" />{" "}
+          Notifications needs to be enabled on this device to verify the
+          patient.
+        </p>
+      )}
+
       <div className="flex items-center gap-3">
         <TextFormField
           value={patient?.abha_number_object?.health_id as string}
@@ -89,7 +109,12 @@ export default function FetchRecordsModal({ patient, show, onClose }: IProps) {
           }}
           loading={idVerificationStatus === "in-progress"}
           ghost={idVerificationStatus === "verified"}
-          disabled={idVerificationStatus === "verified"}
+          disabled={
+            idVerificationStatus === "verified" ||
+            ["unsubscribed", "subscribed_on_other_device"].includes(
+              notificationSubscriptionState,
+            )
+          }
           className={classNames(
             "mt-1.5 !py-3",
             idVerificationStatus === "verified" &&
@@ -215,6 +240,7 @@ export default function FetchRecordsModal({ patient, show, onClose }: IProps) {
             setIsMakingConsentRequest(false);
             onClose();
           }}
+          disabled={idVerificationStatus !== "verified"}
           loading={isMakingConsentRequest}
         >
           Request Consent
diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx
index 3fd46f92f57..e2da270e532 100644
--- a/src/Components/Facility/PatientNotesSlideover.tsx
+++ b/src/Components/Facility/PatientNotesSlideover.tsx
@@ -12,9 +12,9 @@ import routes from "../../Redux/api";
 import { PatientNoteStateType } from "./models";
 import useKeyboardShortcut from "use-keyboard-shortcut";
 import AutoExpandingTextInputFormField from "../Form/FormFields/AutoExpandingTextInputFormField.js";
-import * as Sentry from "@sentry/browser";
 import useAuthUser from "../../Common/hooks/useAuthUser";
 import { PATIENT_NOTES_THREADS } from "../../Common/constants.js";
+import useNotificationSubscriptionState from "../../Common/hooks/useNotificationSubscriptionState.js";
 
 interface PatientNotesProps {
   patientId: string;
@@ -25,6 +25,7 @@ interface PatientNotesProps {
 
 export default function PatientNotesSlideover(props: PatientNotesProps) {
   const authUser = useAuthUser();
+  const notificationSubscriptionState = useNotificationSubscriptionState();
   const [thread, setThread] = useState(
     authUser.user_type === "Nurse"
       ? PATIENT_NOTES_THREADS.Nurses
@@ -35,32 +36,17 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
   const [reload, setReload] = useState(false);
   const [focused, setFocused] = useState(false);
 
-  const { username } = useAuthUser();
-
-  const intialSubscriptionState = async () => {
-    try {
-      const res = await request(routes.getUserPnconfig, {
-        pathParams: { username },
+  useEffect(() => {
+    if (notificationSubscriptionState === "unsubscribed") {
+      Notification.Warn({
+        msg: "Please subscribe to notifications to get live updates on discussion notes.",
+      });
+    } else if (notificationSubscriptionState === "subscribed_on_other_device") {
+      Notification.Warn({
+        msg: "Please subscribe to notifications on this device to get live updates on discussion notes.",
       });
-      const reg = await navigator.serviceWorker.ready;
-      const subscription = await reg.pushManager.getSubscription();
-      if (!subscription && !res.data?.pf_endpoint) {
-        Notification.Warn({
-          msg: "Please subscribe to notifications to get live updates on discussion notes.",
-        });
-      } else if (subscription?.endpoint !== res.data?.pf_endpoint) {
-        Notification.Warn({
-          msg: "Please subscribe to notifications on this device to get live updates on discussion notes.",
-        });
-      }
-    } catch (error) {
-      Sentry.captureException(error);
     }
-  };
-
-  useEffect(() => {
-    intialSubscriptionState();
-  }, []);
+  }, [notificationSubscriptionState]);
 
   const initialData: PatientNoteStateType = {
     notes: [],

From 1a08fafea004860b96960f35624e26f42f72f724 Mon Sep 17 00:00:00 2001
From: Sulochan Khadka <122200551+Sulochan-khadka@users.noreply.github.com>
Date: Tue, 21 May 2024 15:07:10 +0530
Subject: [PATCH 3/5] Show skills of treating doctor in consultation dashboard
 (#7822)

* fixes: Linked skills- to show on patient dashboard for "treating doctor" #7810

* Update src/Components/Patient/PatientInfoCard.tsx

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>

* updated with implementing suggestions

* made changes

* refactor based on suggestions

* show tooltip only if overflow

* Update src/Components/Patient/PatientInfoCard.tsx

---------

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
Co-authored-by: rithviknishad <mail@rithviknishad.dev>
---
 src/Components/Patient/PatientInfoCard.tsx | 44 ++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index cd99d169544..7a88c478bba 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -37,7 +37,27 @@ import { Mews } from "../Facility/Consultations/Mews.js";
 import DischargeSummaryModal from "../Facility/DischargeSummaryModal.js";
 import DischargeModal from "../Facility/DischargeModal.js";
 import { useTranslation } from "react-i18next";
+import useQuery from "../../Utils/request/useQuery.js";
 import FetchRecordsModal from "../ABDM/FetchRecordsModal.js";
+import { SkillModel } from "../Users/models.js";
+
+const formatSkills = (arr: SkillModel[]) => {
+  const skills = arr.map((skill) => skill.skill_object.name);
+
+  if (skills.length === 1) {
+    return skills[0];
+  }
+
+  if (skills.length === 2) {
+    return `${skills[0]} and ${skills[1]}`;
+  }
+
+  if (skills.length === 3) {
+    return `${skills[0]}, ${skills[1]} and ${skills[2]}`;
+  }
+
+  return `${skills[0]}, ${skills[1]} and ${skills.length - 2} other skills...`;
+};
 
 export default function PatientInfoCard(props: {
   patient: PatientModel;
@@ -113,6 +133,12 @@ export default function PatientInfoCard(props: {
 
     return false;
   };
+  const skillsQuery = useQuery(routes.userListSkill, {
+    pathParams: {
+      username: consultation?.treating_physician_object?.username ?? "",
+    },
+    prefetch: !!consultation?.treating_physician_object?.username,
+  });
 
   return (
     <>
@@ -450,7 +476,7 @@ export default function PatientInfoCard(props: {
                   : null}
                 {(consultation?.treating_physician_object ||
                   consultation?.deprecated_verified_by) && (
-                  <div className="text-sm" id="treating-physician">
+                  <span className="space-x-1 text-sm" id="treating-physician">
                     <span className="font-semibold leading-relaxed">
                       {t("treating_doctor")}:{" "}
                     </span>
@@ -459,9 +485,21 @@ export default function PatientInfoCard(props: {
                       : consultation?.deprecated_verified_by}
                     <CareIcon
                       icon="l-check"
-                      className="ml-2 fill-current text-xl text-green-500"
+                      className="fill-current text-xl text-green-500"
                     />
-                  </div>
+                    <br className="md:hidden" />
+                    <span className="tooltip text-xs text-gray-800">
+                      {!!skillsQuery.data?.results?.length &&
+                        formatSkills(skillsQuery.data?.results)}
+                      {(skillsQuery.data?.results?.length || 0) > 3 && (
+                        <ul className="tooltip-text tooltip-bottom flex flex-col text-xs font-medium">
+                          {skillsQuery.data?.results.map((skill) => (
+                            <li>{skill.skill_object.name}</li>
+                          ))}
+                        </ul>
+                      )}
+                    </span>
+                  </span>
                 )}
               </div>
             </div>

From 2c34d5f024deab16169654bdb070a266695b8652 Mon Sep 17 00:00:00 2001
From: Khavin Shankar <khavinshankar@gmail.com>
Date: Tue, 21 May 2024 15:09:29 +0530
Subject: [PATCH 4/5] Remove 'not vaccinated' badge (#7867)

---
 src/Components/Patient/PatientHome.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index 93e109a2eae..9611b3f02b2 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -347,19 +347,13 @@ export const PatientHome = (props: any) => {
                     {patientData.name} - {formatPatientAge(patientData, true)}
                   </h1>
                   <div className="ml-auto mr-9 flex flex-wrap gap-3">
-                    {patientData.is_vaccinated ? (
+                    {patientData.is_vaccinated && (
                       <Chip
                         variant="custom"
                         className="bg-blue-100 text-blue-800"
                         startIcon="l-syringe"
                         text="Vaccinated"
                       />
-                    ) : (
-                      <Chip
-                        variant="warning"
-                        startIcon="l-exclamation-triangle"
-                        text="Not Vaccinated"
-                      />
                     )}
                     {patientData.allow_transfer ? (
                       <Chip

From f71075d182b8d2c1c1351942514912a18d2aee4b Mon Sep 17 00:00:00 2001
From: Khavin Shankar <khavinshankar@gmail.com>
Date: Tue, 21 May 2024 18:58:33 +0530
Subject: [PATCH 5/5] Remove unwanted covid fields (#7870)

---
 cypress/e2e/shifting_spec/filter.cy.ts     |   7 +-
 cypress/pageobject/Shift/ShiftFilters.ts   |  18 +-
 src/Common/constants.tsx                   |   7 -
 src/Components/Patient/ManagePatients.tsx  |  24 --
 src/Components/Patient/PatientFilter.tsx   |  51 ----
 src/Components/Patient/PatientHome.tsx     |  23 +-
 src/Components/Patient/PatientRegister.tsx | 267 +--------------------
 src/Components/Patient/models.tsx          |  12 +-
 src/Components/Shifting/BadgesList.tsx     |   1 -
 src/Components/Shifting/Commons.tsx        |   2 -
 src/Components/Shifting/ListFilter.tsx     |  17 --
 src/Components/Shifting/ListView.tsx       |   9 +-
 src/Components/Shifting/ShiftDetails.tsx   |  31 ---
 src/Components/Shifting/ShiftingBoard.tsx  |   8 +-
 14 files changed, 13 insertions(+), 464 deletions(-)

diff --git a/cypress/e2e/shifting_spec/filter.cy.ts b/cypress/e2e/shifting_spec/filter.cy.ts
index a142a657013..82fad9d99e4 100644
--- a/cypress/e2e/shifting_spec/filter.cy.ts
+++ b/cypress/e2e/shifting_spec/filter.cy.ts
@@ -20,7 +20,7 @@ describe("Shifting section filter", () => {
     shiftingPage.filterByFacility(
       "Dummy Shifting",
       "Dummy Shifting",
-      "District"
+      "District",
     );
 
     shiftingPage.facilityAssignedBadge().should("exist");
@@ -32,13 +32,10 @@ describe("Shifting section filter", () => {
       "ASC Created Date",
       "yes",
       "yes",
-      "POSITIVE",
       "no",
       "MODERATE",
-      "9999999999"
+      "9999999999",
     );
-
-    shiftingPage.diseaseStatusBadge().should("exist");
     shiftingPage.orderingBadge().should("exist");
     shiftingPage.breathlessnessLevelBadge().should("exist");
     shiftingPage.phoneNumberBadge().should("exist");
diff --git a/cypress/pageobject/Shift/ShiftFilters.ts b/cypress/pageobject/Shift/ShiftFilters.ts
index 87d3f33c37e..1f824cebbb3 100644
--- a/cypress/pageobject/Shift/ShiftFilters.ts
+++ b/cypress/pageobject/Shift/ShiftFilters.ts
@@ -27,10 +27,6 @@ class ShiftingPage {
     return cy.get("#is-up-shift");
   }
 
-  diseaseStatusInput() {
-    return cy.get("#disease-status");
-  }
-
   isAntenatalInput() {
     return cy.get("#is-antenatal");
   }
@@ -63,10 +59,6 @@ class ShiftingPage {
     return cy.get("[data-testid='Current facility']");
   }
 
-  diseaseStatusBadge() {
-    return cy.get("[data-testid='Disease status']");
-  }
-
   orderingBadge() {
     return cy.get("[data-testid='Ordering']");
   }
@@ -98,7 +90,7 @@ class ShiftingPage {
   filterByFacility(
     origin_facility: string,
     assigned_facility: string,
-    assigned_to: string
+    assigned_to: string,
   ) {
     this.originFacilityInput().click().type(origin_facility);
     cy.get("[role='option']").contains(origin_facility).click();
@@ -116,10 +108,9 @@ class ShiftingPage {
     ordering: string,
     emergency: string,
     is_up_shift: string,
-    disease_status: string,
     is_antenatal: string,
     breathlessness_level: string,
-    patient_phone_number: string
+    patient_phone_number: string,
   ) {
     this.orderingInput().click();
     cy.get("[role='option']").contains(ordering).click();
@@ -130,9 +121,6 @@ class ShiftingPage {
     this.isUpShiftInput().click();
     cy.get("[role='option']").contains(is_up_shift).click();
 
-    this.diseaseStatusInput().click();
-    cy.get("[role='option']").contains(disease_status).click();
-
     this.isAntenatalInput().click();
     cy.get("[role='option']").contains(is_antenatal).click();
 
@@ -148,7 +136,7 @@ class ShiftingPage {
     created_date_start: string,
     created_date_end: string,
     modified_date_start: string,
-    modified_date_end: string
+    modified_date_end: string,
   ) {
     this.createdDateStartInput().click();
     cy.get("[id^='headlessui-popover-panel-'] .care-l-angle-left-b")
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index 3d6352b3260..10cdbdbcc7f 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -470,13 +470,6 @@ export const SAMPLE_FLOW_RULES = {
   RECEIVED_AT_LAB: ["COMPLETED"],
 };
 
-export const DISEASE_STATUS = [
-  "POSITIVE",
-  "SUSPECTED",
-  "NEGATIVE",
-  "RECOVERED",
-];
-
 export const TEST_TYPE = [
   "UNK",
   "ANTIGEN",
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index b9a5cc6f34c..e0a3b2d9ee5 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -164,7 +164,6 @@ export const PatientManager = () => {
     is_active:
       !qParams.last_consultation__new_discharge_reason &&
       (qParams.is_active || "True"),
-    disease_status: qParams.disease_status || undefined,
     phone_number: qParams.phone_number
       ? parsePhoneNumber(qParams.phone_number)
       : undefined,
@@ -189,8 +188,6 @@ export const PatientManager = () => {
       qParams.date_declared_positive_before || undefined,
     date_declared_positive_after:
       qParams.date_declared_positive_after || undefined,
-    date_of_result_before: qParams.date_of_result_before || undefined,
-    date_of_result_after: qParams.date_of_result_after || undefined,
     last_consultation_medico_legal_case:
       qParams.last_consultation_medico_legal_case || undefined,
     last_consultation_encounter_date_before:
@@ -207,7 +204,6 @@ export const PatientManager = () => {
       qParams.last_consultation__new_discharge_reason || undefined,
     last_consultation_current_bed__location:
       qParams.last_consultation_current_bed__location || undefined,
-    srf_id: qParams.srf_id || undefined,
     number_of_doses: qParams.number_of_doses || undefined,
     covin_id: qParams.covin_id || undefined,
     is_kasp: qParams.is_kasp || undefined,
@@ -259,7 +255,6 @@ export const PatientManager = () => {
     [params.created_date_before, params.created_date_after],
     [params.modified_date_before, params.modified_date_after],
     [params.date_declared_positive_before, params.date_declared_positive_after],
-    [params.date_of_result_before, params.date_of_result_after],
     [params.last_vaccinated_date_before, params.last_vaccinated_date_after],
     [
       params.last_consultation_encounter_date_before,
@@ -595,14 +590,6 @@ export const PatientManager = () => {
                         text={`IP Days: ${dayjs().diff(patient.last_consultation.encounter_date, "day")}`}
                       />
                     )}
-                  {patient.disease_status === "POSITIVE" && (
-                    <Chip
-                      size="small"
-                      variant="danger"
-                      startIcon="l-coronavirus"
-                      text="Positive"
-                    />
-                  )}
                   {patient.gender === 2 &&
                     patient.is_antenatal &&
                     isAntenatal(patient.last_menstruation_start_date) &&
@@ -624,14 +611,6 @@ export const PatientManager = () => {
                       text="Medical Worker"
                     />
                   )}
-                  {patient.disease_status === "EXPIRED" && (
-                    <Chip
-                      size="small"
-                      variant="warning"
-                      startIcon="l-exclamation-triangle"
-                      text="Patient Expired"
-                    />
-                  )}
                   {(!patient.last_consultation ||
                     patient.last_consultation?.facility !== patient.facility ||
                     (patient.last_consultation?.discharge_date &&
@@ -1009,7 +988,6 @@ export const PatientManager = () => {
             ),
             ordering(),
             value("Category", "category", getTheCategoryFromId()),
-            badge("Disease Status", "disease_status"),
             value(
               "Respiratory Support",
               "ventilator_interface",
@@ -1027,7 +1005,6 @@ export const PatientManager = () => {
               paramKey: "last_consultation_admitted_to",
             },
             ...range("Age", "age"),
-            badge("SRF ID", "srf_id"),
             {
               name: "LSG Body",
               value: qParams.lsgBody ? LocalBodyData?.name || "" : "",
@@ -1041,7 +1018,6 @@ export const PatientManager = () => {
               ),
             ),
             badge("Declared Status", "is_declared_positive"),
-            ...dateRange("Result", "date_of_result"),
             ...dateRange("Declared positive", "date_declared_positive"),
             ...dateRange(
               "Symptoms onset",
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index 7c68dce8fbc..fe7a9f4ee06 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -4,7 +4,6 @@ import FiltersSlideover from "../../CAREUI/interactive/FiltersSlideover";
 import {
   ADMITTED_TO,
   DISCHARGE_REASONS,
-  DISEASE_STATUS,
   FACILITY_TYPES,
   GENDER_TYPES,
   PATIENT_FILTER_CATEGORIES,
@@ -51,18 +50,14 @@ export default function PatientFilter(props: any) {
     district_ref: null,
     date_declared_positive_before: filter.date_declared_positive_before || null,
     date_declared_positive_after: filter.date_declared_positive_after || null,
-    date_of_result_before: filter.date_of_result_before || null,
-    date_of_result_after: filter.date_of_result_after || null,
     created_date_before: filter.created_date_before || null,
     created_date_after: filter.created_date_after || null,
     modified_date_before: filter.modified_date_before || null,
     modified_date_after: filter.modified_date_after || null,
     category: filter.category || null,
     gender: filter.gender || null,
-    disease_status: filter.disease_status || null,
     age_min: filter.age_min || null,
     age_max: filter.age_max || null,
-    date_of_result: filter.date_of_result || null,
     date_declared_positive: filter.date_declared_positive || null,
     last_consultation_medico_legal_case:
       filter.last_consultation_medico_legal_case || null,
@@ -82,7 +77,6 @@ export default function PatientFilter(props: any) {
       filter.last_consultation_current_bed__location || "",
     last_consultation__new_discharge_reason:
       filter.last_consultation__new_discharge_reason || null,
-    srf_id: filter.srf_id || null,
     number_of_doses: filter.number_of_doses || null,
     covin_id: filter.covin_id || null,
     is_kasp: filter.is_kasp || null,
@@ -169,18 +163,14 @@ export default function PatientFilter(props: any) {
       lsgBody,
       date_declared_positive_before,
       date_declared_positive_after,
-      date_of_result_before,
-      date_of_result_after,
       created_date_before,
       created_date_after,
       modified_date_before,
       modified_date_after,
       category,
       gender,
-      disease_status,
       age_min,
       age_max,
-      date_of_result,
       last_consultation_medico_legal_case,
       last_consultation_encounter_date_before,
       last_consultation_encounter_date_after,
@@ -191,7 +181,6 @@ export default function PatientFilter(props: any) {
       last_consultation_current_bed__location,
       number_of_doses,
       covin_id,
-      srf_id,
       is_kasp,
       is_declared_positive,
       last_consultation_symptoms_onset_date_before,
@@ -221,13 +210,10 @@ export default function PatientFilter(props: any) {
       date_declared_positive_after: dateQueryString(
         date_declared_positive_after,
       ),
-      date_of_result_before: dateQueryString(date_of_result_before),
-      date_of_result_after: dateQueryString(date_of_result_after),
       created_date_before: dateQueryString(created_date_before),
       created_date_after: dateQueryString(created_date_after),
       modified_date_before: dateQueryString(modified_date_before),
       modified_date_after: dateQueryString(modified_date_after),
-      date_of_result: dateQueryString(date_of_result),
       last_consultation_medico_legal_case:
         last_consultation_medico_legal_case || "",
       last_consultation_encounter_date_before: dateQueryString(
@@ -244,15 +230,12 @@ export default function PatientFilter(props: any) {
       ),
       category: category || "",
       gender: gender || "",
-      disease_status:
-        (disease_status == "Show All" ? "" : disease_status) || "",
       age_min: age_min || "",
       age_max: age_max || "",
       last_consultation_admitted_bed_type_list:
         last_consultation_admitted_bed_type_list || [],
       last_consultation__new_discharge_reason:
         last_consultation__new_discharge_reason || "",
-      srf_id: srf_id || "",
       number_of_doses: number_of_doses || "",
       covin_id: covin_id || "",
       is_kasp: is_kasp || "",
@@ -680,18 +663,6 @@ export default function PatientFilter(props: any) {
             </div>
           )}
 
-          <div className="w-full flex-none">
-            <FieldLabel className="text-sm">COVID Disease status</FieldLabel>
-            <SelectMenuV2
-              placeholder="Show all"
-              options={DISEASE_STATUS}
-              optionLabel={(o) => o}
-              value={filterState.disease_status}
-              onChange={(v) =>
-                setFilterState({ ...filterState, disease_status: v })
-              }
-            />
-          </div>
           <div className="w-full flex-none">
             <FieldLabel className="text-sm">COVID Vaccinated</FieldLabel>
             <SelectMenuV2
@@ -727,17 +698,6 @@ export default function PatientFilter(props: any) {
             />
           </div>
 
-          <div className="w-full flex-none">
-            <TextFormField
-              id="srf_id"
-              name="srf_id"
-              placeholder="Filter by SRF ID"
-              label={<span className="text-sm">SRF ID</span>}
-              value={filterState.srf_id}
-              onChange={handleFormFieldChange}
-              errorClassName="hidden"
-            />
-          </div>
           <div className="w-full flex-none">
             <TextFormField
               id="covin_id"
@@ -750,17 +710,6 @@ export default function PatientFilter(props: any) {
             />
           </div>
 
-          <DateRangeFormField
-            labelClassName="text-sm"
-            name="date_of_result"
-            label="Date of result of COVID Test"
-            value={{
-              start: getDate(filterState.date_of_result_after),
-              end: getDate(filterState.date_of_result_before),
-            }}
-            onChange={handleDateRangeChange}
-            errorClassName="hidden"
-          />
           <DateRangeFormField
             labelClassName="text-sm"
             name="date_declared_positive"
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index 9611b3f02b2..50fc5819314 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -387,20 +387,6 @@ export const PatientHome = (props: any) => {
                         )}
                       </>
                     )}
-                    {patientData.contact_with_confirmed_carrier && (
-                      <Chip
-                        variant="danger"
-                        startIcon="l-exclamation-triangle"
-                        text="Contact with confirmed carrier"
-                      />
-                    )}
-                    {patientData.contact_with_suspected_carrier && (
-                      <Chip
-                        variant="warning"
-                        startIcon="l-exclamation-triangle"
-                        text="Contact with suspected carrier"
-                      />
-                    )}
                     {patientData.past_travel && (
                       <Chip
                         variant="warning"
@@ -747,14 +733,7 @@ export const PatientHome = (props: any) => {
               activeShiftingData.results.map((shift: any) => (
                 <div key={`shift_${shift.id}`} className="mx-2 ">
                   <div className="h-full overflow-hidden rounded-lg bg-white shadow">
-                    <div
-                      className={
-                        "flex h-full flex-col justify-between p-4 " +
-                        (shift.patient_object.disease_status === "POSITIVE"
-                          ? "bg-red-600/5"
-                          : "")
-                      }
-                    >
+                    <div className="flex h-full flex-col justify-between p-4">
                       <div>
                         <div className="mt-1 flex justify-between">
                           <div>
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index c62ad2a8a0d..07e682c137f 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -2,11 +2,9 @@ import * as Notification from "../../Utils/Notifications.js";
 
 import {
   BLOOD_GROUPS,
-  DISEASE_STATUS,
   GENDER_TYPES,
   MEDICAL_HISTORY_CHOICES,
   OCCUPATION_TYPES,
-  TEST_TYPE,
   VACCINES,
 } from "../../Common/constants";
 import {
@@ -89,11 +87,9 @@ const medicalHistoryChoices = MEDICAL_HISTORY_CHOICES.reduce(
   [],
 );
 const genderTypes = GENDER_TYPES;
-const diseaseStatus = [...DISEASE_STATUS];
 const bloodGroups = [...BLOOD_GROUPS];
 const occupationTypes = OCCUPATION_TYPES;
-const testType = [...TEST_TYPE];
-const vaccines = ["Select", ...VACCINES];
+const vaccines = [...VACCINES];
 
 const initForm: any = {
   name: "",
@@ -103,7 +99,6 @@ const initForm: any = {
   phone_number: "+91",
   emergency_phone_number: "+91",
   blood_group: "",
-  disease_status: diseaseStatus[2],
   is_declared_positive: "false",
   date_declared_positive: new Date(),
   date_of_birth: null,
@@ -121,25 +116,13 @@ const initForm: any = {
   allergies: "",
   pincode: "",
   present_health: "",
-  contact_with_confirmed_carrier: "false",
-  contact_with_suspected_carrier: "false",
-
-  estimated_contact_date: null,
   date_of_return: null,
-
-  number_of_primary_contacts: "",
-  number_of_secondary_contacts: "",
   is_antenatal: "false",
   date_of_test: null,
-  date_of_result: null,
-  test_id: "",
-  srf_id: "",
-  test_type: testType[0],
   treatment_plan: false,
   ongoing_medication: "",
   designation_of_health_care_worker: "",
   instituion_of_health_care_worker: "",
-  cluster_name: "",
   covin_id: "",
   is_vaccinated: "false",
   number_of_doses: "0",
@@ -323,14 +306,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
           ? parseGenderFromExt(data.gender, state.form.gender)
           : state.form.gender,
       });
-      field.onChange({
-        name: "test_id",
-        value: data.test_id ? data.test_id : state.form.test_id,
-      });
-      field.onChange({
-        name: "srf_id",
-        value: data.srf_id ? data.srf_id : state.form.srf_id,
-      });
       field.onChange({
         name: "state",
         value: data.district_object
@@ -353,28 +328,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
         name: "village",
         value: data.village ? data.village : state.form.village,
       });
-      field.onChange({
-        name: "disease_status",
-        value: data.result
-          ? data.result.toUpperCase()
-          : state.form.disease_status,
-      });
-      field.onChange({
-        name: "test_type",
-        value: data.test_type
-          ? data.test_type.toUpperCase()
-          : state.form.test_type,
-      });
       field.onChange({
         name: "date_of_test",
         value: data.sample_collection_date
           ? data.sample_collection_date
           : state.form.date_of_test,
       });
-      field.onChange({
-        name: "date_of_result",
-        value: data.result_date ? data.result_date : state.form.date_of_result,
-      });
       field.onChange({
         name: "phone_number",
         value: data.mobile_number
@@ -416,7 +375,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             health_id: data.abha_number_object?.health_id || "",
             nationality: data.nationality ? data.nationality : "India",
             gender: data.gender ? data.gender : undefined,
-            cluster_name: data.cluster_name ? data.cluster_name : "",
             state: data.state ? data.state : "",
             district: data.district ? data.district : "",
             blood_group: data.blood_group
@@ -453,19 +411,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             occupation: data.meta_info?.occupation
               ? parseOccupationFromExt(data.meta_info.occupation)
               : null,
-
-            number_of_primary_contacts: data.number_of_primary_contacts
-              ? data.number_of_primary_contacts
-              : "",
-            number_of_secondary_contacts: data.number_of_secondary_contacts
-              ? data.number_of_secondary_contacts
-              : "",
-            contact_with_confirmed_carrier: data.contact_with_confirmed_carrier
-              ? String(data.contact_with_confirmed_carrier)
-              : "false",
-            contact_with_suspected_carrier: data.contact_with_suspected_carrier
-              ? String(data.contact_with_suspected_carrier)
-              : "false",
             is_vaccinated: String(data.is_vaccinated),
             number_of_doses: data.number_of_doses
               ? String(data.number_of_doses)
@@ -645,39 +590,11 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             errors[field] = "Please enter valid phone number";
           }
           return;
-
-        case "estimated_contact_date":
-          if (
-            JSON.parse(form.contact_with_confirmed_carrier) ||
-            JSON.parse(form.contact_with_suspected_carrier)
-          ) {
-            if (!form[field]) {
-              errors[field] = "Please enter the estimated date of contact";
-            }
-          }
-          return;
-        case "cluster_name":
-          if (
-            JSON.parse(form.contact_with_confirmed_carrier) ||
-            JSON.parse(form.contact_with_suspected_carrier)
-          ) {
-            if (!form[field]) {
-              errors[field] = "Please enter the name / cluster of the contact";
-            }
-          }
-          return;
         case "blood_group":
           if (!form[field]) {
             errors[field] = "Please select a blood group";
           }
           return;
-        case "number_of_primary_contacts":
-        case "number_of_secondary_contacts":
-          if (form[field] && form[field] < 0) {
-            errors[field] = "Value cannot be negative";
-          }
-          return;
-
         case "is_vaccinated":
           if (form.is_vaccinated === "true") {
             if (form.number_of_doses === "0") {
@@ -694,23 +611,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             }
           }
           return;
-
-        case "date_of_result":
-          if (form[field] < form.date_of_test) {
-            errors[field] =
-              "Date should not be before the date of sample collection";
-          }
-          return;
-        case "disease_status":
-          if (form[field] === "POSITIVE") {
-            if (!form.date_of_test) {
-              errors["date_of_test"] = "Please fill the date of sample testing";
-            }
-            if (!form.date_of_result) {
-              errors["date_of_result"] = "Please fill the date of result";
-            }
-          }
-          return;
         case "medical_history":
           if (!form[field].length) {
             errors[field] = "Please fill the medical history";
@@ -780,18 +680,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
           ? dateQueryString(formData.date_of_birth)
           : null,
       year_of_birth: ageInputType === "age" ? formData.year_of_birth : null,
-      disease_status: formData.disease_status,
       date_of_test: formData.date_of_test ? formData.date_of_test : undefined,
-      date_of_result: formData.date_of_result
-        ? formData.date_of_result
-        : undefined,
       date_declared_positive:
         JSON.parse(formData.is_declared_positive) &&
         formData.date_declared_positive
           ? formData.date_declared_positive
           : null,
-      test_id: formData.test_id,
-      srf_id: formData.srf_id,
       covin_id:
         formData.is_vaccinated === "true" ? formData.covin_id : undefined,
       is_vaccinated: formData.is_vaccinated,
@@ -811,7 +705,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             ? formData.last_vaccinated_date
             : null
           : null,
-      test_type: formData.test_type,
       name: _.startCase(_.toLower(formData.name)),
       pincode: formData.pincode ? formData.pincode : undefined,
       gender: Number(formData.gender),
@@ -847,33 +740,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
       present_health: formData.present_health
         ? formData.present_health
         : undefined,
-      contact_with_confirmed_carrier: JSON.parse(
-        formData.contact_with_confirmed_carrier,
-      ),
-      contact_with_suspected_carrier: JSON.parse(
-        formData.contact_with_suspected_carrier,
-      ),
-      estimated_contact_date:
-        (JSON.parse(formData.contact_with_confirmed_carrier) ||
-          JSON.parse(formData.contact_with_suspected_carrier)) &&
-        formData.estimated_contact_date
-          ? formData.estimated_contact_date
-          : null,
-      cluster_name:
-        (JSON.parse(formData.contact_with_confirmed_carrier) ||
-          JSON.parse(formData.contact_with_suspected_carrier)) &&
-        formData.cluster_name
-          ? formData.cluster_name
-          : null,
       allergies: formData.allergies,
-      number_of_primary_contacts: Number(formData.number_of_primary_contacts)
-        ? Number(formData.number_of_primary_contacts)
-        : undefined,
-      number_of_secondary_contacts: Number(
-        formData.number_of_secondary_contacts,
-      )
-        ? Number(formData.number_of_secondary_contacts)
-        : undefined,
       ongoing_medication: formData.ongoing_medication,
       is_declared_positive: JSON.parse(formData.is_declared_positive),
       designation_of_health_care_worker:
@@ -1864,7 +1731,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                         >
                           <div>
                             <div className="mt-5 grid w-full grid-cols-1 gap-4 sm:grid-cols-3 xl:gap-x-20 xl:gap-y-6">
-                              <div>
+                              <div className="col-span-full">
                                 <RadioFormField
                                   label="Is patient Vaccinated against COVID?"
                                   aria-label="is_vaccinated"
@@ -1877,32 +1744,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                   optionValue={(option) => option.value}
                                 />
                               </div>
-                              <div id="contact_with_confirmed_carrier-div">
-                                <RadioFormField
-                                  {...field("contact_with_confirmed_carrier")}
-                                  label="Contact with confirmed Covid patient?"
-                                  aria-label="contact_with_confirmed_carrier"
-                                  options={[
-                                    { label: "Yes", value: "true" },
-                                    { label: "No", value: "false" },
-                                  ]}
-                                  optionDisplay={(option) => option.label}
-                                  optionValue={(option) => option.value}
-                                />
-                              </div>
-                              <div id="contact_with_suspected_carrier-div">
-                                <RadioFormField
-                                  {...field("contact_with_suspected_carrier")}
-                                  label="Contact with Covid suspect?"
-                                  aria-label="contact_with_suspected_carrier"
-                                  options={[
-                                    { label: "Yes", value: "true" },
-                                    { label: "No", value: "false" },
-                                  ]}
-                                  optionDisplay={(option) => option.label}
-                                  optionValue={(option) => option.value}
-                                />
-                              </div>
                             </div>
                             <div className="mt-5 grid w-full grid-cols-1 gap-4 xl:gap-x-20 xl:gap-y-6">
                               <CollapseV2
@@ -1957,73 +1798,8 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                   </div>
                                 }
                               </CollapseV2>
-                              <CollapseV2
-                                opened={
-                                  JSON.parse(
-                                    field("contact_with_confirmed_carrier")
-                                      .value ?? "{}",
-                                  ) ||
-                                  JSON.parse(
-                                    field("contact_with_suspected_carrier")
-                                      .value ?? "{}",
-                                  )
-                                }
-                              >
-                                <div className="grid grid-cols-1 gap-4 md:grid-cols-2 xl:gap-x-20 xl:gap-y-6">
-                                  <div id="estimated_contact_date-div">
-                                    <DateFormField
-                                      {...field("estimated_contact_date")}
-                                      id="estimated_contact_date"
-                                      label="Estimate date of contact"
-                                      disableFuture
-                                      required
-                                      position="LEFT"
-                                    />
-                                  </div>
-
-                                  <div id="cluster_name-div">
-                                    <TextFormField
-                                      {...field("cluster_name")}
-                                      id="cluster_name"
-                                      label="Name / Cluster of Contact"
-                                      placeholder="Name / Cluster of Contact"
-                                      required
-                                    />
-                                  </div>
-                                </div>
-                              </CollapseV2>
-                              <div
-                                data-testid="disease-status"
-                                id="disease_status-div"
-                              >
-                                <SelectFormField
-                                  {...field("disease_status")}
-                                  id="disease_status"
-                                  label="COVID Disease Status"
-                                  options={diseaseStatus}
-                                  optionLabel={(o) => o}
-                                  optionValue={(o) => o}
-                                  required
-                                />
-                              </div>
-                              <div id="test_type-div">
-                                <SelectFormField
-                                  {...field("test_type")}
-                                  id="test_type"
-                                  label="COVID Test Type"
-                                  options={testType}
-                                  optionLabel={(o) => o}
-                                  optionValue={(o) => o}
-                                  required
-                                />
-                              </div>
-                              <div id="srf_id-div">
-                                <TextFormField
-                                  {...field("srf_id")}
-                                  id="srf_id"
-                                  label="SRF Id for COVID Test"
-                                />
-                              </div>
+                            </div>
+                            <div className="mt-5 grid w-full grid-cols-1 gap-4 xl:gap-x-20 xl:gap-y-6">
                               <div id="is_declared_positive-div">
                                 <RadioFormField
                                   {...field("is_declared_positive")}
@@ -2054,15 +1830,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                   </div>
                                 </CollapseV2>
                               </div>
-                              <div id="test_id-div">
-                                <TextFormField
-                                  {...field("test_id")}
-                                  id="test_id"
-                                  label="COVID Positive ID issued by ICMR"
-                                  type="number"
-                                />
-                              </div>
-
                               <div id="date_of_test-div">
                                 <DateFormField
                                   {...field("date_of_test")}
@@ -2072,32 +1839,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                   position="LEFT"
                                 />
                               </div>
-                              <div id="date_of_result-div">
-                                <DateFormField
-                                  {...field("date_of_result")}
-                                  id="date_of_result"
-                                  label="Date of Result for COVID Test"
-                                  disableFuture
-                                  position="LEFT"
-                                />
-                              </div>
-
-                              <div id="number_of_primary_contacts-div">
-                                <TextFormField
-                                  {...field("number_of_primary_contacts")}
-                                  id="number_of_primary_contacts"
-                                  label="Number Of Primary Contacts for COVID"
-                                  type="number"
-                                />
-                              </div>
-                              <div id="number_of_secondary_contacts-div">
-                                <TextFormField
-                                  {...field("number_of_secondary_contacts")}
-                                  id="number_of_secondary_contacts"
-                                  label="Number Of Secondary Contacts for COVID"
-                                  type="number"
-                                />
-                              </div>
                             </div>
                           </div>
                         </AccordionV2>
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index 81a06ff659d..b6f6fae7ea2 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -49,7 +49,6 @@ export interface AbhaObject {
 }
 
 export interface PatientModel {
-  test_id?: string;
   id?: string;
   action?: number;
   name?: string;
@@ -87,19 +86,14 @@ export interface PatientModel {
   sameAddress?: boolean;
   village?: string;
   pincode?: number;
-  contact_with_confirmed_carrier?: boolean;
-  contact_with_suspected_carrier?: boolean;
   is_medical_worker?: boolean;
   designation_of_health_care_worker?: string;
   instituion_of_health_care_worker?: string;
   frontline_worker?: string;
-  estimated_contact_date?: string;
   past_travel?: boolean;
   ongoing_medication?: string;
   countries_travelled?: Array<string>;
   transit_details?: string;
-  number_of_primary_contacts?: number;
-  number_of_secondary_contacts?: number;
   present_health?: string;
   has_SARI?: boolean;
   local_body?: number;
@@ -107,11 +101,8 @@ export interface PatientModel {
   state?: number;
   nationality?: string;
   passport_no?: string;
-  disease_status?: string;
-  test_type?: string;
   date_of_test?: string;
-  date_of_result?: string;
-  srf_id?: string;
+  date_of_result?: string; // keeping this to avoid errors in Death report
   covin_id?: string;
   is_vaccinated?: boolean;
   vaccine_name?: string;
@@ -124,7 +115,6 @@ export interface PatientModel {
   review_interval?: number;
   review_time?: string;
   date_of_return?: string;
-  cluster_name?: string;
   number_of_aged_dependents?: number;
   number_of_chronic_diseased_dependents?: number;
   will_donate_blood?: boolean;
diff --git a/src/Components/Shifting/BadgesList.tsx b/src/Components/Shifting/BadgesList.tsx
index 4490d948cbd..b16d831a96b 100644
--- a/src/Components/Shifting/BadgesList.tsx
+++ b/src/Components/Shifting/BadgesList.tsx
@@ -48,7 +48,6 @@ export default function BadgesList(props: any) {
         badge(t("patient_name"), "patient_name"),
         ...dateRange(t("created"), "created_date"),
         ...dateRange(t("modified"), "modified_date"),
-        badge(t("disease_status"), "disease_status"),
         badge(t("breathlessness_level"), "breathlessness_level"),
         value(
           t("assigned_to"),
diff --git a/src/Components/Shifting/Commons.tsx b/src/Components/Shifting/Commons.tsx
index 57f0b1f8209..284b6e4ce5a 100644
--- a/src/Components/Shifting/Commons.tsx
+++ b/src/Components/Shifting/Commons.tsx
@@ -19,7 +19,6 @@ export const initialFilterData = {
   ordering: null,
   is_kasp: "",
   assigned_to: "",
-  disease_status: "",
   is_antenatal: "",
   breathlessness_level: "",
 };
@@ -55,7 +54,6 @@ export const formatFilter = (params: any) => {
     patient_phone_number: filter.patient_phone_number || undefined,
     ordering: filter.ordering || undefined,
     assigned_to: filter.assigned_to || undefined,
-    disease_status: filter.disease_status || undefined,
     breathlessness_level: filter.breathlessness_level || undefined,
     is_kasp:
       (filter.is_kasp && filter.is_kasp) === ""
diff --git a/src/Components/Shifting/ListFilter.tsx b/src/Components/Shifting/ListFilter.tsx
index 09393dfdb5c..af98f524ed2 100644
--- a/src/Components/Shifting/ListFilter.tsx
+++ b/src/Components/Shifting/ListFilter.tsx
@@ -1,6 +1,5 @@
 import {
   BREATHLESSNESS_LEVEL,
-  DISEASE_STATUS,
   SHIFTING_FILTER_ORDER,
 } from "../../Common/constants";
 import { DateRange } from "../Common/DateRangeInputV2";
@@ -60,7 +59,6 @@ export default function ListFilter(props: any) {
     status: filter.status || null,
     assigned_user_ref: null,
     assigned_to: filter.assigned_to || "",
-    disease_status: filter.disease_status || "",
 
     is_antenatal: filter.is_antenatal || "",
     breathlessness_level: filter.breathlessness_level || "",
@@ -155,7 +153,6 @@ export default function ListFilter(props: any) {
       is_kasp,
       status,
       assigned_to,
-      disease_status,
       is_antenatal,
       breathlessness_level,
     } = filterState;
@@ -177,7 +174,6 @@ export default function ListFilter(props: any) {
       is_kasp: is_kasp || "",
       status: status || "",
       assigned_to: assigned_to || "",
-      disease_status: disease_status || "",
       is_antenatal: is_antenatal || "",
       breathlessness_level: breathlessness_level || "",
     };
@@ -340,19 +336,6 @@ export default function ListFilter(props: any) {
         errorClassName="hidden"
       />
 
-      <SelectFormField
-        name="disease_status"
-        id="disease-status"
-        placeholder="Show all"
-        label={t("disease_status")}
-        value={filterState.disease_status}
-        options={DISEASE_STATUS}
-        optionLabel={(option) => option}
-        optionValue={(option) => option}
-        onChange={(option) => handleFormFieldChange(option)}
-        errorClassName="hidden"
-      />
-
       <SelectFormField
         name="is_antenatal"
         id="is-antenatal"
diff --git a/src/Components/Shifting/ListView.tsx b/src/Components/Shifting/ListView.tsx
index cef6e1c25fd..ffffa3f2baf 100644
--- a/src/Components/Shifting/ListView.tsx
+++ b/src/Components/Shifting/ListView.tsx
@@ -78,14 +78,7 @@ export default function ListView() {
     return data.map((shift: any) => (
       <div key={`shift_${shift.id}`} className="mt-6 w-full">
         <div className="h-full overflow-hidden rounded-lg bg-white shadow">
-          <div
-            className={
-              "flex h-full flex-col justify-between p-4 " +
-              (shift.patient_object.disease_status == "POSITIVE"
-                ? "bg-red-50"
-                : "")
-            }
-          >
+          <div className="flex h-full flex-col justify-between p-4">
             <div>
               <div className="flex justify-between">
                 <div className="mb-2 text-xl font-bold capitalize">
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx
index 5d29e0c890a..457f110c271 100644
--- a/src/Components/Shifting/ShiftDetails.tsx
+++ b/src/Components/Shifting/ShiftDetails.tsx
@@ -4,7 +4,6 @@ import {
   GENDER_TYPES,
   SHIFTING_CHOICES_PEACETIME,
   SHIFTING_CHOICES_WARTIME,
-  TEST_TYPE_CHOICES,
 } from "../../Common/constants";
 import { Link, navigate } from "raviger";
 import { lazy, useState } from "react";
@@ -85,10 +84,6 @@ export default function ShiftDetails(props: { id: string }) {
 
   const copyContent = (data: any) => {
     let formattedText =
-      t("disease_status") +
-      ": *" +
-      data?.patient_object?.disease_status +
-      "* \n" +
       t("name") +
       ":" +
       data?.patient_object?.name +
@@ -129,9 +124,6 @@ export default function ShiftDetails(props: { id: string }) {
     const patientGender = GENDER_TYPES.find(
       (i) => i.id === patientData?.gender,
     )?.text;
-    const testType = TEST_TYPE_CHOICES.find(
-      (i) => i.id === patientData?.test_type,
-    )?.text;
 
     return (
       <div className="mr-3 mt-2 h-full rounded-lg border bg-white p-4 text-black shadow md:mr-8">
@@ -150,20 +142,6 @@ export default function ShiftDetails(props: { id: string }) {
               <span className="badge badge-pill badge-primary">{t("yes")}</span>
             </div>
           )}
-          <div>
-            <span className="font-semibold leading-relaxed">
-              {t("disease_status")}{" "}
-            </span>
-            <span className="badge badge-pill badge-warning">
-              {patientData?.disease_status}
-            </span>
-          </div>
-          <div>
-            <span className="font-semibold leading-relaxed">
-              {t("test_type")}:{" "}
-            </span>
-            {(patientData?.test_type && testType) || "-"}
-          </div>
           <div>
             <span className="font-semibold leading-relaxed">
               {t("facility")}:{" "}
@@ -319,9 +297,6 @@ export default function ShiftDetails(props: { id: string }) {
     const patientGender = GENDER_TYPES.find(
       (i) => i.id === patientData?.gender,
     )?.text;
-    const testType = TEST_TYPE_CHOICES.find(
-      (i) => i.id === patientData?.test_type,
-    )?.text;
 
     return (
       <div id="section-to-print" className="print bg-white ">
@@ -427,12 +402,6 @@ export default function ShiftDetails(props: { id: string }) {
                 formatDateTime(patientData?.date_of_test)) ||
                 "-"}
             </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("test_type")}:{" "}
-              </span>
-              {(patientData?.test_type && testType) || "-"}
-            </div>
           </div>
 
           {/* <div className="mt-2 flex justify-between">
diff --git a/src/Components/Shifting/ShiftingBoard.tsx b/src/Components/Shifting/ShiftingBoard.tsx
index 088f3d66276..3203b5027f5 100644
--- a/src/Components/Shifting/ShiftingBoard.tsx
+++ b/src/Components/Shifting/ShiftingBoard.tsx
@@ -82,12 +82,7 @@ const ShiftCard = ({ shift, filter }: any) => {
           cursor: isDragging ? "grabbing" : "grab",
         }}
       >
-        <div
-          className={classNames(
-            "flex h-full flex-col justify-between p-4",
-            shift.patient_object.disease_status == "POSITIVE" && "bg-red-50",
-          )}
-        >
+        <div className="flex h-full flex-col justify-between p-4">
           <div>
             <div className="flex justify-between">
               <div className="mb-2 text-xl font-bold capitalize">
@@ -316,7 +311,6 @@ export default function ShiftingBoard({
     filterProp.ordering,
     filterProp.is_kasp,
     filterProp.assigned_to,
-    filterProp.disease_status,
     filterProp.is_antenatal,
     filterProp.breathlessness_level,
   ]);