OpenMRS

Timestamp:

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

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

@@ -38 +38 @@
-import org.openmrs.api.context.Context;
-import org.openmrs.api.context.ContextAuthenticationException;
-import org.openmrs.api.context.UserContext;
-import org.openmrs.hl7.HL7Constants;
-import org.openmrs.hl7.HL7InQueue;
@@ -56 +55 @@
-import ca.uhn.hl7v2.model.v25.datatype.CWE;
-import ca.uhn.hl7v2.model.v25.datatype.CX;
+import ca.uhn.hl7v2.model.v25.datatype.DTM;
-import ca.uhn.hl7v2.model.v25.datatype.ID;
-import ca.uhn.hl7v2.model.v25.datatype.NM;
@@ -152 +152 @@
-         * @throws ContextAuthenticationException
-         */
-
+synchronized 
-                
-                Context.openSession();
@@ -234 +234 @@
-                
-                // validate message
-
+
-                validate(message);
-                boolean error = false;
@@ -269 +269 @@
-                                        + message.getName());
-                }
-
+
+
+
+
-        
-                
@@ -284 +287 @@
-                        
-                        // Get the location
-
+//
-                        String institutionId = zlr.getOrderingFacilityIDNum();
-                        Location encounterLocation = setLocation(institutionId);
-                        Date encounterDate = TranslateDate(timeStamp);
-                        Patient hl7Patient = patientHandler.setPatientFromHL7(pid,nk1,encounterDate,encounterLocation);
-
+,encounterDate
-                        
-                        Patient resultPatient = findPatient(hl7Patient,encounterDate);                  
@@ -300 +303 @@
-                                                resultPatient,encounterDate,  provider);
-                                }
-
+       createObsForProvider(encounter,provider);
-                                if (message instanceof ORU_R01)
-                                {
@@ -403 +406 @@
-                                enc.setProvider(providerUser);
-                                es.createEncounter(enc);
-
+//
-                
-                        
@@ -1232 +1235 @@
-                
-                
-
+
+
+
-                
-                Calendar hl7cal = Calendar.getInstance();
@@ -1259 +1264 @@
-                PersonAddress hl7PA = hl7Patient.getPersonAddress();
-                
-, hl7State, hl7Zip, hl7Addr1
+ = "", hl7State = "", hl7Zip = "", hl7Addr1 = ""
-                if (hl7PA != null) {
-                        hl7Addr1 = hl7PA.getAddress1();
+                        if (hl7Addr1 == null || hl7Addr1.equals("")){
+                                hl7Addr1 = "";
+                        }
-                        hl7City = hl7PA.getCityVillage();
+                        if (hl7City == null || hl7City.equals("")){
+                                hl7City = "";
+                        }
+                
-                        hl7State = hl7PA.getStateProvince();
+                        if (hl7State == null || hl7State.equals("")){
+                                hl7State = "";
+                        }
-                        hl7Zip = hl7PA.getPostalCode();
-
-
-
-
-
+
+
+
+
-                }
-                
@@ -1611 +1625 @@
-                        String firstname = "";
-                        String lastname = "";
-.
+|
-                        if (index1 != -1){
-                                firstname = NKnameValue.substring(0,index1);