From deeb687c5bed98983dc0030a76d69130d816c52a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 9 Mar 2017 16:54:48 +0100
Subject: [PATCH] flying team data parser updated
---
.../appointment/parse/PrcFlyingParser.java | 37 +++++++++---------
.../parse/PrcFlyingParserTest.java | 1 +
.../testFiles/prcFlyingTeam.xlsx | Bin 9840 -> 9880 bytes
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java b/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java
index 6d17297e..168a3cfd 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java
+++ b/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
diff --git a/appointment-import/src/test/java/smash/appointment/parse/PrcFlyingParserTest.java b/appointment-import/src/test/java/smash/appointment/parse/PrcFlyingParserTest.java
index 222e092c..6c34a90a 100644
--- a/appointment-import/src/test/java/smash/appointment/parse/PrcFlyingParserTest.java
+++ b/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"));
diff --git a/appointment-import/testFiles/prcFlyingTeam.xlsx b/appointment-import/testFiles/prcFlyingTeam.xlsx
index a3296b81a92b108d4d31115c134211c19223c306..891faa078123cf6c7d6d0b676afc1ce763df549a 100644
GIT binary patch
delta 2103
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
delta 2085
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
KInCt%qW%SN4$Q*<
--
GitLab