diff --git a/src/main/java/com/iemr/common/service/dynamicForm/FormMasterServiceImpl.java b/src/main/java/com/iemr/common/service/dynamicForm/FormMasterServiceImpl.java index 38154f4a..2861819b 100644 --- a/src/main/java/com/iemr/common/service/dynamicForm/FormMasterServiceImpl.java +++ b/src/main/java/com/iemr/common/service/dynamicForm/FormMasterServiceImpl.java @@ -243,8 +243,16 @@ public FormResponseDTO getStructuredFormByFormId(String formId, String lang, Str return dto; }) - .sorted(Comparator.comparing(FieldResponseDTO::getId)) - .collect(Collectors.toList()); + .sorted( + Comparator.comparing( + FieldResponseDTO::getSequence, + Comparator.nullsLast(Comparator.naturalOrder()) + ).thenComparing( + FieldResponseDTO::getId, + Comparator.nullsLast(Comparator.naturalOrder()) + ) + ) .collect(Collectors.toList()); + GroupedFieldResponseDTO singleSection = new GroupedFieldResponseDTO();