BAH-3266 | Siva Reddy | Fetching concepts from default locale if no c…

…oncepts in requested locale
Bahmni · Nov 17, 2023 · ed2a5ca · ed2a5ca
1 parent 3359332
commit ed2a5ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/build_upload.yml b/.github/workflows/build_upload.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - 'release-*'
+      - BAH-3266-test
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
     paths-ignore:

diff --git a/openmrs/obscalculator/BahmniObsValueCalculator.groovy b/openmrs/obscalculator/BahmniObsValueCalculator.groovy
@@ -11,6 +11,7 @@ import org.openmrs.api.context.Context;
 import org.openmrs.module.bahmniemrapi.obscalculator.ObsValueCalculator;
 import org.openmrs.module.bahmniemrapi.encountertransaction.contract.BahmniEncounterTransaction
 import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction;
+import org.openmrs.util.LocaleUtility;
 
 import org.joda.time.LocalDate;
 import org.joda.time.Months;
@@ -232,6 +233,12 @@ public class BahmniObsValueCalculator implements ObsValueCalculator {
 
     static BahmniObservation createObs(String conceptName, BahmniObservation parent, BahmniEncounterTransaction encounterTransaction, Date obsDatetime) {
         def concept = Context.getConceptService().getConceptByName(conceptName)
+        if (concept == null && !LocaleUtility.getDefaultLocale().equals(Context.getLocale())) {
+            List<Concept> conceptsByName = Context.getConceptService().getConceptsByName(conceptName, LocaleUtility.getDefaultLocale(), false);
+            if (!conceptsByName.isEmpty()) {
+                concept = conceptsByName[0];
+            }
+        }
         BahmniObservation newObservation = new BahmniObservation()
         newObservation.setConcept(new EncounterTransaction.Concept(concept.getUuid(), conceptName))
         newObservation.setObservationDateTime(obsDatetime);