From 18478dab03796c30f15e4b14820b4d99350e6a44 Mon Sep 17 00:00:00 2001 From: poojadeshpande01 <92026860+poojadeshpande01@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:06:19 +0530 Subject: [PATCH] BAH-3473 | Locale Issue while uploading the patient visit document. (#248) * Add method to get concept by name and locale and refactor occurance. * Refactor import statement. * Add locale import statement. * Refactor Imports. * Add Locale Imports. --- .../service/impl/VisitDocumentServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/document/service/impl/VisitDocumentServiceImpl.java b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/document/service/impl/VisitDocumentServiceImpl.java index b674ec7075..87d1c00ebf 100644 --- a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/document/service/impl/VisitDocumentServiceImpl.java +++ b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/document/service/impl/VisitDocumentServiceImpl.java @@ -29,7 +29,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -//comment + +import java.util.Locale; @Service public class VisitDocumentServiceImpl implements VisitDocumentService { @@ -87,8 +88,13 @@ private void linkDocumentAndImpressionObs(VisitDocumentRequest visitDocumentRequ } } + private Concept getConceptsByNameAndLocale(String name, Locale locale) { + List conceptList = conceptService.getConceptsByName(name, locale, false); + return conceptList.isEmpty() ? null : conceptList.get(0); + } + private void updateEncounter(Encounter encounter, Date encounterDateTime, List documents) { - Concept imageConcept = conceptService.getConceptByName(DOCUMENT_OBS_GROUP_CONCEPT_NAME); + Concept imageConcept = getConceptsByNameAndLocale(DOCUMENT_OBS_GROUP_CONCEPT_NAME, Locale.ENGLISH); for (Document document : documents) { Concept testConcept = conceptService.getConceptByUuid(document.getTestUuid());