[VAS] Bug 9352 : Filtre par modalité d'entrée de la recherche avancée du registre des fonds

api/api-referential/referential-commons/src/main/java/fr/gouv/vitamui/referential/common/dsl/VitamQueryHelper.java

@@ -111,9 +111,8 @@ public class VitamQueryHelper {
     /* */
     private static final String DATE_FORMAT = "dd/MM/yyyy";
     public static final Collection<String> staticAcquisitionInformations = List.of("Versement", "Protocole", "Achat",
-        "Copie", "Dation", "Dépôt", "Dévolution", "Don", "Legs", "Réintégration", VitamQueryHelper.ACQUISITION_INFORMATION_AUTRES,
+        "Copie", "Dation", "Dépôt", "Dévolution", "Don", "Legs", "Réintégration", "Autres",
         VitamQueryHelper.ACQUISITION_INFORMATION_NON_RENSEIGNE);
-    public static final String ACQUISITION_INFORMATION_AUTRES = "Autres";
     public static final String ACQUISITION_INFORMATION_NON_RENSEIGNE = "Non renseigné";
 
     private VitamQueryHelper() {
@@ -274,7 +273,7 @@ public class VitamQueryHelper {
         acquisitionInformations.removeAll(data);
 
         if(!acquisitionInformations.isEmpty()) {
-            if(data.contains(ACQUISITION_INFORMATION_AUTRES) || data.contains(ACQUISITION_INFORMATION_NON_RENSEIGNE) ) {
+            if(data.contains(ACQUISITION_INFORMATION_NON_RENSEIGNE) ) {
                 query.add(nin(ACQUISITION_INFORMATION, acquisitionInformations.toArray(new String[] {})));
             } else {
                 query.add(in(ACQUISITION_INFORMATION, data.toArray(new String[] {})));

api/api-referential/referential-internal/src/main/java/fr/gouv/vitamui/referential/internal/server/accessionregister/summary/AccessionRegisterSummaryInternalService.java

@@ -245,8 +245,7 @@ public class AccessionRegisterSummaryInternalService {
             List<String> acquisitionInformations = new ArrayList<>(VitamQueryHelper.staticAcquisitionInformations);
             acquisitionInformations.removeAll(acquisitionInformationsFromIhm);
             if(!acquisitionInformations.isEmpty()) {
-                if(acquisitionInformationsFromIhm.contains(VitamQueryHelper.ACQUISITION_INFORMATION_AUTRES)
-                    || acquisitionInformationsFromIhm.contains(VitamQueryHelper.ACQUISITION_INFORMATION_NON_RENSEIGNE) ) {
+                if(acquisitionInformationsFromIhm.contains(VitamQueryHelper.ACQUISITION_INFORMATION_NON_RENSEIGNE) ) {
                     query.add(nin(ACQUISITION_INFORMATION, acquisitionInformations.toArray(new String[] {})));
                 } else {
                     query.add(in(ACQUISITION_INFORMATION, acquisitionInformationsFromIhm.toArray(new String[] {})));