@ampath/esm-patient-registration-app 6.0.1-pre.7 → 6.0.1-pre.70

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

@@ -5,13 +5,16 @@ import {
   openmrsFetch,
   useConfig,
   usePatient,
+  restBaseUrl,
 } from '@openmrs/esm-framework';
+import last from 'lodash-es/last';
 import camelCase from 'lodash-es/camelCase';
 import { type Dispatch, useEffect, useMemo, useState } from 'react';
 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 {
   type FormValues,
   type PatientRegistration,
@@ -19,6 +22,8 @@ import {
   type PersonAttributeResponse,
   type PatientIdentifierResponse,
   type Encounter,
+  type ConceptAnswers,
+  type ObsResponse,
 } from './patient-registration.types';
 import {
   getAddressFieldValuesFromFhirPatient,
@@ -31,12 +36,13 @@ import { useInitialPatientRelationships } from './section/patient-relationships/
 import dayjs from 'dayjs';
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
+  const { martialStatus, education, occupation, educationLoad } = useConcepts();
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
   const { data: attributes, isLoading: isLoadingAttributes } = useInitialPersonAttributes(patientUuid);
   const { data: identifiers, isLoading: isLoadingIdentifiers } = useInitialPatientIdentifiers(patientUuid);
   const { data: relationships, isLoading: isLoadingRelationships } = useInitialPatientRelationships(patientUuid);
-  const { data: encounters } = useInitialEncounters(patientUuid, patientToEdit);
-
+  const { data: obs, isLoading: isLoadingObs, obs: observations } = usePatientObs(patientUuid);
+  const { data: token, isLoading: isLoadingToken } = useGlobalProperties();
   const [initialFormValues, setInitialFormValues] = useState<FormValues>({
     patientUuid: v4(),
     givenName: '',
@@ -95,6 +101,14 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     })();
   }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
 
+  // Setting authentication token
+
+  useEffect(() => {
+    if (!isLoadingToken && token) {
+      setInitialFormValues((initialFormValues) => ({ ...initialFormValues, token: String(token.access_token) }));
+    }
+  }, [isLoadingToken, token]);
+
   // Set initial patient relationships
   useEffect(() => {
     if (!isLoadingRelationships && relationships) {
@@ -133,15 +147,24 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     }
   }, [attributes, setInitialFormValues, isLoadingAttributes]);
 
-  // Set Initial registration encounters
+  // Set initial patient obs
+
+  useEffect(() => {
+    if (!isLoadingObs) {
+      setInitialFormValues((initialFormValues) => ({ ...initialFormValues, obs: obs, observation: observations }));
+    }
+  }, [isLoadingObs]);
+
+  // Set Initial encounter
+
   useEffect(() => {
-    if (patientToEdit && encounters) {
+    if (!educationLoad) {
       setInitialFormValues((initialFormValues) => ({
         ...initialFormValues,
-        obs: encounters as Record<string, string>,
+        concepts: [...occupation, ...martialStatus, ...education],
       }));
     }
-  }, [encounters, patientToEdit]);
+  }, [educationLoad]);
 
   return [initialFormValues, setInitialFormValues];
 }
