Merge pull request #2528 from DuckflipXYZ/2491

#2491 : Sorting acquisitions in mail per sorting index when imported from PACS
fli-iam · Dec 2, 2024 · 695f5ba · 695f5ba
2 parents 73d8150 + 345dd83
commit 695f5ba
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/service/ImporterMailService.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/service/ImporterMailService.java
@@ -58,7 +58,7 @@ public void sendImportEmail(ImportJob importJob, Long userId, Examination examin
         generatedMail.setUserId(userId);
         generatedMail.setStudyCard(importJob.getStudyCardName());
 
-        for (DatasetAcquisition acq : generatedAcquisitions) {
+        for (DatasetAcquisition acq : generatedAcquisitions.stream().sorted(Comparator.comparingInt(DatasetAcquisition::getSortingIndex)).toList()) {
             if (!CollectionUtils.isEmpty(acq.getDatasets())) {
                 for (Dataset dataset : acq.getDatasets()) {
                     datasets.put(dataset.getId(), dataset.getName());