Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging Develop to Staging v24.16.0 #7591

Merged
merged 4 commits into from
Apr 12, 2024
Merged

Merging Develop to Staging v24.16.0 #7591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b706d91
Replace `useDispatch` in Consultation Form (#7533)
rithviknishad Apr 9, 2024
7b52db0
Replace `useDispatch` with `request` in Daily Rounds (#7532)
rithviknishad Apr 9, 2024
34648e9
Fixed scroll overlay in medicine dashboard (#7517)
AshrafMd-1 Apr 9, 2024
d615772
fix: Removed unnecessary rendering of microphone permission warning i…
Spiral-Memory Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
272 changes: 125 additions & 147 deletions src/Components/Facility/ConsultationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,10 @@ import { FieldErrorText, FieldLabel } from "../Form/FormFields/FormField";
import InvestigationBuilder, {
InvestigationType,
} from "../Common/prescription-builder/InvestigationBuilder";
import {
LegacyRef,
createRef,
lazy,
useCallback,
useEffect,
useState,
} from "react";
import { LegacyRef, createRef, lazy, useEffect, useState } from "react";
import ProcedureBuilder, {
ProcedureType,
} from "../Common/prescription-builder/ProcedureBuilder";
import {
createConsultation,
getConsultation,
getPatient,
partialUpdateConsultation,
updateConsultation,
} from "../../Redux/actions";
import { statusType, useAbortableEffect } from "../../Common/utils";

import { BedSelect } from "../Common/BedSelect";
import Beds from "./Consultations/Beds";
import CareIcon from "../../CAREUI/icons/CareIcon";
Expand All @@ -55,12 +39,10 @@ import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
import TextFormField from "../Form/FormFields/TextFormField";
import UserAutocompleteFormField from "../Common/UserAutocompleteFormField";
import { UserModel } from "../Users/models";
import { dischargePatient } from "../../Redux/actions";

import { navigate } from "raviger";
import useAppHistory from "../../Common/hooks/useAppHistory";
import useConfig from "../../Common/hooks/useConfig";
import { useDispatch } from "react-redux";
import useVisibility from "../../Utils/useVisibility";
import dayjs from "../../Utils/dayjs";
import RouteToFacilitySelect, {
Expand All @@ -79,6 +61,9 @@ import {
} from "../Diagnosis/ConsultationDiagnosisBuilder/ConsultationDiagnosisBuilder.js";
import { FileUpload } from "../Patient/FileUpload.js";
import ConfirmDialog from "../Common/ConfirmDialog.js";
import request from "../../Utils/request/request.js";
import routes from "../../Redux/api.js";
import useQuery from "../../Utils/request/useQuery.js";

const Loading = lazy(() => import("../Common/Loading"));
const PageTitle = lazy(() => import("../Common/PageTitle"));
Expand Down Expand Up @@ -254,7 +239,6 @@ type Props = {
export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
const { goBack } = useAppHistory();
const { kasp_enabled, kasp_string } = useConfig();
const dispatchAction: any = useDispatch();
const [state, dispatch] = useAutoSaveReducer<FormDetails>(
consultationFormReducer,
initialState
Expand Down Expand Up @@ -332,29 +316,21 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
bedStatusVisible,
]);

useEffect(() => {
async function fetchPatientName() {
if (patientId) {
setIsLoading(true);
const res = await dispatchAction(getPatient({ id: patientId }));
if (res.data) {
if (isUpdate) {
dispatch({
type: "set_form",
form: { ...state.form, action: res.data.action },
});
}
setPatientName(res.data.name);
setFacilityName(res.data.facility_object.name);
}
} else {
setPatientName("");
setFacilityName("");
const { loading: loadingPatient } = useQuery(routes.getPatient, {
pathParams: { id: patientId },
onResponse: ({ data }) => {
if (!data) return;
if (isUpdate) {
dispatch({
type: "set_form",
form: { ...state.form, action: data.action },
});
}
if (!id) setIsLoading(false);
}
fetchPatientName();
}, [dispatchAction, patientId]);
setPatientName(data.name ?? "");
setFacilityName(data.facility_object?.name ?? "");
},
prefetch: !!patientId,
});

useEffect(() => {
dispatch({
Expand Down Expand Up @@ -385,96 +361,97 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
}
};

const fetchData = useCallback(
async (status: statusType) => {
if (!patientId) setIsLoading(true);
const res = await dispatchAction(getConsultation(id!));
handleFormFieldChange({
name: "InvestigationAdvice",
value: !Array.isArray(res.data.investigation)
? []
: res.data.investigation,
});
handleFormFieldChange({
name: "procedures",
value: !Array.isArray(res.data.procedure) ? [] : res.data.procedure,
});
if (res.data.suggestion === "R") {
if (res.data.referred_to_external)
setReferredToFacility({
name: res.data.referred_to_external,
});
else setReferredToFacility(res.data.referred_to_object);
}
if (res.data.route_to_facility === 20) {
if (res.data.referred_from_facility_external)
setReferredFromFacility({
name: res.data.referred_from_facility_external,
});
else setReferredFromFacility(res.data.referred_from_facility_object);
}
if (!status.aborted) {
if (res?.data) {
const { loading: consultationLoading, refetch } = useQuery(
routes.getConsultation,
{
pathParams: { id: id! },
prefetch: !!(id && ((patientId && patientName) || !patientId)),
onResponse: ({ data }) => {
if (!data) return;
handleFormFieldChange({
name: "InvestigationAdvice",
value:
(Array.isArray(data.investigation) && data.investigation) || [],
});
handleFormFieldChange({
name: "procedures",
value: (Array.isArray(data.procedure) && data.procedure) || [],
});
if (data.suggestion === "R") {
if (data.referred_to_external)
setReferredToFacility({
name: data.referred_to_external,
});
else setReferredToFacility(data.referred_to_object ?? null);
}
if (data.route_to_facility === 20) {
if (data.referred_from_facility_external)
setReferredFromFacility({
name: data.referred_from_facility_external,
});
else
setReferredFromFacility(data.referred_from_facility_object ?? null);
}

if (data) {
const formData = {
...res.data,
symptoms_onset_date: isoStringToDate(res.data.symptoms_onset_date),
encounter_date: isoStringToDate(res.data.encounter_date),
icu_admission_date: isoStringToDate(res.data.icu_admission_date),
admitted: res.data.admitted ? String(res.data.admitted) : "false",
admitted_to: res.data.admitted_to ? res.data.admitted_to : "",
category: res.data.category
? PATIENT_CATEGORIES.find((i) => i.text === res.data.category)
?.id ?? ""
...data,
symptoms_onset_date:
data.symptoms_onset_date &&
isoStringToDate(data.symptoms_onset_date),
encounter_date: isoStringToDate(data.encounter_date),
icu_admission_date:
data.icu_admission_date &&
isoStringToDate(data.icu_admission_date),
admitted: data.admitted ? String(data.admitted) : "false",
admitted_to: data.admitted_to ? data.admitted_to : "",
category: data.category
? PATIENT_CATEGORIES.find((i) => i.text === data.category)?.id ??
""
: "",
patient_no: res.data.patient_no ?? "",
OPconsultation: res.data.consultation_notes,
is_telemedicine: `${res.data.is_telemedicine}`,
is_kasp: `${res.data.is_kasp}`,
assigned_to: res.data.assigned_to || "",
assigned_to_object: res.data.assigned_to_object,
treating_physician: res.data.treating_physician || "",
treating_physician_object: res.data.treating_physician_object,
ett_tt: res.data.ett_tt ? Number(res.data.ett_tt) : 3,
special_instruction: res.data.special_instruction || "",
weight: res.data.weight ? res.data.weight : "",
height: res.data.height ? res.data.height : "",
bed: res.data?.current_bed?.bed_object || null,
new_discharge_reason: res.data?.new_discharge_reason || null,
cause_of_death: res.data?.discharge_notes || "",
death_datetime: res.data?.death_datetime || "",
death_confirmed_doctor: res.data?.death_confirmed_doctor || "",
InvestigationAdvice: Array.isArray(res.data.investigation)
? res.data.investigation
patient_no: data.patient_no ?? "",
OPconsultation: data.consultation_notes,
is_telemedicine: `${data.is_telemedicine}`,
is_kasp: `${data.is_kasp}`,
assigned_to: data.assigned_to || "",
assigned_to_object: data.assigned_to_object,
treating_physician: data.treating_physician || "",
treating_physician_object: data.treating_physician_object,
ett_tt: data.ett_tt ? Number(data.ett_tt) : 3,
special_instruction: data.special_instruction || "",
weight: data.weight ? data.weight : "",
height: data.height ? data.height : "",
bed: data?.current_bed?.bed_object || null,
new_discharge_reason: data?.new_discharge_reason || null,
cause_of_death: data?.discharge_notes || "",
death_datetime: data?.death_datetime || "",
death_confirmed_doctor: data?.death_confirmed_doctor || "",
InvestigationAdvice: Array.isArray(data.investigation)
? data.investigation
: [],
diagnoses: res.data.diagnoses.sort(
diagnoses: data.diagnoses?.sort(
(a: ConsultationDiagnosis, b: ConsultationDiagnosis) =>
ConditionVerificationStatuses.indexOf(a.verification_status) -
ConditionVerificationStatuses.indexOf(b.verification_status)
),
};
dispatch({ type: "set_form", form: { ...state.form, ...formData } });
dispatch({
type: "set_form",
form: { ...state.form, ...(formData as unknown as FormDetails) },
});
setBed(formData.bed);

if (res.data.last_daily_round && state.form.category) {
if (data.last_daily_round && state.form.category) {
setDisabledFields((fields) => [...fields, "category"]);
}
} else {
goBack();
}
setIsLoading(false);
}
},
[dispatchAction, id, patientName, patientId]
);

useAbortableEffect(
(status: statusType) => {
if (id && ((patientId && patientName) || !patientId)) fetchData(status);
},
[fetchData, id, patientId, patientName]
},
}
);

if (isLoading) return <Loading />;
if (isLoading || loadingPatient || consultationLoading) return <Loading />;

const validateForm = () => {
const errors = { ...initError };
Expand Down Expand Up @@ -692,24 +669,18 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
death_datetime: string,
death_confirmed_doctor: string
) => {
const dischargeResponse = await dispatchAction(
dischargePatient(
{
new_discharge_reason: DISCHARGE_REASONS.find(
(i) => i.text === "Expired"
)?.id,
discharge_notes: cause_of_death,
death_datetime: death_datetime,
death_confirmed_doctor: death_confirmed_doctor,
discharge_date: dayjs().toISOString(),
},
{ id }
)
);

if (dischargeResponse?.status === 200) {
return dischargeResponse;
}
await request(routes.dischargePatient, {
pathParams: { id },
body: {
new_discharge_reason: DISCHARGE_REASONS.find(
(i) => i.text === "Expired"
)?.id,
discharge_notes: cause_of_death,
death_datetime: death_datetime,
death_confirmed_doctor: death_confirmed_doctor,
discharge_date: dayjs().toISOString(),
},
});
};

const handleSubmit = async (
Expand Down Expand Up @@ -792,38 +763,43 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
consent_records: state.form.consent_records || [],
};

const res = await dispatchAction(
id ? updateConsultation(id!, data) : createConsultation(data)
const { data: obj } = await request(
id ? routes.updateConsultation : routes.createConsultation,
{
pathParams: id ? { id } : undefined,
body: data,
}
);

setIsLoading(false);
if (res?.data && res.status !== 400) {
if (obj) {
dispatch({ type: "set_form", form: initForm });

if (data.suggestion === "DD") {
await declareThePatientDead(
res.data.id,
obj.id,
state.form.cause_of_death,
state.form.death_datetime,
state.form.death_confirmed_doctor
);
}

Notification.Success({
msg: res.data.discharge_date
msg: obj.discharge_date
? "Patient discharged successfully"
: `Consultation ${id ? "updated" : "created"} successfully`,
});

navigate(
`/facility/${facilityId}/patient/${patientId}/consultation/${res.data.id}`
`/facility/${facilityId}/patient/${patientId}/consultation/${obj.id}`
);

if (data.suggestion === "R") {
navigate(`/facility/${facilityId}/patient/${patientId}/shift/new`);
return;
} else if (!id && data.suggestion === "A") {
navigate(
`/facility/${facilityId}/patient/${patientId}/consultation/${res.data.id}/prescriptions`
`/facility/${facilityId}/patient/${patientId}/consultation/${obj.id}/prescriptions`
);
}
}
Expand Down Expand Up @@ -950,9 +926,10 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
...consentRecords,
{ id: randomId, type: event.value },
];
await dispatchAction(
partialUpdateConsultation(id, { consent_records: newRecords })
);
await request(routes.partialUpdateConsultation, {
pathParams: { id },
body: { consent_records: newRecords },
});
dispatch({
type: "set_form",
form: { ...state.form, consent_records: newRecords },
Expand All @@ -978,9 +955,10 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
const newRecords = state.form.consent_records.map((cr) =>
cr.id === consent_id ? { ...cr, deleted: true } : cr
);
await dispatchAction(
partialUpdateConsultation(id, { consent_records: newRecords })
);
await request(routes.partialUpdateConsultation, {
pathParams: { id },
body: { consent_records: newRecords },
});
dispatch({
type: "set_form",
form: { ...state.form, consent_records: newRecords },
Expand Down Expand Up @@ -1699,7 +1677,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
facilityId={facilityId}
patientId={patientId}
consultationId={id}
fetchPatientData={fetchData}
fetchPatientData={() => refetch()}
/>
</div>
</>
Expand Down
Loading
Loading