@@ -210,7 +233,7 @@ export function useInitialPatientIdentifiers(patientUuid: string): {
 
   const { data, error, isLoading } = useSWR<FetchResponse<{ results: Array<PatientIdentifierResponse> }>, Error>(
     shouldFetch
-      ? `/ws/rest/v1/patient/${patientUuid}/identifier?v=custom:(uuid,identifier,identifierType:(uuid,required,name),preferred)`
+      ? `${restBaseUrl}/patient/${patientUuid}/identifier?v=custom:(uuid,identifier,identifierType:(uuid,required,name),preferred)`
       : null,
     openmrsFetch,
   );
@@ -247,7 +270,7 @@ function useInitialEncounters(patientUuid: string, patientToEdit: fhir.Patient)
   const { registrationObs } = useConfig() as RegistrationConfig;
   const { data, error, isLoading } = useSWR<FetchResponse<{ results: Array<Encounter> }>>(
     patientToEdit && registrationObs.encounterTypeUuid
-      ? `/ws/rest/v1/encounter?patient=${patientUuid}&v=custom:(encounterDatetime,obs:(concept:ref,value:ref))&encounterType=${registrationObs.encounterTypeUuid}`
+      ? `${restBaseUrl}/encounter?patient=${patientUuid}&v=custom:(encounterDatetime,obs:(concept:ref,value:ref))&encounterType=${registrationObs.encounterTypeUuid}`
       : null,
     openmrsFetch,
   );
@@ -265,7 +288,7 @@ function useInitialPersonAttributes(personUuid: string) {
   const shouldFetch = !!personUuid;
   const { data, error, isLoading } = useSWR<FetchResponse<{ results: Array<PersonAttributeResponse> }>, Error>(
     shouldFetch
-      ? `/ws/rest/v1/person/${personUuid}/attribute?v=custom:(uuid,display,attributeType:(uuid,display,format),value)`
+      ? `${restBaseUrl}/person/${personUuid}/attribute?v=custom:(uuid,display,attributeType:(uuid,display,format),value)`
       : null,
     openmrsFetch,
   );
@@ -285,3 +308,62 @@ function getPatientAttributeUuidMapForPatient(attributes: Array<PersonAttributeR
   });
   return attributeUuidMap;
 }
+
+export function usePatientObs(patientUuid: string) {
+  const {
+    registrationObs: { encounterTypeUuid },
+  } = useConfig() as RegistrationConfig;
+  const url = `/ws/rest/v1/encounter?patient=${patientUuid}&encounterType=${encounterTypeUuid}&v=custom:(obs:(uuid,display,concept:(uuid,display),value:(uuid,display)))`;
+  const { data, isLoading, error } = useSWR<{ data: ObsResponse }>(patientUuid ? url : null, openmrsFetch);
+  let obsObject = {};
+  const patientObs = last(data?.data?.results)?.obs?.forEach((ob) => {
+    Object.assign(obsObject, { [ob.concept.uuid]: ob.value.uuid });
+  });
+  return { data: obsObject, isLoading, error, obs: data?.data };
+}
+
+function useConcepts() {
+  const config = useConfig<RegistrationConfig>();
+  const { data: education, isLoading: educationLoad } = useConceptAnswers('a89e48ae-1350-11df-a1f1-0026b9348838');
+  const occupation: Array<ConceptAnswers> = [
+    {
+      uuid: '1538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Farmer',
+    },
+    {
+      uuid: '1540AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Employee',
+    },
+    {
+      uuid: '1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Trader',
+    },
+    {
+      uuid: '159465AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Student',
+    },
+    {
+      uuid: '159466AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Driver',
+    },
+    {
+      uuid: '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'None',
+    },
+    {
+      uuid: '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Other',
+    },
+  ];
+  const martialStatus: Array<ConceptAnswers> = [
+    {
+      uuid: '1538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      display: 'Farmer',
+    },
+  ];
+  //const martialStatus: Array<ConceptAnswers> = config.fieldDefinitions
+  //  .find((fieldDefinition) => fieldDefinition.id === 'maritalStatus')
+  //  .customConceptAnswers.map((concept) => ({ uuid: concept.uuid, display: concept.label }));
+
+  return { martialStatus, education, occupation, educationLoad };
+}

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

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useContext, useMemo, useRef } from 'react';
 import classNames from 'classnames';
