Merge pull request #13530 from SORMAS-Foundation/13528-aefi-sorting-issue

Fixed: Adverse events sorting issue

Author: KarnaiahPesula

sormas-backend/src/main/java/de/symeda/sormas/backend/adverseeventsfollowingimmunization/AefiService.java

@@ -98,6 +98,8 @@ public class AefiService extends AbstractCoreAdoService<Aefi, AefiJoins> {
 	@EJB
 	private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade;
 
+	private static final String PRIMARY_VACCINE_COLUMN = "primaryVaccineColumn";
+
 	public AefiService() {
 		super(Aefi.class, DeletableEntityType.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION);
 	}
@@ -416,10 +418,17 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, AefiQueryCo
 				Expression<?> expression;
 				switch (sortProperty.propertyName) {
 				case AefiIndexDto.UUID:
-				case AefiIndexDto.DISEASE:
+				case AefiIndexDto.REPORT_DATE:
+				case AefiIndexDto.ADVERSE_EVENTS:
 				case AefiIndexDto.START_DATE_TIME:
 					expression = aefiQueryContext.getRoot().get(sortProperty.propertyName);
 					break;
+				case AefiIndexDto.IMMUNIZATION_UUID:
+					expression = aefiQueryContext.getJoins().getImmunization().get(Immunization.UUID);
+					break;
+				case AefiIndexDto.DISEASE:
+					expression = aefiQueryContext.getJoins().getImmunization().get(Immunization.DISEASE);
+					break;
 				case AefiIndexDto.PERSON_UUID:
 					expression = aefiQueryContext.getJoins().getImmunizationJoins().getPerson().get(Person.UUID);
 					break;
@@ -443,7 +452,7 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, AefiQueryCo
 					expression = cb.lower(
 						aefiQueryContext.getJoins().getImmunizationJoins().getPersonJoins().getAddressJoins().getDistrict().get(District.NAME));
 					break;
-				case AefiIndexDto.PRIMARY_VACCINE_NAME:
+				case PRIMARY_VACCINE_COLUMN:
 					expression = aefiQueryContext.getJoins().getPrimarySuspectVaccination().get(Vaccination.VACCINE_NAME);
 					break;
 				case AefiIndexDto.VACCINATION_DATE: