flying team data parser updated

appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java

@@ -11,7 +11,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseScreeningNumber(Row row) {
-		String number = getString(row.getCell(21));
+		String number = getString(row.getCell(22));
 		if (number.trim().isEmpty()) {
 			return "";
 		} else {
@@ -36,7 +36,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseNdNumber(Row row) {
-		return getString(row.getCell(20));
+		return getString(row.getCell(21));
 	}
 
 	@Override
@@ -51,7 +51,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseBirthDate(Row row) {
-		return parseDateOfBirth(row.getCell(22));
+		return parseDateOfBirth(row.getCell(23));
 	}
 
 	@Override
@@ -61,12 +61,12 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseAddDate(Row row) {
-		return getDate(row.getCell(12),Calendar.getInstance());
+		return getDate(row.getCell(13),Calendar.getInstance());
 	}
 
 	@Override
 	protected String parseReferal(Row row) {
-		return getString(row.getCell(11));
+		return getString(row.getCell(12));
 	}
 
 	@Override
@@ -76,7 +76,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseMail(Row row) {
-		return getString(row.getCell(8));
+		return getString(row.getCell(9));
 	}
 
 	@Override
@@ -86,38 +86,38 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parsePhone2(Row row) {
-		return getString(row.getCell(7));
+		return getString(row.getCell(8));
 	}
 
 	@Override
 	protected String parsePhone1(Row row) {
-		return getString(row.getCell(6));
+		return getString(row.getCell(7));
 	}
 
 	@Override
 	protected String parseCity(Row row) {
-		return getString(row.getCell(4));
+		return getString(row.getCell(5));
 	}
 
 	@Override
 	protected String parseCountry(Row row) {
-		return getString(row.getCell(5));
+		return getString(row.getCell(6));
 	}
 
 	@Override
 	protected String parseZipCode(Row row) {
-		return getString(row.getCell(3));
+		return getString(row.getCell(4));
 	}
 
 	@Override
 	protected String parseAddress(Row row) {
-		return getString(row.getCell(2));
+		return getString(row.getCell(3));
 	}
 
 	@Override
 	protected String parseRemarks(Row row) {
-		String remark1 = getString(row.getCell(9));
-		String remark2 = getString(row.getCell(18));
+		String remark1 = getString(row.getCell(10));
+		String remark2 = getString(row.getCell(19));
 
 		String result = "";
 		if (!remark1.trim().isEmpty()) {
@@ -131,17 +131,18 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseDiagnosis(Row row) {
-		return getString(row.getCell(10));
+		return getString(row.getCell(11));
 	}
 
 	@Override
 	protected SubjectType parseType(Row row) {
-		String name = (parseName(row) + " " + parseSurname(row)).toLowerCase();
-		if (name.indexOf("(c)") >= 0 || name.indexOf("©") >= 0) {
+		String str = getString(row.getCell(2)).toLowerCase().trim();
+		if (str.startsWith("c")) {
 			return SubjectType.CONTROL;
-		} else {
+		} else if (str.startsWith("p")) {
 			return SubjectType.PATIENT;
 		}
+		return SubjectType.PATIENT;
 	}
 
 	@Override

appointment-import/src/test/java/smash/appointment/parse/PrcFlyingParserTest.java

@@ -36,6 +36,7 @@ public class PrcFlyingParserTest extends TestBase {
 
 		Subject subject = entries.get(0);
 		assertEquals("F-222", subject.getScreeningNumber());
+		assertEquals(SubjectType.CONTROL, subject.getType());
 		assertEquals("DOE", subject.getSurname());
 		assertEquals("John", subject.getName());
 		assertTrue(subject.getRemarks().contains("notes"));