update consultation redirect url

ohcnetwork · Dec 13, 2023 · 85e6e6d · 85e6e6d
1 parent 16a4a6c
commit 85e6e6d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -16,11 +16,14 @@ interface Props {
 }
 
 export default function DailyRoundsList({ consultation }: Props) {
-  const [consultationId] = useSlugs("consultation");
+  const [facilityId, patientId, consultationId] = useSlugs(
+    "facility",
+    "patient",
+    "consultation"
+  );
   const { t } = useTranslation();
 
-  const consultationUrl = `/consultation/${consultationId}`;
-
+  const consultationUrl = `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`;
   return (
     <PaginatedList
       route={routes.getDailyReports}

diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -522,7 +522,7 @@ export const PatientManager = () => {
         patient.last_consultation?.facility === patient.facility &&
         !(patient.last_consultation?.discharge_date && patient.is_active)
       ) {
-        patientUrl = `/consultation/${patient.last_consultation.id}`;
+        patientUrl = `/facility/${patient.facility}/patient/${patient.id}/consultation/${patient.last_consultation.id}`;
       } else if (patient.facility) {
         patientUrl = `/facility/${patient.facility}/patient/${patient.id}`;
       } else {

diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
@@ -8,6 +8,7 @@ import { FileUpload } from "../../Components/Patient/FileUpload";
 import { make as CriticalCareRecording } from "../../Components/CriticalCareRecording/CriticalCareRecording.bs";
 import { ConsultationDetails } from "../../Components/Facility/ConsultationDetails";
 import TreatmentSummary from "../../Components/Facility/TreatmentSummary";
+import { Redirect } from "raviger";
 
 export default {
   "/facility/:facilityId/patient/:patientId/consultation": ({
@@ -139,6 +140,6 @@ export default {
       />
     ),
   "/consultation/:consultationId": ({ consultationId }: any) => (
-    <ConsultationDetails consultationId={consultationId} tab={"updates"} />
+    <Redirect to={`/facility/id/patient/id/consultation/${consultationId}/`} />
   ),
 };