OpenMRS

Timestamp:

05/09/08 18:54:25 (8 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/MatchHandler.java (modified) (18 diffs)

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

@@ -87 +87 @@
-            PersonAttribute bestNKAttribute = getBestNK(hl7Patient, resolvedPatient, encounterDate);
-            if (bestNKAttribute != null ){
-
+
+
+
-                resolvedPatient.addAttribute(bestNKAttribute);
-            } else {
@@ -95 +97 @@
-                PersonAttribute bestTelephoneAttr = getBestTel( hl7Patient, resolvedPatient, encounterDate);
-                if (bestTelephoneAttr != null ){
-
+
+
+
-                        resolvedPatient.addAttribute(bestTelephoneAttr);
-                } else {
@@ -196 +200 @@
-                else if ( ! existingPreferredAddr.getDateCreated().after(hl7Address.getDateCreated())){
-                        //PID is newer or the same date
+                        if (hl7Address.getAddress1() == null || hl7Address.getAddress1().equals("") ){
+                                hl7Address.setAddress1(existingPrefAddr1);
+                        }
+                        if (hl7Address.getAddress2() == null || hl7Address.getAddress2().equals("") ){
+                                hl7Address.setAddress2(existingPrefAddr2);
+                        }
+                        if (hl7Address.getCityVillage() == null || hl7Address.getCityVillage().equals("") ){
+                                hl7Address.setCityVillage(existingPrefCity);
+                        }
+                        if (hl7Address.getStateProvince() == null || hl7Address.getStateProvince().equals("") ){
+                                hl7Address.setStateProvince(existingState);
+                        }
+                        if (hl7Address.getCountry() == null ||hl7Address.getCountry().equals("") ){
+                                hl7Address.setCountry(existingPrefCountry);
+                        }
+                        if (hl7Address.getPostalCode() == null ||hl7Address.getPostalCode().equals("") ){
+                                hl7Address.setPostalCode(existingPrefPostalCode);
+                        }
+                        if (hl7Address.getCountyDistrict() == null || hl7Address.getCountyDistrict().equals("")){
+                                hl7Address.setCountyDistrict(existingPrefCounty);
+                        }
-                        bestAddress = hl7Address;
-                        bestAddress.setDateCreated(encounterDate);
@@ -388 +413 @@
-        PersonAttribute hl7Attr = hl7Patient.getAttribute(MATCH_INFO);
-       
-
+    
-        String hl7Provln = "";
-        String hl7Provid = "";
@@ -395 +420 @@
-                String resProvfn = "";
-                String resProvid = "";
+                String hl7String = "";
+                String matchString = "";
-        
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        
+        
+        
-                if (matchedAttr.getDateCreated().compareTo(encounterDate) <= 0) {
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        bestProvider.setFirstName(hl7Provfn);
-FirstName
+Id
-
-        } else if (matchedAttr.getDateCreated().compareTo(
@@ -431 +472 @@
-        }
-
-
-
-
+
-                String firstname = "";
-                String lastname = "";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-                
@@ -677 +701 @@
-                String inputfnRaw = matching_input.substring(index2+1,index3);
-                String inputfn = inputfnRaw;
-
-
-
+
-                
-                String inputIdent = getAttributeComponent(matching_input, "mrn");
@@ -760 +782 @@
-                }
-                
-, resState, resZip, resAddr1
+ = "", resState = "", resZip = "", resAddr1 = ""
-                if (PA != null) {
-
+
+
-                                resAddr1 = "";
-                        }
-
+
+
-                                resCity = "";
-                        }
-
+
+
-                                resState = "";
-                        }
-
+
+
-                                resZip = "";
-                        }
-                        
-                }else{
-                        resAddr1 = "";
-                        resCity = "";
-                        resState = "";
-                        resZip = "";
-                }
-                
@@ -788 +809 @@
-                String resRace  = raceAttr == null? "" : raceAttr.getValue();
-                
-
-
-
-
-
+
+
+
-                        if (pn.getPreferred()) {
-                                fName = pn.getGivenName();
@@ -798 +817 @@
-                                
-                        }
-
+*/
-                
-                
@@ -835 +854 @@
-                        
-                        
-
+
+
-                        matchLogger.error(mrn + fn + ln + gender +  city + state + zip + db + mb + yb + tel + nkfn + nkln + drid + drfn + drln + openmrs_id);
-                } catch (IllegalFormatException e) {
@@ -856 +876 @@
-                if (bestIdentifier != null) {
-                        resolvedPatientMRN = bestIdentifier.getIdentifier();
+                        if (resolvedPatientMRN == null) resolvedPatientMRN = "";
-                }
-                
@@ -866 +887 @@
-                if (bestName != null) {
-                        firstName = bestName.getGivenName();
+                        if (firstName == null) firstName = "";
-                        bestFamilyName = bestName.getFamilyName();
+                        if (bestFamilyName == null) bestFamilyName = "";
-                }
-                resultMatchingAttribute = resultMatchingAttribute.replaceAll(
@@ -876 +899 @@
-                // gender
-                // If hl7 gender is null, use the matchedPatient results.
+                if (correctGender == null) correctGender = "";
-                resultMatchingAttribute = resultMatchingAttribute.replaceAll(
-                                        ";sex:[^;]{0,};", ";sex:" + correctGender
@@ -899 +923 @@
-                // Provider ID
-                // PersonAttribute providerAttr
+                String prid = prov.getId();
+                if (prid == null) prid = "";
+                String prfn = prov.getFirstName();
+                if (prfn == null) prfn = "";
+                String prln = prov.getLastName();
+                if (prln == null) prln = "";
+                
+                
-                resultMatchingAttribute = resultMatchingAttribute.replaceAll(
-                                ";drid:[^;]{0,};", ";drid:" + prov.getId() + ";");
@@ -904 +936 @@
-                                ";drfn:[^;]{0,};", ";drfn:" + prov.getFirstName() + ";");
-                resultMatchingAttribute = resultMatchingAttribute.replaceAll(
-;
+
-
-                // Address
@@ -910 +942 @@
-                if (bestAddress != null) {
-                        city = bestAddress.getCityVillage();
+                        if (city == null) city = "";
-                        st = bestAddress.getStateProvince();
+                        if (st == null) st = "";
-                        zip = bestAddress.getPostalCode();
+                        if (zip == null) zip = "";
-                }
-
@@ -930 +965 @@
-                  nkfn = nkname.substring(0,index);
-                  nkln = nkname.substring(index + 1);
+                  
-                }else {
-                        nkln = nkname;
-                }
+                if (nkfn == null) nkfn = "";
+                if (nkln == null) nkln = "";
+                
-                resultMatchingAttribute = resultMatchingAttribute.replaceAll(
-                                ";nkfn:[^;]{0,};", ";nkfn:" + nkfn + ";");