diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index c438fa3fca7..abc7305a00b 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -46,8 +46,6 @@ const symptomChoices = [...SYMPTOM_CHOICES];
export interface ConsultationTabProps {
consultationId: string;
- facilityId: string;
- patientId: string;
consultationData: ConsultationModel;
patientData: PatientModel;
}
@@ -120,6 +118,11 @@ export const ConsultationDetails = (props: any) => {
});
data.symptoms_text = symptoms.join(", ");
}
+ if (facilityId != data.facility || patientId != data.patient) {
+ navigate(
+ `/facility/${data.facility}/patient/${data.patient}/consultation/${data?.id}`
+ );
+ }
setConsultationData(data);
const assetRes = data?.current_bed?.bed_object?.id
? await dispatch(
@@ -153,6 +156,7 @@ export const ConsultationDetails = (props: any) => {
: "No",
is_vaccinated: patientData.is_vaccinated ? "Yes" : "No",
};
+
setPatientData(data);
}
@@ -184,8 +188,6 @@ export const ConsultationDetails = (props: any) => {
const consultationTabProps: ConsultationTabProps = {
consultationId,
- facilityId,
- patientId,
consultationData,
patientData,
};
diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index 46072c16dd8..3b63b60a427 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -16,14 +16,10 @@ interface Props {
}
export default function DailyRoundsList({ consultation }: Props) {
- const [facilityId, patientId, consultationId] = useSlugs(
- "facility",
- "patient",
- "consultation"
- );
+ const [consultationId] = useSlugs("consultation");
const { t } = useTranslation();
- const consultationUrl = `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`;
+ const consultationUrl = `/facility/${consultation.facility}/patient/${consultation.patient}/consultation/${consultation.id}`;
return (
),
+ "/consultation/:consultationId": ({ consultationId }: any) => (
+
+ ),
"/facility/:facilityId/patient/:patientId/consultation/:consultationId/treatment-summary":
({ facilityId, patientId, consultationId }: any) => (