diff --git a/src/main/java/in/gov/chennaicorporation/mobileservice/gccRagPickerSurvey/Service/RagPickerSurveyService.java b/src/main/java/in/gov/chennaicorporation/mobileservice/gccRagPickerSurvey/Service/RagPickerSurveyService.java index 05871a5d..9473c5e6 100644 --- a/src/main/java/in/gov/chennaicorporation/mobileservice/gccRagPickerSurvey/Service/RagPickerSurveyService.java +++ b/src/main/java/in/gov/chennaicorporation/mobileservice/gccRagPickerSurvey/Service/RagPickerSurveyService.java @@ -1124,8 +1124,13 @@ public class RagPickerSurveyService { qid = 15; } else if ("age".equals(cleanKey)) { qid = 6; - } + } + else if ("shift_week".equals(cleanKey)) { + qid = 101; + } } + + // Fallback: If still null, try resolving by field_name or matching q_english // (case-insensitive) from DB without active/delete constraint @@ -1169,7 +1174,12 @@ public class RagPickerSurveyService { } else if (qid == 6) { parentAnswerId = 3; } + else if (qid == 101) { + parentAnswerId = 3; + } } + + // Fallback: If still null, try resolving from mapping table (without // active/delete constraint)