Commit 851d7f98 authored by R.W.Majeed's avatar R.W.Majeed

fixed NPE with missing patient surname, given-name and birthdate

parent f10c959f
......@@ -78,9 +78,15 @@ public class PatientTable extends Table<PatientRow> implements ConceptTable{
public PatientRow fillRecord(ColumnMap map, Object[] row, ObservationFactory factory) throws ParseException {
PatientRow patient = new PatientRow();
patient.setId(idat.patientId.valueOf(map, row, null));
patient.setGivenName(idat.givenName.valueOf(map, row, null));
patient.setSurname(idat.surname.valueOf(map, row, null));
patient.setBirthDate(idat.birthdate.valueOf(map, row, null));
if( idat.givenName != null ){
patient.setGivenName(idat.givenName.valueOf(map, row, null));
}
if( idat.surname != null ){
patient.setSurname(idat.surname.valueOf(map, row, null));
}
if( idat.birthdate != null ){
patient.setBirthDate(idat.birthdate.valueOf(map, row, null));
}
if( idat.deathdate != null ){
patient.setDeathDate(idat.deathdate.valueOf(map, row, null));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment