OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/PatientServiceImpl.java (modified) (8 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/PatientServiceImpl.java

@@ -163 +163 @@
-                
-        /**
+         * @deprecated replaced by {@link #getPatients(String, String, List, boolean)}
-     * @see org.openmrs.api.PatientService#getPatients(java.lang.String, java.lang.String, java.util.List)
-     */
@@ -168 +169 @@
-            List<PatientIdentifierType> identifierTypes)
-            throws APIException {
+        return getPatients(name, identifier, identifierTypes, false);
+        }
+    
+    /**
+     * @see org.openmrs.api.PatientService#getPatients(java.lang.String, java.lang.String, java.util.List, boolean)
+     */
+    public List<Patient> getPatients(String name, String identifier,
+            List<PatientIdentifierType> identifierTypes, boolean matchIdentifierExactly)
+            throws APIException {
-                
-        if (identifierTypes == null)
-                identifierTypes = Collections.emptyList();
-                
-
+, matchIdentifierExactly
-        }
-
@@ -214 +224 @@
-                        // TODO: check patient has at least one "sufficient" identifier
-
-
-
++identifierType
+ + " id type #: " + pi.getIdentifierType().getPatientIdentifierTypeId()
-                                patient.removeIdentifier(pi);
-                                throw new DuplicateIdentifierException("This patient has two identical identifiers of type "
@@ -225 +235 @@
-                                                                       pi);
-                        }
-
-else
-       identifiersUsed.add(pi.getIdentifier());
+else {
+       identifiersUsed.add(pi.getIdentifier() + " id type #: " + pi.getIdentifierType().getPatientIdentifierTypeId());
+}
-                }
-
@@ -326 +336 @@
-         * @param pi PatientIdentifier
-         * @return true/false whether or not this PatientIdentifier is in use
-getPatientB
+{@link #getPatientsByIdentifier(String, boolean)}
-         */
-        private Patient identifierInUse(PatientIdentifier pi) {
@@ -345 +355 @@
-                List<PatientIdentifierType> types = new Vector<PatientIdentifierType>();
-                types.add(type);
-
+, /* exact name+identifier search */ true
-                
-                // ignore this patient (loop until no changes made)
@@ -357 +367 @@
-
-        /**
-, String
+
-         * @see org.openmrs.api.PatientService#getPatientsByIdentifier(java.lang.String, boolean)
-         */
@@ -370 +380 @@
-        
-        /**
-@deprecated replaced by 
+
-         * @see org.openmrs.api.PatientService#getPatientsByIdentifierPattern(java.lang.String, boolean)
-         */