Update order id to include obs id (#61)

IsantePlus · Dec 9, 2024 · 001a1b7 · 001a1b7
1 parent 6da3ae2
commit 001a1b7
Show file tree

Hide file tree

Showing 26 changed files with 65 additions and 81 deletions.
diff --git a/...rc/main/java/org/openmrs/module/labintegration/api/hl7/messages/OMLO21OrderConverter.java b/...rc/main/java/org/openmrs/module/labintegration/api/hl7/messages/OMLO21OrderConverter.java
@@ -10,10 +10,10 @@
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
 import org.openmrs.module.labintegration.api.hl7.config.LabIntegrationProperties;
 import org.openmrs.module.labintegration.api.hl7.config.OrderIdentifier;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.MshGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.ObrGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.OrcGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.PidGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.MshGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.ObrGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.OrcGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.PidGenerator;
 import org.openmrs.module.labintegration.api.hl7.messages.util.VersionSwitcher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

diff --git a/...rc/main/java/org/openmrs/module/labintegration/api/hl7/messages/ORMO01OrderConverter.java b/...rc/main/java/org/openmrs/module/labintegration/api/hl7/messages/ORMO01OrderConverter.java
@@ -9,11 +9,11 @@
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
 import org.openmrs.module.labintegration.api.hl7.config.LabIntegrationProperties;
 import org.openmrs.module.labintegration.api.hl7.config.OrderIdentifier;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.MshGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.ObrGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.OrcGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.PidGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.Pv1Generator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.MshGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.ObrGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.OrcGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.PidGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.Pv1Generator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/.../hl7/messages/gnerators/MshGenerator.java → ...hl7/messages/generators/MshGenerator.java b/.../hl7/messages/gnerators/MshGenerator.java → ...hl7/messages/generators/MshGenerator.java
@@ -1,10 +1,10 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators;
+package org.openmrs.module.labintegration.api.hl7.messages.generators;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.segment.MSH;
 import org.openmrs.module.labintegration.api.date.DateSource;
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.msh.MessageControlIdSource;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.msh.MessageControlIdSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/.../hl7/messages/gnerators/ObrGenerator.java → ...hl7/messages/generators/ObrGenerator.java b/.../hl7/messages/gnerators/ObrGenerator.java → ...hl7/messages/generators/ObrGenerator.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators;
+package org.openmrs.module.labintegration.api.hl7.messages.generators;
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.v25.segment.OBR;

diff --git a/.../hl7/messages/gnerators/OrcGenerator.java → ...hl7/messages/generators/OrcGenerator.java b/.../hl7/messages/gnerators/OrcGenerator.java → ...hl7/messages/generators/OrcGenerator.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators;
+package org.openmrs.module.labintegration.api.hl7.messages.generators;
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.v25.segment.ORC;

diff --git a/.../hl7/messages/gnerators/PidGenerator.java → ...hl7/messages/generators/PidGenerator.java b/.../hl7/messages/gnerators/PidGenerator.java → ...hl7/messages/generators/PidGenerator.java
@@ -1,17 +1,17 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators;
+package org.openmrs.module.labintegration.api.hl7.messages.generators;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.segment.PID;
 import org.openmrs.Encounter;
 import org.openmrs.Patient;
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
 import org.openmrs.module.labintegration.api.hl7.messages.MessageCreationException;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid.PidAddressHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid.PidBillingNumberHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid.PidIdHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid.PidMotherNameHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid.PidNameHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid.RegistrationDataHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pid.PidAddressHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pid.PidBillingNumberHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pid.PidIdHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pid.PidMotherNameHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pid.PidNameHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pid.RegistrationDataHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/.../hl7/messages/gnerators/Pv1Generator.java → ...hl7/messages/generators/Pv1Generator.java b/.../hl7/messages/gnerators/Pv1Generator.java → ...hl7/messages/generators/Pv1Generator.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators;
+package org.openmrs.module.labintegration.api.hl7.messages.generators;
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.v25.datatype.XCN;
@@ -7,8 +7,8 @@
 import org.openmrs.Provider;
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
 import org.openmrs.module.labintegration.api.hl7.messages.MessageCreationException;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers.ProviderInformationHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.pv1.Pv1AssignedPatientLocationHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.helpers.ProviderInformationHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.pv1.Pv1AssignedPatientLocationHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/...ges/gnerators/helpers/LnspCodeHelper.java → ...es/generators/helpers/LnspCodeHelper.java b/...ges/gnerators/helpers/LnspCodeHelper.java → ...es/generators/helpers/LnspCodeHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.helpers;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.segment.OBR;

diff --git a/...ators/helpers/OrderingProviderHelper.java → ...ators/helpers/OrderingProviderHelper.java b/...ators/helpers/OrderingProviderHelper.java → ...ators/helpers/OrderingProviderHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.helpers;
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.v25.datatype.XCN;

diff --git a/...s/gnerators/helpers/PersonNameHelper.java → .../generators/helpers/PersonNameHelper.java b/...s/gnerators/helpers/PersonNameHelper.java → .../generators/helpers/PersonNameHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.helpers;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.datatype.FN;

diff --git a/...rs/helpers/ProviderInformationHelper.java → ...rs/helpers/ProviderInformationHelper.java b/...rs/helpers/ProviderInformationHelper.java → ...rs/helpers/ProviderInformationHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.helpers;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.datatype.XCN;

diff --git a/...erators/helpers/QuantityTimingHelper.java → ...erators/helpers/QuantityTimingHelper.java b/...erators/helpers/QuantityTimingHelper.java → ...erators/helpers/QuantityTimingHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.helpers;
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.v25.datatype.TQ;

diff --git a/...gnerators/msh/MessageControlIdSource.java → ...enerators/msh/MessageControlIdSource.java b/...gnerators/msh/MessageControlIdSource.java → ...enerators/msh/MessageControlIdSource.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.msh;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.msh;
 
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
 import org.openmrs.module.labintegration.api.hl7.scc.SCCHL7Config;

diff --git a/...sages/gnerators/pid/PidAddressHelper.java → ...ages/generators/pid/PidAddressHelper.java b/...sages/gnerators/pid/PidAddressHelper.java → ...ages/generators/pid/PidAddressHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pid;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.datatype.XAD;

diff --git a/...gnerators/pid/PidBillingNumberHelper.java → ...enerators/pid/PidBillingNumberHelper.java b/...gnerators/pid/PidBillingNumberHelper.java → ...enerators/pid/PidBillingNumberHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pid;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.segment.PID;

diff --git a/...7/messages/gnerators/pid/PidIdHelper.java → .../messages/generators/pid/PidIdHelper.java b/...7/messages/gnerators/pid/PidIdHelper.java → .../messages/generators/pid/PidIdHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pid;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.segment.PID;

diff --git a/...es/gnerators/pid/PidMotherNameHelper.java → ...s/generators/pid/PidMotherNameHelper.java b/...es/gnerators/pid/PidMotherNameHelper.java → ...s/generators/pid/PidMotherNameHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pid;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.datatype.XPN;

diff --git a/...messages/gnerators/pid/PidNameHelper.java → ...essages/generators/pid/PidNameHelper.java b/...messages/gnerators/pid/PidNameHelper.java → ...essages/generators/pid/PidNameHelper.java
@@ -1,11 +1,11 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pid;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.datatype.XPN;
 import ca.uhn.hl7v2.model.v25.segment.PID;
 import org.openmrs.Patient;
 import org.openmrs.PersonName;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers.PersonNameHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.helpers.PersonNameHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/...gnerators/pid/RegistrationDataHelper.java → ...enerators/pid/RegistrationDataHelper.java b/...gnerators/pid/RegistrationDataHelper.java → ...enerators/pid/RegistrationDataHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pid;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pid;
 
 import ca.uhn.hl7v2.model.DataTypeException;
 import ca.uhn.hl7v2.model.v25.segment.PID;

diff --git a/...pv1/Pv1AssignedPatientLocationHelper.java → ...pv1/Pv1AssignedPatientLocationHelper.java b/...pv1/Pv1AssignedPatientLocationHelper.java → ...pv1/Pv1AssignedPatientLocationHelper.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.labintegration.api.hl7.messages.gnerators.pv1;
+package org.openmrs.module.labintegration.api.hl7.messages.generators.pv1;
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.DataTypeException;

diff --git a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/scc/SCCOrderIdentifier.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/scc/SCCOrderIdentifier.java
@@ -2,16 +2,17 @@
 
 import ca.uhn.hl7v2.HL7Exception;
 import ca.uhn.hl7v2.model.DataTypeException;
+import ca.uhn.hl7v2.model.v25.datatype.EI;
 import ca.uhn.hl7v2.model.v25.segment.OBR;
 import ca.uhn.hl7v2.model.v25.segment.ORC;
 import org.openmrs.Encounter;
 import org.openmrs.LocationAttribute;
 import org.openmrs.Obs;
 import org.openmrs.module.labintegration.api.hl7.config.HL7Config;
 import org.openmrs.module.labintegration.api.hl7.config.OrderIdentifier;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers.LnspCodeHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers.OrderingProviderHelper;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.helpers.QuantityTimingHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.helpers.LnspCodeHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.helpers.OrderingProviderHelper;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.helpers.QuantityTimingHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -48,27 +49,7 @@ public void updateORC(ORC orc, Obs obs) throws HL7Exception {
 
 	@Override
 	public void updatePlacerOrderNumber(ORC orc, Obs obs) throws DataTypeException {
-
-		//added site code to Placer Order number: site code + encounter id
-
-		Encounter encounter = obs.getEncounter();
-
-		String siteCode = "";
-		String uuid = "0e52924e-4ebb-40ba-9b83-b198b532653b";
-
-		for (LocationAttribute locationAttribute : encounter.getLocation().getAttributes()) {
-
-			if (locationAttribute.getAttributeType().getUuid().equals(uuid)) {
-				siteCode = locationAttribute.getValueReference();
-			}
-		}
-
-		Integer  encounterId = obs.getEncounter().getEncounterId();
-		orc.getPlacerOrderNumber().getEntityIdentifier().setValue(siteCode + encounterId);
-
-	/*	Integer  encounterLocationUuid = obs.getEncounter().getLocation().getId();
-		orc.getPlacerOrderNumber().getEntityIdentifier().setValue(encounterLocationUuid.toString()); */
-
+		generatePlacerOrderNumber(obs, orc.getPlacerOrderNumber());
 	}
 
 	@Override
@@ -81,29 +62,32 @@ public void updateOBR(OBR obr, Obs obs) throws HL7Exception {
 		String encounterLocationUuid = obs.getEncounter().getLocation().getUuid();
 		obr.getPlacerOrderNumber().getEntityIdentifier().setValue(encounterLocationUuid);
 
+		generatePlacerOrderNumber(obs, obr.getPlacerOrderNumber());
+
+		obr.getSpecimenActionCode().setValue(DEFAULT_ACTION_CODE);
+	}
+
+	@Override
+	public void updateUniversalServiceID(OBR obr, Obs obs) throws DataTypeException {
+		lnspCodeHelper.updateUniversalServiceID(obr, obs);
+	}
+
+	private void generatePlacerOrderNumber(Obs obs, EI placerOrderNumber) throws DataTypeException {
+		//added site code to Placer Order number: site code + obs id
+
 		Encounter encounter = obs.getEncounter();
 
 		String siteCode = "";
 		String uuid = "0e52924e-4ebb-40ba-9b83-b198b532653b";
 
-		for (LocationAttribute locationAttribute : encounter.getLocation().getAttributes()) {
+
+		for (LocationAttribute locationAttribute : encounter.getLocation().getActiveAttributes()) {
 
 			if (locationAttribute.getAttributeType().getUuid().equals(uuid)) {
 				siteCode = locationAttribute.getValueReference();
 			}
 		}
 
-		Integer  encounterId = obs.getEncounter().getEncounterId();
-		obr.getPlacerOrderNumber().getEntityIdentifier().setValue(siteCode + encounterId);
-
-		/*Integer encounterLocationUuid = obs.getEncounter().getLocation().getId();
-		obr.getPlacerOrderNumber().getEntityIdentifier().setValue(encounterLocationUuid.toString());*/
-
-		obr.getSpecimenActionCode().setValue(DEFAULT_ACTION_CODE);
-	}
-
-	@Override
-	public void updateUniversalServiceID(OBR obr, Obs obs) throws DataTypeException {
-		lnspCodeHelper.updateUniversalServiceID(obr, obs);
+		placerOrderNumber.getEntityIdentifier().setValue(siteCode + '-' + encounter.getEncounterId() + '-' + obs.getObsId());
 	}
 }
diff --git a/...penmrs/module/labintegration/api/communication/hl7/messages/OMLO21OrderConverterTest.java b/...penmrs/module/labintegration/api/communication/hl7/messages/OMLO21OrderConverterTest.java
@@ -12,8 +12,8 @@
 import org.openmrs.module.labintegration.api.communication.hl7.messages.utils.OrderConverterTestUtils;
 import org.openmrs.module.labintegration.api.hl7.messages.OMLO21OrderConverter;
 import org.openmrs.module.labintegration.api.hl7.messages.OrderControl;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.MshGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.msh.MessageControlIdSource;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.MshGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.msh.MessageControlIdSource;
 import org.openmrs.module.labintegration.api.hl7.openelis.OpenElisHL7Config;
 import org.openmrs.module.labintegration.api.hl7.util.HL7TestMsgUtil;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...penmrs/module/labintegration/api/communication/hl7/messages/ORMO01OrderConverterTest.java b/...penmrs/module/labintegration/api/communication/hl7/messages/ORMO01OrderConverterTest.java
@@ -13,8 +13,8 @@
 import org.openmrs.module.labintegration.api.communication.hl7.messages.utils.OrderConverterTestUtils;
 import org.openmrs.module.labintegration.api.hl7.messages.ORMO01OrderConverter;
 import org.openmrs.module.labintegration.api.hl7.messages.OrderControl;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.MshGenerator;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.msh.MessageControlIdSource;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.MshGenerator;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.msh.MessageControlIdSource;
 import org.openmrs.module.labintegration.api.hl7.scc.SCCHL7Config;
 import org.openmrs.module.labintegration.api.hl7.util.HL7TestMsgUtil;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...integration/api/communication/hl7/messages/generators/msh/MessageControlIdSourceTest.java b/...integration/api/communication/hl7/messages/generators/msh/MessageControlIdSourceTest.java
@@ -4,7 +4,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.msh.MessageControlIdSource;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.msh.MessageControlIdSource;
 
 import java.util.Calendar;
 import java.util.Date;

diff --git a/...s/module/labintegration/api/communication/hl7/messages/utils/OrderConverterTestUtils.java b/...s/module/labintegration/api/communication/hl7/messages/utils/OrderConverterTestUtils.java
@@ -1,6 +1,6 @@
 package org.openmrs.module.labintegration.api.communication.hl7.messages.utils;
 
-import org.openmrs.module.labintegration.api.hl7.messages.gnerators.msh.MessageControlIdSource;
+import org.openmrs.module.labintegration.api.hl7.messages.generators.msh.MessageControlIdSource;
 
 import static org.mockito.Mockito.when;
 

diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,7 @@
     </pluginRepositories>
 
     <properties>
-        <revision>2.2.1-SNAPSHOT</revision>
+        <revision>2.3.0-SNAPSHOT</revision>
         <openmrsPlatformVersion>2.0.5</openmrsPlatformVersion>
         <javaCompilerVersion>1.8</javaCompilerVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>