Responding to review comments for: Create a groovy template to create

the OBR Encounter segment of an ORUR01 message - HLQRY-21
dkayiwa · Aug 2, 2012 · f67a2f7 · f67a2f7
1 parent 547a4e4
commit f67a2f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -116,7 +116,7 @@
 				<![CDATA[
 					<ORU_R01.ORDER_OBSERVATION>
 						<OBR>
-						    <OBR.1>0</OBR.1>
+						    <OBR.1>${ encounterIndex }</OBR.1>
 						    <OBR.3>
 						        <EI.1>${ encounter.getUuid() }</EI.1>
 						    </OBR.3>

diff --git a/api/src/test/java/org/openmrs/module/hl7query/api/Hl7TemplateGeneratorTest.java b/api/src/test/java/org/openmrs/module/hl7query/api/Hl7TemplateGeneratorTest.java
@@ -120,9 +120,11 @@ public void testOBREncSegmentTemplate() throws Exception {
 
         Map<String, Object> bindings = new HashMap<String, Object>();
         bindings.put("encounter", encounter);
+        bindings.put("encounterIndex", 3);
 
         String evaluated = service.evaluateTemplate(template, bindings);
 
+        Assert.assertTrue(evaluated.contains("<OBR.1>3</OBR.1>"));
         Assert.assertTrue(evaluated.contains("<EI.1>ENCOUNTER UUID</EI.1>"));
 	    Assert.assertTrue(evaluated.contains("<OBR.20>LOCATION UUID</OBR.20>"));
 	    Assert.assertTrue(evaluated.contains("<OBR.21>LOCATION NAME</OBR.21>"));

diff --git a/api/src/test/resources/org/openmrs/module/hl7query/api/templates/OBR-ENC.xml b/api/src/test/resources/org/openmrs/module/hl7query/api/templates/OBR-ENC.xml
@@ -1,6 +1,6 @@
 <ORU_R01.ORDER_OBSERVATION>
 	<OBR>
-	    <OBR.1>0</OBR.1>
+	    <OBR.1>${ encounterIndex }</OBR.1>
 	    <OBR.3>
 	        <EI.1>${ encounter.getUuid() }</EI.1>
 	    </OBR.3>