OpenMRS

Timestamp:

05/09/08 13:54:25 (4 months ago)

Author:

msheley

Message:

sockethl7listener --
* Adjustments for blank name and address fields in hl7
* Added handling messages that have no date/times for encounters
* Moved location where createObsForProvider is called.
* Modified logging

Files:

• openmrs-modules/sockethl7listener/src/org/openmrs/module/sockethl7listener/HL7PatientHandler.java (modified) (10 diffs)

openmrs-modules/sockethl7listener/src/org/openmrs/module/sockethl7listener/HL7PatientHandler.java

@@ -541 +541 @@
-                ST STmn = xpn.getSecondAndFurtherGivenNamesOrInitialsThereof();
-                
-
-
-
+
+
+
+
+
-                if (STfn != null){
-
+
+
-                }
-                
-                if (STmn != null){
-
+
+
-                }
-                
@@ -561 +565 @@
-                personNamesSet.add(name);
-
-                ln = ((ln == null) || ln.toLowerCase().equalsIgnoreCase("null"))? "" : ln;
-                fn = ((fn == null) || fn.toLowerCase().equalsIgnoreCase("null"))? "" : fn;
-                //for matching attribute only, check first name for invalid names
-                //and nullify if needed
@@ -568 +570 @@
-                        fn = checkFirstName(fn,this.distinct_only);
-                }
-
-
+
-                hl7Patient.setNames(personNamesSet);
-                hl7Patient.getPersonName().setDateCreated(encounterDate);
@@ -880 +881 @@
-        }
-
-
+, Date encounterDate
-
-                //      Extract provider information for provider observations.
@@ -920 +921 @@
-
-                                provider.createUserForProvider(provider);
-
+, encounterDate
-
-
@@ -988 +989 @@
-        }
-        
-
+, Date encounterDate
-                String mrn = "", attribute = "", drid = "" ,
-                       drfn = "", drln = "", nkfn = "", nkln = "",
@@ -998 +999 @@
-                if (provider != null){
-                        drid = provider.getId();
+                        if (drid ==  null){
+                                drid = "";
+                        }
-                        drfn = provider.getFirstName();
+                        if (drfn ==  null){
+                                drfn = "";
+                        }
-                        drln = provider.getLastName();
+                        if (drln ==  null){
+                                drln = "";
+                        }
-                }
-                
-                fn = p.getGivenName();
+                if (fn == null) fn = "";
-                ln = p.getFamilyName();
+                if (ln == null) ln = "";
-                sex = p.getGender();
+                if (sex == null) sex = "";
+                
-                if (p.getAttribute(ATTRIBUTE_RACE) != null){
-.toLowerCase()
+
-                }
-                if (p.getAttribute(ATTRIBUTE_TELEPHONE) != null) {
-.toLowerCase()
+
-                }
-                if (p.getPatientIdentifier()!= null) {
@@ -1015 +1029 @@
-                }
-                if (p.getAttribute(ATTRIBUTE_NEXT_OF_KIN) != null){
-.toLowerCase()
+
-                }
-                int index = nkname.indexOf("|");
@@ -1026 +1040 @@
-                
-                if (p.getPersonAddress()!= null){
-
-
-
+
+
+
+
+
+
-                }
-                
@@ -1050 +1067 @@
-                }
-
-
+
+
+
+
+
-                p.addAttribute(matchingInfoAttribute);
-                return attribute;