diff --git a/iTrust/sql/data/hcp_additional_diagnosis_data.sql b/iTrust/sql/data/hcp_additional_diagnosis_data.sql
new file mode 100644
index 0000000000000000000000000000000000000000..29163d99144e43aa8e334f49d9e05ab5a39c5419
--- /dev/null
+++ b/iTrust/sql/data/hcp_additional_diagnosis_data.sql
@@ -0,0 +1,29 @@
+INSERT INTO officevisits(ID, visitDate, HCPID, notes, PatientID, HospitalID)
+VALUES
+(125, '2020-11-18', 9000000000, 'Diagnose Cataracts', 1, '1'),
+(126, '2020-11-18', 9000000000, 'Diagnose Cataracts', 2, '1'),
+(127, '2020-11-18', 9000000000, 'Diagnose Cataracts', 3, '1'),
+(128, '2020-11-18', 9000000000, 'Diagnose Cataracts', 4, '1'),
+(129, '2020-11-18', 9000000000, 'Diagnose Cataracts', 21, '1'),
+(130, '2020-11-18', 9000000000, 'Diagnose Cataracts', 22, '1'),
+(131, '2020-11-18', 9000000000, 'Diagnose Cataracts', 23, '1'),
+(132, '2020-11-18', 9000000000, 'Diagnose Cataracts', 24, '1'),
+(133, '2020-11-18', 9000000000, 'Diagnose Cataracts', 105, '1'),
+(134, '2020-11-18', 9000000000, 'Diagnose Cataracts', 107, '1')
+
+ON DUPLICATE KEY UPDATE id = id;
+
+INSERT INTO ovdiagnosis(ID, VisitID, ICDCode)
+VALUES
+(125, 125, 26.8),
+(126, 126, 26.8),
+(127, 127, 26.8),
+(128, 128, 26.8),
+(129, 129, 26.8),
+(130, 130, 26.8),
+(131, 131, 26.8),
+(132, 132, 26.8),
+(133, 133, 26.8),
+(134, 134, 26.8)
+
+ON DUPLICATE KEY UPDATE VisitID = VALUES(VisitID), ICDCode = VALUES(ICDCode);
diff --git a/iTrust/sql/data/hcp_diagnosis_data.sql b/iTrust/sql/data/hcp_diagnosis_data.sql
index c37c8e880fa4204088c693723ad7efc1add0ed01..f0def171bbbe09e7242ce842d96afc93790ee2d9 100644
--- a/iTrust/sql/data/hcp_diagnosis_data.sql
+++ b/iTrust/sql/data/hcp_diagnosis_data.sql
@@ -1,14 +1,3 @@
-/*-- 27606
--- 27607
--- 27606
--- 27606
--- 27603
--- 10001
--- 10001
--- 10001
--- 28803
--- 59710*/
-
INSERT INTO officevisits(ID, visitDate, HCPID, notes, PatientID, HospitalID)
VALUES
(107, '2007-03-09', 9000000004, 'Diagnose Echovirus', 2, '1'),
@@ -30,18 +19,7 @@ VALUES
(122, '2011-08-25', 9000000000, 'Diagnose Mumps', 2, '1'),
(123, '2011-09-09', 9000000000, 'Diagnose Mumps', 3, '1'),
-(124, '2011-09-12', 9000000000, 'Diagnose Mumps', 25, '1'),
-
-(125, '2020-11-18', 9000000000, 'Diagnose Cataracts', 1, '1'),
-(126, '2020-11-18', 9000000000, 'Diagnose Cataracts', 2, '1'),
-(127, '2020-11-18', 9000000000, 'Diagnose Cataracts', 3, '1'),
-(128, '2020-11-18', 9000000000, 'Diagnose Cataracts', 4, '1'),
-(129, '2020-11-18', 9000000000, 'Diagnose Cataracts', 21, '1'),
-(130, '2020-11-18', 9000000000, 'Diagnose Cataracts', 22, '1'),
-(131, '2020-11-18', 9000000000, 'Diagnose Cataracts', 23, '1'),
-(132, '2020-11-18', 9000000000, 'Diagnose Cataracts', 24, '1'),
-(133, '2020-11-18', 9000000000, 'Diagnose Cataracts', 105, '1'),
-(134, '2020-11-18', 9000000000, 'Diagnose Cataracts', 107, '1')
+(124, '2011-09-12', 9000000000, 'Diagnose Mumps', 25, '1')
ON DUPLICATE KEY UPDATE id = id;
@@ -66,18 +44,7 @@ VALUES
(122, 122, 72.00),
(123, 123, 72.00),
-(124, 124, 72.00),
-
-(125, 125, 26.8),
-(126, 126, 26.8),
-(127, 127, 26.8),
-(128, 128, 26.8),
-(129, 129, 26.8),
-(130, 130, 26.8),
-(131, 131, 26.8),
-(132, 132, 26.8),
-(133, 133, 26.8),
-(134, 134, 26.8)
+(124, 124, 72.00)
ON DUPLICATE KEY UPDATE VisitID = VALUES(VisitID), ICDCode = VALUES(ICDCode);
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 85071d5d193beb4ad26f65ec5646abbfb36d3a55..3e87e10f137526ea3aada1c16e2879362b1a6ed4 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
@@ -116,6 +116,8 @@ public class OVDiagnosesTest extends TestCase {
}
public void testZipSFs() throws Exception {
+ TestDataGenerator gen = new TestDataGenerator();
+ gen.hcp_additional_diagnosis_data();
Date lower = new SimpleDateFormat("MM/dd/yyyy").parse("11/18/2020");
Date upper = new SimpleDateFormat("MM/dd/yyyy").parse("11/18/2020");
DiagnosisStatisticsBean bean = diagDAO.getDiagnosisCounts("26.8", "27606-1234", lower, upper, 5);
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 26d026000f00b01501b5b6ed16a749744e8f8d76..33922fb4d0541e45356e3b06bd55e61891d49ce7 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/datagenerators/TestDataGenerator.java
@@ -741,7 +741,12 @@ public class TestDataGenerator {
public void hcp_diagnosis_data() throws FileNotFoundException, IOException,
SQLException {
new DBBuilder(factory).executeSQLFile(DIR + "/hcp_diagnosis_data.sql");
- }
+ }
+
+ public void hcp_additional_diagnosis_data() throws FileNotFoundException,
+ IOException, SQLException {
+ new DBBuilder(factory).executeSQLFile(DIR + "/hcp_additional_diagnosis_data.sql");
+ }
public void immunization_data() throws FileNotFoundException, IOException,
SQLException {