Merge pull request #43 from KPMP/KPMP-5700_UniquifyFilters

KPMP-5700: Setting the clinical props so we do not have value overlap

.java-version

@@ -0,0 +1 @@
+21.0.4

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
 

src/main/java/org/kpmp/repositoryDataset/RepositoryFileDataset.java

@@ -162,79 +162,79 @@ public void setPrimaryAdjudicatedCategory(String primaryAdjudicatedCat) {
     }
 
     public String getKdigoStage() {
-        return this.kdigoStage;
+        return this.kdigoStage + "(ks)";
     }
 
     public void setKdigoStage(String kdigoStage) {
         this.kdigoStage = kdigoStage;
     }
 
     public String getBaselineEgfr() {
-        return this.baselineEgfr;
+        return this.baselineEgfr + "(eGFR)";
     }
 
     public void setBaselineEgfr(String baselineEgfr) {
         this.baselineEgfr = baselineEgfr;
     }
 
     public String getProteinuria() {
-        return this.proteinuria;
+        return this.proteinuria + "(prot)";
     }
 
     public void setProteinuria(String proteinuria) {
         this.proteinuria = proteinuria;
     }
 
     public String getA1c() {
-        return this.a1c;
+        return this.a1c + "(a1c)";
     }
 
     public void setA1c(String a1c) {
         this.a1c = a1c;
     }
 
     public String getAlbuminuria() {
-        return this.albuminuria;
+        return this.albuminuria + "(alb)";
     }
 
     public void setAlbuminuria(String albuminuria) {
         this.albuminuria = albuminuria;
     }
 
     public String getDiabetesHistory() {
-        return this.diabetesHistory;
+        return this.diabetesHistory + "(dh)";
     }
 
     public void setDiabetesHistory(String diabetesHistory) {
         this.diabetesHistory = diabetesHistory;
     }
 
     public String getDiabetesDuration() {
-        return this.diabetesDuration;
+        return this.diabetesDuration + "(dd)";
     }
 
     public void setDiabetesDuration(String diabetesDuration) {
         this.diabetesDuration = diabetesDuration;
     }
 
     public String getHypertensionHistory() {
-        return this.hypertensionHistory;
+        return this.hypertensionHistory + "(hh)";
     }
 
     public void setHypertensionHistory(String hypertensionHistory) {
         this.hypertensionHistory = hypertensionHistory;
     }
 
     public String getHypertensionDuration() {
-        return this.hypertensionDuration;
+        return this.hypertensionDuration + "(hd)";
     }
 
     public void setHypertensionDuration(String hypertensionDuration) {
         this.hypertensionDuration = hypertensionDuration;
     }
 
     public String getOnRaasBlockade() {
-        return this.onRaasBlockade;
+        return this.onRaasBlockade + "(rb)";
     }
 
     public void setOnRaasBlockade(String onRaasBlockade) {

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());
     }
 
 }