BAH-3407| Add check for concept to choose correct locale

bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/BahmniObsServiceImpl.java

@@ -18,8 +18,10 @@
 import org.openmrs.api.ConceptService;
 import org.openmrs.api.ObsService;
 import org.openmrs.api.VisitService;
+import org.openmrs.api.context.Context;
 import org.openmrs.module.bahmniemrapi.encountertransaction.contract.BahmniObservation;
 import org.openmrs.module.bahmniemrapi.encountertransaction.mapper.OMRSObsToBahmniObsMapper;
+import org.openmrs.util.LocaleUtility;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,11 +71,20 @@ public Collection<BahmniObservation> observationsFor(String patientUuid, Collect
     private List<String> getConceptNames(Collection<Concept> concepts) {
         List<String> conceptNames = new ArrayList<>();
         for (Concept concept : concepts) {
-            conceptNames.add(concept.getName().getName());
+            if(concept != null) {
+                conceptNames.add(getConceptName(concept, Context.getLocale()));
+            }
         }
         return conceptNames;
     }
 
+    private String getConceptName(Concept concept, Locale searchLocale) {
+        if (concept.getName(searchLocale) != null)
+            return concept.getName(searchLocale).getName();
+        else
+            return concept.getName(LocaleUtility.getDefaultLocale()).getName();
+    }
+
     @Override
     public Collection<BahmniObservation> observationsFor(String patientUuid, Concept rootConcept, Concept childConcept, Integer numberOfVisits, Date startDate, Date endDate, String patientProgramUuid) {
         Collection<Encounter> encounters = programWorkflowService.getEncountersByPatientProgramUuid(patientProgramUuid);