Patient Age and Facility Location Edits (#10260)

ohcnetwork · Jan 29, 2025 · 25cdaf6 · 25cdaf6
1 parent 0c3342f
commit 25cdaf6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 23 deletions.
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
@@ -135,7 +135,6 @@ export const formatPatientAge = (
   obj: PatientModel | Patient,
   abbreviated = false,
 ) => {
-  if (obj.age != null) return `${obj.age} Y`;
   const suffixes = getRelativeDateSuffix(abbreviated);
   const start = dayjs(
     obj.date_of_birth

diff --git a/src/components/Facility/FacilityForm.tsx b/src/components/Facility/FacilityForm.tsx
@@ -211,8 +211,8 @@ export default function FacilityForm(props: FacilityProps) {
         )?.id,
         address: facilityData.address,
         phone_number: facilityData.phone_number,
-        latitude: facilityData.latitude,
-        longitude: facilityData.longitude,
+        latitude: Number(facilityData.latitude),
+        longitude: Number(facilityData.longitude),
         is_public: facilityData.is_public,
       });
     }

diff --git a/src/components/Patient/PatientDetailsTab/Demography.tsx b/src/components/Patient/PatientDetailsTab/Demography.tsx
@@ -265,22 +265,6 @@ export const Demography = (props: PatientProps) => {
         </div>
 
         <div className="lg:basis-4/5">
-          <div className="mb-2 flex flex-row justify-between">
-            <div>
-              <Button
-                id="update-patient-details"
-                variant="outline"
-                className="mt-4"
-                disabled={!!patientData.death_datetime}
-                onClick={withPermissionCheck(() =>
-                  navigate(`/facility/${id}/patient/${id}/update`),
-                )}
-              >
-                <CareIcon icon="l-edit-alt" className="text-lg pr-1" />
-                {t("edit_profile")}
-              </Button>
-            </div>
-          </div>
           {/* <div className="mt-4 rounded-md border border-blue-400 bg-blue-50 p-5 grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 md:gap-y-8 lg:grid-cols-2">
             {[
               { label: t("abha_number"), value: "-" },

diff --git a/src/components/Patient/PatientRegistration.tsx b/src/components/Patient/PatientRegistration.tsx
@@ -283,9 +283,10 @@ export default function PatientRegistration(
         same_address:
           patientQuery.data.address === patientQuery.data.permanent_address,
         age_or_dob: patientQuery.data.date_of_birth ? "dob" : "age",
-        age: !patientQuery.data.date_of_birth
-          ? patientQuery.data.age
-          : undefined,
+        age:
+          !patientQuery.data.date_of_birth && patientQuery.data.year_of_birth
+            ? new Date().getFullYear() - patientQuery.data.year_of_birth
+            : undefined,
         date_of_birth: patientQuery.data.date_of_birth
           ? patientQuery.data.date_of_birth
           : undefined,

diff --git a/src/types/emr/patient.ts b/src/types/emr/patient.ts
@@ -87,7 +87,6 @@ export interface PatientModel {
   assigned_to?: number | null;
   assigned_to_object?: AssignedToObjectModel;
   meta_info?: PatientMeta;
-  age?: string;
 }
 
 export const validatePatient = (patient: PatientModel, useDob: boolean) => {