Version bump

IsantePlus · Apr 16, 2021 · dae4654 · dae4654
1 parent 842c3bd
commit dae4654
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 11 deletions.
diff --git a/api-2.1/pom.xml b/api-2.1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>fhir2</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/api-2.2/pom.xml b/api-2.2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>fhir2</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>fhir2</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>fhir2-api</artifactId>

diff --git a/...n/java/org/openmrs/module/fhir2/api/translators/impl/PatientIdentifierTranslatorImpl.java b/...n/java/org/openmrs/module/fhir2/api/translators/impl/PatientIdentifierTranslatorImpl.java
@@ -11,6 +11,8 @@
 
 import javax.annotation.Nonnull;
 
+import java.util.Locale;
+
 import lombok.AccessLevel;
 import lombok.Setter;
 import org.hl7.fhir.r4.model.CodeableConcept;
@@ -69,10 +71,11 @@ public Identifier toFhirResource(@Nonnull PatientIdentifier identifier) {
 
 		if (globalPropertyService.getGlobalProperty(FhirConstants.GLOBAL_PROPERTY_URI_PREFIX) != null
 		        && !globalPropertyService.getGlobalProperty(FhirConstants.GLOBAL_PROPERTY_URI_PREFIX).isEmpty()
-		        && identifier.getIdentifierType() != null) {
+		        && identifier.getIdentifierType() != null && !identifier.getPreferred()) {
 
 			patientIdentifier.setSystem(globalPropertyService.getGlobalProperty(FhirConstants.GLOBAL_PROPERTY_URI_PREFIX)
-			        + '/' + identifier.getIdentifierType().getId() + '-' + identifier.getIdentifierType().getName());
+			        + '/' + identifier.getIdentifierType().getId() + '-'
+			        + identifier.getIdentifierType().getName().toLowerCase(Locale.ROOT).replace(" ", "-"));
 		}
 		return patientIdentifier;
 	}

diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/PatientTranslatorImpl.java b/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/PatientTranslatorImpl.java
@@ -128,6 +128,10 @@ public Patient toFhirResource(@Nonnull org.openmrs.Patient openmrsPatient) {
 			patient.addName(nameTranslator.toFhirResource(name));
 		}
 
+		if (patient.hasName()) {
+			patient.getNameFirstRep().setUse(HumanName.NameUse.OFFICIAL);
+		}
+
 		if (openmrsPatient.getGender() != null) {
 			patient.setGender(genderTranslator.toFhirResource(openmrsPatient.getGender()));
 		}

diff --git a/integration-tests-2.1/pom.xml b/integration-tests-2.1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>fhir2</artifactId>
 		<groupId>org.openmrs.module</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/integration-tests-2.2/pom.xml b/integration-tests-2.2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>fhir2</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>fhir2</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>fhir2</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>fhir2-omod</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.openmrs.module</groupId>
     <artifactId>fhir2</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>FHIR2</name>
     <description>Implementation of FHIR R4 for OpenMRS</description>

diff --git a/test-data/pom.xml b/test-data/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>fhir2</artifactId>
         <groupId>org.openmrs.module</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>