diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..f222bf6 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +21.0.4 diff --git a/changelog.md b/changelog.md index ae1ff52..05d38d2 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,7 @@ ## Release 1.6 Brief summary of what's in this release: +- uniquifying the clinical data filters by adding a few characters so filtering works correctly in app ### Breaking changes diff --git a/src/main/java/org/kpmp/repositoryDataset/RepositoryFileDataset.java b/src/main/java/org/kpmp/repositoryDataset/RepositoryFileDataset.java index a3e4d35..934fd91 100644 --- a/src/main/java/org/kpmp/repositoryDataset/RepositoryFileDataset.java +++ b/src/main/java/org/kpmp/repositoryDataset/RepositoryFileDataset.java @@ -162,7 +162,7 @@ public void setPrimaryAdjudicatedCategory(String primaryAdjudicatedCat) { } public String getKdigoStage() { - return this.kdigoStage; + return this.kdigoStage + "(ks)"; } public void setKdigoStage(String kdigoStage) { @@ -170,7 +170,7 @@ public void setKdigoStage(String kdigoStage) { } public String getBaselineEgfr() { - return this.baselineEgfr; + return this.baselineEgfr + "(eGFR)"; } public void setBaselineEgfr(String baselineEgfr) { @@ -178,7 +178,7 @@ public void setBaselineEgfr(String baselineEgfr) { } public String getProteinuria() { - return this.proteinuria; + return this.proteinuria + "(prot)"; } public void setProteinuria(String proteinuria) { @@ -186,7 +186,7 @@ public void setProteinuria(String proteinuria) { } public String getA1c() { - return this.a1c; + return this.a1c + "(a1c)"; } public void setA1c(String a1c) { @@ -194,7 +194,7 @@ public void setA1c(String a1c) { } public String getAlbuminuria() { - return this.albuminuria; + return this.albuminuria + "(alb)"; } public void setAlbuminuria(String albuminuria) { @@ -202,7 +202,7 @@ public void setAlbuminuria(String albuminuria) { } public String getDiabetesHistory() { - return this.diabetesHistory; + return this.diabetesHistory + "(dh)"; } public void setDiabetesHistory(String diabetesHistory) { @@ -210,7 +210,7 @@ public void setDiabetesHistory(String diabetesHistory) { } public String getDiabetesDuration() { - return this.diabetesDuration; + return this.diabetesDuration + "(dd)"; } public void setDiabetesDuration(String diabetesDuration) { @@ -218,7 +218,7 @@ public void setDiabetesDuration(String diabetesDuration) { } public String getHypertensionHistory() { - return this.hypertensionHistory; + return this.hypertensionHistory + "(hh)"; } public void setHypertensionHistory(String hypertensionHistory) { @@ -226,7 +226,7 @@ public void setHypertensionHistory(String hypertensionHistory) { } public String getHypertensionDuration() { - return this.hypertensionDuration; + return this.hypertensionDuration + "(hd)"; } public void setHypertensionDuration(String hypertensionDuration) { @@ -234,7 +234,7 @@ public void setHypertensionDuration(String hypertensionDuration) { } public String getOnRaasBlockade() { - return this.onRaasBlockade; + return this.onRaasBlockade + "(rb)"; } public void setOnRaasBlockade(String onRaasBlockade) { diff --git a/src/test/java/org/kpmp/repositoryDataset/RepositoryFileDatasetTest.java b/src/test/java/org/kpmp/repositoryDataset/RepositoryFileDatasetTest.java index b75c202..559736f 100644 --- a/src/test/java/org/kpmp/repositoryDataset/RepositoryFileDatasetTest.java +++ b/src/test/java/org/kpmp/repositoryDataset/RepositoryFileDatasetTest.java @@ -120,61 +120,61 @@ public void setPrimaryAdjudicatedCat() { @Test public void setKdigoStage() { repositoryDataset.setKdigoStage("stage 11"); - assertEquals("stage 11", repositoryDataset.getKdigoStage()); + assertEquals("stage 11 (ks)", repositoryDataset.getKdigoStage()); } @Test public void setBaselineEgfr() { repositoryDataset.setBaselineEgfr("13"); - assertEquals("13", repositoryDataset.getBaselineEgfr()); + assertEquals("13 (eGFR)", repositoryDataset.getBaselineEgfr()); } @Test public void setProteinuria() { repositoryDataset.setProteinuria("1234"); - assertEquals("1234", repositoryDataset.getProteinuria()); + assertEquals("1234 (prot)", repositoryDataset.getProteinuria()); } @Test public void setA1c() { repositoryDataset.setA1c("90%"); - assertEquals("90%", repositoryDataset.getA1c()); + assertEquals("90% (a1c)", repositoryDataset.getA1c()); } @Test public void setAlbuminuria() { repositoryDataset.setAlbuminuria("yup"); - assertEquals("yup", repositoryDataset.getAlbuminuria()); + assertEquals("yup (alb)", repositoryDataset.getAlbuminuria()); } @Test public void setDiabetesDuration(){ repositoryDataset.setDiabetesDuration("1 years"); - assertEquals("1 years", repositoryDataset.getDiabetesDuration()); + assertEquals("1 years (dd)", repositoryDataset.getDiabetesDuration()); } @Test public void setDiabetesHistory() { repositoryDataset.setDiabetesHistory("no"); - assertEquals("no", repositoryDataset.getDiabetesHistory()); + assertEquals("no (dh)", repositoryDataset.getDiabetesHistory()); } @Test public void setHypertensionDuration() { repositoryDataset.setHypertensionDuration("1 years"); - assertEquals("1 years", repositoryDataset.getHypertensionDuration()); + assertEquals("1 years (hd)", repositoryDataset.getHypertensionDuration()); } @Test public void setHypertensionHistory() { repositoryDataset.setHypertensionHistory("no"); - assertEquals("no", repositoryDataset.getHypertensionHistory()); + assertEquals("no (hh)", repositoryDataset.getHypertensionHistory()); } @Test public void setOnRaasBlockade() { repositoryDataset.setOnRaasBlockade("no"); - assertEquals("no", repositoryDataset.getOnRaasBlockade()); + assertEquals("no (rb)", repositoryDataset.getOnRaasBlockade()); } } \ No newline at end of file