BAH-3500 | Add a method getRouteConceptByName to get correct concept …

…irrespective of the locale.
openmrs · Jan 30, 2024 · 12de773 · 12de773
1 parent aa45884
commit 12de773
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 13 deletions.
diff --git a/api-1.10/pom.xml b/api-1.10/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>emrapi</artifactId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>emrapi-api-1.10</artifactId>

diff --git a/api-1.11/pom.xml b/api-1.11/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>emrapi</artifactId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>emrapi-api-1.11</artifactId>

diff --git a/api-1.12/pom.xml b/api-1.12/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>emrapi</artifactId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>emrapi-api-1.12</artifactId>

diff --git a/...12/src/main/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapper.java b/...12/src/main/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapper.java
@@ -32,7 +32,7 @@ public DrugOrder map(EncounterTransaction.DosingInstructions dosingInstructions,
         drugOrder.setDose(dosingInstructions.getDose());
         drugOrder.setDoseUnits(orderMetadataService.getDoseUnitsConceptByName(dosingInstructions.getDoseUnits()));
         drugOrder.setDosingInstructions(dosingInstructions.getAdministrationInstructions());
-        drugOrder.setRoute(conceptByName(dosingInstructions.getRoute()));
+        drugOrder.setRoute(orderMetadataService.getRouteConceptByName(dosingInstructions.getRoute()));
         drugOrder.setAsNeeded(dosingInstructions.getAsNeeded());
         drugOrder.setFrequency(orderMetadataService.getOrderFrequencyByName(dosingInstructions.getFrequency(), false));
         drugOrder.setQuantity(Double.valueOf(dosingInstructions.getQuantity()));

diff --git a/api-1.12/src/main/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataService.java b/api-1.12/src/main/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataService.java
@@ -69,4 +69,15 @@ public Concept getDispenseUnitsConceptByName(String conceptName) {
         }
         return null;
     }
+
+    public Concept getRouteConceptByName(String conceptName) {
+        List<Concept> drugRoutes = orderService.getDrugRoutes();
+        for (Concept route : drugRoutes) {
+            if(route.getName().getName().equals(conceptName)){
+                return route;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/api-2.2/pom.xml b/api-2.2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>emrapi</artifactId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>emrapi-api-2.2</artifactId>

diff --git a/api-pre2.2/pom.xml b/api-pre2.2/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>emrapi</artifactId>
-		<version>1.35.0-SNAPSHOT</version>
+		<version>1.36.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>emrapi</artifactId>
-		<version>1.35.0-SNAPSHOT</version>
+		<version>1.36.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>emrapi-api</artifactId>

diff --git a/condition-list/pom.xml b/condition-list/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>emrapi</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>emrapi-condition-list</artifactId>

diff --git a/fhir-condition/pom.xml b/fhir-condition/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>emrapi</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>emrapi</artifactId>
-		<version>1.35.0-SNAPSHOT</version>
+		<version>1.36.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>emrapi-omod</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openmrs.module</groupId>
     <artifactId>emrapi</artifactId>
-    <version>1.35.0-SNAPSHOT</version>
+    <version>1.36.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>EMR API Module</name>
     <description>Higher-level APIs to support building EMR functionality in OpenMRS, to supplement the data-level APIs

diff --git a/web-2.2/pom.xml b/web-2.2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>emrapi</artifactId>
-        <version>1.35.0-SNAPSHOT</version>
+        <version>1.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>emrapi-web-2.2</artifactId>

diff --git a/web-pre2.2/pom.xml b/web-pre2.2/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>emrapi</artifactId>
 		<groupId>org.openmrs.module</groupId>
-		<version>1.35.0-SNAPSHOT</version>
+		<version>1.36.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>