Skip to content

Commit d68e026

Browse files
committed
fix disease variant sorting in ext msgs, show perinatal details heading for required disease(s)
1 parent 0c34caf commit d68e026

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,11 @@ private List<Order> getOrderList(List<SortProperty> sortProperties, CriteriaBuil
665665
case ExternalMessageIndexDto.MESSAGE_DATE_TIME:
666666
case ExternalMessageIndexDto.STATUS:
667667
case ExternalMessageIndexDto.DISEASE:
668-
case ExternalMessageIndexDto.DISEASE_VARIANT:
669668
order.addAll(orderBuilder.build(externalMessageRoot.get(sortProperty.propertyName)));
670669
break;
670+
case ExternalMessageIndexDto.DISEASE_VARIANT:
671+
order.addAll(orderBuilder.build(externalMessageRoot.get(ExternalMessage.DISEASE_VARIANT_VALUE)));
672+
break;
671673
case ExternalMessageIndexDto.PERSON_FIRST_NAME:
672674
case ExternalMessageIndexDto.PERSON_LAST_NAME:
673675
case ExternalMessageIndexDto.PERSON_POSTAL_CODE:

sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,10 @@ protected void addFields() {
727727
nameOfGuardians.setVisible(true);
728728
minimumAdultAge = FacadeProvider.getConfigFacade().getMinimumAdultAge();
729729
minimumEmancipatedAge = FacadeProvider.getConfigFacade().getMinimumEmancipatedAge();
730+
731+
if (!List.of(Disease.RESPIRATORY_SYNCYTIAL_VIRUS).contains(disease)) {
732+
perinatalDetailsHeader.setVisible(false);
733+
}
730734
}
731735

732736
private int getApproximateAgeInYears() {

0 commit comments

Comments
 (0)