OpenMRS

Timestamp:

08/28/08 00:49:18 (3 months ago)

Author:

nribeka

Message:

patient matching module: modified patientToRecord method and remove duplicate entry in the report file.

Files:

• openmrs-modules/patientmatching/src/org/openmrs/module/patientmatching/PatientMatchingActivator.java (modified) (2 diffs)
• openmrs-modules/patientmatching/web/src/org/openmrs/module/patientmatching/web/MatchingConfigUtilities.java (modified) (3 diffs)

openmrs-modules/patientmatching/src/org/openmrs/module/patientmatching/PatientMatchingActivator.java

@@ -226 +226 @@
-            List<String> listExcludedProperties = new ArrayList<String>();
-            
-            Class[] classes = {Patient.class, PersonAddress.class, PersonName.class};
-            List<String> propertyList = new ArrayList<String>();
-
-
-
+
-            
-            for (String property : propertyList) {
@@ -243 +240 @@
-                }
-            }
+            
+            propertyList = new ArrayList<String>();
+            propertyList.addAll(MatchingConfigUtilities.introspectBean(listExcludedProperties, PersonName.class));
+            
+            PersonName personName = patient.getPersonName();
+            
+            for (String property : propertyList) {
+                String value = "";
+                try {
+                    String classProperty = property.substring(property.lastIndexOf(".") + 1);
+                    value = BeanUtils.getProperty(personName, classProperty);
+                } catch (Exception e) {
+                    logger.debug("Error getting the value for property: " + property, e);
+                } finally {
+                    ret.addDemographic(property, value);
+                }
+            }
+            
+            propertyList = new ArrayList<String>();
+            propertyList.addAll(MatchingConfigUtilities.introspectBean(listExcludedProperties, PersonAddress.class));
+
+            PersonAddress personAddress = patient.getPersonAddress();
+            
+            for (String property : propertyList) {
+                String value = "";
+                try {
+                    String classProperty = property.substring(property.lastIndexOf(".") + 1);
+                    value = BeanUtils.getProperty(personAddress, classProperty);
+                } catch (Exception e) {
+                    logger.debug("Error getting the value for property: " + property, e);
+                } finally {
+                    ret.addDemographic(property, value);
+                }
+            }
-
-            PatientService patientService = Context.getPatientService();

openmrs-modules/patientmatching/web/src/org/openmrs/module/patientmatching/web/MatchingConfigUtilities.java

@@ -14 +14 @@
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
-import java.util.TreeMap;
+import java.util.TreeSet;
-
-import org.apache.commons.beanutils.PropertyUtils;
@@ -368 +370 @@
-        }
-        
-List<String> globalIncludeColumns = new ArrayLis
+Set<String> globalIncludeColumns = new TreeSe
-        DedupMatchResultList list = new DedupMatchResultList();
-        for (MatchingConfig matchingConfig : matchingConfigLists) {
@@ -406 +408 @@
-
-        List<Map<String, String>> buffer = new ArrayList<Map<String, String>>();
-        
-        Collections.sort(globalIncludeColumns);
-
-        for (List<Record> recordList: records) {