OpenMRS

Timestamp:

04/30/08 19:48:54 (8 months ago)

Author:

msheley

Message:

--sockethl7listener
* Modify setting of patient identifier types when using

assigning authority

* Modify how Assigning Authority is pulled from PID segment

Files:

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

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

@@ -22 +22 @@
-import org.openmrs.api.PersonService;
-import org.openmrs.api.context.Context;
+import org.openmrs.module.sockethl7listener.service.SocketHL7ListenerService;
-
-import ca.uhn.hl7v2.HL7Exception;
@@ -476 +477 @@
-                                        if (stIdent != null)
-                                        {
-
-               .getUniversalID().toString();
+.getNamespaceID().getValue();
+
-                                                if ((pit = patientService
-                                                                .getPatientIdentifierType("MRN_" + assignAuth)) == null)
@@ -483 +484 @@
-                                                        pit = patientService
-                                                                        .getPatientIdentifierType("MRN_OTHER");
-                                                        pi.setLocation(encounterLocation);
-                                                        pi.setIdentifierType(pit);
-                                                        pi.setIdentifier(stIdent);
-                                                        pi.setPreferred(true);
-                                                        pi.setDateCreated(encounterDate);
-                                                        pi.setCreator(Context.getAuthenticatedUser());
-                                                        pi.setPatient(hl7Patient);
-                                                        identifiers.add(pi);
-                                                }
+                                                pi.setLocation(encounterLocation);
+                                                pi.setIdentifierType(pit);
+                                                pi.setIdentifier(stIdent);
+                                                pi.setPreferred(true);
+                                                pi.setDateCreated(encounterDate);
+                                                pi.setCreator(Context.getAuthenticatedUser());
+                                                pi.setPatient(hl7Patient);
+                                                identifiers.add(pi);
+                                                
-                                        }
-                                        
@@ -855 +857 @@
-                        motherNameAttr.setValue(motherNameString);      
-                        motherNameAttr.setDateCreated(encounterDate);
-                        //motherNameAttr.setDateCreated( new Date());
-                        motherNameAttr.setCreator(Context.getAuthenticatedUser());
-                        hl7Patient.addAttribute(motherNameAttr);
@@ -910 +911 @@
-
-                //      Extract provider information for provider observations.
-                //PersonService ps = Context.getPersonService();
-                Provider provider = new Provider();
-                XCN doctor = null;
@@ -935 +935 @@
-                        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 {
@@ -953 +957 @@
-                                        }
-        
-+ "." +  provider.getLastName());
-//providerNameAttr.setDateChanged(encounterDate
+
+               + "." +  provider.getLastName()
-                                        providerNameAttr.setDateCreated(encounterDate);
-                                        providerNameAttr.setCreator(Context.getAuthenticatedUser());
@@ -960 +964 @@
-
-                                //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());