[Bug]Failure to change preferred name, or identifier using a POST req…

…uest to the REST API
openmrs · Sep 29, 2017 · 671863d · 671863d
1 parent 49ed4dc
commit 671863d
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/...rs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java b/...rs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java
@@ -214,17 +214,31 @@ public PatientIdentifier getByUniqueId(String uniqueId) {
 	 */
 	@Override
 	public PatientIdentifier save(PatientIdentifier delegate) {
-		// make sure it has already been added to the patient
+
 		boolean needToAdd = true;
 		for (PatientIdentifier pi : delegate.getPatient().getActiveIdentifiers()) {
 			if (pi.equals(delegate)) {
 				needToAdd = false;
 				break;
 			}
 		}
-		if (needToAdd)
+
+		if (needToAdd) {
 			delegate.getPatient().addIdentifier(delegate);
-		return service().savePatientIdentifier(delegate);
+		}
+
+		if (delegate.isPreferred()) {
+			for (PatientIdentifier pI : delegate.getPatient().getActiveIdentifiers()) {
+				if (!pI.equals(delegate)) {
+					pI.setPreferred(false);
+				}
+			}
+		}
+
+		service().savePatient(delegate.getPatient());
+
+		return delegate;
+
 	}
 
 	@Override