Changeset 4212 for openmrs-modules/sockethl7listener/src/org/openmrs/module/sockethl7listener/HL7PatientHandler.java
- Timestamp:
- 05/15/08 12:56:25 (6 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openmrs-modules/sockethl7listener/src/org/openmrs/module/sockethl7listener/HL7PatientHandler.java
r4159 r4212 5 5 import java.util.Properties; 6 6 import java.util.Set; 7 import java.util.StringTokenizer; 7 8 import java.util.TreeSet; 8 9 … … 881 882 } 882 883 884 public void formatDoctorName(XCN doctor, Provider provider) 885 { 886 if (doctor != null) 887 { 888 String firstName = ""; 889 String lastName = ""; 890 891 892 if (doctor.getGivenName() != null) 893 { 894 firstName = doctor.getGivenName().toString(); 895 } 896 if (doctor.getGivenName() != null) 897 { 898 lastName = doctor.getFamilyName().getSurname().toString(); 899 } 900 901 provider.setFirstName(firstName); 902 provider.setLastName(lastName); 903 } 904 } 905 883 906 public Provider setProviderFromPV1(PV1 pv1,Patient hl7Patient, Date encounterDate) { 884 907 … … 896 919 if (doctor != null){ 897 920 921 formatDoctorName(doctor,provider); 898 922 String id = ""; 899 String firstName = ""; 900 String lastName = ""; 901 902 if (doctor.getIDNumber()!= null){ 923 if (doctor.getIDNumber() != null) 924 { 903 925 id = doctor.getIDNumber().toString(); 904 926 } 905 if (doctor.getGivenName()!= null){ 906 firstName = doctor.getGivenName().toString(); 907 } 908 if (doctor.getGivenName()!= null){ 909 lastName = doctor.getFamilyName().getSurname().toString(); 910 } 911 912 provider.setFirstName(firstName); 913 provider.setLastName(lastName); 927 914 928 provider.setId(id); 915 929 //using npi for provider id