@kenyaemr/esm-patient-registration-app 8.0.1-pre.95 → 8.0.2

package/src/patient-registration/input/basic-input/input/input.component.tsx

@@ -66,7 +66,7 @@ export interface TextInputProps
    * `true` to use the light version. For use on $ui-01 backgrounds only.
    * Don't use this to make tile background color same as container background color.
    * 'The `light` prop for `TextInput` has ' +
-      'been deprecated in favor of the new `Layer` component. It will be removed in the next major release.'
+   'been deprecated in favor of the new `Layer` component. It will be removed in the next major release.'
    */
   light?: boolean;
 
@@ -145,6 +145,10 @@ export const Input: React.FC<InputProps> = ({ checkWarning, ...props }) => {
     t('invalidEmail')
     t('numberInNameDubious')
     t('yearsEstimateRequired')
+    t('deathdayIsRequired', 'Death date is required when the patient is marked as deceased.')
+    t('deathdayInvalidDate', 'Date of death is invalid')
+    t('deathCauseRequired', 'Cause of death is required')
+    t('nonCodedCauseOfDeathRequired', 'Non-coded cause of death is required')
   */
 
   const value = field.value || '';

package/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx

@@ -26,7 +26,8 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
     () => identifierTypes.find((identifierType) => identifierType.uuid === patientIdentifier.identifierTypeUuid),
     [patientIdentifier, identifierTypes],
   );
-  const { autoGeneration, initialValue, identifierValue, identifierName, required } = patientIdentifier;
+  const { autoGeneration, initialValue, identifierValue, identifierName, required, selectedSource } = patientIdentifier;
+  const manualEntryEnabled = selectedSource?.autoGenerationOption?.manualEntryEnabled;
   const [hideInputField, setHideInputField] = useState(autoGeneration || initialValue === identifierValue);
   const name = `identifiers.${fieldName}.identifierValue`;
   const [identifierField, identifierFieldMeta] = useField(name);
@@ -46,8 +47,8 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
     setFieldValue(`identifiers.${fieldName}`, {
       ...patientIdentifier,
       identifierValue: initialValue,
-      selectedSource: null,
-      autoGeneration: false,
+      selectedSource,
+      autoGeneration,
     } as PatientIdentifierValue);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [initialValue, setHideInputField]);
@@ -57,6 +58,7 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
     setFieldValue(`identifiers.${fieldName}`, {
       ...patientIdentifier,
       ...setIdentifierSource(identifierType?.identifierSources?.[0], initialValue, initialValue),
+      ...(autoGeneration && manualEntryEnabled && { identifierValue: initialValue ?? '' }),
     });
   };
 
@@ -83,9 +85,12 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
     }
   };
 
