OpenMRS

Timestamp:

05/18/08 13:16:49 (8 months ago)

Author:

djazayeri

Message:

Fixing #746 - Merge Patients should merge orders, program enrollment, person attributes, and relationship
Also allowing identifiers for voided patients to be reassigned to non-voided patients

Files:

• openmrs/trunk/src/api/org/openmrs/api/impl/PatientServiceImpl.java (modified) (7 diffs)

openmrs/trunk/src/api/org/openmrs/api/impl/PatientServiceImpl.java

@@ -27 +27 @@
-import org.openmrs.Location;
-import org.openmrs.Obs;
+import org.openmrs.Order;
-import org.openmrs.Patient;
-import org.openmrs.PatientIdentifier;
-import org.openmrs.PatientIdentifierType;
+import org.openmrs.PatientProgram;
-import org.openmrs.PersonAddress;
+import org.openmrs.PersonAttribute;
-import org.openmrs.PersonName;
+import org.openmrs.Relationship;
-import org.openmrs.Tribe;
-import org.openmrs.api.APIAuthenticationException;
@@ -43 +47 @@
-import org.openmrs.api.InvalidIdentifierFormatException;
-import org.openmrs.api.MissingRequiredIdentifierException;
+import org.openmrs.api.ObsService;
+import org.openmrs.api.OrderService;
-import org.openmrs.api.PatientIdentifierException;
-import org.openmrs.api.PatientService;
+import org.openmrs.api.PersonService;
+import org.openmrs.api.ProgramWorkflowService;
-import org.openmrs.api.context.Context;
-import org.openmrs.api.db.PatientDAO;
@@ -258 +266 @@
-                List<PatientIdentifier> ids = getPatientIdentifiers(identifier, type);
-                for (PatientIdentifier id : ids) {
-
-
+
+
+
-                        if ( ignorePatient == null || !id.getPatient().equals(ignorePatient))
-                                return id.getPatient();
@@ -601 +610 @@
-                log.debug("Merging patients: (preferred)" + preferred.getPatientId() + ", (notPreferred) " + notPreferred.getPatientId());
-                
-
+
+
-                EncounterService es = Context.getEncounterService();
-                for (Encounter e : es.getEncounters(notPreferred)){
@@ -631 +641 @@
-                                tmpIdentifier.setVoidedBy(null);
-                                tmpIdentifier.setVoidReason(null);
+                                // we don't want to change the preferred identifier of the preferred patient
+                                tmpIdentifier.setPreferred(false);
-                                preferred.addIdentifier(tmpIdentifier);
-                                log.debug("Merging identifier " + tmpIdentifier.getIdentifier() + " to " + preferred.getPatientId());
@@ -657 +669 @@
-                                tmpName.setVoidedBy(null);
-                                tmpName.setVoidReason(null);
+                                // we don't want to change the preferred name of the preferred patient
+                                tmpName.setPreferred(false);
-                                preferred.addName(tmpName);
-                                log.debug("Merging name " + newName.getGivenName() + " to " + preferred.getPatientId());
@@ -685 +699 @@
-                                preferred.addAddress(tmpAddress);
-                                log.debug("Merging address " + newAddress.getPersonAddressId() + " to " + preferred.getPatientId());
+                        }
+                }
+                
+                // copy all program enrollments
+                ProgramWorkflowService programService = Context.getProgramWorkflowService();
+                for (PatientProgram pp : programService.getPatientPrograms(notPreferred)) {
+                        if (!pp.getVoided()) {
+                                PatientProgram enroll = pp.copy();
+                                enroll.setPatient(preferred);
+                                log.debug("Copying patientProgram " + pp.getPatientProgramId() + " to " + preferred.getPatientId());
+                                programService.createPatientProgram(enroll);
+                        }
+                }
+                
+                // copy all relationships
+                PersonService personService = Context.getPersonService();
+                for (Relationship rel : personService.getRelationships(notPreferred)) {
+                        if (!rel.isVoided()) {
+                                Relationship tmpRel = rel.copy();
+                                if (tmpRel.getPersonA().equals(notPreferred))
+                                        tmpRel.setPersonA(preferred);
+                                if (tmpRel.getPersonB().equals(notPreferred))
+                                        tmpRel.setPersonB(preferred);
+                                log.debug("Copying relationship " + rel.getRelationshipId() + " to " + preferred.getPatientId());
+                                personService.createRelationship(tmpRel);
+                        }
+                }
+                
+                // move all obs that weren't contained in encounters
+                // TODO: this should be a copy, not a move
+                ObsService obsService = Context.getObsService();
+                for (Obs obs : obsService.getObservations(notPreferred, false)) {
+                        if (obs.getEncounter() == null && !obs.isVoided()) {
+                                obs.setPerson(preferred);
+                                obsService.updateObs(obs);
+                        }
+                }
+                
+                // copy all orders that weren't contained in encounters
+                OrderService os = Context.getOrderService();
+                for (Order o : os.getOrdersByPatient(notPreferred)) {
+                        if (o.getEncounter() == null && !o.getVoided()) {
+                                Order tmpOrder = o.copy();
+                                tmpOrder.setPatient(preferred);
+                                os.createOrder(tmpOrder);
+                        }
+                }
+                
+                // copy person attributes
+                for (PersonAttribute attr : notPreferred.getAttributes()) {
+                        if (!attr.isVoided()) {
+                                PersonAttribute tmpAttr = attr.copy();
+                                tmpAttr.setPerson(null);
+                                preferred.addAttribute(tmpAttr);
-                        }
-                }