diff --git a/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/TsConceptSearchServiceImpl.java b/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/TsConceptSearchServiceImpl.java index ed4d7ee11..0dca3fe20 100644 --- a/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/TsConceptSearchServiceImpl.java +++ b/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/service/impl/TsConceptSearchServiceImpl.java @@ -50,6 +50,10 @@ private List getDiagnosisConcepts(String query, Integer limit, Str Locale searchLocale = getSearchLocale(locale); List conceptSearchResults = emrConceptService.conceptSearch(query, LocaleUtility.getDefaultLocale(), null, diagnosisSets, conceptSources, limit); + if(!LocaleUtility.getDefaultLocale().equals(searchLocale)) { + conceptSearchResults.addAll(emrConceptService.conceptSearch(query, searchLocale, null, diagnosisSets, conceptSources, limit)); + } + ConceptSource conceptSource = conceptSources.isEmpty() ? null : conceptSources.get(0); return createListResponse(conceptSearchResults, conceptSource, searchLocale); }