+  const showEditButton = !required && hideInputField && (!!initialValue || manualEntryEnabled);
+  const showResetButton =
+    (!!initialValue && initialValue !== identifierValue) || (!hideInputField && manualEntryEnabled);
   return (
     <div className={styles.IDInput}>
-      {!autoGeneration && !hideInputField ? (
+      {!hideInputField ? (
         <Input
           id={name}
           labelText={identifierName}
@@ -99,21 +104,24 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
         />
       ) : (
         <div className={styles.textID}>
-          <p className={styles.label}>{identifierName}</p>
-          <p className={styles.bodyShort02}>
+          <p data-testid="identifier-label" className={styles.label}>
+            {required ? identifierName : `${t('optionalIdentifierLabel', { identifierName })}`}
+          </p>
+          <p data-testid="identifier-placeholder" className={styles.bodyShort02}>
             {autoGeneration ? t('autoGeneratedPlaceholderText', 'Auto-generated') : identifierValue}
           </p>
-          <input type="hidden" {...identifierField} disabled />
+          <input data-testid="identifier-input" type="hidden" {...identifierField} disabled />
           {/* This is added for any error descriptions */}
           {!!(identifierFieldMeta.touched && identifierFieldMeta.error) && (
             <span className={styles.dangerLabel01}>{identifierFieldMeta.error && t(identifierFieldMeta.error)}</span>
           )}
         </div>
       )}
-      <div style={{ marginBottom: '1rem' }}>
-        {!patientIdentifier.required && patientIdentifier.initialValue && hideInputField && (
+      <div className={styles.actionButtonContainer}>
+        {showEditButton && (
           <UserHasAccess privilege="Edit Patient Identifiers">
             <Button
+              data-testid="edit-button"
               size="md"
               kind="ghost"
               onClick={handleEdit}
@@ -124,7 +132,7 @@ const IdentifierInput: React.FC<IdentifierInputProps> = ({ patientIdentifier, fi
             </Button>
           </UserHasAccess>
         )}
-        {initialValue && initialValue !== identifierValue && (
+        {showResetButton && (
           <UserHasAccess privilege="Edit Patient Identifiers">
             <Button
               size="md"

package/src/patient-registration/input/custom-input/identifier/identifier-input.test.tsx

@@ -1,29 +1,28 @@
 /* eslint-disable testing-library/no-node-access */
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { Formik, Form } from 'formik';
-import { type PatientIdentifierType } from '../../../patient-registration.types';
-import { initialFormValues } from '../../../patient-registration.component';
+import { Form, Formik } from 'formik';
+import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { esmPatientRegistrationSchema, type RegistrationConfig } from '../../../../config-schema';
+import { ResourcesContext, type Resources } from '../../../../offline.resources';
+import {
+  PatientRegistrationContext,
+  type PatientRegistrationContextProps,
+} from '../../../patient-registration-context';
+import type {
+  AddressTemplate,
+  FormValues,
+  IdentifierSource,
+  PatientIdentifierValue,
+} from '../../../patient-registration.types';
 import IdentifierInput from './identifier-input.component';
+import userEvent from '@testing-library/user-event';
 
-// TODO: Fix this test
-xdescribe('identifier input', () => {
-  const openmrsID = {
-    name: 'OpenMRS ID',
+const mockIdentifierTypes = [
+  {
     fieldName: 'openMrsId',
-    required: true,
-    uuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
-    format: null,
-    isPrimary: true,
+    format: '',
     identifierSources: [
-      {
-        uuid: '691eed12-c0f1-11e2-94be-8c13b969e334',
-        name: 'Generator 1 for OpenMRS ID',
-        autoGenerationOption: {
-          manualEntryEnabled: false,
-          automaticGenerationEnabled: true,
-        },
-      },
       {
         uuid: '01af8526-cea4-4175-aa90-340acb411771',
         name: 'Generator 2 for OpenMRS ID',
@@ -33,72 +32,172 @@ xdescribe('identifier input', () => {
         },
       },
     ],
-    autoGenerationSource: null,
-  };
+    isPrimary: true,
+    name: 'OpenMRS ID',
+    required: true,
+    uniquenessBehavior: 'UNIQUE' as const,
+    uuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+  },
+];
 
-  const setupIdentifierInput = async (identifierType: PatientIdentifierType) => {
-    initialFormValues['source-for-' + identifierType.fieldName] = identifierType.identifierSources[0].name;
+const mockResourcesContextValue: Resources = {
+  addressTemplate: {} as AddressTemplate,
+  currentSession: {
+    authenticated: true,
+    sessionId: 'JSESSION',
+    currentProvider: { uuid: 'provider-uuid', identifier: 'PRO-123' },
+  },
+  relationshipTypes: [],
+  identifierTypes: [...mockIdentifierTypes],
+};
 
-    render(
-      <Formik initialValues={initialFormValues} onSubmit={null}>
-        <Form>
-          <IdentifierInput identifierType={identifierType} />
-        </Form>
-      </Formik>,
-    );
-    const identifierInput = screen.getByLabelText(identifierType.fieldName) as HTMLInputElement;
-    let identifierSourceSelectInput = screen.getByLabelText('source-for-' + identifierType.fieldName);
-    return {
-      identifierInput,
-      identifierSourceSelectInput,
-    };
-  };
+const mockContextValues: PatientRegistrationContextProps = {
+  currentPhoto: '',
+  inEditMode: false,
+  identifierTypes: [],
+  initialFormValues: {} as FormValues,
+  isOffline: false,
+  setCapturePhotoProps: jest.fn(),
+  setFieldValue: jest.fn(),
+  setInitialFormValues: jest.fn(),
+  setFieldTouched: jest.fn(),
+  validationSchema: null,
+  values: {} as FormValues,
+};
 
-  it('exists', async () => {
-    const { identifierInput, identifierSourceSelectInput } = await setupIdentifierInput(openmrsID);
+const mockUseConfig = jest.mocked(useConfig<RegistrationConfig>);
 
-    expect(identifierInput.type).toBe('text');
-    expect(identifierSourceSelectInput.type).toBe('select-one');
+describe('identifier input', () => {
+  mockUseConfig.mockReturnValue({
+    ...getDefaultsFromConfigSchema(esmPatientRegistrationSchema),
   });
 
-  it('has correct props for identifier source select input', async () => {
-    const { identifierSourceSelectInput } = await setupIdentifierInput(openmrsID);
+  const fieldName = 'openMrsId';
+  const openmrsID = {
+    identifierTypeUuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+    initialValue: '',
+    identifierName: 'OpenMRS ID',
+    selectedSource: {
+      uuid: '01af8526-cea4-4175-aa90-340acb411771',
+      name: 'Generator 2 for OpenMRS ID',
+      autoGenerationOption: {
+        manualEntryEnabled: false,
+        automaticGenerationEnabled: true,
+      },
+    } as IdentifierSource,
+    autoGeneration: false,
+    preferred: true,
+    required: true,
+  } as PatientIdentifierValue;
+
+  const setupIdentifierInput = (patientIdentifier: PatientIdentifierValue, initialValues = {}) => {
+    render(
+      <ResourcesContext.Provider value={mockResourcesContextValue}>
+        <Formik initialValues={initialValues} onSubmit={jest.fn()}>
+          <Form>
+            <PatientRegistrationContext.Provider value={mockContextValues}>
+              <IdentifierInput patientIdentifier={patientIdentifier} fieldName={fieldName} />
+            </PatientRegistrationContext.Provider>
+          </Form>
+        </Formik>
+      </ResourcesContext.Provider>,
+    );
+  };
 
-    expect(identifierSourceSelectInput.childElementCount).toBe(3);
-    expect(identifierSourceSelectInput.value).toBe('Generator 1 for OpenMRS ID');
+  it('shows the identifier input', () => {
+    openmrsID.autoGeneration = false;
+    setupIdentifierInput(openmrsID as PatientIdentifierValue);
+    expect(screen.getByLabelText(openmrsID.identifierName)).toBeInTheDocument();
   });
 
-  it('has correct props for identifier input', async () => {
-    const { identifierInput } = await setupIdentifierInput(openmrsID);
-    expect(identifierInput.placeholder).toBe('Auto-generated');
-    expect(identifierInput.disabled).toBe(true);
+  it('displays an edit button when there is an initial value', async () => {
+    // setup
+    openmrsID.autoGeneration = false;
+    openmrsID.required = false;
+    openmrsID.initialValue = '1002UU9';
+    openmrsID.identifierValue = '1002UU9';
+    // replay
+    setupIdentifierInput(openmrsID as PatientIdentifierValue);
+    expect(screen.getByText('Edit')).toBeInTheDocument();
   });
 
-  it('text input should not be disabled if manual entry is enabled', async () => {
+  it('hides the edit button when the identifier is required', async () => {
     // setup
-    openmrsID.identifierSources[0].autoGenerationOption.manualEntryEnabled = true;
+    openmrsID.autoGeneration = false;
+    openmrsID.required = true;
+    openmrsID.initialValue = '1002UU9';
+    openmrsID.identifierValue = '1002UU9';
     // replay
-    const { identifierInput } = await setupIdentifierInput(openmrsID);
-    expect(identifierInput.placeholder).toBe('Auto-generated');
-    expect(identifierInput.disabled).toBe(false);
+    setupIdentifierInput(openmrsID);
+    expect(screen.queryByText('Edit')).not.toBeInTheDocument();
   });
 
-  it('should not render select widget if auto-entry is false', async () => {
+  it('displays a delete button when the identifier is not a default type', () => {
     // setup
-    openmrsID.identifierSources = [
-      {
-        uuid: '691eed12-c0f1-11e2-94be-8c13b969e334',
-        name: 'Generator 1 for OpenMRS ID',
+    openmrsID.required = false;
+    // replay
+    setupIdentifierInput(openmrsID);
+    expect(screen.getByText('Delete')).toBeInTheDocument();
+  });
+
+  describe('auto-generated identifier', () => {
+    it('hides the input when the identifier is auto-generated', () => {
+      openmrsID.autoGeneration = true;
+      setupIdentifierInput(openmrsID);
+      expect(screen.getByTestId('identifier-input')).toHaveAttribute('type', 'hidden');
+    });
+
+    it("displays 'Auto-Generated' when the indentifier has auto generation", () => {
+      openmrsID.autoGeneration = true;
+      setupIdentifierInput(openmrsID);
+      expect(screen.getByTestId('identifier-placeholder').innerHTML).toBe('Auto-generated');
+      expect(screen.getByTestId('identifier-input')).toBeDisabled();
+    });
+
+    describe('manual entry allowed', () => {
+      openmrsID.selectedSource = {
         autoGenerationOption: {
           manualEntryEnabled: true,
-          automaticGenerationEnabled: false,
         },
-      },
-    ];
-    // replay
-    const { identifierInput, identifierSourceSelectInput } = await setupIdentifierInput(openmrsID);
-    expect(identifierInput.placeholder).toBe('Enter identifier');
-    expect(identifierInput.disabled).toBe(false);
-    expect(identifierSourceSelectInput).toBe(undefined);
+      } as IdentifierSource;
+
+      it('shows the edit button', () => {
+        openmrsID.autoGeneration = true;
+        setupIdentifierInput(openmrsID);
+        expect(screen.getByText('Edit')).toBeInTheDocument();
+      });
+
+      describe('edit button clicked', () => {
+        it('displays an empty input field', async () => {
+          const user = userEvent.setup();
+          openmrsID.autoGeneration = true;
+          openmrsID.required = false;
+          openmrsID.selectedSource = {
+            autoGenerationOption: {
+              manualEntryEnabled: true,
+            },
+          } as IdentifierSource;
+          setupIdentifierInput(openmrsID);
+          const editButton = screen.getByTestId('edit-button');
+          await user.click(editButton);
+          expect(screen.getByLabelText(new RegExp(`${openmrsID.identifierName}`))).toHaveValue('');
+        });
+
+        it('displays an input field with the identifier value if it exists', async () => {
+          const user = userEvent.setup();
+          openmrsID.autoGeneration = true;
+          openmrsID.required = false;
+          openmrsID.selectedSource = {
+            autoGenerationOption: {
+              manualEntryEnabled: true,
+            },
+          } as IdentifierSource;
+          setupIdentifierInput(openmrsID, { identifiers: { [fieldName]: { identifierValue: '10001V' } } });
+          const editButton = screen.getByTestId('edit-button');
+          await user.click(editButton);
+          expect(screen.getByLabelText(new RegExp(`${openmrsID.identifierName}`))).toHaveValue('10001V');
+        });
+      });
+    });
   });
 });

package/src/patient-registration/input/dummy-data/dummy-data-input.component.tsx

@@ -25,7 +25,10 @@ export const dummyFormValues: FormValues = {
   telephoneNumber: '0800001066',
   isDead: false,
   deathDate: '',
+  deathTime: '',
+  deathTimeFormat: 'AM',
   deathCause: '',
+  nonCodedCauseOfDeath: '',
   relationships: [],
   address: {
     address1: 'Bom Jesus Street',

package/src/patient-registration/input/input.scss

@@ -116,3 +116,8 @@
   margin: 0;
   padding-left: layout.$spacing-05;
 }
+
+.actionButtonContainer {
+  margin-left: layout.$spacing-05;
+  margin-bottom: layout.$spacing-05;
+}

package/src/patient-registration/patient-registration-context.ts

@@ -1,7 +1,7 @@
 import { useConfig } from '@openmrs/esm-framework';
 import { createContext, type SetStateAction } from 'react';
 import { type RegistrationConfig } from '../config-schema';
-import { type FormValues, type CapturePhotoProps } from './patient-registration.types';
+import { type CapturePhotoProps, type FormValues } from './patient-registration.types';
 
 export interface PatientRegistrationContextProps {
   currentPhoto: string;
@@ -9,11 +9,12 @@ export interface PatientRegistrationContextProps {
   inEditMode: boolean;
   initialFormValues: FormValues;
   isOffline: boolean;
-  setCapturePhotoProps(value: SetStateAction<CapturePhotoProps>): void;
-  setFieldValue(field: string, value: any, shouldValidate?: boolean): void;
   setInitialFormValues?: React.Dispatch<SetStateAction<FormValues>>;
   validationSchema: any;
   values: FormValues;
+  setCapturePhotoProps(value: SetStateAction<CapturePhotoProps>): void;
+  setFieldValue(field: string, value: any, shouldValidate?: boolean): void;
+  setFieldTouched(field: string, isTouched?: any, shouldValidate?: boolean): void;
 }
 
 export const PatientRegistrationContext = createContext<PatientRegistrationContextProps | undefined>(undefined);

package/src/patient-registration/patient-registration-hooks.ts

@@ -1,11 +1,11 @@
 import {
   type FetchResponse,
-  type OpenmrsResource,
   getSynchronizationItems,
   openmrsFetch,
+  type OpenmrsResource,
+  restBaseUrl,
   useConfig,
   usePatient,
-  restBaseUrl,
 } from '@openmrs/esm-framework';
 import last from 'lodash-es/last';
 import camelCase from 'lodash-es/camelCase';
@@ -14,14 +14,17 @@ import useSWR from 'swr';
 import { v4 } from 'uuid';
 import { type RegistrationConfig } from '../config-schema';
 import { patientRegistration } from '../constants';
-import { useConceptAnswers, useGlobalProperties } from '../patient-verification/patient-verification-hook';
 import {
+  useConceptAnswers,
+  useGlobalProperties,
+} from '../client-registry/patient-verification/patient-verification-hook';
+import {
+  type Encounter,
   type FormValues,
+  type PatientIdentifierResponse,
   type PatientRegistration,
   type PatientUuidMapType,
   type PersonAttributeResponse,
-  type PatientIdentifierResponse,
-  type Encounter,
   type ConceptAnswers,
   type ObsResponse,
 } from './patient-registration.types';
@@ -36,8 +39,10 @@ import { useInitialPatientRelationships } from './section/patient-relationships/
 import dayjs from 'dayjs';
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
+  const { freeTextFieldConceptUuid } = useConfig<RegistrationConfig>();
   const { martialStatus, education, occupation, educationLoad } = useConcepts();
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
+  const { data: deathInfo, isLoading: isLoadingDeathInfo } = useInitialPersonDeathInfo(patientUuid);
   const { data: attributes, isLoading: isLoadingAttributes } = useInitialPersonAttributes(patientUuid);
   const { data: identifiers, isLoading: isLoadingIdentifiers } = useInitialPatientIdentifiers(patientUuid);
   const { data: relationships, isLoading: isLoadingRelationships } = useInitialPatientRelationships(patientUuid);
@@ -59,8 +64,11 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     birthdateEstimated: false,
     telephoneNumber: '',
     isDead: false,
-    deathDate: '',
+    deathDate: undefined,
+    deathTime: undefined,
+    deathTimeFormat: 'AM',
     deathCause: '',
+    nonCodedCauseOfDeath: '',
     relationships: [],
     identifiers: {},
     address: {},
@@ -101,6 +109,24 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     })();
   }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
 
+  // Set initial patient death info
+  useEffect(() => {
+    if (!isLoadingDeathInfo && deathInfo?.dead) {
+      const deathDatetime = deathInfo.deathDate || null;
+      const deathDate = deathDatetime ? new Date(deathDatetime) : undefined;
+      const time = deathDate ? dayjs(deathDate).format('hh:mm') : undefined;
+      const timeFormat = deathDate ? (dayjs(deathDate).hour() >= 12 ? 'PM' : 'AM') : 'AM';
+      setInitialFormValues((initialFormValues) => ({
+        ...initialFormValues,
+        isDead: deathInfo.dead || false,
+        deathDate: deathDate,
+        deathTime: time,
+        deathTimeFormat: timeFormat,
+        deathCause: deathInfo.causeOfDeathNonCoded ? freeTextFieldConceptUuid : deathInfo.causeOfDeath?.uuid,
+        nonCodedCauseOfDeath: deathInfo.causeOfDeathNonCoded,
+      }));
+    }
+  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues]);
   // Setting authentication token
 
   useEffect(() => {
@@ -301,6 +327,32 @@ function useInitialPersonAttributes(personUuid: string) {
   return result;
 }
 
+interface DeathInfoResults {
+  uuid: string;
+  display: string;
+  causeOfDeath: OpenmrsResource | null;
+  dead: boolean;
+  deathDate: string;
+  causeOfDeathNonCoded: string | null;
+}
+
+function useInitialPersonDeathInfo(personUuid: string) {
+  const { data, error, isLoading } = useSWR<FetchResponse<DeathInfoResults>, Error>(
+    !!personUuid
+      ? `${restBaseUrl}/person/${personUuid}?v=custom:(uuid,display,causeOfDeath,dead,deathDate,causeOfDeathNonCoded)`
+      : null,
+    openmrsFetch,
+  );
+
+  const result = useMemo(() => {
+    return {
+      data: data?.data,
+      isLoading,
+    };
+  }, [data, error]);
+  return result;
+}
+
 function getPatientAttributeUuidMapForPatient(attributes: Array<PersonAttributeResponse>) {
   const attributeUuidMap = {};
   attributes.forEach((attribute) => {
@@ -356,9 +408,15 @@ function useConcepts() {
     },
   ];
 
-  const martialStatus: Array<ConceptAnswers> = config.fieldDefinitions
-    .find((fieldDefinition) => fieldDefinition.id === 'maritalStatus')
-    .customConceptAnswers.map((concept) => ({ uuid: concept.uuid, display: concept.label }));
+  const maritalStatusCustomConceptAnswers =
+    config.fieldDefinitions.find((fieldDefinition) => fieldDefinition.id === 'maritalStatus')?.customConceptAnswers ??
+    [];
+
+  const martialStatus: Array<ConceptAnswers> =
+    maritalStatusCustomConceptAnswers.map((concept) => ({
+      uuid: concept?.uuid,
+      display: concept?.label,
+    })) ?? [];
 
   return { martialStatus, education, occupation, educationLoad };
 }

package/src/patient-registration/patient-registration-utils.ts

@@ -3,11 +3,11 @@ import camelCase from 'lodash-es/camelCase';
 import { parseDate } from '@openmrs/esm-framework';
 import {
   type AddressValidationSchemaType,
+  type Encounter,
   type FormValues,
   type PatientIdentifier,
-  type PatientUuidMapType,
   type PatientIdentifierValue,
-  type Encounter,
+  type PatientUuidMapType,
 } from './patient-registration.types';
 
 export function parseAddressTemplateXml(addressTemplate: string) {
@@ -47,6 +47,7 @@ export function parseAddressTemplateXml(addressTemplate: string) {
     addressValidationSchema,
   };
 }
+
 export function parseAddressTemplateXmlOld(addressTemplate: string) {
   const templateXmlDoc = new DOMParser().parseFromString(addressTemplate, 'text/xml');
   const nameMappings = templateXmlDoc.querySelector('nameMappings').querySelectorAll('property');
@@ -123,11 +124,6 @@ export function getFormValuesFromFhirPatient(patient: fhir.Patient) {
   result.birthdate = patient.birthDate ? parseDate(patient.birthDate) : undefined;
   result.telephoneNumber = patient.telecom ? patient.telecom[0].value : '';
 
-  if (patient.deceasedBoolean || patient.deceasedDateTime) {
-    result.isDead = true;
-    result.deathDate = patient.deceasedDateTime ? patient.deceasedDateTime.split('T')[0] : '';
-  }
-
   return {
     ...result,
     ...patient.identifier.map((identifier) => {