Merge pull request #580 from mozzy11/2.8

cytology report should display all cell abnomalities
I-TECH-UW · Oct 27, 2023 · a029071 · a029071
2 parents 241f7ad + 8b6d913
commit a029071
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientCytologyReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientCytologyReport.java
@@ -52,7 +52,14 @@ protected void setAdditionalReportItems() {
                         }
                         switch (diagnosisResult.getCategory()) {
                             case EPITHELIAL_CELL_ABNORMALITY: {
-                                data.setEpithelialCellAbnomalities(diagnoses);
+                                List<String> existingDiagnoses =  new ArrayList<>();
+                                if(data.getEpithelialCellAbnomalities() != null){
+                                 if(!data.getEpithelialCellAbnomalities().isEmpty()){
+                                   existingDiagnoses = data.getEpithelialCellAbnomalities();
+                                 }
+                                }
+                                existingDiagnoses.addAll(diagnoses);
+                                data.setEpithelialCellAbnomalities(existingDiagnoses);
                                 break;
                             }
                             case NON_NEOPLASTIC_CELLULAR_VARIATIONS: {