-import { Button, Link, InlineLoading, Dropdown } from '@carbon/react';
-import { XAxis } from '@carbon/react/icons';
+import { Button, Link, InlineLoading } from '@carbon/react';
+import { XAxis, ShareKnowledge } from '@carbon/react/icons';
 import { useLocation, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { Formik, Form, type FormikHelpers } from 'formik';
@@ -11,23 +11,32 @@ import {
   useConfig,
   interpolateUrl,
   usePatient,
-  showModal,
+  usePatientPhoto,
 } from '@openmrs/esm-framework';
 import { getValidationSchema } from './validation/patient-registration-validation';
 import { type FormValues, type CapturePhotoProps } from './patient-registration.types';
 import { PatientRegistrationContext } from './patient-registration-context';
 import { type SavePatientForm, SavePatientTransactionManager } from './form-manager';
-import { fetchPatientRecordFromClientRegistry, usePatientPhoto, fetchPerson } from './patient-registration.resource';
 import { DummyDataInput } from './input/dummy-data/dummy-data-input.component';
-import { cancelRegistration, filterUndefinedPatientIdenfier, scrollIntoView } from './patient-registration-utils';
-import { useInitialAddressFieldValues, useInitialFormValues, usePatientUuidMap } from './patient-registration-hooks';
+import {
+  cancelRegistration,
+  filterUndefinedPatientIdenfier,
+  parseAddressTemplateXml,
+  scrollIntoView,
+} from './patient-registration-utils';
+import {
+  useInitialAddressFieldValues,
+  useInitialFormValues,
+  usePatientObs,
+  usePatientUuidMap,
+} from './patient-registration-hooks';
 import { ResourcesContext } from '../offline.resources';
 import { builtInSections, type RegistrationConfig, type SectionDefinition } from '../config-schema';
 import { SectionWrapper } from './section/section-wrapper.component';
 import BeforeSavePrompt from './before-save-prompt';
 import styles from './patient-registration.scss';
-import { TextInput } from '@carbon/react';
-import { ClientRegistry } from '../patient-verification/client-registry.component';
+import PatientVerification from '../patient-verification/patient-verification.component';
+import { handleSavePatientToClientRegistry } from '../patient-verification/patient-verification-hook';
 
 let exportedInitialFormValuesForTesting = {} as FormValues;
 
@@ -55,6 +64,9 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
   const savePatientTransactionManager = useRef(new SavePatientTransactionManager());
   const fieldDefinition = config?.fieldDefinitions?.filter((def) => def.type === 'address');
   const validationSchema = getValidationSchema(config);
+  const [enableClientRegistry, setEnableClientRegistry] = useState(
+    inEditMode ? initialFormValues.identifiers['nationalUniquePatientIdentifier']?.identifierValue : false,
+  );
 
   useEffect(() => {
     exportedInitialFormValuesForTesting = initialFormValues;
@@ -109,6 +121,26 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
 
       setTarget(redirectUrl);
     } catch (error) {
+      const fieldErrors = Object.entries(error.responseBody?.error?.fieldErrors || {}) as Array<
+        [string, Array<{ code: string; message: string }>]
+      >;
+
+      if (savePatientTransactionManager.current.patientSaved) {
+        fieldErrors.forEach(([field, error]) => {
+          const errorMessage = error.map((e) => e.message).join(', ');
+          showSnackbar({
+            subtitle: errorMessage,
+            title: `Patient registration successful, with errors for registration encounter`,
+            kind: 'warning',
+            timeoutInMs: 8000,
+          });
+        });
+        const afterUrl = new URLSearchParams(search).get('afterUrl');
+        const redirectUrl = interpolateUrl(afterUrl || config.links.submitButton, { patientUuid: values.patientUuid });
+
+        setTarget(redirectUrl);
+      }
+
       if (error.responseBody?.error?.globalErrors) {
         error.responseBody.error.globalErrors.forEach((error) => {
           showSnackbar({
@@ -129,6 +161,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
         });
       } else {
         createErrorHandler()(error);
+        console.error(error);
       }
 
       helpers.setSubmitting(false);
@@ -173,6 +206,18 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                     </Link>
                   </div>
                 ))}
+                <Button
+                  renderIcon={ShareKnowledge}
+                  disabled={!currentSession || !identifierTypes}
+                  onClick={() => {
+                    setEnableClientRegistry(true);
+                    props.isValid
+                      ? handleSavePatientToClientRegistry(props.values, props.setValues, inEditMode)
+                      : props.validateForm().then((errors) => displayErrors(errors));
+                  }}
+                  className={styles.submitButton}>
+                  {t('postToRegistry', 'Post to registry')}
+                </Button>
                 <Button
                   className={styles.submitButton}
                   type="submit"
@@ -180,7 +225,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   // Current session and identifiers are required for patient registration.
                   // If currentSession or identifierTypes are not available, then the
                   // user should be blocked to register the patient.
-                  disabled={!currentSession || !identifierTypes || props.isSubmitting}>
+                  disabled={!currentSession || !identifierTypes || props.isSubmitting || !enableClientRegistry}>
                   {props.isSubmitting ? (
                     <InlineLoading
                       className={styles.spinner}
@@ -213,7 +258,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
                   initialFormValues: props.initialValues,
                   setInitialFormValues,
                 }}>
-                <ClientRegistry initialFormValues={initialFormValues} setInitialFormValues={setInitialFormValues} />
+                <PatientVerification props={props} setInitialFormValues={setInitialFormValues} />
                 {sections.map((section, index) => (
                   <SectionWrapper
                     key={`registration-section-${section.id}`}
@@ -235,6 +280,3 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
  * Just exported for testing
  */
 export { exportedInitialFormValuesForTesting as initialFormValues };
-function dispose() {
-  throw new Error('Function not implemented.');
-}

package/src/patient-registration/{patient-registration.resource.test.tsx → patient-registration.resource.testt.tsx}

@@ -1,4 +1,4 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { savePatient } from './patient-registration.resource';
 
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
@@ -15,12 +15,12 @@ describe('savePatient', () => {
   it('appends patient uuid in url if provided', () => {
     mockOpenmrsFetch.mockImplementationOnce((url) => url);
     savePatient(null, '1234');
-    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual('/ws/rest/v1/patient/1234');
+    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual(`${restBaseUrl}/patient/1234`);
   });
 
   it('does not append patient uuid in url', () => {
     mockOpenmrsFetch.mockImplementationOnce(() => {});
     savePatient(null);
-    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual('/ws/rest/v1/patient/');
+    expect(mockOpenmrsFetch.mock.calls[0][0]).toEqual(`${restBaseUrl}/patient/`);
   });
 });

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

@@ -1,9 +1,8 @@
-import useSWR from 'swr';
-import { openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type Patient, type Relationship, type PatientIdentifier, type Encounter } from './patient-registration.types';
 
-export const uuidIdentifier = '05a29f94-c0ed-11e2-94be-8c13b969e334';
-export const uuidTelephoneNumber = '14d4f066-15f5-102d-96e4-000c29c2a5d7';
+export const uuidIdentifier = '58a4732e-1359-11df-a1f1-0026b9348838';
+export const uuidTelephoneNumber = '72a759a8-1359-11df-a1f1-0026b9348838';
 
 function dataURItoFile(dataURI: string) {
   const byteString = atob(dataURI.split(',')[1]);
@@ -22,7 +21,7 @@ function dataURItoFile(dataURI: string) {
 export function savePatient(patient: Patient | null, updatePatientUuid?: string) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/patient/${updatePatientUuid || ''}`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${updatePatientUuid || ''}`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -35,7 +34,7 @@ export function savePatient(patient: Patient | null, updatePatientUuid?: string)
 export function saveEncounter(encounter: Encounter) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/encounter`, {
+  return openmrsFetch(`${restBaseUrl}/encounter`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -48,7 +47,7 @@ export function saveEncounter(encounter: Encounter) {
 export function generateIdentifier(source: string) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/idgen/identifiersource/${source}/identifier`, {
+  return openmrsFetch(`${restBaseUrl}/idgen/identifiersource/${source}/identifier`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -61,7 +60,7 @@ export function generateIdentifier(source: string) {
 export function deletePersonName(nameUuid: string, personUuid: string) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/person/${personUuid}/name/${nameUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/person/${personUuid}/name/${nameUuid}`, {
     method: 'DELETE',
     signal: abortController.signal,
   });
@@ -70,7 +69,7 @@ export function deletePersonName(nameUuid: string, personUuid: string) {
 export function saveRelationship(relationship: Relationship) {
   const abortController = new AbortController();
 
-  return openmrsFetch('/ws/rest/v1/relationship', {
+  return openmrsFetch(`${restBaseUrl}/relationship`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -83,7 +82,7 @@ export function saveRelationship(relationship: Relationship) {
 export function updateRelationship(relationshipUuid, relationship: { relationshipType: string }) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/relationship/${relationshipUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/relationship/${relationshipUuid}`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -96,7 +95,7 @@ export function updateRelationship(relationshipUuid, relationship: { relationshi
 export function deleteRelationship(relationshipUuid) {
   const abortController = new AbortController();
 
-  return openmrsFetch(`/ws/rest/v1/relationship/${relationshipUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/relationship/${relationshipUuid}`, {
     headers: {
       'Content-Type': 'application/json',
     },
@@ -134,57 +133,12 @@ export async function savePatientPhoto(
   });
 }
 
-interface ObsFetchResponse {
-  results: Array<PhotoObs>;
-}
-
-interface PhotoObs {
-  display: string;
-  obsDatetime: string;
-  uuid: string;
-  value: {
-    display: string;
-    links: {
-      rel: string;
-      uri: string;
-    };
-  };
-}
-
-interface UsePatientPhotoResult {
-  data: { dateTime: string; imageSrc: string } | null;
-  isError: Error;
-  isLoading: boolean;
-}
-
-export function usePatientPhoto(patientUuid: string): UsePatientPhotoResult {
-  const {
-    concepts: { patientPhotoUuid },
-  } = useConfig();
-  const url = `/ws/rest/v1/obs?patient=${patientUuid}&concept=${patientPhotoUuid}&v=full`;
-
-  const { data, error, isLoading } = useSWR<{ data: ObsFetchResponse }, Error>(patientUuid ? url : null, openmrsFetch);
-
-  const item = data?.data?.results[0];
-
-  return {
-    data: item
-      ? {
-          dateTime: item?.obsDatetime,
-          imageSrc: item?.value?.links?.uri,
-        }
-      : null,
-    isError: error,
-    isLoading,
-  };
-}
-
 export async function fetchPerson(query: string, abortController: AbortController) {
   const [patientsRes, personsRes] = await Promise.all([
-    openmrsFetch(`/ws/rest/v1/patient?q=${query}`, {
+    openmrsFetch(`${restBaseUrl}/patient?q=${query}`, {
       signal: abortController.signal,
     }),
-    openmrsFetch(`/ws/rest/v1/person?q=${query}`, {
+    openmrsFetch(`${restBaseUrl}/person?q=${query}`, {
       signal: abortController.signal,
     }),
   ]);
@@ -202,7 +156,7 @@ export async function fetchPerson(query: string, abortController: AbortControlle
 
 export async function addPatientIdentifier(patientUuid: string, patientIdentifier: PatientIdentifier) {
   const abortController = new AbortController();
-  return openmrsFetch(`/ws/rest/v1/patient/${patientUuid}/identifier/`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${patientUuid}/identifier/`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -214,7 +168,7 @@ export async function addPatientIdentifier(patientUuid: string, patientIdentifie
 
 export async function updatePatientIdentifier(patientUuid: string, identifierUuid: string, identifier: string) {
   const abortController = new AbortController();
-  return openmrsFetch(`/ws/rest/v1/patient/${patientUuid}/identifier/${identifierUuid}`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${patientUuid}/identifier/${identifierUuid}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -226,7 +180,7 @@ export async function updatePatientIdentifier(patientUuid: string, identifierUui
 
 export async function deletePatientIdentifier(patientUuid: string, patientIdentifierUuid: string) {
   const abortController = new AbortController();
-  return openmrsFetch(`/ws/rest/v1/patient/${patientUuid}/identifier/${patientIdentifierUuid}?purge`, {
+  return openmrsFetch(`${restBaseUrl}/patient/${patientUuid}/identifier/${patientIdentifierUuid}?purge`, {
     method: 'DELETE',
     headers: {
       'Content-Type': 'application/json',
@@ -234,17 +188,3 @@ export async function deletePatientIdentifier(patientUuid: string, patientIdenti
     signal: abortController.signal,
   });
 }
-export const fetchPatientRecordFromClientRegistry = (
-  patientIdentifier: string,
-  identifierType: string,
-  country: string,
-) => {
-  const url = `
-  https://ngx.ampath.or.ke/registry/api/uno?uno=${patientIdentifier}&idType=${identifierType}&countryCode=${country}`;
-
-  return fetch(url)
-    .then((response) => {
-      return response.json();
-    })
-    .then((data) => data);
-};

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

@@ -112,11 +112,3 @@ html[dir='rtl'] {
     padding-right: spacing.$spacing-07;
   }
 }
-.patientVerification {
-  & > * {
-    margin-top: spacing.$spacing-03;
-  }
-  & > :last-child {
-    margin-top: spacing.$spacing-03;
-  }
-}

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

@@ -118,7 +118,7 @@ export type Patient = {
 };
 
 export interface Encounter {
-  encounterDatetime: Date;
+  encounterDatetime?: Date;
   patient: string;
   encounterType: string;
   location: string;
@@ -184,6 +184,9 @@ export interface FormValues {
   address: {
     [addressField: string]: string;
   };
+  observation?: ObsResponse;
+  concepts?: Array<ConceptAnswers>;
+  token?: string;
 }
 
 export interface PatientUuidMapType {
@@ -316,3 +319,6 @@ export interface RestAddressTemplate {
   display: string;
   value: string;
 }
+export interface ObsResponse {
+  results: Array<{ obs: Array<{ uuid: string; display: string; value: OpenmrsResource; concept: OpenmrsResource }> }>;
+}

package/src/patient-registration/section/patient-relationships/relationships-section.component.tsx

@@ -177,7 +177,11 @@ export const RelationshipsSection = () => {
           uuid: type.uuid,
           direction: 'bIsToA',
         };
-        aIsToB.display === bIsToA.display ? tmp.push(aIsToB) : tmp.push(aIsToB, bIsToA);
+        aIsToB.display === bIsToA.display
+          ? tmp.push(aIsToB)
+          : bIsToA.display === 'Patient'
+            ? tmp.push(aIsToB, { display: `Patient (${aIsToB.display})`, uuid: type.uuid, direction: 'bIsToA' })
+            : tmp.push(aIsToB, bIsToA);
       });
       setDisplayRelationshipTypes(tmp);
     }

package/src/patient-registration/section/patient-relationships/relationships.resource.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import useSWR from 'swr';
-import { type FetchResponse, openmrsFetch } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type RelationshipValue } from '../../patient-registration.types';
 import { personRelationshipRepresentation } from '../../../constants';
 
@@ -10,7 +10,7 @@ export function useInitialPatientRelationships(patientUuid: string): {
 } {
   const shouldFetch = !!patientUuid;
   const { data, error, isLoading } = useSWR<FetchResponse<RelationshipsResponse>, Error>(
-    shouldFetch ? `/ws/rest/v1/relationship?v=${personRelationshipRepresentation}&person=${patientUuid}` : null,
+    shouldFetch ? `${restBaseUrl}/relationship?v=${personRelationshipRepresentation}&person=${patientUuid}` : null,
     openmrsFetch,
   );