Merge branch 'develop' into privacy-consultation-bed

ohcnetwork · Oct 15, 2024 · 89c4bb0 · 89c4bb0
2 parents 10fbb33 + e8f898e
commit 89c4bb0
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Components/DeathReport/DeathReport.tsx b/src/Components/DeathReport/DeathReport.tsx
@@ -1,15 +1,13 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { useEffect, useState } from "react";
-import { statusType, useAbortableEffect } from "../../Common/utils";
+import { useState } from "react";
 import { GENDER_TYPES } from "../../Common/constants";
 import TextFormField from "../Form/FormFields/TextFormField";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import DateFormField from "../Form/FormFields/DateFormField";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import {
   formatDateTime,
+  formatPatientAge,
   humanizeStrings,
-  patientAgeInYears,
 } from "../../Utils/utils";
 import Page from "../Common/components/Page";
 import Form from "../Form/Form";
@@ -111,7 +109,7 @@ export default function PrintDeathReport(props: { id: string }) {
         const patientComorbidities = getPatientComorbidities(res.data);
         const data = {
           ...res.data,
-          age: patientAgeInYears(res.data!),
+          age: formatPatientAge(res.data!, true),
           gender: patientGender,
           address: patientAddress,
           comorbidities: patientComorbidities,
@@ -372,7 +370,7 @@ export default function PrintDeathReport(props: { id: string }) {
                     <div>
                       <TextFormField
                         {...field("age")}
-                        type="number"
+                        type="text"
                         label={t("age")}
                       />
                     </div>