BAH-2509 | fixed duplication of reports when there is multiple encounters (#85)

kavitha-sundararajan · web-flow · commit b2b5dd9b80e9 · 2022-11-02T11:12:24.000Z
diff --git a/omod/src/main/java/org/bahmni/module/hip/web/service/DiagnosticReportService.java b/omod/src/main/java/org/bahmni/module/hip/web/service/DiagnosticReportService.java
@@ -134,9 +134,10 @@ private List<DiagnosticReportBundle> getLabResults(Patient patient, List<Visit>
         Map<String, List<LabOrderResult>> groupedByOrderUUID = results.getResults().stream().collect(Collectors.groupingBy(LabOrderResult::getOrderUuid));
 
         List<OpenMrsLabResults> labResults = new ArrayList<>();
-        Map<Obs, List<LabOrderResult>> labRecordsMap = new HashMap<>();
+        Map<Obs, List<LabOrderResult>> labRecordsMap;
 
         for (Map.Entry<Encounter, List<Obs>> map : orderedTestUploads.entrySet()) {
+            labRecordsMap = new HashMap<>();
             for (Obs obs: map.getValue()) {
                 labRecordsMap.put(obs,groupedByOrderUUID.get(obs.getOrder().getUuid()));
             }
@@ -149,6 +150,7 @@ private List<DiagnosticReportBundle> getLabResults(Patient patient, List<Visit>
         }
 
         for (Map.Entry<Encounter, List<Obs>> map : unorderedUploads.entrySet()) {
+            labRecordsMap = new HashMap<>();
             putAllUnOrderedObsUploadsIntoMap(unorderedUploads.get(map.getKey()),labRecordsMap);
             labResults.add(new OpenMrsLabResults(map.getKey(),map.getKey().getPatient(),labRecordsMap));
         }

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,10 @@ private List<DiagnosticReportBundle> getLabResults(Patient patient, List<Visit>`
`134`	`134`	`Map<String, List<LabOrderResult>> groupedByOrderUUID = results.getResults().stream().collect(Collectors.groupingBy(LabOrderResult::getOrderUuid));`
`135`	`135`
`136`	`136`	`List<OpenMrsLabResults> labResults = new ArrayList<>();`
`137`		`- Map<Obs, List<LabOrderResult>> labRecordsMap = new HashMap<>();`
	`137`	`+ Map<Obs, List<LabOrderResult>> labRecordsMap;`
`138`	`138`
`139`	`139`	`for (Map.Entry<Encounter, List<Obs>> map : orderedTestUploads.entrySet()) {`
	`140`	`+ labRecordsMap = new HashMap<>();`
`140`	`141`	`for (Obs obs: map.getValue()) {`
`141`	`142`	`labRecordsMap.put(obs,groupedByOrderUUID.get(obs.getOrder().getUuid()));`
`142`	`143`	`}`
`@@ -149,6 +150,7 @@ private List<DiagnosticReportBundle> getLabResults(Patient patient, List<Visit>`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`for (Map.Entry<Encounter, List<Obs>> map : unorderedUploads.entrySet()) {`
	`153`	`+ labRecordsMap = new HashMap<>();`
`152`	`154`	`putAllUnOrderedObsUploadsIntoMap(unorderedUploads.get(map.getKey()),labRecordsMap);`
`153`	`155`	`labResults.add(new OpenMrsLabResults(map.getKey(),map.getKey().getPatient(),labRecordsMap));`
`154`	`156`	`}`