diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt index 0e7787a96f..65e706ae79 100644 --- a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt +++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt @@ -41,7 +41,6 @@ import org.smartregister.fhircore.engine.util.extension.extractGeneralPractition import org.smartregister.fhircore.engine.util.extension.extractHealthStatusFromMeta import org.smartregister.fhircore.engine.util.extension.extractName import org.smartregister.fhircore.engine.util.extension.extractOfficialIdentifier -import org.smartregister.fhircore.engine.util.extension.extractSecondaryIdentifier import org.smartregister.fhircore.engine.util.extension.extractTelecom import org.smartregister.fhircore.engine.util.extension.hasActivePregnancy import org.smartregister.fhircore.engine.util.extension.toAgeDisplay @@ -63,8 +62,7 @@ constructor( fun hivPatientIdentifier(patient: Patient): String = // would either be an ART or HCC number - patient.extractOfficialIdentifier() - ?: patient.extractSecondaryIdentifier() ?: patient.identifierFirstRep.value ?: "" + patient.extractOfficialIdentifier() ?: "" override suspend fun loadRegisterData( currentPage: Int, diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt index 04cfaa8a31..44ab3d6082 100644 --- a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt +++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt @@ -195,7 +195,7 @@ class HivRegisterDaoTest : RobolectricTest() { } @Test - fun `test hiv patient identifier to be the 'secondary' identifier when no 'official' identifier found`() = + fun `test hiv patient identifier to be empty string when no 'official' identifier found`() = runTest { val identifierNumber = "149856" val patient = @@ -209,7 +209,7 @@ class HivRegisterDaoTest : RobolectricTest() { } ) } - assertEquals(identifierNumber, hivRegisterDao.hivPatientIdentifier(patient)) + assertEquals("", hivRegisterDao.hivPatientIdentifier(patient)) } @Test