Addressed blank ecid and mpi fetch source (#66)

IsantePlus · Nov 19, 2021 · a0137c4 · a0137c4
1 parent e1c50d2
commit a0137c4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/api/src/main/java/org/openmrs/module/xdssender/api/patient/PatientEcidUpdater.java b/api/src/main/java/org/openmrs/module/xdssender/api/patient/PatientEcidUpdater.java
@@ -24,7 +24,7 @@ public class PatientEcidUpdater {
 
     private static final String ECID_UUID = "f54ed6b9-f5b9-4fd5-a588-8f7561a78401";
     private static final String CODE_NATIONAL_UUID = "9fb4533d-4fd5-4276-875b-2ab41597f5dd";
-    private static final String FETCHER_BEAN_ID = "registrationcore.mpiPatientFetcherPdq";
+    private static final String FETCHER_BEAN_ID = "registrationcore.mpiPatientFetcherFhir";
     private static final String FETCH_PATIENT_METHOD = "fetchMpiPatient";
 
     @Autowired
@@ -52,6 +52,8 @@ private void updateEcid(Patient patient) {
         if (mpiPatient != null) {
             String ecid = getEcid(mpiPatient);
 
+            ecid = ecid == null ? patient.getUuid() : ecid;
+
             PatientIdentifierType ecidIdType = patientService
                     .getPatientIdentifierTypeByUuid(ECID_UUID);