diff --git a/lib/api/my_attendance_api_client.dart b/lib/api/my_attendance_api_client.dart
index 78742a3..24cf6c0 100644
--- a/lib/api/my_attendance_api_client.dart
+++ b/lib/api/my_attendance_api_client.dart
@@ -40,14 +40,19 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
-  Future<List<ESERVICESVS>> getValueSetValues(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list, {String? empID, String? parentValue}) async {
+  Future<List<ESERVICESVS>> getValueSetValues(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list,
+      {String? empID, String? parentValue, bool hasParent = false}) async {
     String url = "${ApiConsts.erpRest}GET_VALUE_SET_VALUES";
     Map<String, dynamic> postParams = {
       "P_SELECTED_RESP_ID": -999,
       "P_MENU_TYPE": "E",
       "P_PAGE_LIMIT": 1000,
       "P_PAGE_NUM": 1,
-      "P_PARENT_VALUE": empID != null ? parentValue : null,
+      "P_PARENT_VALUE": hasParent
+          ? parentValue
+          : empID != null
+              ? parentValue
+              : null,
       "P_SEGMENT_NAME": pSegmentName,
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
       "P_DESC_FLEX_NAME": pDescFlexName,
diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index 7103dfd..170762c 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -9,9 +9,9 @@ class ApiConsts {
  //  static String baseUrl = "https://webservices.hmg.com"; // PreProd
   // static String baseUrl = "https://hmgwebservices.com"; // Live server
 
-  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
 
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
  // static String baseUrl = "http://10.20.200.111:1010/";
 
   // static String baseUrl = "https://webservices.hmg.com"; // PreProd
diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
index 4f67c62..ef88e11 100644
--- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
+++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
@@ -97,7 +97,8 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp);
       Utils.hideLoading(context);
       await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
-          arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit',isAttachmentMandatory: dynamicParams!.isAttachmentMandatory));
+          arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit',
+              isAttachmentMandatory: dynamicParams!.isAttachmentMandatory));
       if (!AppState().cancelRequestTrancsection) {
         return;
       }
@@ -133,8 +134,27 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
                 .toJson())
             .toList();
 
+        String? selectedEmp = dynamicParams!.selectedEmp;
+        bool hasParentId = false;
+
+        if (segmentId.isNotEmpty && selectedEmp == null) {
+          for (var element in getEitDffStructureList!) {
+            try {
+              if (element.sEGMENTNAME == segmentId && selectedEmp == null) {
+                var selectedElement = element;
+                if (selectedElement.vALIDATIONTYPE == "Y" || selectedElement.vALIDATIONTYPE == "D") {
+                  hasParentId = true;
+                  break;
+                }
+              }
+            } catch (ex) {
+              print("err:$ex");
+            }
+          }
+        }
+
         List<ESERVICESVS> eServicesResponseModel = await MyAttendanceApiClient().getValueSetValues(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!, values,
-            empID: dynamicParams!.selectedEmp, parentValue: structureList.eSERVICESDV!.pVALUECOLUMNNAME);
+            empID: selectedEmp, parentValue: structureList.eSERVICESDV!.pVALUECOLUMNNAME, hasParent: hasParentId);
         List<GetEITDFFStructureList> abc = genericResponseModel?.getEITDFFStructureList ?? [];
         getEitDffStructureList = abc;
         int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == segmentId);
@@ -862,9 +882,8 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
           context: context,
           initialTime: time,
           builder: (cxt, child) {
-            return MediaQuery(data: MediaQuery.of(context).copyWith(alwaysUse24HourFormat: true), child: Localizations.override(
-                context: context,
-                locale: const Locale('en', 'US'),child: child ?? Container()));
+            return MediaQuery(
+                data: MediaQuery.of(context).copyWith(alwaysUse24HourFormat: true), child: Localizations.override(context: context, locale: const Locale('en', 'US'), child: child ?? Container()));
           });
 
       if (picked != null && picked != time) {