diff --git a/iTrust/sql/data/malariaEpidemic.sql b/iTrust/sql/data/malariaEpidemic1.sql
similarity index 100%
rename from iTrust/sql/data/malariaEpidemic.sql
rename to iTrust/sql/data/malariaEpidemic1.sql
diff --git a/iTrust/sql/data/malariaEpidemic2.sql b/iTrust/sql/data/malariaEpidemic2.sql
new file mode 100644
index 0000000000000000000000000000000000000000..7e005317afc7129e89d1301cadb1a2c4b77c8a45
--- /dev/null
+++ b/iTrust/sql/data/malariaEpidemic2.sql
@@ -0,0 +1,64 @@
+INSERT INTO officevisits(ID, visitDate, HCPID, notes, PatientID, HospitalID)
+VALUES
+(218, CONCAT(YEAR(NOW()), '-11-01'), 9000000000, 'Diagnose Malaria', 1, '1'),
+(219, CONCAT(YEAR(NOW()), '-11-02'), 9000000000, 'Diagnose Malaria', 2, '1'),
+(220, CONCAT(YEAR(NOW()), '-11-03'), 9000000000, 'Diagnose Malaria', 3, '1'),
+(221, CONCAT(YEAR(NOW()), '-11-04'), 9000000000, 'Diagnose Malaria', 4, '1'),
+(222, CONCAT(YEAR(NOW()), '-11-05'), 9000000000, 'Diagnose Malaria', 5, '1'),
+(223, CONCAT(YEAR(NOW()), '-11-06'), 9000000000, 'Diagnose Malaria', 6, '1'),
+(224, CONCAT(YEAR(NOW()), '-11-07'), 9000000000, 'Diagnose Malaria', 7, '1'),
+(225, CONCAT(YEAR(NOW()), '-11-08'), 9000000000, 'Diagnose Malaria', 8, '1'),
+(226, CONCAT(YEAR(NOW()), '-11-09'), 9000000000, 'Diagnose Malaria', 10, '1'),
+(227, CONCAT(YEAR(NOW()), '-11-10'), 9000000000, 'Diagnose Malaria', 20, '1'),
+(228, CONCAT(YEAR(NOW()), '-11-11'), 9000000000, 'Diagnose Malaria', 21, '1'),
+(229, CONCAT(YEAR(NOW()), '-11-12'), 9000000000, 'Diagnose Malaria', 101, '1'),
+(230, CONCAT(YEAR(NOW()), '-11-13'), 9000000000, 'Diagnose Malaria', 400, '1'),
+(231, CONCAT(YEAR(NOW()), '-11-14'), 9000000000, 'Diagnose Malaria', 401, '1'),
+
+(232, CONCAT(YEAR(NOW())-1, '-11-01'), 9000000000, 'Diagnose Malaria', 1, '1'),
+(233, CONCAT(YEAR(NOW())-1, '-11-02'), 9000000000, 'Diagnose Malaria', 2, '1'),
+(234, CONCAT(YEAR(NOW())-1, '-11-03'), 9000000000, 'Diagnose Malaria', 3, '1'),
+(235, CONCAT(YEAR(NOW())-1, '-11-04'), 9000000000, 'Diagnose Malaria', 4, '1'),
+(236, CONCAT(YEAR(NOW())-1, '-11-05'), 9000000000, 'Diagnose Malaria', 5, '1'),
+(237, CONCAT(YEAR(NOW())-1, '-11-06'), 9000000000, 'Diagnose Malaria', 6, '1'),
+(238, CONCAT(YEAR(NOW())-1, '-11-07'), 9000000000, 'Diagnose Malaria', 7, '1'),
+(239, CONCAT(YEAR(NOW())-1, '-11-08'), 9000000000, 'Diagnose Malaria', 8, '1'),
+(240, CONCAT(YEAR(NOW())-1, '-11-09'), 9000000000, 'Diagnose Malaria', 10, '1'),
+(241, CONCAT(YEAR(NOW())-1, '-11-10'), 9000000000, 'Diagnose Malaria', 20, '1'),
+(242, CONCAT(YEAR(NOW())-1, '-11-11'), 9000000000, 'Diagnose Malaria', 21, '1'),
+(243, CONCAT(YEAR(NOW())-1, '-11-12'), 9000000000, 'Diagnose Malaria', 101, '1')
+
+
+ON DUPLICATE KEY UPDATE id = id;
+
+INSERT INTO ovdiagnosis(ID, VisitID, ICDCode)
+VALUES
+
+(218, 218, 84.50),
+(219, 219, 84.50),
+(220, 220, 84.50),
+(221, 221, 84.50),
+(222, 222, 84.50),
+(223, 223, 84.50),
+(224, 224, 84.50),
+(225, 225, 84.50),
+(226, 226, 84.50),
+(227, 227, 84.50),
+(228, 228, 84.50),
+(229, 229, 84.50),
+(230, 230, 84.50),
+(231, 231, 84.50),
+(232, 232, 84.50),
+(233, 233, 84.50),
+(234, 234, 84.50),
+(235, 235, 84.50),
+(236, 236, 84.50),
+(237, 237, 84.50),
+(238, 238, 84.50),
+(239, 239, 84.50),
+(240, 240, 84.50),
+(241, 241, 84.50),
+(242, 242, 84.50),
+(243, 243, 84.50)
+
+ON DUPLICATE KEY UPDATE VisitID = VALUES(VisitID), ICDCode = VALUES(ICDCode);
diff --git a/iTrust/sql/data/malariaEpidemic3.sql b/iTrust/sql/data/malariaEpidemic3.sql
new file mode 100644
index 0000000000000000000000000000000000000000..8545edfd121efda70aded754ee29df6f65a831b6
--- /dev/null
+++ b/iTrust/sql/data/malariaEpidemic3.sql
@@ -0,0 +1,44 @@
+INSERT INTO officevisits(ID, visitDate, HCPID, notes, PatientID, HospitalID)
+VALUES
+(218, CONCAT(YEAR(NOW()), '-11-02'), 9000000000, 'Diagnose Malaria', 1, '1'),
+(219, CONCAT(YEAR(NOW()), '-11-02'), 9000000000, 'Diagnose Malaria', 2, '1'),
+
+(221, CONCAT(YEAR(NOW()), '-11-09'), 9000000000, 'Diagnose Malaria', 6, '1'),
+(222, CONCAT(YEAR(NOW()), '-11-09'), 9000000000, 'Diagnose Malaria', 7, '1'),
+
+
+(223, CONCAT(YEAR(NOW())-1, '-11-02'), 9000000000, 'Diagnose Malaria', 1, '1'),
+(224, CONCAT(YEAR(NOW())-1, '-11-02'), 9000000000, 'Diagnose Malaria', 2, '1'),
+(225, CONCAT(YEAR(NOW())-2, '-11-02'), 9000000000, 'Diagnose Malaria', 3, '1'),
+(226, CONCAT(YEAR(NOW())-2, '-11-02'), 9000000000, 'Diagnose Malaria', 4, '1'),
+(227, CONCAT(YEAR(NOW())-1, '-11-09'), 9000000000, 'Diagnose Malaria', 6, '1'),
+(228, CONCAT(YEAR(NOW())-1, '-11-09'), 9000000000, 'Diagnose Malaria', 7, '1'),
+(229, CONCAT(YEAR(NOW())-2, '-11-09'), 9000000000, 'Diagnose Malaria', 8, '1'),
+(230, CONCAT(YEAR(NOW())-2, '-11-09'), 9000000000, 'Diagnose Malaria', 10, '1'),
+
+
+(231, CONCAT(YEAR(NOW()), '-10-02'), 9000000000, 'Diagnose Malaria', 3, '1'),
+(232, CONCAT(YEAR(NOW()), '-10-09'), 9000000000, 'Diagnose Malaria', 6, '1')
+
+
+ON DUPLICATE KEY UPDATE id = id;
+
+INSERT INTO ovdiagnosis(ID, VisitID, ICDCode)
+VALUES
+(218, 218, 84.50),
+(219, 219, 84.50),
+(220, 220, 84.50),
+(221, 221, 84.50),
+(222, 222, 84.50),
+(223, 223, 84.50),
+(224, 224, 84.50),
+(225, 225, 84.50),
+(226, 226, 84.50),
+(227, 227, 84.50),
+(228, 228, 84.50),
+(229, 229, 84.50),
+(230, 230, 84.50),
+(231, 231, 84.50),
+(232, 231, 84.50)
+
+ON DUPLICATE KEY UPDATE VisitID = VALUES(VisitID), ICDCode = VALUES(ICDCode);
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/charts/DiagnosisTrendDataTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/charts/DiagnosisTrendDataTest.java
index 5761a9ec059a905144e37ec997175f563782e4a0..32252af96822ab7d062e2e76428f18f6911ceca3 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/charts/DiagnosisTrendDataTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/charts/DiagnosisTrendDataTest.java
@@ -22,7 +22,7 @@ public class DiagnosisTrendDataTest extends TestCase {
gen.clearAllTables();
gen.standardData();
gen.influenza_epidemic();
- gen.malaria_epidemic();
+ gen.malaria_epidemic1();
}
public void testProduceDataset() {
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/dao/officevisit/OVDiagnosesTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/officevisit/OVDiagnosesTest.java
index 31976368a521106b319838b9cae76fa235b6849f..69ef1e5018cb519e8a7ec35993a89fd1f25c18a8 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/dao/officevisit/OVDiagnosesTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/dao/officevisit/OVDiagnosesTest.java
@@ -176,11 +176,11 @@ public class OVDiagnosesTest extends TestCase {
public void testMalaria() throws Exception {
DAOFactory factory = TestDAOFactory.getTestInstance();
TestDataGenerator gen = new TestDataGenerator();
- gen.malaria_epidemic();
+ gen.malaria_epidemic1();
ViewDiagnosisStatisticsAction a = new ViewDiagnosisStatisticsAction(factory);
- assertTrue(a.isMalariaEpidemic("11/02/" + thisYear, "27607", "110"));
+ assertTrue(a.isMalariaEpidemic("11/16/" + thisYear, "27607", "110"));
}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java b/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
index 03037124a70bf63dceb07e8c4125466287497fdf..26d026000f00b01501b5b6ed16a749744e8f8d76 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
@@ -905,9 +905,19 @@ public class TestDataGenerator {
+ "/referral_sort_testdata.sql");
}
- public void malaria_epidemic() throws SQLException, FileNotFoundException,
+ public void malaria_epidemic1() throws SQLException, FileNotFoundException,
IOException {
- new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic.sql");
+ new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic1.sql");
+ }
+
+ public void malaria_epidemic2() throws SQLException, FileNotFoundException,
+ IOException {
+ new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic2.sql");
+ }
+
+ public void malaria_epidemic3() throws SQLException, FileNotFoundException,
+ IOException {
+ new DBBuilder(factory).executeSQLFile(DIR + "/malariaEpidemic3.sql");
}
public void influenza_epidemic() throws SQLException,