From 7ffa7d5fcfe165db5aff86d18b12deb988fc3ae5 Mon Sep 17 00:00:00 2001
From: SanoferSameera <79590907+SanoferSameera@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:21:07 +0530
Subject: [PATCH] BAH-3499 | Add. diagnosis search in user locale (#250)

---
 .../bahmnicore/service/impl/TsConceptSearchServiceImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

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 ed4d7ee11a..0dca3fe209 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<SimpleObject> getDiagnosisConcepts(String query, Integer limit, Str
         Locale searchLocale = getSearchLocale(locale);
         List<ConceptSearchResult> 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);
     }