|
|
@ -780,12 +780,12 @@ public class ChildSurveyService { |
|
|
"FROM child_survey_response r " + |
|
|
"FROM child_survey_response r " + |
|
|
"JOIN child_survey_questions_master q ON r.qid = q.qid " + |
|
|
"JOIN child_survey_questions_master q ON r.qid = q.qid " + |
|
|
"WHERE r.survey_id = ? AND r.cat_id = '1' AND r.isactive = 1 AND r.isdelete = 0 " + |
|
|
"WHERE r.survey_id = ? AND r.cat_id = '1' AND r.isactive = 1 AND r.isdelete = 0 " + |
|
|
"AND ((q.isactive = 1 AND q.isdelete = 0) OR (q.cat_id = '1' AND q.field_name IN ('q91', 'q2','q1','q5' ,'q24')))"; |
|
|
|
|
|
|
|
|
"AND ((q.isactive = 1 AND q.isdelete = 0) OR (q.cat_id = '1' AND q.field_name IN ('q92','q91', 'q2','q1','q5', 'q24')))"; |
|
|
|
|
|
|
|
|
List<Map<String, Object>> ansData = jdbcChildSurveyTemplate.queryForList(ansSql, surveyId); |
|
|
List<Map<String, Object>> ansData = jdbcChildSurveyTemplate.queryForList(ansSql, surveyId); |
|
|
List<Map<String, Object>> answersList = new ArrayList<>(); |
|
|
List<Map<String, Object>> answersList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
List<String> allowedFields = java.util.Arrays.asList("q91", "q2", "q1", "q5", "q24"); |
|
|
|
|
|
|
|
|
List<String> allowedFields = java.util.Arrays.asList("q92", "q91", "q2", "q1", "q5", "q24"); |
|
|
|
|
|
|
|
|
for (Map<String, Object> ans : ansData) { |
|
|
for (Map<String, Object> ans : ansData) { |
|
|
String fieldName = (String) ans.get("field_name"); |
|
|
String fieldName = (String) ans.get("field_name"); |
|
|
|