consultation depth-2

hrit2773 · Apr 24, 2024 · 9546232 · 9546232
1 parent 7475b94
commit 9546232
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 112 deletions.
diff --git a/src/Components/Common/SymptomsSelect.tsx b/src/Components/Common/SymptomsSelect.tsx
@@ -71,7 +71,7 @@ export const SymptomsSelect = (props: FormFieldBaseProps<number[]>) => {
  <FormField field={field}>
  <MultiSelectMenuV2
  id={field.id}
- options={SYMPTOM_CHOICES}
+ options={SYMPTOM_CHOICES.filter((sym) => sym.id !== 1)}
  disabled={props.disabled}
  placeholder="Select symptoms"
  optionLabel={(option) => option.text}

diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -373,35 +373,76 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
  <div className="text-sm font-semibold uppercase">
  Consultation Update
  </div>
- <div className="my-4 flex flex-wrap items-center gap-2">
- {props.consultationData.symptoms?.map(
- (symptom, index) => (
- <Chip
- key={index}
- text={
- SYMPTOM_CHOICES.find(
- (choice) => choice.id === symptom,
- )?.text ?? "Err. Unknown"
- }
- size="small"
- />
- ),
- )}
- </div>
- {props.consultationData.other_symptoms && (
- <div className="capitalize">
- <div className="text-xs font-semibold">
- Other Symptoms:
- </div>
- {props.consultationData.other_symptoms}
+ {props.consultationData.symptoms_with_dates?.length ? (
+ <div className=" my-3 flex flex-col gap-4">
+ {props.consultationData.symptoms_with_dates.map(
+ (tl) => (
+ <div className="flex flex-col gap-4">
+ <div>
+ <span className="text-xs font-semibold leading-relaxed text-gray-800">
+ from {formatDate(tl.date)}
+ </span>
+ </div>
+ <div className=" flex flex-wrap gap-3">
+ {tl.symptoms.map((symptom, idx) => (
+ <Chip
+ key={idx}
+ text={
+ SYMPTOM_CHOICES.find(
+ (choice) => choice.id === symptom,
+ )?.text ?? "Err. Unknown"
+ }
+ size="small"
+ />
+ ))}
+ </div>
+ </div>
+ ),
+ )}
+ {props.consultationData.other_symptoms && (
+ <div className="capitalize">
+ <div className="text-xs font-semibold">
+ Other Symptoms:
+ </div>
+ {props.consultationData.other_symptoms}
+ </div>
+ )}
  </div>
+ ) : (
+ <>
+ <div className="my-4 flex flex-wrap items-center gap-2">
+ {props.consultationData.symptoms?.map(
+ (symptom, index) => (
+ <Chip
+ key={index}
+ text={
+ SYMPTOM_CHOICES.find(
+ (choice) => choice.id === symptom,
+ )?.text ?? "Err. Unknown"
+ }
+ size="small"
+ />
+ ),
+ )}
+ </div>
+ {props.consultationData.other_symptoms && (
+ <div className="capitalize">
+ <div className="text-xs font-semibold">
+ Other Symptoms:
+ </div>
+ {props.consultationData.other_symptoms}
+ </div>
+ )}
+ <span className="text-xs font-semibold leading-relaxed text-gray-800">
+ from{" "}
+ {props.consultationData.symptoms_onset_date
+ ? formatDate(
+ props.consultationData.symptoms_onset_date,
+ )
+ : "--/--/----"}
+ </span>
+ </>
  )}
- <span className="text-xs font-semibold leading-relaxed text-gray-800">
- from{" "}
- {props.consultationData.symptoms_onset_date
- ? formatDate(props.consultationData.symptoms_onset_date)
- : "--/--/----"}
- </span>
  </div>
  </div>
  </div>

diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -120,6 +120,9 @@ export const ConsultationDetails = (props: any) => {
  });
  data.symptoms_text = symptoms.join(", ");
  }
+ if (res.data.symptoms_with_dates.length) {
+ data.symptoms_text = "symptoms";
+ }
  if (facilityId != data.facility || patientId != data.patient) {
  navigate(
  `/facility/${data.facility}/patient/${data.patient}/consultation/${data?.id}`,