OpenMRS

Timestamp:

05/07/08 18:28:28 (7 months ago)

Author:

msheley

Message:

sockethl7listener --
* Removal of provider name and id from person attribute. This was primarily for use related to patient matching. They are no longer required
* Removed some member variables in MatchHandler.
* Adjusted comparison methods for identifier, name, address, provider.

Files:

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

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

@@ -48 +48 @@
-        protected static final String ATTRIBUTE_RACE = "Race";
-        protected static final String ATTRIBUTE_BIRTHPLACE = "Birthplace";
-        protected static final String PROVIDER_ID = "Provider ID";
-        protected static final String PROVIDER_NAME = "Provider Name";
-        protected static final String CITIZENSHIP = "Citizenship";
-        protected static final String MATCH_INFO = "Other Matching Information";
-        protected static final String PATIENT_IDENT_TYPE = "MRN";
-        
-        protected PatientService patientService;
@@ -88 +85 @@
-        public Patient setPatientFromHL7(PID pid, NK1 nk1,
-                        Date encounterDate, Location encounterLocation){
-
+//
-                Patient hl7Patient = new Patient();
-                CX[] identList = null;
@@ -438 +435 @@
-
-                //Save matchin information attribute; Check if attribute type exists
-
+/*
-
-                if (otherMatchingAttrType == null){
@@ -444 +441 @@
-                }
-
-                //personAttrList += ";openmrs_id:";
-                PersonAttribute matchingInfoAttribute = new PersonAttribute(otherMatchingAttrType,personAttrList);
-
-
-
+
-                return hl7Patient;
-        }
@@ -467 +461 @@
-                        String stIdent = "";
-                        String assignAuth = "";
-
+//
-                        
-                        if (identList.length != 0)
@@ -498 +492 @@
-                                }
-                                
-
+//
-                                hl7Patient.setIdentifiers(identifiers);
-
@@ -574 +568 @@
-                        fn = checkFirstName(fn,this.distinct_only);
-                }
-
+//
-
-                hl7Patient.setNames(personNamesSet);
@@ -580 +574 @@
-                hl7Patient.getPersonName().setCreator(Context.getAuthenticatedUser());
-
-                //hl7Patient.setNames(personNamesSet);
-                //hl7Patient.setDateChanged(encounterDate);
-                //hl7Patient.getPersonName().setDateCreated(new Date());
-                //hl7Patient.getPersonName().setDateChanged(encounterDate);
-                //hl7Patient.getPersonName().setCreator(Context.getAuthenticatedUser());
-
-        }
@@ -619 +608 @@
-                }
-
-
+//
-
-
@@ -670 +659 @@
-                hl7Patient.setGender(gender);
-                
-
+//
-                //personAttrList += ";sex:" + gender;
-
@@ -712 +701 @@
-                        int year = ts.getTime().getYear();
-                        if (year != 0) stYear = String.valueOf(year);
-
-
-
+//
+//
+//
-
-                } catch (DataTypeException e) {
@@ -768 +757 @@
-                        hl7Patient.getPersonAddress().setCreator(Context.getAuthenticatedUser());
-
-
-
-
+//
+//
+//
-
-                } catch (RuntimeException e) {
@@ -800 +789 @@
-                }
-                
-
+//
-                PersonAttribute telNumAttr = new PersonAttribute(telPhoneAttrType,tNumber);
-                
@@ -852 +841 @@
-                        if (nkln == null) nkln = "";
-                        if (nkfn == null) nkfn = "";
-
-.
+//
+|
-                        motherNameAttr.setAttributeType(motherAttributeType);
-                        motherNameAttr.setValue(motherNameString);      
@@ -891 +880 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-                //      Extract provider information for provider observations.
@@ -917 +889 @@
-                try {
-                        doctor= pv1.getAttendingDoctor(0);      
+
+
+                        //Load provider object with PV1 information
+
+                        if (doctor != null){
+
+                                String id = "";
+                                String firstName = "";
+                                String lastName = "";
+
+                                if (doctor.getIDNumber()!= null){
+                                        id = doctor.getIDNumber().toString();
+                                }
+                                if (doctor.getGivenName()!= null){
+                                        firstName = doctor.getGivenName().toString();
+                                }
+                                if (doctor.getGivenName()!= null){
+                                        lastName = doctor.getFamilyName().getSurname().toString();
+                                }
+
+                                provider.setFirstName(firstName);
+                                provider.setLastName(lastName);
+                                provider.setId(id);
+                                //using npi for provider id
+                                SocketHL7ListenerService hl7ListService = (SocketHL7ListenerService) Context.getService(SocketHL7ListenerService.class);
+                                if (id == null ||id.equals("")){
+                                        String npi = hl7ListService.getNPI(provider.getFirstName(),provider.getLastName());
+                                        provider.setId(npi);
+                                }
+
+                                provider.createUserForProvider(provider);
+                                setPatientMatchingAttribute(provider, hl7Patient);
+
+
+                        }
+
-                } catch (HL7Exception e2) {
-                        hl7Logger.error("Unable to collect provider id from PV1 segment",e2);
-                }       
-
-                //Load provider object with PV1 information
-
-                if (doctor != null){
-
-                        String id = "";
-                        
-                        if (doctor.getIDNumber()!= null){
-                                id = doctor.getIDNumber().toString();
-                                if (id == null) id = "";
-                        }
-                        
-                        provider.setId(id);
-                        formatDoctorName(doctor,provider);
-                        provider.createUserForProvider(provider);
-                        //using npi for provider id
-                        SocketHL7ListenerService hl7ListService = (SocketHL7ListenerService) Context.getService(SocketHL7ListenerService.class);
-                        String npi = hl7ListService.getNPI(provider.getFirstName(),provider.getLastName());
-                        provider.setId(npi);
-                        
-                        try {
-                                        //May not need this attribute after storing provider as a user.
-                                        PersonAttributeType providerIDAttrType = personService.getPersonAttributeType(PROVIDER_ID);
-                                        if (providerIDAttrType == null){
-                                                createAttributeType(PROVIDER_ID);
-                                        }
-                                        PersonAttribute providerID = new PersonAttribute(providerIDAttrType,provider.getId());
-                                        providerID.setDateCreated(encounterDate);
-                                        //providerID.setDateChanged(encounterDate);
-                                        providerID.setCreator(Context.getAuthenticatedUser());
-                                        hl7Patient.addAttribute(providerID);
-        
-                                        PersonAttributeType providerNameAttrType = personService.getPersonAttributeType(PROVIDER_NAME);
-                                        if (providerNameAttrType == null){
-                                                createAttributeType(PROVIDER_NAME);
-                                        }
-        
-                                        PersonAttribute providerNameAttr = new PersonAttribute(providerNameAttrType,provider.getFirstName() 
-                                                        + "." +  provider.getLastName());
-                                        providerNameAttr.setDateCreated(encounterDate);
-                                        providerNameAttr.setCreator(Context.getAuthenticatedUser());
-                                        hl7Patient.addAttribute(providerNameAttr);
-
-                                //Add to the attribute string used for matching
-                            //TODO If id is empty in the hl7 message, do we want to add
-                                        //add that empty string for drid, or do we want to use
-                                        //the referenced npi value?
-                                //concatMatchingAttribute("drid", id);
-                                concatMatchingAttribute("drid", provider.getId());
-                                concatMatchingAttribute("drfn", provider.getFirstName());
-                                concatMatchingAttribute("drln", provider.getLastName());
-                                
-                                //Create the attribute type 
-                                PersonAttributeType otherMatchingAttrType = personService.getPersonAttributeType(MATCH_INFO);
-                                if (otherMatchingAttrType == null){
-                                        createAttributeType(MATCH_INFO);
-                                }
-                                //Add the attribute type
-                                PersonAttribute matchingInfoAttribute = new PersonAttribute(otherMatchingAttrType,personAttrList);
-                                //matchingInfoAttribute.setDateChanged(encounterDate);
-                                matchingInfoAttribute.setDateCreated(encounterDate);
-                                matchingInfoAttribute.setCreator(Context.getAuthenticatedUser());
-                                hl7Patient.addAttribute(matchingInfoAttribute);
-
-                        } catch (RuntimeException e) {
-                                logger.error("Unable to create attribute for provider id or provider name " + e.getMessage());
-                        }
-                }
-                return provider;
-        }
@@ -1004 +944 @@
-        }
-
-        protected void concatMatchingAttribute(String segment, String value
-                        ){
-                if (value == null) value = "";
-                personAttrList += ";" + segment + ":" + value;
-        }
-        
-        public static String checkFirstName(String fname,boolean distinct_only){
@@ -1052 +987 @@
-                
-        }
+        
+        public String setPatientMatchingAttribute(Provider provider, Patient p){
+                String mrn = "", attribute = "", drid = "" ,
+                       drfn = "", drln = "", nkfn = "", nkln = "",
+                       db = "", yb = "", mb = "", fn = "", ln = "",
+                       city = "", zip = "", st = "", race = "", tel = "",
+                       sex = "" , nkname = "";
+                
+        
+                if (provider != null){
+                        drid = provider.getId();
+                        drfn = provider.getFirstName();
+                        drln = provider.getLastName();
+                }
+                
+                fn = p.getGivenName();
+                ln = p.getFamilyName();
+                sex = p.getGender();
+                if (p.getAttribute(ATTRIBUTE_RACE) != null){
+                        race = p.getAttribute(ATTRIBUTE_RACE).getValue().toLowerCase();
+                }
+                if (p.getAttribute(ATTRIBUTE_TELEPHONE) != null) {
+                        tel = p.getAttribute(ATTRIBUTE_TELEPHONE).getValue().toLowerCase();
+                }
+                if (p.getPatientIdentifier()!= null) {
+                        mrn = p.getPatientIdentifier().getIdentifier();
+                }
+                if (p.getAttribute(ATTRIBUTE_NEXT_OF_KIN) != null){
+                        nkname = p.getAttribute(ATTRIBUTE_NEXT_OF_KIN).getValue().toLowerCase();
+                }
+                int index = nkname.indexOf("|");
+                if (index > 0){
+                  nkfn = nkname.substring(0,index);
+                  nkln = nkname.substring(index + 1);
+                }else {
+                        nkln = nkname;
+                }
+                
+                if (p.getPersonAddress()!= null){
+                        city = p.getPersonAddress().getCityVillage().toLowerCase();
+                        zip = p.getPersonAddress().getPostalCode().toLowerCase();
+                        st = p.getPersonAddress().getStateProvince().toLowerCase();
+                }
+                
+            
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(p.getBirthdate());
+                yb = Integer.toString(cal.get(Calendar.YEAR));
+                mb = Integer.toString(cal.get(Calendar.MONTH ) + 1);
+                db = Integer.toString(cal.get(Calendar.DAY_OF_MONTH));
+                attribute = "mrn:" + mrn + ";fn:" + fn + ";ln:" + ln + ";race:" 
+                        + race + ";nkfn:" + nkfn + ";nkln:" + nkln + ";db:" + db 
+                        + ";mb:" + mb + ";yb:" + yb + ";sex:" + sex + ";city:"
+                        + city + ";st:" + st + ";zip:" + zip + ";tel:" + tel
+                        + ";drid:" + drid + ";drfn:" + drfn + ";drln:" + drln;
+                
+                
+                PersonAttributeType otherMatchingAttrType = personService.getPersonAttributeType(MATCH_INFO);
+
+                if (otherMatchingAttrType == null){
+                        createAttributeType(MATCH_INFO);
+                }
+
+                PersonAttribute matchingInfoAttribute = new PersonAttribute(otherMatchingAttrType,attribute);
+                p.addAttribute(matchingInfoAttribute);
+                return attribute;
+        }
+        
-
-}