diff --git a/src/Components/CriticalCareRecording/Others/DailyRound__General.res b/src/Components/CriticalCareRecording/Others/DailyRound__General.res
index 18caeb0e597..22c5051083e 100644
--- a/src/Components/CriticalCareRecording/Others/DailyRound__General.res
+++ b/src/Components/CriticalCareRecording/Others/DailyRound__General.res
@@ -30,19 +30,28 @@ let symptoms = [
"CONSTIPATION",
"HEAD ACHE",
"BLEEDING",
- "DIZZINESS"
-];
+ "DIZZINESS",
+]
@react.component
let make = (~others, ~renderOptionalDescription, ~title) => {
-
{title("Symptoms")}
{Js.Array.map(id => {
-
- {str(symptoms[id - 1])}
-
- }, Others.additional_symptoms(
- others,
- ))->React.array}
{renderOptionalDescription(
+ let additionalSymptoms = Others.additional_symptoms(others)
+
+ {title("Symptoms")}
+
+ {switch additionalSymptoms {
+ | Some(symptomsArray) => Js.Array.map(id => {
+
+ {str(symptoms[id - 1])}
+
+ }, symptomsArray)->React.array
+ | None => React.null
+ }}
+
+ {renderOptionalDescription(
"Physical Examination Info",
Others.physical_examination_info(others),
- )} {renderOptionalDescription("Other Details", Others.other_details(others))}
+ )}
+ {renderOptionalDescription("Other Details", Others.other_details(others))}
+
}
diff --git a/src/Components/CriticalCareRecording/types/CriticalCare__Others.res b/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
index 93cf8508872..21b9513eb8d 100644
--- a/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
+++ b/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
@@ -2,7 +2,7 @@ type t = {
bilateral_air_entry: option,
etco2: option,
physical_examination_info: option,
- additional_symptoms: array,
+ additional_symptoms: option>,
other_details: option,
other_symptoms: option,
}
@@ -21,12 +21,12 @@ let make = (
~other_symptoms,
~other_details,
) => {
- bilateral_air_entry: bilateral_air_entry,
- etco2: etco2,
- physical_examination_info: physical_examination_info,
- other_details: other_details,
- additional_symptoms: additional_symptoms,
- other_symptoms: other_symptoms,
+ bilateral_air_entry,
+ etco2,
+ physical_examination_info,
+ other_details,
+ additional_symptoms,
+ other_symptoms,
}
let makeFromJs = dailyRound => {
diff --git a/src/Components/Facility/Consultations/DailyRoundsFilter.tsx b/src/Components/Facility/Consultations/DailyRoundsFilter.tsx
index 829c085a840..430154d6689 100644
--- a/src/Components/Facility/Consultations/DailyRoundsFilter.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsFilter.tsx
@@ -73,7 +73,9 @@ export default function DailyRoundsFilter(props: Props) {
label={t("Round Type")}
options={DailyRoundTypes}
placeholder={t("show_all")}
- optionLabel={(o) => t(o)}
+ optionLabel={(o) =>
+ o === "DOCTORS_LOG" ? "Progress Note" : t(o)
+ }
optionValue={(o) => o}
/>
{
review_interval: Number(prevReviewInterval),
};
- if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
+ if (!["VENTILATOR"].includes(state.form.rounds_type)) {
data = {
...data,
bp: state.form.bp ?? {},
@@ -342,9 +342,13 @@ export const DailyRounds = (props: any) => {
if (obj) {
dispatch({ type: "set_form", form: initForm });
Notification.Success({
- msg: `${obj.rounds_type === "VENTILATOR" ? "Critical Care" : capitalize(obj.rounds_type)} log update details updated successfully`,
+ msg: `${obj.rounds_type === "DOCTORS_LOG" ? "Progress Notes" : (obj.rounds_type === "VENTILATOR" ? "Critical Care" : capitalize(obj.rounds_type)) + " log update"} details updated successfully`,
});
- if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
+ if (
+ ["NORMAL", "TELEMEDICINE", "DOCTORS_LOG"].includes(
+ state.form.rounds_type,
+ )
+ ) {
navigate(
`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`,
);