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

Jump to bottom

Added provisional diagnosis in Consultation #3564

Merged
merged 5 commits into from
Sep 22, 2022
Merged

Added provisional diagnosis in Consultation #3564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88831f6
feat (Consultation): added icd11_provisional_diagnosis
khavinshankar Sep 6, 2022
aff212a
Merge remote-tracking branch 'origin/develop' into fix#3526
khavinshankar Sep 17, 2022
040f697
Merge branch 'develop' into fix#3526
khavinshankar Sep 17, 2022
3834589
merged latest develop branch
khavinshankar Sep 17, 2022
b35e03f
refactor (ConsultationDetails): removed comments
khavinshankar Sep 17, 2022
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
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

106 changes: 65 additions & 41 deletions src/Components/Facility/ConsultationDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { statusType, useAbortableEffect } from "../../Common/utils";
import * as Notification from "../../Utils/Notifications";
import { getConsultation, getPatient } from "../../Redux/actions";
import loadable from "@loadable/component";
import { ConsultationModel } from "./models";
import { ConsultationModel, ICD11DiagnosisModel } from "./models";
import { PatientModel } from "../Patient/models";
import {
SYMPTOM_CHOICES,
Expand Down Expand Up @@ -73,7 +73,6 @@ export const ConsultationDetails = (props: any) => {
const [open, setOpen] = useState(false);
const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
const [isSendingDischargeApi, setIsSendingDischargeApi] = useState(false);
const [diagnosisShowMore, setDiagnosisShowMore] = useState(false);

const initDischargeSummaryForm: { email: string } = {
email: "",
Expand Down Expand Up @@ -261,8 +260,6 @@ export const ConsultationDetails = (props: any) => {
[consultationId, dispatch, patientData.is_vaccinated]
);

console.log("consultationData", consultationData);

useAbortableEffect((status: statusType) => {
fetchData(status);
}, []);
Expand All @@ -276,6 +273,49 @@ export const ConsultationDetails = (props: any) => {
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="text-sm w-full">
<p className="font-semibold leading-relaxed">{label}</p>

{diagnoses
.slice(0, !showMore ? nshow : undefined)
.map((diagnosis: any) => (
<p>{diagnosis.label}</p>
))}
{diagnoses.length > nshow && (
<>
{!showMore ? (
<a
onClick={() => setShowMore(true)}
className="text-sm text-blue-600 hover:text-blue-300 cursor-pointer"
>
show more
</a>
) : (
<a
onClick={() => setShowMore(false)}
className="text-sm text-blue-600 hover:text-blue-300 cursor-pointer"
>
show less
</a>
)}
</>
)}
</div>
) : null;
};

return (
<div>
<Dialog open={open} onClose={handleDischargeSummary}>
Expand Down Expand Up @@ -497,45 +537,29 @@ export const ConsultationDetails = (props: any) => {
</div>
)*/}

{(consultationData?.icd11_diagnoses_object?.length ||
consultationData.diagnosis) && (
<div className="text-sm w-full">
<p className="font-semibold leading-relaxed">Diagnosis:</p>
<ShowDiagnosis
diagnoses={
consultationData?.icd11_provisional_diagnoses_object
}
label="Provisional Diagnosis"
/>

{
// shows the old diagnosis data
consultationData.diagnosis && (
<p>{consultationData.diagnosis}</p>
)
}
<ShowDiagnosis
diagnoses={[
...(consultationData?.diagnosis
? [
{
id: "0",
label: consultationData?.diagnosis,
parentId: null,
},
]
: []),
...(consultationData?.icd11_diagnoses_object || []),
]}
label="Diagnosis"
/>

{consultationData?.icd11_diagnoses_object
?.slice(0, !diagnosisShowMore ? 3 : undefined)
.map((diagnosis) => (
<p>{diagnosis.label}</p>
))}
{consultationData?.icd11_diagnoses_object &&
consultationData.icd11_diagnoses_object.length > 3 && (
<>
{!diagnosisShowMore ? (
<a
onClick={() => setDiagnosisShowMore(true)}
className="text-sm text-blue-600 hover:text-blue-300 cursor-pointer"
>
show more
</a>
) : (
<a
onClick={() => setDiagnosisShowMore(false)}
className="text-sm text-blue-600 hover:text-blue-300 cursor-pointer"
>
show less
</a>
)}{" "}
</>
)}
</div>
)}
{consultationData.verified_by && (
<div className="text-sm mt-2">
<span className="font-semibold leading-relaxed">
Expand Down
25 changes: 25 additions & 0 deletions src/Components/Facility/ConsultationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ type FormDetails = {
referred_to: string;
icd11_diagnoses: string[];
icd11_diagnoses_object: ICD11DiagnosisModel[];
icd11_provisional_diagnoses: string[];
icd11_provisional_diagnoses_object: ICD11DiagnosisModel[];
verified_by: string;
is_kasp: BooleanStrings;
kasp_enabled_date: null;
Expand Down Expand Up @@ -129,6 +131,8 @@ const initForm: FormDetails = {
referred_to: "",
icd11_diagnoses: [],
icd11_diagnoses_object: [],
icd11_provisional_diagnoses: [],
icd11_provisional_diagnoses_object: [],
verified_by: "",
is_kasp: "false",
kasp_enabled_date: null,
Expand Down Expand Up @@ -496,6 +500,7 @@ export const ConsultationForm = (props: any) => {
discharge_date: state.form.discharge_date,
ip_no: state.form.ip_no,
icd11_diagnoses: state.form.icd11_diagnoses,
icd11_provisional_diagnoses: state.form.icd11_provisional_diagnoses,
verified_by: state.form.verified_by,
discharge_advice: dischargeAdvice,
prn_prescription: PRNAdvice,
Expand Down Expand Up @@ -942,6 +947,26 @@ export const ConsultationForm = (props: any) => {
errors={state.errors.verified_by}
/>
</div>
<div id="provisional-diagnosis-div" className="mt-4">
<InputLabel id="diagnosis-label">Provisional Diagnosis</InputLabel>
<DiagnosisSelect
name="icd11_provisional_diagnoses"
selected={state.form.icd11_provisional_diagnoses_object}
setSelected={(selected: ICD11DiagnosisModel[] | null) => {
dispatch({
type: "set_form",
form: {
...state.form,
icd11_provisional_diagnoses:
selected?.map(
(diagnosis: ICD11DiagnosisModel) => diagnosis.id
) || [],
},
});
}}
/>
</div>

<div id="diagnosis-div" className="mt-4">
<InputLabel id="diagnosis-label">Diagnosis</InputLabel>
<DiagnosisSelect
Expand Down
1 change: 1 addition & 0 deletions src/Components/Facility/models.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export interface ConsultationModel {
kasp_enabled_date?: string;
diagnosis?: string;
icd11_diagnoses_object?: ICD11DiagnosisModel[];
icd11_provisional_diagnoses_object?: ICD11DiagnosisModel[];
verified_by?: string;
suggestion_text?: string;
symptoms?: Array<number>;
Expand Down