From 54080cc3c3c8983996fb9b6fd3e96a950dd80b9a Mon Sep 17 00:00:00 2001
From: Saurav Mishra <80103738+SauravBizbRolly@users.noreply.github.com>
Date: Mon, 10 Aug 2026 16:47:00 +0530
Subject: [PATCH] fix order issue in dynamic from (#447)

---
 .../service/dynamicForm/FormMasterServiceImpl.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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();