diff --git a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/OMLO21OrderConverter.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/OMLO21OrderConverter.java index 57834eb..dddde78 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/OMLO21OrderConverter.java +++ b/api/src/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/ORMO01OrderConverter.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/ORMO01OrderConverter.java index d2e0b07..603fc83 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/ORMO01OrderConverter.java +++ b/api/src/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/MshGenerator.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/MshGenerator.java similarity index 89% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/MshGenerator.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/MshGenerator.java index a13d0f8..4946220 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/MshGenerator.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/ObrGenerator.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/ObrGenerator.java similarity index 92% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/ObrGenerator.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/ObrGenerator.java index 6ed77eb..b776027 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/ObrGenerator.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/OrcGenerator.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/OrcGenerator.java similarity index 87% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/OrcGenerator.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/OrcGenerator.java index 9bcf53f..c302a41 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/OrcGenerator.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/PidGenerator.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/PidGenerator.java similarity index 77% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/PidGenerator.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/PidGenerator.java index db6e19c..729e4e5 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/PidGenerator.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/PidGenerator.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.model.DataTypeException; import ca.uhn.hl7v2.model.v25.segment.PID; @@ -6,12 +6,12 @@ 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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/Pv1Generator.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/Pv1Generator.java similarity index 86% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/Pv1Generator.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/Pv1Generator.java index 7420b7d..33ced81 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/Pv1Generator.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/LnspCodeHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/LnspCodeHelper.java similarity index 95% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/LnspCodeHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/LnspCodeHelper.java index 2f437e5..65c9b82 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/LnspCodeHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/OrderingProviderHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/OrderingProviderHelper.java similarity index 94% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/OrderingProviderHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/OrderingProviderHelper.java index 556f60a..18dec89 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/OrderingProviderHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/PersonNameHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/PersonNameHelper.java similarity index 94% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/PersonNameHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/PersonNameHelper.java index 2a50938..1e46fda 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/PersonNameHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/ProviderInformationHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/ProviderInformationHelper.java similarity index 93% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/ProviderInformationHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/ProviderInformationHelper.java index 64f9c4d..b3e5ee1 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/ProviderInformationHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/QuantityTimingHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/QuantityTimingHelper.java similarity index 95% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/QuantityTimingHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/helpers/QuantityTimingHelper.java index caa48b5..f00ebb9 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/helpers/QuantityTimingHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/msh/MessageControlIdSource.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/msh/MessageControlIdSource.java similarity index 91% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/msh/MessageControlIdSource.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/msh/MessageControlIdSource.java index cbc4cde..ac84f90 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/msh/MessageControlIdSource.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidAddressHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidAddressHelper.java similarity index 93% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidAddressHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidAddressHelper.java index ffc4c74..75ff279 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidAddressHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidBillingNumberHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidBillingNumberHelper.java similarity index 90% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidBillingNumberHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidBillingNumberHelper.java index 0cf8e9e..f106121 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidBillingNumberHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidIdHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidIdHelper.java similarity index 96% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidIdHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidIdHelper.java index 8048de2..5f029ea 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidIdHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidMotherNameHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidMotherNameHelper.java similarity index 91% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidMotherNameHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidMotherNameHelper.java index 9d714f5..4de9e80 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidMotherNameHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidNameHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidNameHelper.java similarity index 79% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidNameHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/PidNameHelper.java index babb630..7003e2e 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/PidNameHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/RegistrationDataHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/RegistrationDataHelper.java similarity index 96% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/RegistrationDataHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pid/RegistrationDataHelper.java index d42b451..4053e57 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pid/RegistrationDataHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pv1/Pv1AssignedPatientLocationHelper.java b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pv1/Pv1AssignedPatientLocationHelper.java similarity index 97% rename from api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pv1/Pv1AssignedPatientLocationHelper.java rename to api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/pv1/Pv1AssignedPatientLocationHelper.java index 76e9f9f..a6fec33 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/gnerators/pv1/Pv1AssignedPatientLocationHelper.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/hl7/messages/generators/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 index 7a17142..8387bf2 100644 --- 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,6 +2,7 @@ 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; @@ -9,9 +10,9 @@ 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/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/OMLO21OrderConverterTest.java b/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/OMLO21OrderConverterTest.java index 7911765..076139e 100644 --- a/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/OMLO21OrderConverterTest.java +++ b/api/src/test/java/org/openmrs/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/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/ORMO01OrderConverterTest.java b/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/ORMO01OrderConverterTest.java index e90b6d0..7b66c87 100644 --- a/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/ORMO01OrderConverterTest.java +++ b/api/src/test/java/org/openmrs/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/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/generators/msh/MessageControlIdSourceTest.java b/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/generators/msh/MessageControlIdSourceTest.java index 9f6ade4..239dab1 100644 --- a/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/generators/msh/MessageControlIdSourceTest.java +++ b/api/src/test/java/org/openmrs/module/labintegration/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/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/utils/OrderConverterTestUtils.java b/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/utils/OrderConverterTestUtils.java index af8351e..62d01d2 100644 --- a/api/src/test/java/org/openmrs/module/labintegration/api/communication/hl7/messages/utils/OrderConverterTestUtils.java +++ b/api/src/test/java/org/openmrs/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 index c359812..f61f3cc 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT 2.0.5 1.8 UTF-8