diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java b/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java
index 9ccf251b..eb928821 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java
@@ -111,9 +111,9 @@ public SuccessResponse<String> changeSurveyOwner(
         @PathVariable Long surveyId,
         @RequestBody ChangeSurveyOwnerRequest request
     ) {
-        log.info("[ADMIN] 설문 소유자 변경 요청 - surveyId: {}, newMemberId: {}", surveyId, request.newMemberId());
+        log.info("[ADMIN] 설문 소유자 변경 요청 - surveyId: {}, memberId: {}, userKey: {}", surveyId, request.newMemberId(), request.newUserKey());
 
-        adminFacade.changeSurveyOwner(surveyId, request.newMemberId());
+        adminFacade.changeSurveyOwner(surveyId, request.newMemberId(), request.newUserKey());
 
         return SuccessResponse.ok("설문 소유자가 변경되었습니다.");
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java b/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java
index 744f8528..61de6b2b 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java
@@ -76,7 +76,9 @@ public record QuestionDto(
         String imageUrl,
         ChoicePropDto choiceProperty,
         RatingPropDto ratingProperty,
-        DatePropDto dateProperty
+        DatePropDto dateProperty,
+        GridPropDto gridProperty,
+        TimePropDto timeProperty
     ) {
         public static QuestionDto from(SurveyQuestion vo) {
             if (vo == null) return null;
@@ -91,7 +93,9 @@ public static QuestionDto from(SurveyQuestion vo) {
                 vo.imageUrl(),
                 ChoicePropDto.from(vo.choiceProperty()),
                 RatingPropDto.from(vo.ratingProperty()),
-                DatePropDto.from(vo.dateProperty())
+                DatePropDto.from(vo.dateProperty()),
+                GridPropDto.from(vo.gridProperty()),
+                TimePropDto.from(vo.timeProperty())
             );
         }
 
@@ -110,10 +114,10 @@ public static ChoicePropDto from(SurveyQuestion.ChoiceProp vo) {
                 return new ChoicePropDto(vo.maxChoice(), vo.hasCustomInput(), vo.hasNoneOption(), vo.isSectionDecidable(), optionDtos);
             }
 
-            public record OptionDto(String content, Integer nextSection, String imageUrl) {
+            public record OptionDto(Long optionId, String content, Integer nextSection, String imageUrl) {
                 public static OptionDto from(SurveyQuestion.ChoiceProp.Option vo) {
                     if (vo == null) return null;
-                    return new OptionDto(vo.content(), vo.nextSection(), vo.imageUrl());
+                    return new OptionDto(vo.optionId(), vo.content(), vo.nextSection(), vo.imageUrl());
                 }
             }
         }
@@ -131,6 +135,35 @@ public static DatePropDto from(SurveyQuestion.DateProp vo) {
                 return new DatePropDto(vo.defaultDate());
             }
         }
+
+        public record TimePropDto(Boolean isInterval) {
+            public static TimePropDto from(SurveyQuestion.TimeProp vo) {
+                if (vo == null) return null;
+                return new TimePropDto(vo.isInterval());
+            }
+        }
+
+        public record GridPropDto(
+            Boolean isCheckbox,
+            Boolean isChoiceMixed,
+            Boolean isChoiceDistinct,
+            Set<GridOptionDto> gridOptions
+        ) {
+            public static GridPropDto from(SurveyQuestion.GridProp vo) {
+                if (vo == null) return null;
+                Set<GridOptionDto> optionDtos = vo.gridOptions() != null
+                    ? vo.gridOptions().stream().map(GridOptionDto::from).collect(Collectors.toSet())
+                    : Set.of();
+                return new GridPropDto(vo.isCheckbox(), vo.isChoiceMixed(), vo.isChoiceDistinct(), optionDtos);
+            }
+
+            public record GridOptionDto(Long gridOptionId, Boolean isRow, String content, Integer order) {
+                public static GridOptionDto from(SurveyQuestion.GridProp.GridOption vo) {
+                    if (vo == null) return null;
+                    return new GridOptionDto(vo.gridOptionId(), vo.isRow(), vo.content(), vo.order());
+                }
+            }
+        }
     }
 
     public record ScreeningDto(
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminAuthService.java b/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminAuthService.java
deleted file mode 100644
index 53316647..00000000
--- a/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminAuthService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package OneQ.OnSurvey.domain.admin.application;
-
-import OneQ.OnSurvey.domain.admin.domain.model.Admin;
-import OneQ.OnSurvey.domain.admin.domain.model.AdminRole;
-import OneQ.OnSurvey.domain.admin.domain.port.out.MemberPort;
-import OneQ.OnSurvey.domain.admin.domain.repository.AdminRepository;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-public class AdminAuthService {
-
-    private final AdminRepository adminRepository;
-    private final MemberPort memberPort;
-    private final PasswordEncoder passwordEncoder;
-
-    public String authenticate(String username, String rawPassword) {
-
-        Admin admin = adminRepository.findByUsername(username);
-        if (admin == null || !admin.matchPassword(passwordEncoder, rawPassword)) {
-            return null;
-        }
-
-        return admin.getAdminId();
-
-    }
-
-    @Transactional
-    public boolean register(Long userKey, String username, String password, String name) {
-        Admin existingAdmin = adminRepository.findByUsername(username);
-        Long memberId = memberPort.validateAdminRoleAndGetMemberIdByUserKey(userKey);
-        if (existingAdmin != null || memberId == null) {
-            return false;
-        }
-
-        String encodedPassword = passwordEncoder.encode(password);
-
-        Admin newAdmin = Admin.builder()
-            .memberId(memberId)
-            .userKey(userKey)
-            .username(username)
-            .password(encodedPassword)
-            .name(name)
-            .role(AdminRole.ROLE_ADMIN)
-            .build();
-
-        adminRepository.save(newAdmin);
-        return true;
-    }
-}
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminFacade.java b/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminFacade.java
index 69259d37..17d0ee85 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminFacade.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/application/AdminFacade.java
@@ -99,8 +99,8 @@ public AdminSurveyDetailResponse getSurveyDetail(Long surveyId) {
 
     @Override
     @Transactional
-    public void changeSurveyOwner(Long surveyId, Long memberId) {
-        surveyPort.updateSurveyOwner(surveyId, memberId);
+    public void changeSurveyOwner(Long surveyId, Long memberId, Long userKey) {
+        surveyPort.updateSurveyOwner(surveyId, memberId, userKey);
     }
 
     @Override
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveyQuestion.java b/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveyQuestion.java
index 2d0cbc75..0d8408d5 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveyQuestion.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveyQuestion.java
@@ -18,7 +18,9 @@ public record SurveyQuestion(
 
     ChoiceProp choiceProperty,
     RatingProp ratingProperty,
-    DateProp dateProperty
+    DateProp dateProperty,
+    GridProp gridProperty,
+    TimeProp timeProperty
 ) {
     public record ChoiceProp (
         Integer maxChoice,
@@ -29,6 +31,7 @@ public record ChoiceProp (
         Set<Option> options
     ) {
         public record Option (
+            Long optionId,
             String content,
             Integer nextSection,
             String imageUrl
@@ -44,4 +47,23 @@ public record RatingProp (
     public record DateProp (
         LocalDate defaultDate
     ) {}
+
+    public record GridProp (
+        Boolean isCheckbox,
+        Boolean isChoiceMixed,
+        Boolean isChoiceDistinct,
+
+        Set<GridOption> gridOptions
+    ) {
+        public record GridOption (
+            Long gridOptionId,
+            Boolean isRow,
+            String content,
+            Integer order
+        ) {}
+    }
+
+    public record TimeProp (
+        Boolean isInterval
+    ) {}
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/in/AdminUseCase.java b/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/in/AdminUseCase.java
index e8f9ac06..9d12f334 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/in/AdminUseCase.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/in/AdminUseCase.java
@@ -20,7 +20,7 @@ public interface AdminUseCase {
 
     AdminSurveyDetailResponse getSurveyDetail(Long surveyId);
 
-    void changeSurveyOwner(Long surveyId, Long newMemberId);
+    void changeSurveyOwner(Long surveyId, Long newMemberId, Long newUserKey);
 
     List<SurveyGrantStatsResponse> getSurveyGrantStats();
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/out/SurveyPort.java b/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/out/SurveyPort.java
index dcbe715b..b130b889 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/out/SurveyPort.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/domain/port/out/SurveyPort.java
@@ -24,7 +24,7 @@ public interface SurveyPort {
 
     List<SurveySection> findSurveySectionsById(Long surveyId);
 
-    void updateSurveyOwner(Long surveyId, Long newMemberId);
+    void updateSurveyOwner(Long surveyId, Long newMemberId, Long newUserKey);
 
     List<OngoingSurveyView> findOngoingSurveys();
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/infra/adapter/SurveyAdapter.java b/src/main/java/OneQ/OnSurvey/domain/admin/infra/adapter/SurveyAdapter.java
index 96c521e8..be19510b 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/infra/adapter/SurveyAdapter.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/infra/adapter/SurveyAdapter.java
@@ -97,10 +97,11 @@ public List<OngoingSurveyView> findOngoingSurveys() {
     }
 
     @Override
-    public void updateSurveyOwner(Long surveyId, Long memberId) {
+    public void updateSurveyOwner(Long surveyId, Long memberId, Long userKey) {
         SurveyOwnerChangeDto changeDto = SurveyOwnerChangeDto.builder()
             .surveyId(surveyId)
             .newMemberId(memberId)
+            .newUserKey(userKey)
             .build();
 
         surveyCommandService.updateSurveyOwner(changeDto);
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java b/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java
index 32e7ac38..68307b59 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java
@@ -6,11 +6,14 @@
 import OneQ.OnSurvey.domain.admin.domain.model.survey.SurveyScreening;
 import OneQ.OnSurvey.domain.admin.domain.model.survey.SurveySection;
 import OneQ.OnSurvey.domain.admin.domain.model.survey.SurveySingleViewInfo;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.ChoiceDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DateDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.GridDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.RatingDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.TimeDto;
 import OneQ.OnSurvey.domain.survey.model.SurveyStatus;
 import OneQ.OnSurvey.domain.survey.model.dto.ScreeningViewData;
 import OneQ.OnSurvey.domain.survey.model.dto.SurveyDetailData;
@@ -89,6 +92,7 @@ public static SurveyQuestion toSurveyQuestion(DefaultQuestionDto questionDto) {
                         choice.getIsSectionDecidable(),
                         choice.getOptions().stream()
                             .map(optionDto -> new SurveyQuestion.ChoiceProp.Option(
+                                optionDto.getOptionId(),
                                 optionDto.getContent(),
                                 optionDto.getNextSection(),
                                 optionDto.getImageUrl()
@@ -116,6 +120,33 @@ public static SurveyQuestion toSurveyQuestion(DefaultQuestionDto questionDto) {
                     )
                 ).build();
             }
+            case "GRID" -> {
+                GridDto grid = (GridDto) questionDto;
+                yield question.gridProperty(
+                    new SurveyQuestion.GridProp(
+                        grid.getIsCheckbox(),
+                        grid.getIsChoiceMixed(),
+                        grid.getIsChoiceDistinct(),
+                        (grid.getGridOptions() != null ? grid.getGridOptions() : List.<GridOptionDto>of())
+                            .stream()
+                            .map(gridOptionDto -> new SurveyQuestion.GridProp.GridOption(
+                                gridOptionDto.getGridOptionId(),
+                                gridOptionDto.getIsRow(),
+                                gridOptionDto.getContent(),
+                                gridOptionDto.getOrder()
+                            ))
+                            .collect(Collectors.toSet())
+                    )
+                ).build();
+            }
+            case "TIME" -> {
+                TimeDto time = (TimeDto) questionDto;
+                yield question.timeProperty(
+                    new SurveyQuestion.TimeProp(
+                        time.getIsInterval()
+                    )
+                ).build();
+            }
             default -> question.build();
         };
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/entity/QuestionAnswer.java b/src/main/java/OneQ/OnSurvey/domain/participation/entity/QuestionAnswer.java
index edb20337..774608ad 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/entity/QuestionAnswer.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/entity/QuestionAnswer.java
@@ -12,19 +12,23 @@
 
 @Getter @ToString
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity @Table(name = "question_answer")
+@Entity @Table(name = "QUESTION_ANSWER")
 public class QuestionAnswer extends AbstractAnswer {
 
-    @Column(name = "question_id")
+    @Column(name = "QUESTION_ID", nullable = false)
     private Long questionId;
 
-    @Column(length = 512)
+    @Column(name = "GRID_ROW_ORDER")
+    private Integer gridRowOrder;
+
+    @Column(length = 512, nullable = false)
     private String content;
 
     @Builder
-    private QuestionAnswer(Long questionId, Long memberId, String content) {
+    private QuestionAnswer(Long questionId, Long memberId, Integer gridRowOrder, String content) {
         this.questionId = questionId;
         this.memberId = memberId;
+        this.gridRowOrder = gridRowOrder;
         this.content = content;
     }
 
@@ -32,6 +36,7 @@ public static QuestionAnswer from(AnswerInsertDto.AnswerInfo info) {
         return QuestionAnswer.builder()
                 .questionId(info.getId())
                 .memberId(info.getMemberId())
+                .gridRowOrder(info.getGridRowOrder())
                 .content(info.getContent())
                 .build();
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerInsertDto.java b/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerInsertDto.java
index 71380cea..9eef7fe9 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerInsertDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerInsertDto.java
@@ -7,12 +7,15 @@
 
 @Getter @Builder
 public class AnswerInsertDto {
-    List<AnswerInfo> answerInfoList;
+    private Integer section;
+    private List<AnswerInfo> answerInfoList;
 
     @Getter @Builder
     public static class AnswerInfo {
         private Long id;
         private Long memberId;
+        private Integer gridRowOrder;
+        // TODO: 응답값을 List로 받도록 하여, 중복선택 응답 처리를 쉽도록 수정 (스크리닝 응답은 단일 원소의 리스트로 받도록)
         private String content;
 
         public Boolean getBooleanContent() {
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerStats.java b/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerStats.java
index 98e4c1e4..9c480d81 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerStats.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerStats.java
@@ -5,12 +5,21 @@
 
 @Getter @AllArgsConstructor
 public class AnswerStats {
-    Long questionId;
-    String content;
-    Long count;
+    private Long questionId;
+    private Integer gridRowOrder;
+    private String content;
+    private Long count;
+
+    public AnswerStats(Long questionId, String content, Long count) {
+        this.questionId = questionId;
+        this.gridRowOrder = null;
+        this.content = content;
+        this.count = count;
+    }
 
     public AnswerStats(Long questionId, String content) {
         this.questionId = questionId;
+        this.gridRowOrder = null;
         this.content = content;
         this.count = 1L;
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/ParticipationCompletionDto.java b/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/ParticipationCompletionDto.java
new file mode 100644
index 00000000..67a267e3
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/model/dto/ParticipationCompletionDto.java
@@ -0,0 +1,14 @@
+package OneQ.OnSurvey.domain.participation.model.dto;
+
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+public record ParticipationCompletionDto(
+    long surveyId,
+    long memberId,
+    long userKey,
+    List<Integer> visitedSectionList
+) {
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/AnswerRepository.java b/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/AnswerRepository.java
index 4fca5f44..150d7eb2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/AnswerRepository.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/AnswerRepository.java
@@ -1,7 +1,10 @@
 package OneQ.OnSurvey.domain.participation.repository.answer;
 
 import OneQ.OnSurvey.domain.participation.model.dto.AnswerStats;
+import OneQ.OnSurvey.domain.survey.SurveyErrorCode;
 import OneQ.OnSurvey.domain.survey.model.SurveyResponseFilterCondition;
+import OneQ.OnSurvey.global.common.exception.CustomException;
+import OneQ.OnSurvey.global.common.exception.ErrorCode;
 
 import java.util.Collection;
 import java.util.List;
@@ -15,6 +18,10 @@ default List<E> getAnswerListByQuestionIdsAndMemberId(Collection<Long> questionI
         return List.of();
     }
 
+    default void deleteBySurveyIdAndSectionAndMemberId(Long surveyId, Integer section, Long memberId) {
+        throw new CustomException(ErrorCode.SERVER_UNTRACKED_ERROR);
+    }
+
     List<AnswerStats> getAggregatedAnswersByQuestionIds(List<Long> questionIdList);
     default List<AnswerStats> getAnswersByQuestionIds(List<Long> questionIdList){
         return List.of();
@@ -40,4 +47,7 @@ default List<AnswerStats> getRespondentCountsByQuestionIds(
     ) {
         return List.of();
     }
+    default void deleteInvalidSectionQuestionAnswer(long surveyId, long memberId, Collection<Integer> visitedSectionList) {
+        throw new CustomException(SurveyErrorCode.SURVEY_PARTICIPATION_INVALID_SECTION_REMAIN);
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/QuestionAnswerRepositoryImpl.java b/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/QuestionAnswerRepositoryImpl.java
index 06a6f174..7d0502f4 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/QuestionAnswerRepositoryImpl.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/repository/answer/QuestionAnswerRepositoryImpl.java
@@ -11,6 +11,7 @@
 import com.querydsl.core.types.dsl.EnumPath;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import org.springframework.stereotype.Repository;
 
@@ -44,10 +45,28 @@ public List<QuestionAnswer> getAnswerListByQuestionIdsAndMemberId(Collection<Lon
             .fetch();
     }
 
+    @Override
+    public void deleteBySurveyIdAndSectionAndMemberId(Long surveyId, Integer section, Long memberId) {
+        jpaQueryFactory.delete(questionAnswer)
+            .where(
+                questionAnswer.memberId.eq(memberId),
+                questionAnswer.questionId.in(
+                    JPAExpressions.select(question.questionId)
+                        .from(question)
+                        .where(
+                            question.surveyId.eq(surveyId),
+                            question.section.eq(section)
+                        )
+                )
+            )
+            .execute();
+    }
+
     @Override
     public List<AnswerStats> getAggregatedAnswersByQuestionIds(List<Long> questionIdList) {
         return jpaQueryFactory.select(Projections.constructor(AnswerStats.class,
                 questionAnswer.questionId,
+                questionAnswer.gridRowOrder,
                 questionAnswer.content,
                 questionAnswer.answerId.count()
             ))
@@ -59,7 +78,7 @@ public List<AnswerStats> getAggregatedAnswersByQuestionIds(List<Long> questionId
                 questionAnswer.questionId.in(questionIdList),
                 response.isResponded.isTrue()
             )
-            .groupBy(questionAnswer.questionId, questionAnswer.content)
+            .groupBy(questionAnswer.questionId, questionAnswer.gridRowOrder, questionAnswer.content)
             .orderBy(questionAnswer.questionId.asc())
             .fetch();
     }
@@ -94,6 +113,7 @@ public List<AnswerStats> getAggregatedAnswersByQuestionIds(
                 .select(Projections.constructor(
                         AnswerStats.class,
                         questionAnswer.questionId,
+                        questionAnswer.gridRowOrder,
                         questionAnswer.content,
                         questionAnswer.answerId.count()
                 ))
@@ -109,7 +129,7 @@ public List<AnswerStats> getAggregatedAnswersByQuestionIds(
                         buildGenderCondition(member.gender, effective.genders()),
                         buildResidenceCondition(member.residence, effective.residences())
                 )
-                .groupBy(questionAnswer.questionId, questionAnswer.content)
+                .groupBy(questionAnswer.questionId, questionAnswer.gridRowOrder, questionAnswer.content)
                 .orderBy(questionAnswer.questionId.asc())
                 .fetch();
     }
@@ -190,6 +210,29 @@ public void deleteAllByIds(Collection<Long> answerIds) {
             .execute();
     }
 
+    @Override
+    public void deleteInvalidSectionQuestionAnswer(long surveyId, long memberId, Collection<Integer> visitedSectionList) {
+        if (visitedSectionList == null) {
+            visitedSectionList = List.of();
+        }
+
+        jpaQueryFactory.delete(questionAnswer)
+            .where(
+                questionAnswer.questionId.in(JPAExpressions
+                    .select(
+                        question.questionId
+                    )
+                    .from(question)
+                    .where(
+                        question.surveyId.eq(surveyId),
+                        question.section.notIn(visitedSectionList)
+                    )
+                ),
+                questionAnswer.memberId.eq(memberId)
+            )
+            .execute();
+    }
+
     private BooleanExpression buildGenderCondition(EnumPath<Gender> genderPath, List<Gender> genders) {
         if (genders == null || genders.isEmpty()) return null;
         if (genders.contains(Gender.ALL)) return null;
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerCommandService.java b/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerCommandService.java
index 03aab5f7..e159555e 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerCommandService.java
@@ -5,6 +5,7 @@
 import OneQ.OnSurvey.domain.participation.model.dto.AnswerInsertDto;
 import OneQ.OnSurvey.domain.participation.repository.answer.AnswerRepository;
 import OneQ.OnSurvey.domain.participation.repository.response.ResponseRepository;
+import OneQ.OnSurvey.domain.question.repository.question.QuestionRepository;
 import OneQ.OnSurvey.domain.survey.SurveyErrorCode;
 import OneQ.OnSurvey.global.common.exception.CustomException;
 import OneQ.OnSurvey.global.common.exception.ErrorCode;
@@ -15,13 +16,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -31,14 +28,17 @@ public class QuestionAnswerCommandService extends AnswerCommandService<QuestionA
     private String surveyLockKeyPrefix;
 
     private final RedisAgent redisAgent;
+    private final QuestionRepository questionRepository;
 
     public QuestionAnswerCommandService(
         AnswerRepository<QuestionAnswer> answerRepository,
         ResponseRepository responseRepository,
-        RedisAgent redisAgent
+        RedisAgent redisAgent,
+        QuestionRepository questionRepository
     ) {
         super(answerRepository, responseRepository);
         this.redisAgent = redisAgent;
+        this.questionRepository = questionRepository;
     }
 
     @Override
@@ -50,70 +50,37 @@ public QuestionAnswer createAnswerFromDto(AnswerInsertDto.AnswerInfo answerInfo)
     @Override
     public Boolean upsertAnswers(AnswerInsertDto insertDto, Long surveyId, Long userKey, Long memberId) {
         log.info("[QUESTION_ANSWER:COMMAND] 문항 응답 생성 - memberId: {}", memberId);
-
-        // 새로운 응답을 questionId 기준으로 그룹화
-        Map<Long, Set<QuestionAnswer>> newQuestionAnswerMap = insertDto.getAnswerInfoList().stream()
-            .map(this::createAnswerFromDto)
-            .collect(Collectors.groupingBy(QuestionAnswer::getQuestionId, Collectors.toSet()));
-        List<Long> questionIdList = newQuestionAnswerMap.keySet().stream().toList();
-
-
         String lockKey = surveyLockKeyPrefix + surveyId + ":" + userKey;
         try {
-            return redisAgent.executeNewTransactionAfterLock(lockKey, 3, () -> {
-                /*
-                    새로운 응답의 questionId로부터 기존 응답 조회 및 그룹화
-                    Phantom Read 방지를 위해 조회 로직도 락 내부에서 실행
-                 */
-                Map<Long, Set<QuestionAnswer>> existingQuestionAnswerMap =
-                    answerRepository.getAnswerListByQuestionIdsAndMemberId(questionIdList, memberId)
-                        .stream()
-                        .collect(Collectors.groupingBy(QuestionAnswer::getQuestionId, Collectors.toSet()));
-
-                // 새로 저장할 응답 리스트
-                List<QuestionAnswer> finalAnswersToSave = new ArrayList<>();
-                // 삭제하지 않을 ID
-                Set<Long> idSetToKeep = new HashSet<>();
+            return redisAgent.executeNewTransactionAfterLock(lockKey, 0, () -> {
+                int section = insertDto.getSection();
+                Set<Long> questionIdSet = new HashSet<>(questionRepository.getQuestionIdListBySurveyIdAndSection(surveyId, section));
+
+                // 섹션에 해당하는 문항에 대한 응답 제출이 이루어졌는지 검증
+                List<AnswerInsertDto.AnswerInfo> answerInfoList = insertDto.getAnswerInfoList() != null ? insertDto.getAnswerInfoList() : List.of();
+                boolean hasInvalidQuestionId = answerInfoList.stream()
+                    .map(AnswerInsertDto.AnswerInfo::getId)
+                    .anyMatch(questionId -> questionId == null || !questionIdSet.contains(questionId));
+                if (hasInvalidQuestionId) {
+                    log.warn("[QUESTION_ANSWER:COMMAND] 섹션, 문항 ID 불일치 - section: {}", section);
+                    throw new CustomException(SurveyErrorCode.SURVEY_ANSWER_INVALID);
+                }
 
-                questionIdList.forEach(questionId -> {
-                    // questionId에 대한 새로운 응답과 기존 응답의 content 집합 생성
-                    Set<QuestionAnswer> newAnswerContentSet = newQuestionAnswerMap.getOrDefault(questionId, Set.of());
-                    Set<String> newContents = newAnswerContentSet.stream()
-                        .map(QuestionAnswer::getContent)
-                        .map(content -> content == null ? null : content.strip())
-                        .collect(Collectors.toSet());
-                    Set<QuestionAnswer> existingAnswerContentSet = existingQuestionAnswerMap.getOrDefault(questionId, Set.of());
-                    Set<String> existingContents = existingAnswerContentSet.stream()
-                        .map(QuestionAnswer::getContent)
-                        .collect(Collectors.toSet());
+                // 문항이 없는 빈 섹션
+                if (questionIdSet.isEmpty()) {
+                    return true;
+                }
 
-                    // 새로운 응답이 null을 포함한 경우(객관식) 혹은 빈 문자열인 경우(단답/장문), 해당 문항의 기존 응답은 모두 삭제 대상에 남겨둠
-                    if (!newContents.contains(null) && !newContents.contains("")) {
-                        // 새로운 응답 중 기존에 없는 content는 저장 대상에 추가
-                        newAnswerContentSet.stream()
-                            .filter(newAnswer -> !existingContents.contains(newAnswer.getContent()))
-                            .forEach(finalAnswersToSave::add);
-                        // 새로운 응답에 포함된 기존 응답은 삭제 대상에서 제외
-                        existingAnswerContentSet.stream()
-                            .filter(existingAnswer -> newContents.contains(existingAnswer.getContent()))
-                            .map(QuestionAnswer::getAnswerId)
-                            .forEach(idSetToKeep::add);
-                    }
-                });
-                // 삭제할 기존 응답 ID 리스트 (초기값: 기존 응답 전체)
-                List<Long> finalAnswerIdsToDelete = existingQuestionAnswerMap.values().stream()
-                    .flatMap(Collection::stream)
-                    .map(QuestionAnswer::getAnswerId)
-                    .collect(Collectors.toList());
-                finalAnswerIdsToDelete.removeAll(idSetToKeep);
+                List<QuestionAnswer> finalAnswersToSave = answerInfoList.stream()
+                    .filter(info -> info.getContent() != null && !info.getContent().isBlank())
+                    .map(this::createAnswerFromDto)
+                    .peek(answer -> answer.updateContent(answer.getContent().strip()))
+                    .toList();
 
+                answerRepository.deleteBySurveyIdAndSectionAndMemberId(surveyId, section, memberId);
                 if (!finalAnswersToSave.isEmpty()) {
                     answerRepository.saveAll(finalAnswersToSave);
                 }
-                if (!finalAnswerIdsToDelete.isEmpty()) {
-                    answerRepository.deleteAllByIds(finalAnswerIdsToDelete);
-                }
-
                 updateResponseAfterQuestionAnswers(surveyId, memberId);
 
                 return true;
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerQueryService.java b/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerQueryService.java
index c13ddc8a..92bf0f26 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerQueryService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/QuestionAnswerQueryService.java
@@ -40,54 +40,68 @@ public List<SurveyManagementDetailResponse.DetailInfo> getDetailInfo(
     ) {
         log.info("[QUESTION_ANSWER_SERVICE] 문항 별 응답결과 조회 - surveyId: {}, filter: {}", surveyId, filter);
 
-        Map<Boolean, List<SurveyManagementDetailResponse.DetailInfo>> typeInfoMap = detailInfoList.stream()
-                .collect(Collectors.partitioningBy(detailInfo -> detailInfo.getType().isText()));
+        List<Long> textQuestionIdList = detailInfoList.stream()
+            .filter(detailInfo -> detailInfo.getType().isText())
+            .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
+            .toList();
 
-        List<Long> nonTextQuestionIdList = typeInfoMap.get(false).stream()
-                .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
-                .toList();
-
-        List<Long> textQuestionIdList = typeInfoMap.get(true).stream()
-                .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
-                .toList();
+        List<Long> nonTextQuestionIdList = detailInfoList.stream()
+            .filter(detailInfo -> !detailInfo.getType().isText())
+            .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
+            .toList();
 
         log.info("[QUESTION_ANSWER_SERVICE] 응답을 조회할 문항 IDs - 주관식: {}, 비주관식: {}",
-                textQuestionIdList, nonTextQuestionIdList);
+            textQuestionIdList, nonTextQuestionIdList);
 
         List<Long> allQuestionIdList = detailInfoList.stream()
-                .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
-                .toList();
+            .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
+            .toList();
 
         List<AnswerStats> respondentCountStats = answerRepository.getRespondentCountsByQuestionIds(allQuestionIdList, filter);
         Map<Long, Long> respondentCountMap = respondentCountStats.stream()
-                .collect(Collectors.toMap(AnswerStats::getQuestionId, AnswerStats::getCount));
+            .collect(Collectors.toMap(AnswerStats::getQuestionId, AnswerStats::getCount));
 
         detailInfoList.forEach(detailInfo ->
-                detailInfo.setRespondentCount(respondentCountMap.getOrDefault(detailInfo.getQuestionId(), 0L))
+            detailInfo.setRespondentCount(respondentCountMap.getOrDefault(detailInfo.getQuestionId(), 0L))
         );
 
         List<AnswerStats> nonTextAnswerStats = nonTextQuestionIdList.isEmpty()
-                ? List.of()
-                : answerRepository.getAggregatedAnswersByQuestionIds(nonTextQuestionIdList, filter);
+            ? List.of()
+            : answerRepository.getAggregatedAnswersByQuestionIds(nonTextQuestionIdList, filter);
 
         List<AnswerStats> textAnswerStats = textQuestionIdList.isEmpty()
-                ? List.of()
-                : answerRepository.getAnswersByQuestionIds(textQuestionIdList, filter);
+            ? List.of()
+            : answerRepository.getAnswersByQuestionIds(textQuestionIdList, filter);
 
         Map<Long, Map<String, Long>> nonTextAnswerMap = nonTextAnswerStats.stream()
-                .collect(Collectors.groupingBy(
-                        AnswerStats::getQuestionId,
-                        Collectors.toMap(
-                                AnswerStats::getContent,
-                                AnswerStats::getCount
-                        )
-                ));
+            .filter(stats -> stats.getGridRowOrder() == null)
+            .collect(Collectors.groupingBy(
+                AnswerStats::getQuestionId,
+                Collectors.toMap(
+                    AnswerStats::getContent,
+                    AnswerStats::getCount
+                )
+            ));
+
+        Map<Long, Map<Integer, Map<String, Long>>> gridAnswerMap = nonTextAnswerStats.stream()
+            .filter(stats -> stats.getGridRowOrder() != null)
+            .collect(Collectors.groupingBy(
+                AnswerStats::getQuestionId,
+                Collectors.groupingBy(
+                    AnswerStats::getGridRowOrder,
+                    Collectors.toMap(
+                        AnswerStats::getContent,
+                        AnswerStats::getCount,
+                        Long::sum
+                    )
+                )
+            ));
 
         Map<Long, List<String>> textAnswerMap = textAnswerStats.stream()
-                .collect(Collectors.groupingBy(
-                        AnswerStats::getQuestionId,
-                        Collectors.mapping(AnswerStats::getContent, Collectors.toList())
-                ));
+            .collect(Collectors.groupingBy(
+                AnswerStats::getQuestionId,
+                Collectors.mapping(AnswerStats::getContent, Collectors.toList())
+            ));
 
         detailInfoList.forEach(detailInfo -> {
             Long questionId = detailInfo.getQuestionId();
@@ -95,22 +109,41 @@ public List<SurveyManagementDetailResponse.DetailInfo> getDetailInfo(
 
             if (questionType.isText()) {
                 detailInfo.setAnswerList(
-                        textAnswerMap.getOrDefault(questionId, List.of())
+                    textAnswerMap.getOrDefault(questionId, List.of())
                 );
 
+            } else if (questionType.isGrid()) {
+                Map<String, Map<String, Long>> frame = detailInfo.getGridAnswerMap();
+                Map<Integer, Map<String, Long>> rowOrderAnswerMap = gridAnswerMap.getOrDefault(questionId, Map.of());
+
+                List<String> rowKeyList = new ArrayList<>(frame.keySet());
+                rowOrderAnswerMap.forEach((rowOrder, columnAnswerMap) -> {
+                    String rowKey = rowOrder < rowKeyList.size() ? rowKeyList.get(rowOrder) : null;
+                    if (rowKey == null || frame.get(rowKey) == null) {
+                        return;
+                    }
+
+                    Map<String, Long> rowFrame = frame.get(rowKey);
+                    rowFrame.keySet().forEach(col ->
+                        rowFrame.put(col, columnAnswerMap.getOrDefault(col, 0L))
+                    );
+                });
+
+                detailInfo.setGridAnswerMap(frame);
+
             } else if (questionType.isChoice()) {
                 Map<String, Long> frame = detailInfo.getAnswerMap();
                 Map<String, Long> answerMap = nonTextAnswerMap.getOrDefault(questionId, Map.of());
 
                 frame.keySet().forEach(key ->
-                        frame.put(key, answerMap.getOrDefault(key, 0L))
+                    frame.put(key, answerMap.getOrDefault(key, 0L))
                 );
 
                 List<String> etcList = new ArrayList<>();
                 answerMap.entrySet().stream()
-                        .filter(entry -> !frame.containsKey(entry.getKey()))
-                        .forEach(entry -> IntStream.range(0, entry.getValue().intValue())
-                                .forEach((ignored) -> etcList.add(entry.getKey())));
+                    .filter(entry -> !frame.containsKey(entry.getKey()))
+                    .forEach(entry -> IntStream.range(0, entry.getValue().intValue())
+                        .forEach((ignored) -> etcList.add(entry.getKey())));
 
                 detailInfo.setAnswerList(etcList);
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/ScreeningAnswerQueryService.java b/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/ScreeningAnswerQueryService.java
index 4dacaa0c..ef554efe 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/ScreeningAnswerQueryService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/service/answer/ScreeningAnswerQueryService.java
@@ -32,8 +32,6 @@ public List<SurveyManagementDetailResponse.DetailInfo> getDetailInfo(
             .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
             .toList();
 
-        log.info("[SCREENING_ANSWER_SERVICE] 응답을 조회할 스크리닝 IDs - screeningIds: {}", screeningIdList);
-
         List<AnswerStats> screeningAnswerStats = answerRepository.getAggregatedAnswersByQuestionIds(screeningIdList);
 
         Map<Long, Map<String, Long>> screeningAnswerMap = screeningAnswerStats.stream()
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommand.java b/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommand.java
index dfa320f5..61437b92 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommand.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommand.java
@@ -1,5 +1,7 @@
 package OneQ.OnSurvey.domain.participation.service.response;
 
+import OneQ.OnSurvey.domain.participation.model.dto.ParticipationCompletionDto;
+
 public interface ResponseCommand {
-    Boolean createResponse(Long surveyId, Long memberId, Long userKey);
+    Boolean createResponse(ParticipationCompletionDto dto);
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommandService.java b/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommandService.java
index e147d3d5..8b97b757 100644
--- a/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/participation/service/response/ResponseCommandService.java
@@ -1,7 +1,10 @@
 package OneQ.OnSurvey.domain.participation.service.response;
 
+import OneQ.OnSurvey.domain.participation.entity.QuestionAnswer;
 import OneQ.OnSurvey.domain.participation.entity.Response;
+import OneQ.OnSurvey.domain.participation.model.dto.ParticipationCompletionDto;
 import OneQ.OnSurvey.domain.participation.model.event.SurveyCompletedEvent;
+import OneQ.OnSurvey.domain.participation.repository.answer.AnswerRepository;
 import OneQ.OnSurvey.domain.participation.repository.response.ResponseRepository;
 import OneQ.OnSurvey.domain.survey.SurveyErrorCode;
 import OneQ.OnSurvey.domain.survey.entity.Survey;
@@ -29,6 +32,7 @@
 @RequiredArgsConstructor
 public class ResponseCommandService implements ResponseCommand {
 
+    private final AnswerRepository<QuestionAnswer> answerRepository;
     private final ResponseRepository responseRepository;
     private final SurveyRepository surveyRepository;
     private final SurveyInfoRepository surveyInfoRepository;
@@ -51,7 +55,8 @@ public class ResponseCommandService implements ResponseCommand {
     private String creatorKey;
 
     @Override
-    public Boolean createResponse(Long surveyId, Long memberId, Long userKey) {
+    public Boolean createResponse(ParticipationCompletionDto dto) {
+        long surveyId = dto.surveyId(), memberId = dto.memberId(), userKey = dto.userKey();
         try {
             return redisAgent.executeNewTransactionAfterLock(surveyLockKeyPrefix + surveyId + ":" + userKey, 3, () -> {
                 Response response = responseRepository
@@ -62,9 +67,9 @@ public Boolean createResponse(Long surveyId, Long memberId, Long userKey) {
                     throw new CustomException(SurveyErrorCode.SURVEY_ALREADY_PARTICIPATED);
                 }
 
-
                 response.markResponded();
                 responseRepository.save(response);
+                answerRepository.deleteInvalidSectionQuestionAnswer(surveyId, memberId, dto.visitedSectionList());
                 surveyGlobalStatsService.addCompletedCount(1);
                 surveyInfoRepository.increaseCompletedCount(surveyId);
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/GridOption.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/GridOption.java
new file mode 100644
index 00000000..d6e45377
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/GridOption.java
@@ -0,0 +1,53 @@
+package OneQ.OnSurvey.domain.question.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter @Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Entity @Table(name = "GRID_OPTION")
+public class GridOption {
+
+    @Id @Column(name = "GRID_OPTION_ID")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long gridOptionId;
+
+    @Column(name = "QUESTION_ID", nullable = false)
+    private Long questionId;
+
+    @Column(name = "IS_ROW", nullable = false)
+    @ColumnDefault("FALSE")
+    @Builder.Default
+    private Boolean isRow = false;
+
+    @Column(nullable = false)
+    private String content;
+
+    @Column(name = "GRID_ORDER", nullable = false)
+    private Integer order;
+
+    public static GridOption of(Long questionId, Boolean isRow, String content, Integer order) {
+        return GridOption.builder()
+            .questionId(questionId)
+            .isRow(isRow)
+            .content(content)
+            .order(order)
+            .build();
+    }
+
+    public void updateGridOption(String content, Integer order) {
+        this.content = content;
+        this.order = order;
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java
index 7cc148a3..641082c0 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java
@@ -39,7 +39,7 @@ public abstract class Question extends BaseEntity {
     @Builder.Default
     protected Boolean isRequired = false;
 
-    @Column(name = "SECTION")
+    @Column(name = "SECTION", nullable = false)
     @ColumnDefault("1")
     @Builder.Default
     protected Integer section = 1;
@@ -47,7 +47,7 @@ public abstract class Question extends BaseEntity {
     @Column(name = "image_url", columnDefinition = "TEXT")
     protected String imageUrl;
 
-    public void updateQuestion(
+    protected void updateQuestion(
         String title,
         String description,
         Boolean isRequired,
@@ -63,11 +63,7 @@ public void updateQuestion(
         this.imageUrl = imageUrl;
     }
 
-    public void updateOrder(Integer order) {
-        this.order = order;
-    }
-
-    public boolean isChoice() {
-        return QuestionType.CHOICE.equals(QuestionType.valueOf(this.type));
+    public QuestionType getQuestionType() {
+        return QuestionType.valueOf(this.type);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Grid.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Grid.java
new file mode 100644
index 00000000..82f20fd0
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Grid.java
@@ -0,0 +1,83 @@
+package OneQ.OnSurvey.domain.question.entity.question;
+
+import OneQ.OnSurvey.domain.question.entity.Question;
+import OneQ.OnSurvey.domain.question.model.QuestionType;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter @SuperBuilder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@DiscriminatorValue(value = QuestionType.Values.GRID)
+public class Grid extends Question {
+
+    // 객관식 - 체크박스 그리드
+    @Column(name = "IS_CHECKBOX")
+    @ColumnDefault("FALSE")
+    @Builder.Default
+    private Boolean isCheckbox = false;
+
+    // 행 순서가 무작위인 문항
+    @Column(name = "IS_CHOICE_MIXED")
+    @ColumnDefault("FALSE")
+    @Builder.Default
+    private Boolean isChoiceMixed = false;
+
+    // 각 열당 최대 1개의 응답만 존재할 수 있는 문항
+    @Column(name = "IS_CHOICE_DISTINCT")
+    @ColumnDefault("FALSE")
+    @Builder.Default
+    private Boolean isChoiceDistinct = false;
+
+    public static Grid of(
+        Long surveyId,
+        Integer order,
+        String title,
+        String description,
+        Boolean isRequired,
+        Integer section,
+        QuestionType type,
+        String imageUrl,
+        Boolean isCheckbox,
+        Boolean isChoiceMixed,
+        Boolean isChoiceDistinct
+    ) {
+        return Grid.builder()
+            .surveyId(surveyId)
+            .order(order)
+            .title(title)
+            .description(description)
+            .isRequired(isRequired)
+            .type(type.name())
+            .section(section)
+            .imageUrl(imageUrl)
+            .isCheckbox(isCheckbox)
+            .isChoiceMixed(isChoiceMixed)
+            .isChoiceDistinct(isChoiceDistinct)
+            .build();
+    }
+
+    public void updateQuestion(
+        String title,
+        String description,
+        Boolean isRequired,
+        Integer order,
+        Integer section,
+        String imageUrl,
+        Boolean isCheckbox,
+        Boolean isChoiceMixed,
+        Boolean isChoiceDistinct
+    ) {
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
+        this.isCheckbox = isCheckbox != null ? isCheckbox : false;
+        this.isChoiceMixed = isChoiceMixed != null ? isChoiceMixed : false;
+        this.isChoiceDistinct = isChoiceDistinct != null ? isChoiceDistinct : false;
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Time.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Time.java
new file mode 100644
index 00000000..ef1d2bfd
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Time.java
@@ -0,0 +1,62 @@
+package OneQ.OnSurvey.domain.question.entity.question;
+
+import OneQ.OnSurvey.domain.question.entity.Question;
+import OneQ.OnSurvey.domain.question.model.QuestionType;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter @SuperBuilder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@DiscriminatorValue(value = QuestionType.Values.TIME)
+public class Time extends Question {
+
+    @Column(name = "IS_INTERVAL")
+    @ColumnDefault("FALSE")
+    @Builder.Default
+    private Boolean isInterval = false;
+
+    public static Time of(
+        Long surveyId,
+        Integer order,
+        String title,
+        String description,
+        Boolean isRequired,
+        Integer section,
+        QuestionType type,
+        String imageUrl,
+        Boolean isInterval
+    ) {
+        return Time.builder()
+            .surveyId(surveyId)
+            .order(order)
+            .title(title)
+            .description(description)
+            .isRequired(isRequired)
+            .type(type.name())
+            .section(section)
+            .imageUrl(imageUrl)
+            .isInterval(isInterval)
+            .build();
+    }
+
+    public void updateQuestion(
+        String title,
+        String description,
+        Boolean isRequired,
+        Integer order,
+        Integer section,
+        String imageUrl,
+        Boolean isInterval
+    ) {
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
+        this.isInterval = isInterval;
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java b/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java
index 0b5bafab..f9d0b6fa 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java
@@ -15,7 +15,8 @@ public enum QuestionType {
     DATE("날짜형", Values.DATE),
     IMAGE("이미지형", Values.IMAGE),
     TITLE("제목형", Values.TITLE),
-    TEXT("주관식", Values.TEXT);
+    GRID("그리드형", Values.GRID),
+    TIME("시간형", Values.TIME);
     private final String description;
     private final String value;
 
@@ -27,16 +28,21 @@ public static class Values {
         public static final String LONG = "LONG";
         public static final String NUMBER = "NUMBER";
         public static final String DATE = "DATE";
-        public static final String TEXT = "TEXT";
         public static final String IMAGE = "IMAGE";
         public static final String TITLE = "TITLE";
+        public static final String GRID = "GRID";
+        public static final String TIME = "TIME";
     }
 
     public boolean isText() {
-        return SHORT.equals(this) || LONG.equals(this) || DATE.equals(this) || TEXT.equals(this) || NUMBER.equals(this);
+        return SHORT.equals(this) || LONG.equals(this) || DATE.equals(this) || NUMBER.equals(this) || TIME.equals(this);
     }
 
     public boolean isChoice() {
         return CHOICE.equals(this);
     }
+
+    public boolean isGrid() {
+        return GRID.equals(this);
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/GridOptionDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/GridOptionDto.java
new file mode 100644
index 00000000..abf2e99e
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/GridOptionDto.java
@@ -0,0 +1,25 @@
+package OneQ.OnSurvey.domain.question.model.dto;
+
+import OneQ.OnSurvey.domain.question.entity.GridOption;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter @Builder @ToString
+public class GridOptionDto {
+    private Long gridOptionId;
+    private Long questionId;
+    private Boolean isRow;
+    private String content;
+    private Integer order;
+
+    public static GridOptionDto fromEntity(GridOption gridOption) {
+        return GridOptionDto.builder()
+            .gridOptionId(gridOption.getGridOptionId())
+            .questionId(gridOption.getQuestionId())
+            .isRow(gridOption.getIsRow())
+            .content(gridOption.getContent())
+            .order(gridOption.getOrder())
+            .build();
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/GridOptionUpsertDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/GridOptionUpsertDto.java
new file mode 100644
index 00000000..b7fd6e00
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/GridOptionUpsertDto.java
@@ -0,0 +1,13 @@
+package OneQ.OnSurvey.domain.question.model.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.List;
+
+@Getter @Builder @ToString
+public class GridOptionUpsertDto {
+    private Long questionId;
+    private List<GridOptionDto> gridOptionInfoList;
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java
index c8f3c701..e8040801 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java
@@ -3,11 +3,12 @@
 import OneQ.OnSurvey.domain.question.entity.Question;
 import OneQ.OnSurvey.domain.question.entity.question.Choice;
 import OneQ.OnSurvey.domain.question.entity.question.DateAnswer;
+import OneQ.OnSurvey.domain.question.entity.question.Grid;
 import OneQ.OnSurvey.domain.question.entity.question.Rating;
+import OneQ.OnSurvey.domain.question.entity.question.Time;
 import OneQ.OnSurvey.domain.question.model.QuestionType;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.ToString;
 
 import java.time.LocalDateTime;
@@ -34,7 +35,6 @@ public static class UpsertInfo {
         Boolean hasNoneOption;
         Boolean hasCustomInput;
         Boolean isSectionDecidable;
-        @Setter
         List<OptionDto> options;
 
         // Rating 필드
@@ -44,6 +44,23 @@ public static class UpsertInfo {
 
         // Date 필드
         LocalDateTime defaultDate;
+
+        // Grid 필드
+        Boolean isCheckbox;
+        Boolean isChoiceMixed;
+        Boolean isChoiceDistinct;
+        List<GridOptionDto> gridOptions;
+
+        // Time 필드
+        Boolean isInterval;
+
+        public void updateOptions(List<OptionDto> options) {
+            this.options = options;
+        }
+
+        public void updateGridOptions(List<GridOptionDto> gridOptions) {
+            this.gridOptions = gridOptions;
+        }
     }
 
     public static UpsertInfo fromEntity(Question question) {
@@ -79,6 +96,18 @@ public static UpsertInfo fromEntity(Question question) {
                 DateAnswer dateAnswer = (DateAnswer) question;
                 yield builder.defaultDate(dateAnswer.getDefaultDate()).build();
             }
+            case GRID -> {
+                Grid grid = (Grid) question;
+                yield builder
+                    .isCheckbox(grid.getIsCheckbox())
+                    .isChoiceMixed(grid.getIsChoiceMixed())
+                    .isChoiceDistinct(grid.getIsChoiceDistinct())
+                    .build();
+            }
+            case TIME -> {
+                Time time = (Time) question;
+                yield builder.isInterval(time.getIsInterval()).build();
+            }
             default -> builder.build();
         };
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java
index 9f05a1cb..f19f66b7 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java
@@ -2,6 +2,7 @@
 
 import OneQ.OnSurvey.domain.question.entity.question.Choice;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -41,4 +42,10 @@ public static ChoiceDto fromEntity(Choice choice) {
     public void updateOptions(List<OptionDto> optionInfoList) {
         this.options = optionInfoList;
     }
+
+    @Schema(description = "문항 타입 유형", example = "CHOICE")
+    @Override
+    public String getQuestionType() {
+        return super.getQuestionType();
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java
index ea5ccb05..cf6585fb 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java
@@ -1,6 +1,7 @@
 package OneQ.OnSurvey.domain.question.model.dto.type;
 
 import OneQ.OnSurvey.domain.question.entity.question.DateAnswer;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -28,4 +29,10 @@ public static DateDto fromEntity(DateAnswer date) {
             .imageUrl(date.getImageUrl())
             .build();
     }
+
+    @Schema(description = "문항 타입 유형", example = "DATE")
+    @Override
+    public String getQuestionType() {
+        return super.getQuestionType();
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java
index 8fbe3ca2..782e4b35 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java
@@ -25,6 +25,8 @@
     @JsonSubTypes.Type(value = ChoiceDto.class, name = "CHOICE"),
     @JsonSubTypes.Type(value = RatingDto.class, name = "RATING"),
     @JsonSubTypes.Type(value = DateDto.class, name = "DATE"),
+    @JsonSubTypes.Type(value = GridDto.class, name = "GRID"),
+    @JsonSubTypes.Type(value = TimeDto.class, name = "TIME")
 })
 public class DefaultQuestionDto {
     private Long questionId;
@@ -33,7 +35,7 @@ public class DefaultQuestionDto {
     @Schema(
         description = "문항 타입 유형",
         allowableValues = {
-            "CHOICE", "RATING", "NPS", "SHORT", "LONG", "NUMBER", "DATE"
+            "SHORT", "LONG", "NUMBER", "IMAGE", "TITLE", "NPS", "CHOICE", "RATING", "DATE", "GRID", "TIME"
         }
     )
     private String questionType;
@@ -60,6 +62,11 @@ public static DefaultQuestionDto fromEntity(Question question) {
 
     @JsonIgnore
     public boolean isChoice() {
-        return QuestionType.valueOf(this.questionType).isChoice();
+        return QuestionType.CHOICE.name().equals(this.questionType);
+    }
+
+    @JsonIgnore
+    public boolean isGrid() {
+        return QuestionType.GRID.name().equals(this.questionType);
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/GridDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/GridDto.java
new file mode 100644
index 00000000..58c4aac1
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/GridDto.java
@@ -0,0 +1,49 @@
+package OneQ.OnSurvey.domain.question.model.dto.type;
+
+import OneQ.OnSurvey.domain.question.entity.question.Grid;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@Getter @SuperBuilder @ToString(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class GridDto extends DefaultQuestionDto {
+    private Boolean isCheckbox;
+    private Boolean isChoiceMixed;
+    private Boolean isChoiceDistinct;
+
+    private List<GridOptionDto> gridOptions;
+
+    public static GridDto fromEntity(Grid grid) {
+        return GridDto.builder()
+            .isCheckbox(grid.getIsCheckbox())
+            .isChoiceMixed(grid.getIsChoiceMixed())
+            .isChoiceDistinct(grid.getIsChoiceDistinct())
+            .questionId(grid.getQuestionId())
+            .surveyId(grid.getSurveyId())
+            .questionType(grid.getType())
+            .title(grid.getTitle())
+            .description(grid.getDescription())
+            .isRequired(grid.getIsRequired())
+            .questionOrder(grid.getOrder())
+            .section(grid.getSection() != null ? grid.getSection() : 1)
+            .imageUrl(grid.getImageUrl())
+            .build();
+    }
+
+    public void updateGridOptions(List<GridOptionDto> gridOptions) {
+        this.gridOptions = gridOptions;
+    }
+
+    @Schema(description = "문항 타입 유형", example = "GRID")
+    @Override
+    public String getQuestionType() {
+        return super.getQuestionType();
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/QuestionTypeAndInfoDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/QuestionTypeAndInfoDto.java
index 05e4b166..7bc388b2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/QuestionTypeAndInfoDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/QuestionTypeAndInfoDto.java
@@ -12,7 +12,7 @@ public class QuestionTypeAndInfoDto {
     @Schema(
         description = "문항 타입 유형",
         allowableValues = {
-            "CHOICE", "RATING", "NPS", "SHORT", "LONG", "NUMBER", "DATE"
+            "CHOICE", "RATING", "NPS", "SHORT", "LONG", "NUMBER", "DATE", "IMAGE", "TITLE", "GRID", "TIME"
         }
     )
     private QuestionType questionType;
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java
index 2d7e4cc0..d5e047b6 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java
@@ -1,6 +1,7 @@
 package OneQ.OnSurvey.domain.question.model.dto.type;
 
 import OneQ.OnSurvey.domain.question.entity.question.Rating;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -30,4 +31,10 @@ public static RatingDto fromEntity(Rating rating) {
             .imageUrl(rating.getImageUrl())
             .build();
     }
+
+    @Schema(description = "문항 타입 유형", example = "RATING")
+    @Override
+    public String getQuestionType() {
+        return super.getQuestionType();
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/TimeDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/TimeDto.java
new file mode 100644
index 00000000..e15137e8
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/TimeDto.java
@@ -0,0 +1,36 @@
+package OneQ.OnSurvey.domain.question.model.dto.type;
+
+import OneQ.OnSurvey.domain.question.entity.question.Time;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+@Getter @SuperBuilder @ToString(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class TimeDto extends DefaultQuestionDto {
+    private Boolean isInterval;
+
+    public static TimeDto fromEntity(Time time) {
+        return TimeDto.builder()
+            .isInterval(time.getIsInterval())
+            .questionId(time.getQuestionId())
+            .surveyId(time.getSurveyId())
+            .questionType(time.getType())
+            .title(time.getTitle())
+            .description(time.getDescription())
+            .isRequired(time.getIsRequired())
+            .questionOrder(time.getOrder())
+            .section(time.getSection() != null ? time.getSection() : 1)
+            .imageUrl(time.getImageUrl())
+            .build();
+    }
+
+    @Schema(description = "문항 타입 유형", example = "TIME")
+    @Override
+    public String getQuestionType() {
+        return super.getQuestionType();
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionJpaRepository.java b/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionJpaRepository.java
new file mode 100644
index 00000000..216fedf9
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionJpaRepository.java
@@ -0,0 +1,13 @@
+package OneQ.OnSurvey.domain.question.repository.gridOption;
+
+import OneQ.OnSurvey.domain.question.entity.GridOption;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface GridOptionJpaRepository extends JpaRepository<GridOption, Long> {
+    List<GridOption> getGridOptionsByQuestionIdIsInOrderByGridOptionIdAsc(Collection<Long> questionIds);
+
+    List<GridOption> getGridOptionsByQuestionId(Long questionId);
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionRepository.java b/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionRepository.java
new file mode 100644
index 00000000..7df3657b
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionRepository.java
@@ -0,0 +1,14 @@
+package OneQ.OnSurvey.domain.question.repository.gridOption;
+
+import OneQ.OnSurvey.domain.question.entity.GridOption;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface GridOptionRepository {
+    List<GridOption> getGridOptionsByQuestionIds(Collection<Long> questionIds);
+    List<GridOption> getGridOptionsByQuestionId(Long questionId);
+    List<GridOption> saveAll(Collection<GridOption> gridOptions);
+    void deleteAll(Collection<Long> ids);
+    void deleteBySections(Long surveyId, Collection<Integer> sections);
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionRepositoryImpl.java b/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionRepositoryImpl.java
new file mode 100644
index 00000000..bf3ed9c0
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/repository/gridOption/GridOptionRepositoryImpl.java
@@ -0,0 +1,58 @@
+package OneQ.OnSurvey.domain.question.repository.gridOption;
+
+import OneQ.OnSurvey.domain.question.entity.GridOption;
+import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+import java.util.List;
+
+import static OneQ.OnSurvey.domain.question.entity.QQuestion.question;
+import static OneQ.OnSurvey.domain.question.entity.QGridOption.gridOption;
+
+@Repository
+@RequiredArgsConstructor
+public class GridOptionRepositoryImpl implements GridOptionRepository {
+
+    private final GridOptionJpaRepository gridOptionJpaRepository;
+    private final JPAQueryFactory jpaQueryFactory;
+
+    @Override
+    public List<GridOption> getGridOptionsByQuestionIds(Collection<Long> questionIds) {
+        return gridOptionJpaRepository.getGridOptionsByQuestionIdIsInOrderByGridOptionIdAsc(questionIds);
+    }
+
+    @Override
+    public List<GridOption> getGridOptionsByQuestionId(Long questionId) {
+        return gridOptionJpaRepository.getGridOptionsByQuestionId(questionId);
+    }
+
+    @Override
+    public List<GridOption> saveAll(Collection<GridOption> gridOptions) {
+        return gridOptionJpaRepository.saveAllAndFlush(gridOptions);
+    }
+
+    @Override
+    public void deleteAll(Collection<Long> ids) {
+        gridOptionJpaRepository.deleteAllByIdInBatch(ids);
+    }
+
+    @Override
+    public void deleteBySections(Long surveyId, Collection<Integer> sections) {
+        jpaQueryFactory.delete(
+            gridOption
+        ).where(
+            gridOption.questionId.in(
+                JPAExpressions
+                    .select(question.questionId)
+                    .from(question)
+                    .where(
+                        question.surveyId.eq(surveyId),
+                        question.section.notIn(sections)
+                    )
+            )
+        ).execute();
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepository.java b/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepository.java
index d929a878..8694d7f3 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepository.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepository.java
@@ -16,4 +16,5 @@ public interface QuestionRepository {
     void deleteAll(Set<Long> idList);
     void deleteBySurveyIdAndNotInOrder(Long surveyId, Collection<Integer> order);
     int countBySurveyId(Long surveyId);
+    List<Long> getQuestionIdListBySurveyIdAndSection(Long surveyId, Integer section);
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepositoryImpl.java b/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepositoryImpl.java
index ca7acc94..f1e3908a 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepositoryImpl.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/repository/question/QuestionRepositoryImpl.java
@@ -1,6 +1,7 @@
 package OneQ.OnSurvey.domain.question.repository.question;
 
 import OneQ.OnSurvey.domain.question.entity.Question;
+import OneQ.OnSurvey.domain.question.model.QuestionType;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -58,6 +59,28 @@ public void deleteBySurveyIdAndNotInOrder(Long surveyId, Collection<Integer> ord
 
     @Override
     public int countBySurveyId(Long surveyId) {
-        return questionJpaRepository.countBySurveyId(surveyId);
+        Long result = jpaQueryFactory
+            .select(question.questionId.count())
+            .from(question)
+            .where(
+                question.surveyId.eq(surveyId),
+                question.type.ne(QuestionType.TITLE.name()),
+                question.type.ne(QuestionType.IMAGE.name())
+            )
+            .fetchOne();
+        return result != null ? Math.toIntExact(result) : 0;
+    }
+
+    @Override
+    public List<Long> getQuestionIdListBySurveyIdAndSection(Long surveyId, Integer section) {
+        return jpaQueryFactory
+            .select(question.questionId)
+            .from(question)
+            .where(
+                question.surveyId.eq(surveyId),
+                question.section.eq(section)
+            )
+            .orderBy(question.order.asc())
+            .fetch();
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommand.java b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommand.java
index 1a120f51..cb0fd8c2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommand.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommand.java
@@ -1,5 +1,6 @@
 package OneQ.OnSurvey.domain.question.service;
 
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.QuestionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
@@ -9,5 +10,6 @@
 public interface QuestionCommand {
     QuestionUpsertDto upsertQuestionList(QuestionUpsertDto upsertDto);
     List<OptionUpsertDto> upsertChoiceOptionList(List<OptionUpsertDto> upsertDtoList);
+    List<GridOptionUpsertDto> upsertGridOptionList(List<GridOptionUpsertDto> upsertDtoList);
     List<SectionDto> upsertSections(Long surveyId, List<SectionDto> sectionDtoList);
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java
index 3f45d293..bfb74478 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java
@@ -1,15 +1,19 @@
 package OneQ.OnSurvey.domain.question.service;
 
 import OneQ.OnSurvey.domain.question.entity.ChoiceOption;
+import OneQ.OnSurvey.domain.question.entity.GridOption;
 import OneQ.OnSurvey.domain.question.entity.Question;
 import OneQ.OnSurvey.domain.question.entity.Section;
 import OneQ.OnSurvey.domain.question.entity.question.*;
 import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.QuestionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
 import OneQ.OnSurvey.domain.question.repository.choiceOption.ChoiceOptionRepository;
+import OneQ.OnSurvey.domain.question.repository.gridOption.GridOptionRepository;
 import OneQ.OnSurvey.domain.question.repository.question.QuestionRepository;
 import OneQ.OnSurvey.domain.question.repository.section.SectionRepository;
 import OneQ.OnSurvey.domain.survey.SurveyErrorCode;
@@ -30,9 +34,10 @@
 @Transactional
 public class QuestionCommandService implements QuestionCommand {
 
-    private final QuestionRepository questionRepository;
     private final ChoiceOptionRepository choiceOptionRepository;
+    private final GridOptionRepository gridOptionRepository;
     private final SectionRepository sectionRepository;
+    private final QuestionRepository questionRepository;
 
     @Override
     public QuestionUpsertDto upsertQuestionList(QuestionUpsertDto upsertDto) {
@@ -55,9 +60,6 @@ public QuestionUpsertDto upsertQuestionList(QuestionUpsertDto upsertDto) {
             .map(QuestionUpsertDto.UpsertInfo::getQuestionId)
             .collect(Collectors.toSet());
 
-        log.info("[QUESTION:COMMAND:upsertQuestionList] 수정되는 문항 IDs: {}", updateIdSet);
-        log.info("[QUESTION:COMMAND:upsertQuestionList] 생성되는 문항 개수: {}", newInfoList.size());
-
         // 4. Delete 대상 ID 추출 및 삭제
         if (newInfoList.isEmpty()) {
             Set<Long> deleteIdSet = prevQuestionList.stream()
@@ -66,20 +68,23 @@ public QuestionUpsertDto upsertQuestionList(QuestionUpsertDto upsertDto) {
                 .collect(Collectors.toSet());
 
             if (!deleteIdSet.isEmpty()) {
-                log.info("[QUESTION:COMMAND:upsertQuestionList] 삭제되는 문항 IDs: {}", deleteIdSet);
-
                 // 문항 삭제 전에 해당 문항의 보기(ChoiceOption)도 삭제
                 List<ChoiceOption> optionsToDelete = choiceOptionRepository.getOptionsByQuestionIds(deleteIdSet);
+                List<GridOption> gridOptionsToDelete = gridOptionRepository.getGridOptionsByQuestionIds(deleteIdSet);
                 if (!optionsToDelete.isEmpty()) {
                     Set<Long> optionIdsToDelete = optionsToDelete.stream()
                         .map(ChoiceOption::getChoiceOptionId)
                         .collect(Collectors.toSet());
-                    log.info("[QUESTION:COMMAND:upsertQuestionList] 삭제되는 보기 IDs: {}", optionIdsToDelete);
                     choiceOptionRepository.deleteAll(optionIdsToDelete);
                 }
+                if (!gridOptionsToDelete.isEmpty()) {
+                    Set<Long> gridOptionIdsToDelete = gridOptionsToDelete.stream()
+                        .map(GridOption::getGridOptionId)
+                        .collect(Collectors.toSet());
+                    gridOptionRepository.deleteAll(gridOptionIdsToDelete);
+                }
 
                 questionRepository.deleteAll(deleteIdSet);
-                log.info("[QUESTION:COMMAND:upsertQuestionList] DELETE 진행");
             }
         }
 
@@ -124,6 +129,222 @@ public QuestionUpsertDto upsertQuestionList(QuestionUpsertDto upsertDto) {
             .build();
     }
 
+    @Override
+    public List<OptionUpsertDto> upsertChoiceOptionList(List<OptionUpsertDto> upsertDtoList) {
+        log.info("[QUESTION:COMMAND:upsertChoiceOptionList] 보기 UPSERT");
+
+        List<ChoiceOption> finalList = new ArrayList<>();
+
+        for (OptionUpsertDto upsertDto : upsertDtoList) {
+            Long questionId = upsertDto.getQuestionId();
+            List<OptionDto> requestInfos = upsertDto.getOptionInfoList();
+
+            // 1. DB 저장 보기 전체 조회
+            List<ChoiceOption> prevOptionList = choiceOptionRepository.getOptionsByQuestionId(questionId);
+
+            // 2. Insert/Update 데이터 파티셔닝
+            Map<Boolean, List<OptionDto>> partitionUpsertInfoList = requestInfos.stream()
+                .collect(Collectors.partitioningBy(info -> info.getOptionId() != null));
+
+            List<OptionDto> newInfoList = partitionUpsertInfoList.get(false);
+            List<OptionDto> updateInfoList = partitionUpsertInfoList.get(true);
+
+            // 3. Update 대상 ID 추출
+            Set<Long> updateIdSet = updateInfoList.stream()
+                .map(OptionDto::getOptionId)
+                .collect(Collectors.toSet());
+
+            // 4. Delete 대상 ID 추출 및 삭제
+            Set<Long> deleteIdSet = prevOptionList.stream()
+                .map(ChoiceOption::getChoiceOptionId)
+                .filter(optionId -> !updateIdSet.contains(optionId))
+                .collect(Collectors.toSet());
+            if (!deleteIdSet.isEmpty()) {
+                choiceOptionRepository.deleteAll(deleteIdSet);
+            }
+
+            // 5. Update 대상 수정
+            Map<Long, OptionDto> updateInfoMap = updateInfoList.stream().collect(Collectors.toMap(
+                OptionDto::getOptionId,
+                Function.identity(),
+                (existing, replace) -> existing
+            ));
+            List<ChoiceOption> updateList = prevOptionList.stream()
+                .filter(option -> updateIdSet.contains(option.getChoiceOptionId()))
+                .toList();
+
+            updateList.forEach(option -> {
+                Long id = option.getChoiceOptionId();
+                OptionDto optionInfo = updateInfoMap.get(id);
+                option.updateOption(
+                    optionInfo.getContent(),
+                    optionInfo.getNextSection(),
+                    optionInfo.getImageUrl()
+                );
+            });
+
+            // 6. Insert 대상 객체 생성
+            List<ChoiceOption> insertList = newInfoList.stream()
+                .map(upsertInfo -> ChoiceOption.of(
+                    questionId,
+                    upsertInfo.getContent(),
+                    upsertInfo.getNextSection(),
+                    upsertInfo.getImageUrl()
+                )).toList();
+
+            finalList.addAll(updateList);
+            finalList.addAll(insertList);
+        }
+
+        // 7. Update/Insert 진행
+        List<ChoiceOption> optionList = choiceOptionRepository.saveAll(finalList);
+
+        log.info("[QUESTION:COMMAND:upsertChoiceOptionList] UPSERT 완료");
+
+        // 8. 반환값 구성
+        Map<Long, List<ChoiceOption>> idOptionListMap = optionList.stream().collect(Collectors.groupingBy(ChoiceOption::getQuestionId));
+        return idOptionListMap.entrySet().stream().map(entry -> {
+            Long questionId = entry.getKey();
+            List<ChoiceOption> savedList = entry.getValue();
+
+            return OptionUpsertDto.builder()
+                .questionId(questionId)
+                .optionInfoList(savedList.stream().map(OptionDto::fromEntity).toList())
+                .build();
+            })
+            .toList();
+    }
+
+    @Override
+    public List<GridOptionUpsertDto> upsertGridOptionList(List<GridOptionUpsertDto> upsertDtoList) {
+        log.info("[QUESTION:COMMAND:upsertGridOptionList] 그리드 문항 행/열 UPSERT");
+
+        List<GridOption> finalList = new ArrayList<>();
+        for (GridOptionUpsertDto upsertDto : upsertDtoList) {
+            Long questionId = upsertDto.getQuestionId();
+            List<GridOptionDto> requestInfos = upsertDto.getGridOptionInfoList();
+
+            // 1. DB 저장 보기 전체 조회
+            List<GridOption> prevOptionList = gridOptionRepository.getGridOptionsByQuestionId(questionId);
+
+            // 2. Insert/Update 데이터 파티셔닝
+            Map<Boolean, List<GridOptionDto>> partitionUpsertInfoList = requestInfos.stream()
+                .collect(Collectors.partitioningBy(info -> info.getGridOptionId() != null));
+
+            List<GridOptionDto> newInfoList = partitionUpsertInfoList.get(false);
+            List<GridOptionDto> updateInfoList = partitionUpsertInfoList.get(true);
+
+            // 3. Update 대상 ID 추출
+            Set<Long> updateIdSet = updateInfoList.stream()
+                .map(GridOptionDto::getGridOptionId)
+                .collect(Collectors.toSet());
+
+            // 4. Delete 대상 ID 추출 및 삭제
+            Set<Long> deleteIdSet = prevOptionList.stream()
+                .map(GridOption::getGridOptionId)
+                .filter(optionId -> !updateIdSet.contains(optionId))
+                .collect(Collectors.toSet());
+            if (!deleteIdSet.isEmpty()) {
+                gridOptionRepository.deleteAll(deleteIdSet);
+            }
+
+            // 5. Update 대상 수정
+            Map<Long, GridOptionDto> updateInfoMap = updateInfoList.stream().collect(Collectors.toMap(
+                GridOptionDto::getGridOptionId,
+                Function.identity(),
+                (existing, replace) -> existing
+            ));
+            List<GridOption> updateList = prevOptionList.stream()
+                .filter(option -> updateIdSet.contains(option.getGridOptionId()))
+                .toList();
+
+            updateList.forEach(option -> {
+                Long id = option.getGridOptionId();
+                GridOptionDto optionInfo = updateInfoMap.get(id);
+                option.updateGridOption(
+
+                    optionInfo.getContent(),
+                    optionInfo.getOrder()
+                );
+            });
+
+            // 6. Insert 대상 객체 생성
+            List<GridOption> insertList = newInfoList.stream()
+                .map(upsertInfo -> GridOption.of(
+                    questionId,
+                    upsertInfo.getIsRow(),
+                    upsertInfo.getContent(),
+                    upsertInfo.getOrder()
+                )).toList();
+
+            finalList.addAll(updateList);
+            finalList.addAll(insertList);
+        }
+
+        // 7. Update/Insert 진행
+        List<GridOption> optionList = gridOptionRepository.saveAll(finalList);
+        log.info("[QUESTION:COMMAND:upsertGridOptionList] UPSERT 완료");
+
+        // 8. 반환값 구성
+        Map<Long, List<GridOption>> idOptionListMap = optionList.stream().collect(Collectors.groupingBy(GridOption::getQuestionId));
+        return idOptionListMap.entrySet().stream().map(entry -> {
+                Long questionId = entry.getKey();
+                List<GridOption> savedList = entry.getValue();
+
+                return GridOptionUpsertDto.builder()
+                    .questionId(questionId)
+                    .gridOptionInfoList(savedList.stream().map(GridOptionDto::fromEntity).toList())
+                    .build();
+            })
+            .toList();
+    }
+
+    @Override
+    public List<SectionDto> upsertSections(Long surveyId, List<SectionDto> sectionDtoList) {
+        if (!sectionDtoList.stream().allMatch(SectionDto::isValid)) {
+            log.warn("[QUESTION:COMMAND:upsertSection] 섹션 정보가 유효하지 않습니다. surveyId: {}", surveyId);
+            throw new CustomException(SurveyErrorCode.SURVEY_FORM_INVALID_SECTION);
+        }
+
+        Map<Integer, Section> orderSectionMap = sectionRepository.findAllSectionBySurveyId(surveyId).stream()
+            .collect(Collectors.toMap
+                (Section::getSectionOrder, Function.identity())
+            );
+        List<Section> sectionList = sectionDtoList.stream().map(sectionDto -> {
+            if (sectionDto.isNewSection()) {
+                return Section.builder()
+                    .surveyId(surveyId)
+                    .title(sectionDto.title())
+                    .description(sectionDto.description())
+                    .sectionOrder(sectionDto.order())
+                    .nextSection(sectionDto.nextSection())
+                    .build();
+            } else {
+                Section section = orderSectionMap.get(sectionDto.order());
+                section.updateSection(
+                    sectionDto.title(), sectionDto.description(), sectionDto.order(), sectionDto.nextSection()
+                );
+                orderSectionMap.remove(sectionDto.order());
+                return section;
+            }
+        }).toList();
+        List<Section> savedSectionList = List.of();
+        if (!orderSectionMap.isEmpty()) {
+            sectionRepository.deleteAll(orderSectionMap.values().stream().map(Section::getSectionId).toList());
+        }
+        if (!sectionDtoList.isEmpty()) {
+            savedSectionList = sectionRepository.saveAll(sectionList);
+        }
+        if (!savedSectionList.isEmpty()) {
+            Set<Integer> savedSections = savedSectionList.stream().map(Section::getSectionOrder).collect(Collectors.toSet());
+            choiceOptionRepository.deleteBySections(surveyId, savedSections);
+            gridOptionRepository.deleteBySections(surveyId, savedSections);
+            questionRepository.deleteBySurveyIdAndNotInOrder(surveyId, savedSections);
+        }
+
+        return savedSectionList.stream().map(SectionDto::fromEntity).toList();
+    }
+
     private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question question) {
         if (question instanceof Choice choice) {
             choice.updateQuestion(
@@ -211,6 +432,28 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection()
             );
+        } else if (question instanceof Grid grid) {
+            grid.updateQuestion(
+                upsertInfo.getTitle(),
+                upsertInfo.getDescription(),
+                upsertInfo.getIsRequired(),
+                upsertInfo.getQuestionOrder(),
+                upsertInfo.getSection(),
+                upsertInfo.getImageUrl(),
+                upsertInfo.getIsCheckbox(),
+                upsertInfo.getIsChoiceMixed(),
+                upsertInfo.getIsChoiceDistinct()
+            );
+        } else if (question instanceof Time time) {
+            time.updateQuestion(
+                upsertInfo.getTitle(),
+                upsertInfo.getDescription(),
+                upsertInfo.getIsRequired(),
+                upsertInfo.getQuestionOrder(),
+                upsertInfo.getSection(),
+                upsertInfo.getImageUrl(),
+                upsertInfo.getIsInterval()
+            );
         }
     }
 
@@ -321,143 +564,34 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getSection(),
                 type
             );
+        } else if (QuestionType.GRID.equals(type)) {
+            return Grid.of(
+                surveyId,
+                upsertInfo.getQuestionOrder(),
+                upsertInfo.getTitle(),
+                upsertInfo.getDescription(),
+                upsertInfo.getIsRequired(),
+                upsertInfo.getSection(),
+                type,
+                upsertInfo.getImageUrl(),
+                upsertInfo.getIsCheckbox(),
+                upsertInfo.getIsChoiceMixed(),
+                upsertInfo.getIsChoiceDistinct()
+            );
+        } else if (QuestionType.TIME.equals(type)) {
+            return Time.of(
+                surveyId,
+                upsertInfo.getQuestionOrder(),
+                upsertInfo.getTitle(),
+                upsertInfo.getDescription(),
+                upsertInfo.getIsRequired(),
+                upsertInfo.getSection(),
+                type,
+                upsertInfo.getImageUrl(),
+                upsertInfo.getIsInterval()
+            );
         } else {
             throw new CustomException(ErrorCode.INVALID_REQUEST);
         }
     }
-
-    @Override
-    public List<OptionUpsertDto> upsertChoiceOptionList(List<OptionUpsertDto> upsertDtoList) {
-        log.info("[QUESTION:COMMAND:upsertChoiceOptionList] 보기 UPSERT");
-
-        List<ChoiceOption> finalList = new ArrayList<>();
-
-        for (OptionUpsertDto upsertDto : upsertDtoList) {
-            Long questionId = upsertDto.getQuestionId();
-            List<OptionDto> requestInfos = upsertDto.getOptionInfoList();
-
-            // 1. DB 저장 보기 전체 조회
-            List<ChoiceOption> prevOptionList = choiceOptionRepository.getOptionsByQuestionId(questionId);
-
-            // 2. Insert/Update 데이터 파티셔닝
-            Map<Boolean, List<OptionDto>> partitionUpsertInfoList = requestInfos.stream()
-                .collect(Collectors.partitioningBy(info -> info.getOptionId() != null));
-
-            List<OptionDto> newInfoList = partitionUpsertInfoList.get(false);
-            List<OptionDto> updateInfoList = partitionUpsertInfoList.get(true);
-
-            // 3. Update 대상 ID 추출
-            Set<Long> updateIdSet = updateInfoList.stream()
-                .map(OptionDto::getOptionId)
-                .collect(Collectors.toSet());
-
-            log.info("[QUESTION:COMMAND:upsertChoiceOptionList] 수정되는 문항: {}, 보기 IDs: {}", questionId, updateIdSet);
-            log.info("[QUESTION:COMMAND:upsertChoiceOptionList] 생성되는 문항: {}, 보기 개수: {}", questionId, newInfoList.size());
-
-            // 4. Delete 대상 ID 추출 및 삭제
-            Set<Long> deleteIdSet = prevOptionList.stream()
-                .map(ChoiceOption::getChoiceOptionId)
-                .filter(optionId -> !updateIdSet.contains(optionId))
-                .collect(Collectors.toSet());
-            if (!deleteIdSet.isEmpty()) {
-                log.info("[QUESTION:COMMAND:upsertChoiceOptionList] 삭제되는 문항: {}, 보기 IDs: {}", questionId, deleteIdSet);
-                choiceOptionRepository.deleteAll(deleteIdSet);
-            }
-
-            // 5. Update 대상 수정
-            Map<Long, OptionDto> updateInfoMap = updateInfoList.stream().collect(Collectors.toMap(
-                OptionDto::getOptionId,
-                Function.identity(),
-                (existing, replace) -> existing
-            ));
-            List<ChoiceOption> updateList = prevOptionList.stream()
-                .filter(option -> updateIdSet.contains(option.getChoiceOptionId()))
-                .toList();
-
-            updateList.forEach(option -> {
-                Long id = option.getChoiceOptionId();
-                OptionDto optionInfo = updateInfoMap.get(id);
-                option.updateOption(
-                    optionInfo.getContent(),
-                    optionInfo.getNextSection(),
-                    optionInfo.getImageUrl()
-                );
-            });
-
-            // 6. Insert 대상 객체 생성
-            List<ChoiceOption> insertList = newInfoList.stream()
-                .map(upsertInfo -> ChoiceOption.of(
-                    questionId,
-                    upsertInfo.getContent(),
-                    upsertInfo.getNextSection(),
-                    upsertInfo.getImageUrl()
-                )).toList();
-
-            finalList.addAll(updateList);
-            finalList.addAll(insertList);
-        }
-
-        // 7. Update/Insert 진행
-        List<ChoiceOption> optionList = choiceOptionRepository.saveAll(finalList);
-
-        log.info("[QUESTION:COMMAND:upsertChoiceOptionList] UPSERT 완료");
-
-        // 8. 반환값 구성
-        Map<Long, List<ChoiceOption>> idOptionListMap = optionList.stream().collect(Collectors.groupingBy(ChoiceOption::getQuestionId));
-        return idOptionListMap.entrySet().stream().map(entry -> {
-            Long questionId = entry.getKey();
-            List<ChoiceOption> savedList = entry.getValue();
-
-            return OptionUpsertDto.builder()
-                .questionId(questionId)
-                .optionInfoList(savedList.stream().map(OptionDto::fromEntity).toList())
-                .build();
-            })
-            .toList();
-    }
-
-    @Override
-    public List<SectionDto> upsertSections(Long surveyId, List<SectionDto> sectionDtoList) {
-        if (!sectionDtoList.stream().allMatch(SectionDto::isValid)) {
-            log.warn("[QUESTION:COMMAND:upsertSection] 섹션 정보가 유효하지 않습니다. surveyId: {}", surveyId);
-            throw new CustomException(SurveyErrorCode.SURVEY_FORM_INVALID_SECTION);
-        }
-
-        Map<Integer, Section> orderSectionMap = sectionRepository.findAllSectionBySurveyId(surveyId).stream()
-            .collect(Collectors.toMap
-                (Section::getSectionOrder, Function.identity())
-            );
-        List<Section> sectionList = sectionDtoList.stream().map(sectionDto -> {
-            if (sectionDto.isNewSection()) {
-                return Section.builder()
-                    .surveyId(surveyId)
-                    .title(sectionDto.title())
-                    .description(sectionDto.description())
-                    .sectionOrder(sectionDto.order())
-                    .nextSection(sectionDto.nextSection())
-                    .build();
-            } else {
-                Section section = orderSectionMap.get(sectionDto.order());
-                section.updateSection(
-                    sectionDto.title(), sectionDto.description(), sectionDto.order(), sectionDto.nextSection()
-                );
-                orderSectionMap.remove(sectionDto.order());
-                return section;
-            }
-        }).toList();
-        List<Section> savedSectionList = List.of();
-        if (!orderSectionMap.isEmpty()) {
-            sectionRepository.deleteAll(orderSectionMap.values().stream().map(Section::getSectionId).toList());
-        }
-        if (!sectionDtoList.isEmpty()) {
-            savedSectionList = sectionRepository.saveAll(sectionList);
-        }
-        if (!savedSectionList.isEmpty()) {
-            Set<Integer> savedSections = savedSectionList.stream().map(Section::getSectionOrder).collect(Collectors.toSet());
-            choiceOptionRepository.deleteBySections(surveyId, savedSections);
-            questionRepository.deleteBySurveyIdAndNotInOrder(surveyId, savedSections);
-        }
-
-        return savedSectionList.stream().map(SectionDto::fromEntity).toList();
-    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionConverter.java b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionConverter.java
index 8f625d13..e421c3e3 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionConverter.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionConverter.java
@@ -3,14 +3,19 @@
 import OneQ.OnSurvey.domain.question.entity.Question;
 import OneQ.OnSurvey.domain.question.entity.question.Choice;
 import OneQ.OnSurvey.domain.question.entity.question.DateAnswer;
+import OneQ.OnSurvey.domain.question.entity.question.Grid;
 import OneQ.OnSurvey.domain.question.entity.question.Rating;
+import OneQ.OnSurvey.domain.question.entity.question.Time;
 import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.QuestionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.ChoiceDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DateDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.GridDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.RatingDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.TimeDto;
 
 import java.util.List;
 
@@ -61,6 +66,18 @@ private static QuestionUpsertDto.UpsertInfo toUpsertInfo(DefaultQuestionDto dto)
                 .maxValue(ratingDto.getMaxValue())
                 .rate(ratingDto.getRate());
             case DateDto dateDto -> builder.defaultDate(dateDto.getDate());
+            case GridDto gridDto -> builder.isCheckbox(gridDto.getIsCheckbox())
+                .isChoiceMixed(gridDto.getIsChoiceMixed() != null ? gridDto.getIsChoiceMixed() : false)
+                .isChoiceDistinct(gridDto.getIsChoiceDistinct() != null ? gridDto.getIsChoiceDistinct() : false)
+                .gridOptions(gridDto.getGridOptions().stream().map(option ->
+                    GridOptionDto.builder()
+                        .gridOptionId(option.getGridOptionId())
+                        .isRow(option.getIsRow())
+                        .content(option.getContent())
+                        .order(option.getOrder()).build()
+                    ).toList()
+                );
+            case TimeDto timeDto -> builder.isInterval(timeDto.getIsInterval() != null ? timeDto.getIsInterval() : false);
             default -> {
             }
         }
@@ -69,14 +86,13 @@ private static QuestionUpsertDto.UpsertInfo toUpsertInfo(DefaultQuestionDto dto)
     }
 
     public static DefaultQuestionDto toQuestionDto(Question question) {
-        if (question instanceof Choice choice) {
-            return ChoiceDto.fromEntity(choice);
-        } else if (question instanceof Rating rating) {
-            return RatingDto.fromEntity(rating);
-        } else if (question instanceof DateAnswer dateAnswer) {
-            return DateDto.fromEntity(dateAnswer);
-        } else {
-            return DefaultQuestionDto.fromEntity(question);
-        }
+        return switch (question) {
+            case Choice choice -> ChoiceDto.fromEntity(choice);
+            case Rating rating -> RatingDto.fromEntity(rating);
+            case DateAnswer dateAnswer -> DateDto.fromEntity(dateAnswer);
+            case Grid grid -> GridDto.fromEntity(grid);
+            case Time time -> TimeDto.fromEntity(time);
+            default -> DefaultQuestionDto.fromEntity(question);
+        };
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQuery.java b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQuery.java
index e399c7fe..be2b4a4d 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQuery.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQuery.java
@@ -1,5 +1,6 @@
 package OneQ.OnSurvey.domain.question.service;
 
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
 
@@ -7,6 +8,7 @@
 
 public interface QuestionQuery {
     List<OptionDto> getOptionsByQuestionIdList(List<Long> questionIdList);
+    List<GridOptionDto> getGridOptionsByQuestionIdList(List<Long> questionIdList);
     List<DefaultQuestionDto> getQuestionDtoListBySurveyId(Long surveyId);
     List<DefaultQuestionDto> getQuestionDtoListBySurveyIdAndSection(Long surveyId, Integer section);
     int countQuestionsBySurveyId(Long surveyId);
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQueryService.java b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQueryService.java
index 9a5188ec..31f41647 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQueryService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionQueryService.java
@@ -1,11 +1,16 @@
 package OneQ.OnSurvey.domain.question.service;
 
 import OneQ.OnSurvey.domain.question.entity.ChoiceOption;
+import OneQ.OnSurvey.domain.question.entity.GridOption;
 import OneQ.OnSurvey.domain.question.entity.Question;
+import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.ChoiceDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.GridDto;
 import OneQ.OnSurvey.domain.question.repository.choiceOption.ChoiceOptionRepository;
+import OneQ.OnSurvey.domain.question.repository.gridOption.GridOptionRepository;
 import OneQ.OnSurvey.domain.question.repository.question.QuestionRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +30,7 @@ public class QuestionQueryService implements QuestionQuery {
 
     private final QuestionRepository questionRepository;
     private final ChoiceOptionRepository choiceOptionRepository;
+    private final GridOptionRepository gridOptionRepository;
 
     @Override
     public List<OptionDto> getOptionsByQuestionIdList(List<Long> questionIdList) {
@@ -33,12 +39,19 @@ public List<OptionDto> getOptionsByQuestionIdList(List<Long> questionIdList) {
         return optionList.stream().map(OptionDto::fromEntity).toList();
     }
 
+    @Override
+    public List<GridOptionDto> getGridOptionsByQuestionIdList(List<Long> questionIdList) {
+        List<GridOption> gridOptionList = gridOptionRepository.getGridOptionsByQuestionIds(questionIdList);
+
+        return gridOptionList.stream().map(GridOptionDto::fromEntity).toList();
+    }
+
     @Override
     public List<DefaultQuestionDto> getQuestionDtoListBySurveyId(Long surveyId) {
         List<Question> questionList = questionRepository.getQuestionListBySurveyId(surveyId);
         log.info("[QUESTION:QUERY:getQuestionDtoListBySurveyId] 조회할 설문 문항 IDs: {}", questionList.stream().map(Question::getQuestionId).toList());
 
-        return fillChoiceOptions(questionList);
+        return fillOptions(questionList);
     }
 
     @Override
@@ -46,7 +59,7 @@ public List<DefaultQuestionDto> getQuestionDtoListBySurveyIdAndSection(Long surv
         List<Question> questionList = questionRepository.getQuestionListBySurveyIdAndSection(surveyId, section);
         log.info("[QUESTION:QUERY:getQuestionDtoListBySurveyIdAndSection] 조회할 설문 문항 IDs: {}", questionList.stream().map(Question::getQuestionId).toList());
 
-        return fillChoiceOptions(questionList);
+        return fillOptions(questionList);
     }
 
     @Override
@@ -54,31 +67,38 @@ public int countQuestionsBySurveyId(Long surveyId) {
         return questionRepository.countBySurveyId(surveyId);
     }
 
-    private List<DefaultQuestionDto> fillChoiceOptions(List<Question> questionList) {
-
-        Set<Long> choiceIdSet = questionList.stream()
-            .filter(Question::isChoice)
-            .map(Question::getQuestionId)
-            .collect(Collectors.toSet());
-        log.info("[QUESTION:QUERY:fillChoiceOptions] 선택형 설문 문항 IDs: {}", choiceIdSet);
-
-        List<ChoiceOption> totalOptionList = choiceIdSet.isEmpty() ?
-            List.of() : choiceOptionRepository.getOptionsByQuestionIds(choiceIdSet);
-        Map<Long, List<ChoiceOption>> questionIdChoiceOptionMap = totalOptionList.stream()
-            .collect(Collectors.groupingBy(ChoiceOption::getQuestionId));
-
-        List<DefaultQuestionDto> questionDtoList = questionList.stream()
+    private List<DefaultQuestionDto> fillOptions(List<Question> questionList) {
+        Map<QuestionType, Set<Long>> typeIdMap = questionList.stream()
+            .filter(q -> QuestionType.CHOICE.equals(q.getQuestionType()) || QuestionType.GRID.equals(q.getQuestionType()))
+            .collect(Collectors.groupingBy(
+                Question::getQuestionType,
+                Collectors.mapping(Question::getQuestionId, Collectors.toSet())
+            ));
+
+        Map<Long, List<ChoiceOption>> choiceIdOptionMap = typeIdMap.getOrDefault(QuestionType.CHOICE, Set.of()).isEmpty()
+            ? Map.of()
+            : choiceOptionRepository.getOptionsByQuestionIds(typeIdMap.get(QuestionType.CHOICE))
+                .stream()
+                .collect(Collectors.groupingBy(ChoiceOption::getQuestionId));
+        Map<Long, List<GridOption>> gridIdOptionMap = typeIdMap.getOrDefault(QuestionType.GRID, Set.of()).isEmpty()
+            ? Map.of()
+            : gridOptionRepository.getGridOptionsByQuestionIds(typeIdMap.get(QuestionType.GRID))
+                .stream()
+                .collect(Collectors.groupingBy(GridOption::getQuestionId));
+
+        return questionList.stream()
             .map(QuestionConverter::toQuestionDto)
+            .peek(dto -> {
+                if (dto.isChoice()) {
+                    ChoiceDto choiceDto = (ChoiceDto) dto;
+                    List<ChoiceOption> optionList = choiceIdOptionMap.getOrDefault(dto.getQuestionId(), List.of());
+                    choiceDto.updateOptions(optionList.stream().map(OptionDto::fromEntity).toList());
+                } else if (dto.isGrid()) {
+                    GridDto gridDto = (GridDto) dto;
+                    List<GridOption> gridOptionList = gridIdOptionMap.getOrDefault(dto.getQuestionId(), List.of());
+                    gridDto.updateGridOptions(gridOptionList.stream().map(GridOptionDto::fromEntity).toList());
+                }
+            })
             .toList();
-
-        questionDtoList.forEach(dto -> {
-            if (dto.isChoice()) {
-                ChoiceDto choiceDto = (ChoiceDto) dto;
-                List<ChoiceOption> optionList = questionIdChoiceOptionMap.getOrDefault(dto.getQuestionId(), List.of());
-                choiceDto.updateOptions(optionList.stream().map(OptionDto::fromEntity).toList());
-            }
-        });
-
-        return questionDtoList;
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java b/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java
index beabc9ce..a3c6c635 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java
@@ -18,6 +18,7 @@ public enum SurveyErrorCode implements ApiErrorCode {
     SURVEY_PARTICIPATION_TEMP_EXCEEDED("SURVEY_PARTICIPATION_TEMP_EXCEEDED_409", "설문 참여 가능 인원이 일시적으로 초과되었습니다.", HttpStatus.CONFLICT),
     SURVEY_PARTICIPATION_OWN_SURVEY("SURVEY_PARTICIPATION_OWN_403", "본인이 생성한 설문에는 참여할 수 없습니다.", HttpStatus.FORBIDDEN),
     SURVEY_PARTICIPATION_IN_PROCESS("SURVEY_PARTICIPATION_IN_409", "제출한 설문 응답이 처리 중입니다.", HttpStatus.CONFLICT),
+    SURVEY_PARTICIPATION_INVALID_SECTION_REMAIN("SURVEY_PARTICIPATION_001", "무효 섹션 응답이 제거되지 않습니다.", HttpStatus.BAD_REQUEST),
 
     SURVEY_INCORRECT_STATUS("SURVEY_STATUS_400", "요청과 설문 상태가 올바르지 않습니다.", HttpStatus.BAD_REQUEST),
     SURVEY_FORM_INVALID_QUESTION_TYPE("SURVEY_FORM_QUESTION_TYPE_400", "문항 타입이 올바르지 않습니다.", HttpStatus.BAD_REQUEST),
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/controller/FormRequestController.java b/src/main/java/OneQ/OnSurvey/domain/survey/controller/FormRequestController.java
index 30aed89a..cf5434d2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/controller/FormRequestController.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/controller/FormRequestController.java
@@ -43,6 +43,7 @@ public SuccessResponse<Long> createGoogleFormRequest(
         @AuthenticationPrincipal Authenticatable principal,
         @RequestBody @Valid FormRequestDto request
     ) {
+        log.info("[FormRequest] 폼 등록 요청 - userKey: {}", principal.getUserKey());
         return SuccessResponse.ok(formCreator.createFormRequest(principal.getUserKey(), principal.getMemberId(), request));
     }
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/controller/ManagementController.java b/src/main/java/OneQ/OnSurvey/domain/survey/controller/ManagementController.java
index 0077f203..42749f32 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/controller/ManagementController.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/controller/ManagementController.java
@@ -4,6 +4,7 @@
 import OneQ.OnSurvey.domain.participation.service.answer.AnswerQuery;
 import OneQ.OnSurvey.domain.participation.service.response.ResponseQuery;
 import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
@@ -98,29 +99,77 @@ public SuccessResponse<SurveyManagementDetailResponse> getSurveyManagementDetail
                 ))
             .toList();
 
-        List<Long> choiceIdList = detailInfoList.stream()
-            .filter(dto -> dto.getType().isChoice())
-            .map(SurveyManagementDetailResponse.DetailInfo::getQuestionId)
-            .toList();
+        Map<QuestionType, List<Long>> typeIdMap = detailInfoList.stream()
+            .filter(info -> info.getType().isChoice() || info.getType().isGrid())
+            .collect(Collectors.groupingBy(
+                SurveyManagementDetailResponse.DetailInfo::getType,
+                Collectors.mapping(SurveyManagementDetailResponse.DetailInfo::getQuestionId, Collectors.toList())
+            ));
 
+        List<Long> choiceIdList = typeIdMap.getOrDefault(QuestionType.CHOICE, List.of());
         if (!choiceIdList.isEmpty()) {
             List<OptionDto> optionInfoList = questionQuery.getOptionsByQuestionIdList(choiceIdList);
             Map<Long, List<OptionDto>> questionIdOptionInfoMap = optionInfoList.stream()
                 .collect(Collectors.groupingBy(OptionDto::getQuestionId));
 
-            detailInfoList.forEach(detailInfo -> {
-                List<OptionDto> optionDtoList = questionIdOptionInfoMap.getOrDefault(detailInfo.getQuestionId(), List.of());
-
-                Map<String, Long> contentMap = optionDtoList.stream()
-                    .sorted(Comparator.comparingLong(OptionDto::getOptionId))
-                    .collect(Collectors.toMap(
-                        OptionDto::getContent,
-                        dto -> 0L,
-                        (existing, replacement) -> existing,
-                        LinkedHashMap::new
-                    ));
-                detailInfo.setAnswerMap(contentMap.isEmpty() ? Map.of() : contentMap);
-            });
+            detailInfoList.stream()
+                .filter(detailInfo -> detailInfo.getType().isChoice())
+                .forEach(detailInfo -> {
+                    List<OptionDto> optionDtoList = questionIdOptionInfoMap.getOrDefault(detailInfo.getQuestionId(), List.of());
+
+                    Map<String, Long> contentMap = optionDtoList.stream()
+                        .sorted(Comparator.comparingLong(OptionDto::getOptionId))
+                        .collect(Collectors.toMap(
+                            OptionDto::getContent,
+                            dto -> 0L,
+                            (existing, replacement) -> existing,
+                            LinkedHashMap::new
+                        ));
+                    detailInfo.setAnswerMap(contentMap.isEmpty() ? Map.of() : contentMap);
+                });
+        }
+
+        List<Long> gridIdList = typeIdMap.getOrDefault(QuestionType.GRID, List.of());
+        if (!gridIdList.isEmpty()) {
+            List<GridOptionDto> gridOptionInfoList = questionQuery.getGridOptionsByQuestionIdList(gridIdList);
+            Map<Long, List<GridOptionDto>> questionIdGridOptionInfoMap = gridOptionInfoList.stream()
+                .collect(Collectors.groupingBy(GridOptionDto::getQuestionId));
+            detailInfoList.stream()
+                .filter(detailInfo -> detailInfo.getType().isGrid())
+                .forEach(detailInfo -> {
+                    List<GridOptionDto> optionDtoList = questionIdGridOptionInfoMap.getOrDefault(detailInfo.getQuestionId(), List.of());
+
+                    Comparator<GridOptionDto> comparator = Comparator.comparing(
+                        GridOptionDto::getOrder,
+                        Comparator.nullsLast(Comparator.naturalOrder())
+                    );
+                    List<String> rowList = optionDtoList.stream()
+                        .filter(dto -> Boolean.TRUE.equals(dto.getIsRow()))
+                        .sorted(comparator)
+                        .map(GridOptionDto::getContent)
+                        .toList();
+
+                    List<String> columnList = optionDtoList.stream()
+                        .filter(dto -> Boolean.FALSE.equals(dto.getIsRow()))
+                        .sorted(comparator)
+                        .map(GridOptionDto::getContent)
+                        .toList();
+
+                    Map<String, Map<String, Long>> gridMap = rowList.stream()
+                        .collect(Collectors.toMap(
+                            row -> row,
+                            row -> columnList.stream().collect(Collectors.toMap(
+                                column -> column,
+                                column -> 0L,
+                                (existing, replacement) -> existing,
+                                LinkedHashMap::new
+                            )),
+                            (existing, replacement) -> existing,
+                            LinkedHashMap::new
+                        ));
+
+                    detailInfo.setGridAnswerMap(gridMap.isEmpty() ? Map.of() : gridMap);
+                });
         }
 
         detailInfoList = answerQuery.getDetailInfo(surveyId, filter, detailInfoList);
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/controller/ParticipationController.java b/src/main/java/OneQ/OnSurvey/domain/survey/controller/ParticipationController.java
index 23327f22..b2d09ff1 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/controller/ParticipationController.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/controller/ParticipationController.java
@@ -3,6 +3,7 @@
 import OneQ.OnSurvey.domain.participation.entity.QuestionAnswer;
 import OneQ.OnSurvey.domain.participation.entity.ScreeningAnswer;
 import OneQ.OnSurvey.domain.participation.model.dto.AnswerInsertDto;
+import OneQ.OnSurvey.domain.participation.model.dto.ParticipationCompletionDto;
 import OneQ.OnSurvey.domain.participation.model.dto.ParticipationStatus;
 import OneQ.OnSurvey.domain.participation.service.answer.AnswerCommand;
 import OneQ.OnSurvey.domain.participation.service.response.ResponseCommand;
@@ -13,6 +14,7 @@
 import OneQ.OnSurvey.domain.survey.model.SurveyStatus;
 import OneQ.OnSurvey.domain.survey.model.request.InsertQuestionAnswerRequest;
 import OneQ.OnSurvey.domain.survey.model.request.InsertScreeningAnswerRequest;
+import OneQ.OnSurvey.domain.survey.model.request.SurveyParticipationCompletionRequest;
 import OneQ.OnSurvey.domain.survey.model.response.*;
 import OneQ.OnSurvey.domain.survey.repository.SurveyRepository;
 import OneQ.OnSurvey.domain.survey.service.command.SurveyCommandService;
@@ -21,6 +23,7 @@
 import OneQ.OnSurvey.global.common.exception.CustomException;
 import OneQ.OnSurvey.global.common.response.SuccessResponse;
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
@@ -188,7 +191,7 @@ public SuccessResponse<DeprecatedQuestionResponse> getTotalSurveyInfoOfSurveyId(
         Survey survey = surveyQueryService.getSurveyById(surveyId);
 
         if (surveyQueryService.checkValidSegmentation(surveyId, principal.getUserKey())) {
-            log.info("[PARTICIPATION] 세그먼트 불일치로 인한 설문 응답 불가 - surveyId: {}, userKey: {}", surveyId, principal.getUserKey());
+            log.warn("[PARTICIPATION] 세그먼트 불일치로 인한 설문 응답 불가 - surveyId: {}, userKey: {}", surveyId, principal.getUserKey());
             throw new CustomException(SurveyErrorCode.SURVEY_WRONG_SEGMENTATION);
         }
 
@@ -248,16 +251,11 @@ public SuccessResponse<Boolean> createScreeningAnswer(
     public SuccessResponse<Boolean> createQuestionAnswer(
         @AuthenticationPrincipal CustomUserDetails principal,
         @PathVariable Long surveyId,
-        @RequestBody InsertQuestionAnswerRequest request
+        @RequestBody @Valid InsertQuestionAnswerRequest request
     ) {
         log.info("[PARTICIPATION] 설문 응답 생성 - surveyId: {}, userKey: {}, request: {}",
             surveyId, principal.getMemberId(), request.toString());
 
-        if (request.isEmpty()) {
-            log.warn("[PARTICIPATION] 빈 응답 생성 요청 - surveyId: {}, userKey: {}", surveyId, principal.getMemberId());
-            throw new CustomException(SurveyErrorCode.SURVEY_ANSWER_INVALID);
-        }
-
         AnswerInsertDto answerInsertDto = request.toDto(principal.getMemberId());
 
         return SuccessResponse.ok(questionAnswerCommand.upsertAnswers(answerInsertDto, surveyId, principal.getUserKey(), principal.getMemberId()));
@@ -266,12 +264,20 @@ public SuccessResponse<Boolean> createQuestionAnswer(
     @PostMapping("surveys/{surveyId}/complete")
     @Operation(summary = "설문 작성을 완료합니다.")
     public SuccessResponse<Boolean> completeSurvey(
-            @AuthenticationPrincipal CustomUserDetails principal,
-            @PathVariable Long surveyId
-    ) {
+        @AuthenticationPrincipal CustomUserDetails principal,
+        @PathVariable Long surveyId,
+        @RequestBody SurveyParticipationCompletionRequest request
+        ) {
         log.info("[PARTICIPATION] 설문 완료 - surveyId: {}, memberId: {}", surveyId, principal.getMemberId());
 
-        Boolean result = responseCommand.createResponse(surveyId, principal.getMemberId(), principal.getUserKey());
+        ParticipationCompletionDto dto = ParticipationCompletionDto.builder()
+            .surveyId(surveyId)
+            .memberId(principal.getMemberId())
+            .userKey(principal.getUserKey())
+            .visitedSectionList(request.visitedSections())
+            .build();
+
+        Boolean result = responseCommand.createResponse(dto);
         return SuccessResponse.ok(result);
     }
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/entity/FormRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/entity/FormRequest.java
index fb7f6b79..78b6be9f 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/entity/FormRequest.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/entity/FormRequest.java
@@ -43,11 +43,13 @@ public class FormRequest extends BaseEntity {
     @Column(name = "registered_survey_id")
     private Long registeredSurveyId;
 
-    public static FormRequest createRequest(String formLink, String requesterEmail, Long userKey) {
+    public static FormRequest createRequest(String formLink, String requesterEmail, int dueCount, int totalCoin, Long userKey) {
         return FormRequest.builder()
             .formLink(formLink)
             .userKey(userKey)
             .requesterEmail(requesterEmail)
+            .targetResponseCount(dueCount)
+            .price(totalCoin)
             .isRegistered(false)
             .build();
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyAnswerProjection.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyAnswerProjection.java
index 4ac97aff..e2afea24 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyAnswerProjection.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyAnswerProjection.java
@@ -9,4 +9,6 @@ public class SurveyAnswerProjection {
     private final Long memberId;
     private final Long questionId;
     private final String content;
+    // 그리드 이외 타입은 기본값 0을 가지도록 함.
+    private final Integer gridRowOrder;
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyQuestionHeader.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyQuestionHeader.java
index 802e4041..7b913eea 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyQuestionHeader.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/export/SurveyQuestionHeader.java
@@ -9,4 +9,6 @@ public class SurveyQuestionHeader {
     private final Long questionId;
     private final Integer orderNo;
     private final String title;
+    private final Integer rowOrder;
+    private final String rowContent;
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormRequestDto.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormRequestDto.java
index 1a4b4cff..b58cbe9e 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormRequestDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormRequestDto.java
@@ -39,6 +39,6 @@ public record FormRequestDto(
     Set<Interest> interests
 ) {
     public FormRequest toEntity(long userKey) {
-        return FormRequest.createRequest(formLink, requesterEmail, userKey);
+        return FormRequest.createRequest(formLink, requesterEmail,surveyForm().dueCount(), surveyForm().totalCoin(), userKey);
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/InsertQuestionAnswerRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/InsertQuestionAnswerRequest.java
index 46c132f8..0b05c686 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/InsertQuestionAnswerRequest.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/InsertQuestionAnswerRequest.java
@@ -2,6 +2,10 @@
 
 import OneQ.OnSurvey.domain.participation.model.dto.AnswerInsertDto;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -10,20 +14,47 @@
 
 @Getter @Builder
 public class InsertQuestionAnswerRequest {
+    @NotNull @Positive
+    private Integer section;
+
+    @Schema(
+        description = "문항 응답 목록",
+        example = """
+            [
+              { "questionId": 100, "rowOrder": null, "content": "옵션 A" },
+              { "questionId": 101, "rowOrder": 0, "content": "매우 만족" },
+              { "questionId": 101, "rowOrder": 0, "content": "매우 불만족" },
+              { "questionId": 101, "rowOrder": 1, "content": "보통" }
+            ]
+            """
+    )
+    @NotNull
     private List<QuestionAnswerInfo> infoList;
 
     @Getter @AllArgsConstructor
+    @Schema(description = "개별 문항 응답 정보")
     public static class QuestionAnswerInfo {
+        @Schema(description = "문항 ID", example = "202")
+        @NotNull
         private Long questionId;
+
+        @Schema(description = "그리드 행 순서(0부터 시작). GRID 문항이 아니면 null", example = "0", nullable = true)
+        @PositiveOrZero
+        private Integer rowOrder;
+
+        @Schema(description = "응답 내용(선택 값/텍스트/그리드 열 값)", example = "매우 만족")
         private String content;
     }
 
     public AnswerInsertDto toDto(Long memberId) {
+        infoList = (infoList != null) ? infoList : List.of();
         return AnswerInsertDto.builder()
+            .section(section)
             .answerInfoList(infoList.stream().map(info ->
                 AnswerInsertDto.AnswerInfo.builder()
                     .id(info.getQuestionId())
                     .memberId(memberId)
+                    .gridRowOrder(info.getRowOrder())
                     .content(info.getContent())
                     .build())
                 .toList())
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyParticipationCompletionRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyParticipationCompletionRequest.java
new file mode 100644
index 00000000..151e0581
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyParticipationCompletionRequest.java
@@ -0,0 +1,8 @@
+package OneQ.OnSurvey.domain.survey.model.request;
+
+import java.util.List;
+
+public record SurveyParticipationCompletionRequest(
+    List<Integer> visitedSections
+) {
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyManagementDetailResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyManagementDetailResponse.java
index f7e6cbfd..32c12a07 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyManagementDetailResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyManagementDetailResponse.java
@@ -68,8 +68,30 @@ public static class DetailInfo {
                 ]
             """
         )
-        // 주관식 (SHORT, LONG, DATE, NUMBER) 설문 필드
+        // 주관식 (SHORT, LONG, DATE, NUMBER, TIME) 설문 필드
         private List<String> answerList;
+
+        @Setter
+        @Schema(
+            description = "(그리드) 응답값",
+            example = """
+                {
+                    "row1": {
+                        "col1": 5,
+                        "col2": 15,
+                        "col3": 10
+                    },
+                    "row2": {
+                        "col1": 5,
+                        "col2": 15,
+                        "col3": 10,
+                        "col4": 10
+                    }
+                }
+            """
+        )
+        // 그리드 (GRID) 설문 필드, [ 행: (열: 응답 수) ]
+        private Map<String, Map<String, Long>> gridAnswerMap;
     }
 
     public void updateCurrentCount(Integer currentCount) {
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/repository/export/SurveyExportRepositoryImpl.java b/src/main/java/OneQ/OnSurvey/domain/survey/repository/export/SurveyExportRepositoryImpl.java
index 120520ba..c7c5bb4f 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/repository/export/SurveyExportRepositoryImpl.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/repository/export/SurveyExportRepositoryImpl.java
@@ -13,6 +13,7 @@
 import static OneQ.OnSurvey.domain.member.QMember.member;
 import static OneQ.OnSurvey.domain.participation.entity.QQuestionAnswer.questionAnswer;
 import static OneQ.OnSurvey.domain.participation.entity.QResponse.response;
+import static OneQ.OnSurvey.domain.question.entity.QGridOption.gridOption;
 import static OneQ.OnSurvey.domain.question.entity.QQuestion.question;
 import static OneQ.OnSurvey.domain.survey.entity.QSurvey.survey;
 
@@ -29,11 +30,17 @@ public List<SurveyQuestionHeader> findQuestionHeaders(Long surveyId) {
                         SurveyQuestionHeader.class,
                         question.questionId,
                         question.order,
-                        question.title
+                        question.title,
+                        gridOption.order.coalesce(0),
+                        gridOption.content
                 ))
                 .from(question)
+                .leftJoin(gridOption).on(
+                    question.questionId.eq(gridOption.questionId),
+                    gridOption.isRow.isTrue()
+                )
                 .where(question.surveyId.eq(surveyId))
-                .orderBy(question.order.asc())
+                .orderBy(question.order.asc(), gridOption.order.asc())
                 .fetch();
     }
 
@@ -47,13 +54,10 @@ public List<SurveyMemberProjection> findMembersWhoAnswered(Long surveyId) {
                         member.gender.stringValue(),
                         member.residence.stringValue()
                 ))
-                .from(questionAnswer)
-                .join(question).on(question.questionId.eq(questionAnswer.questionId))
-                .join(member).on(member.id.eq(questionAnswer.memberId))
-                .join(response).on(response.surveyId.eq(surveyId).and(response.memberId.eq(questionAnswer.memberId)))
-                .where(question.surveyId.eq(surveyId).and(response.isResponded.isTrue()))
-                .distinct()
-                .orderBy(member.id.asc())
+                .from(response)
+                .join(member).on(member.id.eq(response.memberId))
+                .where(response.surveyId.eq(surveyId).and(response.isResponded.isTrue()))
+                .orderBy(response.createdAt.asc())
                 .fetch();
     }
 
@@ -64,7 +68,8 @@ public List<SurveyAnswerProjection> findAnswers(Long surveyId) {
                         SurveyAnswerProjection.class,
                         questionAnswer.memberId,
                         questionAnswer.questionId,
-                        questionAnswer.content
+                        questionAnswer.content,
+                        questionAnswer.gridRowOrder.coalesce(0)
                 ))
                 .from(questionAnswer)
                 .join(question).on(question.questionId.eq(questionAnswer.questionId))
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java
index 8d899699..e470eedf 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java
@@ -7,6 +7,7 @@
 import OneQ.OnSurvey.domain.question.service.QuestionQueryService;
 import OneQ.OnSurvey.domain.discount.entity.DiscountCode;
 import OneQ.OnSurvey.domain.discount.service.DiscountCodeQueryService;
+import OneQ.OnSurvey.global.infra.transaction.TransactionHandler;
 import OneQ.OnSurvey.global.promotion.application.PromotionTierResolver;
 import OneQ.OnSurvey.domain.survey.SurveyErrorCode;
 import OneQ.OnSurvey.domain.survey.entity.Screening;
@@ -62,13 +63,14 @@ public class SurveyCommandService implements SurveyCommand {
     private final MemberRepository memberRepository;
     private final SurveyRefundPolicy surveyRefundPolicy;
     private final SurveyGlobalStatsService surveyGlobalStatsService;
-    private final RedisAgent redisAgent;
     private final QuestionQueryService questionQueryService;
     private final PromotionTierResolver promotionTierResolver;
     private final DiscountCodeQueryService discountCodeQueryService;
 
     private final AlertNotifier alertNotifier;
     private final AfterCommitExecutor afterCommitExecutor;
+    private final RedisAgent redisAgent;
+    private final TransactionHandler transactionHandler;
 
     @Value("${redis.survey-key-prefix.potential-count}")
     private String potentialKey;
@@ -309,12 +311,24 @@ public boolean sendSurveyHeartbeat(Long surveyId, Long userKey) {
     public void updateSurveyOwner(SurveyOwnerChangeDto changeDto) {
         Survey survey = surveyRepository.getSurveyById(changeDto.surveyId())
                 .orElseThrow(() -> new CustomException(SurveyErrorCode.SURVEY_NOT_FOUND));
+        String prevKey = redisAgent.getAndSetValue(this.creatorKey + changeDto.surveyId(), String.valueOf(changeDto.newUserKey()));
 
-        survey.changeOwner(changeDto.newMemberId());
-        surveyRepository.save(survey);
+        try {
+            transactionHandler.runInTransaction(() -> {
 
-        log.info("[SURVEY:COMMAND:updateSurveyOwner] 설문 소유자 변경 완료 - surveyId: {}, newMemberId: {}",
-            changeDto.surveyId(), changeDto.newMemberId());
+                survey.changeOwner(changeDto.newMemberId());
+                surveyRepository.save(survey);
+
+                log.info("[SURVEY:COMMAND:updateSurveyOwner] 설문 소유자 변경 완료 - surveyId: {}, memberId: {}, userKey: {}",
+                    changeDto.surveyId(), changeDto.newMemberId(), changeDto.newUserKey());
+                return null;
+            });
+        }  catch (Exception e) {
+            log.error("[SURVEY:COMMAND:updateSurveyOwner] 설문 소유자 변경 실패 - surveyId: {}, memberId: {}, userKey: {}",
+                changeDto.surveyId(), changeDto.newMemberId(), changeDto.newUserKey(), e
+            );
+            redisAgent.getAndSetValue(this.creatorKey + changeDto.surveyId(), prevKey);
+        }
     }
 
     @Override
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/export/SurveyExportService.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/export/SurveyExportService.java
index e3134fba..3a1f8a12 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/export/SurveyExportService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/export/SurveyExportService.java
@@ -32,14 +32,12 @@ public class SurveyExportService implements SurveyExport {
     private final SurveyInfoRepository surveyInfoRepository;
 
     @Override
-    @Transactional(readOnly = true)
     public SurveyExportFile exportCsvForAdmin(Long surveyId) {
         log.info("[SurveyExport] CSV export start (admin). surveyId={}", surveyId);
         return buildCsv(surveyId);
     }
 
     @Override
-    @Transactional(readOnly = true)
     public SurveyExportFile exportCsv(Long surveyId, Long requesterMemberId) {
         log.info("[SurveyExport] CSV export start. surveyId={}", surveyId);
 
@@ -52,7 +50,8 @@ public SurveyExportFile exportCsv(Long surveyId, Long requesterMemberId) {
 
     private SurveyExportFile buildCsv(Long surveyId) {
         try {
-            SurveyInfo surveyInfo = surveyInfoRepository.findBySurveyId(surveyId).orElseThrow(() -> new CustomException(SurveyErrorCode.SURVEY_INFO_NOT_FOUND));
+            SurveyInfo surveyInfo = surveyInfoRepository.findBySurveyId(surveyId)
+                    .orElseThrow(() -> new CustomException(SurveyErrorCode.SURVEY_INFO_NOT_FOUND));
             boolean includeGender = shouldIncludeGender(surveyInfo);
             boolean includeAge = shouldIncludeAge(surveyInfo);
 
@@ -63,89 +62,98 @@ private SurveyExportFile buildCsv(Long surveyId) {
             log.info("[SurveyExport] fetched. surveyId={}, questions={}, members={}, answers={}",
                     surveyId, headers.size(), members.size(), answers.size());
 
-            Map<Long, Map<Long, Set<String>>> answerMap = new HashMap<>();
-            for (SurveyAnswerProjection a : answers) {
-                answerMap.computeIfAbsent(a.getMemberId(), k -> new HashMap<>())
-                    .computeIfAbsent(a.getQuestionId(), k -> new TreeSet<>())
-                    .add(a.getContent());
-            }
+            Map<Long, Map<Long, Map<Integer, Set<String>>>> answerMap = buildAnswerMap(answers);
 
             StringBuilder sb = new StringBuilder();
-
-            // header
-            List<String> headerCols = new ArrayList<>();
-            if (includeAge) headerCols.add("age");
-            if (includeGender) headerCols.add("gender");
-            headerCols.add("residence");
-            for (SurveyQuestionHeader h : headers) {
-                headerCols.add("Q" + nvlInt(h.getOrderNo() + 1) + ". " + nvl(h.getTitle()));
-            }
-            sb.append(String.join(",", escapeCsv(headerCols))).append("\n");
-
-            // rows
+            sb.append(String.join(",", escapeCsv(buildHeaderColumns(headers, includeAge, includeGender)))).append("\n");
             for (SurveyMemberProjection m : members) {
-                List<String> row = new ArrayList<>();
-
-                if (includeAge) {
-                    Integer age = toAge(m.getBirthDay());
-                    row.add(age == null ? "" : String.valueOf(age));
-                }
-
-                if (includeGender) {
-                    row.add(nvl(m.getGender()));
-                }
-
-                row.add(nvl(m.getResidence()));
-
-                Map<Long, Set<String>> memberAnswers = answerMap.getOrDefault(m.getMemberId(), Map.of());
-                for (SurveyQuestionHeader h : headers) {
-                    row.add(nvl(String.join(",", memberAnswers.getOrDefault(h.getQuestionId(), Set.of()))));
-                }
-
-                sb.append(String.join(",", escapeCsv(row))).append("\n");
+                sb.append(String.join(",", escapeCsv(buildDataRow(m, headers, answerMap, includeAge, includeGender)))).append("\n");
             }
 
-            // UTF-8 BOM
-            byte[] bom = new byte[] {(byte)0xEF, (byte)0xBB, (byte)0xBF};
-            byte[] body = sb.toString().getBytes(StandardCharsets.UTF_8);
-            byte[] out = new byte[bom.length + body.length];
-            System.arraycopy(bom, 0, out, 0, bom.length);
-            System.arraycopy(body, 0, out, bom.length, body.length);
-
+            byte[] csv = addBom(sb.toString().getBytes(StandardCharsets.UTF_8));
             String title = surveyExportRepository.findSurveyTitle(surveyId);
-            String safeTitle = sanitizeFileName(title == null ? "survey" : title);
+            String date = LocalDate.now().format(java.time.format.DateTimeFormatter.BASIC_ISO_DATE);
+            String filename = sanitizeFileName(title == null ? "survey" : title) + "_" + date + ".csv";
 
-            String date = java.time.LocalDate.now()
-                    .format(java.time.format.DateTimeFormatter.BASIC_ISO_DATE);
-
-            String filename = safeTitle + "_" + date + ".csv";
-            log.info("[SurveyExport] CSV export success. surveyId={}, bytes={}, filename={}",
-                    surveyId, out.length, filename);
-
-            return new SurveyExportFile(out, filename, "text/csv; charset=UTF-8");
+            log.info("[SurveyExport] CSV export success. surveyId={}, bytes={}, filename={}", surveyId, csv.length, filename);
+            return new SurveyExportFile(csv, filename, "text/csv; charset=UTF-8");
         } catch (Exception e) {
             log.error("[SurveyExport] CSV export failed. surveyId={}", surveyId, e);
             throw e;
         }
     }
 
+    private Map<Long, Map<Long, Map<Integer, Set<String>>>> buildAnswerMap(List<SurveyAnswerProjection> answers) {
+        Map<Long, Map<Long, Map<Integer, Set<String>>>> map = new HashMap<>();
+        for (SurveyAnswerProjection a : answers) {
+            map.computeIfAbsent(a.getMemberId(), k -> new HashMap<>())
+               .computeIfAbsent(a.getQuestionId(), k -> new HashMap<>())
+               .computeIfAbsent(a.getGridRowOrder(), k -> new TreeSet<>())
+               .add(a.getContent());
+        }
+        return map;
+    }
+
+    private List<String> buildHeaderColumns(List<SurveyQuestionHeader> headers, boolean includeAge, boolean includeGender) {
+        List<String> cols = new ArrayList<>();
+        if (includeAge) cols.add("age");
+        if (includeGender) cols.add("gender");
+        cols.add("residence");
+        for (SurveyQuestionHeader h : headers) {
+            int orderLabel = h.getOrderNo() == null ? 0 : h.getOrderNo() + 1;
+            cols.add("Q" + orderLabel + ". " + nvl(h.getTitle()) + gridNvl(h.getRowContent()));
+        }
+        return cols;
+    }
+
+    private List<String> buildDataRow(SurveyMemberProjection m, List<SurveyQuestionHeader> headers,
+                                      Map<Long, Map<Long, Map<Integer, Set<String>>>> answerMap,
+                                      boolean includeAge, boolean includeGender) {
+        List<String> row = new ArrayList<>();
+        if (includeAge) {
+            Integer age = toAge(m.getBirthDay());
+            row.add(age == null ? "" : String.valueOf(age));
+        }
+        if (includeGender) {
+            row.add(nvl(m.getGender()));
+        }
+        row.add(nvl(m.getResidence()));
+
+        Map<Long, Map<Integer, Set<String>>> memberAnswers = answerMap.getOrDefault(m.getMemberId(), Map.of());
+        for (SurveyQuestionHeader h : headers) {
+            row.add(nvl(String.join(",", memberAnswers
+                    .getOrDefault(h.getQuestionId(), Map.of())
+                    .getOrDefault(h.getRowOrder(), Set.of()))));
+        }
+        return row;
+    }
+
+    private byte[] addBom(byte[] body) {
+        byte[] bom = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
+        byte[] out = new byte[bom.length + body.length];
+        System.arraycopy(bom, 0, out, 0, bom.length);
+        System.arraycopy(body, 0, out, bom.length, body.length);
+        return out;
+    }
+
     private boolean shouldIncludeGender(SurveyInfo info) {
         if (info == null) return false;
         if (info.getGender() == null) return false;
-        return info.getGender() != Gender.ALL; // '전체'면 제공 안 함
+        return info.getGender() != Gender.ALL;
     }
 
     private boolean shouldIncludeAge(SurveyInfo info) {
         if (info == null) return false;
         Set<AgeRange> ages = info.getAges();
         if (ages == null || ages.isEmpty()) return false;
-
         return !ages.contains(AgeRange.ALL);
     }
 
-
     private String nvl(String s) { return s == null ? "" : s; }
-    private String nvlInt(Integer i) { return i == null ? "" : String.valueOf(i); }
+
+    private String gridNvl(String s) {
+        return s == null ? "" : " [" + s + "]";
+    }
 
     private List<String> escapeCsv(List<String> vals) {
         List<String> out = new ArrayList<>(vals.size());
@@ -162,19 +170,12 @@ private String escapeCsvOne(String s) {
         return v;
     }
 
-    /**
-     * birthDay 기반 age 계산
-     */
     private Integer toAge(String birthDay) {
         if (birthDay == null || birthDay.isBlank()) return null;
-
         String digits = birthDay.replaceAll("[^0-9]", "");
         if (digits.length() < 4) return null;
-
-        int year;
-
         try {
-            year = Integer.parseInt(digits.substring(0, 4));
+            int year = Integer.parseInt(digits.substring(0, 4));
             return LocalDate.now().getYear() - year + 1;
         } catch (Exception e) {
             return null;
@@ -183,14 +184,9 @@ private Integer toAge(String birthDay) {
 
     private String sanitizeFileName(String raw) {
         String s = raw.trim();
-
         s = s.replaceAll("[\\\\/:*?\"<>|\\r\\n\\t]", " ");
-
         s = s.replaceAll("\\s+", " ").trim();
-
         if (s.length() > 50) s = s.substring(0, 50).trim();
-
         return s.isBlank() ? "survey" : s;
     }
-
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/form/SurveyFormFacade.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/form/SurveyFormFacade.java
index 7f0f29f3..4f6afc3b 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/form/SurveyFormFacade.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/form/SurveyFormFacade.java
@@ -1,6 +1,7 @@
 package OneQ.OnSurvey.domain.survey.service.form;
 
 import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.QuestionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
@@ -17,10 +18,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -71,19 +71,23 @@ public UpdateQuestionResponse upsertQuestions(Long surveyId, QuestionRequest req
 
         validateUpsertQuestionsRequest(request);
 
-        QuestionUpsertDto requestQuestionUpsertDto =
-                QuestionConverter.toQuestionUpsertDto(surveyId, request.getQuestions());
+        QuestionUpsertDto requestQuestionUpsertDto = QuestionConverter.toQuestionUpsertDto(surveyId, request.getQuestions());
+        QuestionUpsertDto savedQuestionUpsertDto = questionCommand.upsertQuestionList(requestQuestionUpsertDto);
 
-        QuestionUpsertDto savedQuestionUpsertDto =
-                questionCommand.upsertQuestionList(requestQuestionUpsertDto);
+        OptionUpsertBundle optionUpsertBundle = buildOptionUpsertDtos(savedQuestionUpsertDto, requestQuestionUpsertDto);
+        List<OptionUpsertDto> optionUpsertDtoList = optionUpsertBundle.choiceOptionUpsertDtos();
+        List<GridOptionUpsertDto> gridOptionUpsertDtoList = optionUpsertBundle.gridOptionUpsertDtos();
 
-        List<OptionUpsertDto> optionUpsertDtoList =
-                buildOptionUpsertDtosFromSavedQuestions(savedQuestionUpsertDto, requestQuestionUpsertDto);
-
-        optionUpsertDtoList = questionCommand.upsertChoiceOptionList(optionUpsertDtoList);
+        if (!optionUpsertDtoList.isEmpty()) {
+            optionUpsertDtoList = questionCommand.upsertChoiceOptionList(optionUpsertDtoList);
+        }
+        if (!gridOptionUpsertDtoList.isEmpty()) {
+            gridOptionUpsertDtoList = questionCommand.upsertGridOptionList(gridOptionUpsertDtoList);
+        }
         Map<Long, OptionUpsertDto> optionDtoMap = mapOptionsByQuestionId(optionUpsertDtoList);
+        Map<Long, GridOptionUpsertDto> gridOptionDtoMap = mapGridOptionsByQuestionId(gridOptionUpsertDtoList);
 
-        applyOptionsToQuestionUpsertDto(savedQuestionUpsertDto, optionDtoMap);
+        applyOptionsToQuestionUpsertDto(savedQuestionUpsertDto, optionDtoMap, gridOptionDtoMap);
 
         return new UpdateQuestionResponse(
                 savedQuestionUpsertDto.getSurveyId(),
@@ -178,67 +182,91 @@ private void validateUpsertQuestionsRequest(QuestionRequest request) {
         }
     }
 
-    /** UPSERT 이후 CHOICE 타입 문항에 대해 questionId -> UpsertInfo 맵 생성 */
-    private Map<Long, QuestionUpsertDto.UpsertInfo> buildChoiceQuestionMap(QuestionUpsertDto questionUpsertDto) {
-        return questionUpsertDto.getUpsertInfoList().stream()
-                .filter(info -> QuestionType.CHOICE.equals(info.getQuestionType()))
-                .filter(info -> info.getQuestionId() != null) // 🔹 null key 방지
-                .collect(Collectors.toMap(
-                        QuestionUpsertDto.UpsertInfo::getQuestionId,
-                        Function.identity()
-                ));
-    }
-
-    /** UPSERT된 QuestionUpsertDto에서 CHOICE 문항별 OptionUpsertDto 리스트 생성 */
-    private List<OptionUpsertDto> buildOptionUpsertDtosFromSavedQuestions(
+    /** CHOICE/GRID 옵션 UPSERT DTO를 동시에 구성 */
+    private OptionUpsertBundle buildOptionUpsertDtos(
         QuestionUpsertDto savedQuestionUpsertDto,
         QuestionUpsertDto requestedQuestionUpsertDto
     ) {
-        Set<Long> choiceQuestionIdSet = getChoiceQuestionIds(savedQuestionUpsertDto);
-        Map<Long, QuestionUpsertDto.UpsertInfo> requestChoiceQuestionMap = buildChoiceQuestionMap(requestedQuestionUpsertDto);
-
-        return choiceQuestionIdSet.stream()
-            .map(qId -> OptionUpsertDto.builder()
-                .questionId(qId)
-                .optionInfoList(
-                    (requestChoiceQuestionMap.get(qId) != null
-                    && requestChoiceQuestionMap.get(qId).getOptions() != null)
-                        ? requestChoiceQuestionMap.get(qId).getOptions()
-                        : List.of()
-                )
-                .build())
-            .toList();
-    }
-
-    private Set<Long> getChoiceQuestionIds(QuestionUpsertDto questionUpsertDto) {
-        return questionUpsertDto.getUpsertInfoList().stream()
-            .filter(info -> QuestionType.CHOICE.equals(info.getQuestionType()))
-            .map(QuestionUpsertDto.UpsertInfo::getQuestionId)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toSet());
+        Map<Integer, QuestionUpsertDto.UpsertInfo> requestedByOrder = requestedQuestionUpsertDto.getUpsertInfoList().stream()
+            .filter(info -> info.getQuestionOrder() != null)
+            .collect(Collectors.toMap(
+                QuestionUpsertDto.UpsertInfo::getQuestionOrder,
+                Function.identity(),
+                (existing, replace) -> existing
+            ));
+
+        List<OptionUpsertDto> choiceOptionUpsertDtos = new ArrayList<>();
+        List<GridOptionUpsertDto> gridOptionUpsertDtos = new ArrayList<>();
+
+        savedQuestionUpsertDto.getUpsertInfoList().stream()
+            .filter(savedInfo -> savedInfo.getQuestionType().isChoice() || savedInfo.getQuestionType().isGrid())
+            .filter(savedInfo -> savedInfo.getQuestionId() != null && requestedByOrder.get(savedInfo.getQuestionOrder()) != null)
+            .forEach(savedInfo -> {
+                QuestionUpsertDto.UpsertInfo requestInfo = requestedByOrder.get(savedInfo.getQuestionOrder());
+
+                if (savedInfo.getQuestionType().isChoice()) {
+                    choiceOptionUpsertDtos.add(OptionUpsertDto.builder()
+                        .questionId(savedInfo.getQuestionId())
+                        .optionInfoList(requestInfo.getOptions() != null ? requestInfo.getOptions() : List.of())
+                        .build()
+                    );
+                } else if (savedInfo.getQuestionType().isGrid()) {
+                    gridOptionUpsertDtos.add(GridOptionUpsertDto.builder()
+                        .questionId(savedInfo.getQuestionId())
+                        .gridOptionInfoList(requestInfo.getGridOptions() != null ? requestInfo.getGridOptions() : List.of())
+                        .build()
+                    );
+                }
+            });
+
+        return new OptionUpsertBundle(choiceOptionUpsertDtos, gridOptionUpsertDtos);
     }
 
     /** questionId 기준 OptionUpsertDto 맵핑 */
     private Map<Long, OptionUpsertDto> mapOptionsByQuestionId(List<OptionUpsertDto> optionUpsertDtoList) {
         return optionUpsertDtoList.stream()
-                .collect(Collectors.toMap(
-                        OptionUpsertDto::getQuestionId,
-                        Function.identity()
-                ));
+            .collect(Collectors.toMap(
+                OptionUpsertDto::getQuestionId,
+                Function.identity()
+            ));
+    }
+
+    /** questionId 기준 GridOptionUpsertDto 맵핑 */
+    private Map<Long, GridOptionUpsertDto> mapGridOptionsByQuestionId(List<GridOptionUpsertDto> gridOptionUpsertDtoList) {
+        return gridOptionUpsertDtoList.stream()
+            .collect(Collectors.toMap(
+                GridOptionUpsertDto::getQuestionId,
+                Function.identity()
+            ));
     }
 
     /** UPSERT된 보기 정보를 questionUpsertDto에 다시 반영 */
     private void applyOptionsToQuestionUpsertDto(
             QuestionUpsertDto questionUpsertDto,
-            Map<Long, OptionUpsertDto> optionDtoMap
+            Map<Long, OptionUpsertDto> optionDtoMap,
+            Map<Long, GridOptionUpsertDto> gridOptionDtoMap
     ) {
-        questionUpsertDto.getUpsertInfoList().forEach(upsertInfo -> {
-            Long questionId = upsertInfo.getQuestionId();
-            OptionUpsertDto optionInfoList = optionDtoMap.get(questionId);
-
-            if (optionInfoList != null) {
-                upsertInfo.setOptions(optionInfoList.getOptionInfoList());
-            }
+        questionUpsertDto.getUpsertInfoList().stream()
+            .filter(upsertInfo -> upsertInfo.getQuestionType().isChoice() || upsertInfo.getQuestionType().isGrid())
+            .forEach(upsertInfo -> {
+                Long questionId = upsertInfo.getQuestionId();
+
+                if (upsertInfo.getQuestionType().isChoice()) {
+                    OptionUpsertDto optionInfoList = optionDtoMap.get(questionId);
+                    if (optionInfoList != null) {
+                        upsertInfo.updateOptions(optionInfoList.getOptionInfoList());
+                    }
+                } else if (upsertInfo.getQuestionType().isGrid()){
+                    GridOptionUpsertDto gridOptionUpsertDto = gridOptionDtoMap.get(questionId);
+                    if (gridOptionUpsertDto != null) {
+                        upsertInfo.updateGridOptions(gridOptionUpsertDto.getGridOptionInfoList());
+                    }
+                }
         });
     }
+
+    private record OptionUpsertBundle(
+        List<OptionUpsertDto> choiceOptionUpsertDtos,
+        List<GridOptionUpsertDto> gridOptionUpsertDtos
+    ) { }
 }
\ No newline at end of file
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormConverter.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormConverter.java
index 70a1a834..0e74543b 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormConverter.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormConverter.java
@@ -1,12 +1,16 @@
 package OneQ.OnSurvey.domain.survey.service.formRequest;
 
 import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.QuestionUpsertDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.ChoiceDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.GridDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.RatingDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.TimeDto;
 import OneQ.OnSurvey.domain.question.service.QuestionCommand;
 import OneQ.OnSurvey.domain.survey.model.formRequest.ConversionDto;
 import OneQ.OnSurvey.domain.survey.model.formRequest.FormValidationPostResponse;
@@ -42,7 +46,7 @@ public Long createSurveyFromConversionResult(ConversionDto dto, Long memberId) {
         }
 
         // 3. 문항 생성
-        List<QuestionUpsertDto.UpsertInfo> upsertInfoList = dto.questions().stream()
+        Map<Integer, QuestionUpsertDto.UpsertInfo> upsertInfoList = dto.questions().stream()
             .map(q -> {
                 QuestionType type = QuestionType.valueOf(q.getQuestionType());
                 QuestionUpsertDto.UpsertInfo.UpsertInfoBuilder builder = QuestionUpsertDto.UpsertInfo.builder()
@@ -74,48 +78,75 @@ public Long createSurveyFromConversionResult(ConversionDto dto, Long memberId) {
                             .rate(ratingDto.getRate())
                             .build();
                     }
+                    case GRID -> {
+                        GridDto gridDto = (GridDto) q;
+                        yield builder
+                            .isCheckbox(gridDto.getIsCheckbox())
+                            .isChoiceMixed(gridDto.getIsChoiceMixed())
+                            .isChoiceDistinct(gridDto.getIsChoiceDistinct())
+                            .gridOptions(gridDto.getGridOptions())
+                            .build();
+                    }
+                    case TIME -> {
+                        TimeDto timeDto = (TimeDto) q;
+                        yield builder.isInterval(timeDto.getIsInterval()).build();
+                    }
                     default -> builder.build();
                 };
             })
-            .toList();
+            .collect(Collectors.toMap(QuestionUpsertDto.UpsertInfo::getQuestionOrder, Function.identity()));
 
         if (!upsertInfoList.isEmpty()) {
             QuestionUpsertDto upsertDto = QuestionUpsertDto.builder()
                 .surveyId(surveyId)
-                .upsertInfoList(upsertInfoList)
+                .upsertInfoList(upsertInfoList.values().stream().toList())
                 .build();
             // 4. 전체 문항 저장
             QuestionUpsertDto savedQuestions = questionCommand.upsertQuestionList(upsertDto);
 
-            // 5. CHOICE 문항 옵션 저장
+            // 5. CHOICE, GRID 문항 옵션 저장
             List<OptionUpsertDto> optionUpsertDtoList = new ArrayList<>();
+            List<GridOptionUpsertDto> gridOptionUpsertDtoList = new ArrayList<>();
             List<QuestionUpsertDto.UpsertInfo> savedInfoList = savedQuestions.getUpsertInfoList();
-            Map<Integer, QuestionUpsertDto.UpsertInfo> originalInfoMap = upsertInfoList.stream()
-                .collect(java.util.stream.Collectors.toMap(QuestionUpsertDto.UpsertInfo::getQuestionOrder, Function.identity()));
-
-            for (QuestionUpsertDto.UpsertInfo savedInfo : savedInfoList) {
-                QuestionUpsertDto.UpsertInfo originalInfo = originalInfoMap.get(savedInfo.getQuestionOrder());
-
-                if (savedInfo.getQuestionType().isChoice() && originalInfo.getOptions() != null) {
-                    List<OptionDto> options = originalInfo.getOptions().stream()
-                        .map(opt -> OptionDto.builder()
-                            .questionId(savedInfo.getQuestionId())
-                            .content(opt.getContent())
-                            .nextSection(opt.getNextSection())
-                            .imageUrl(opt.getImageUrl())
-                            .build())
-                        .toList();
-
-                    optionUpsertDtoList.add(OptionUpsertDto.builder()
-                        .questionId(savedInfo.getQuestionId())
-                        .optionInfoList(options)
-                        .build());
-                }
-            }
-
+            savedInfoList.stream()
+                .filter(info -> info.getQuestionType().isChoice() || info.getQuestionType().isGrid())
+                .filter(info -> upsertInfoList.get(info.getQuestionOrder()) != null)
+                .forEach(info -> {
+                    QuestionUpsertDto.UpsertInfo originalInfo = upsertInfoList.get(info.getQuestionOrder());
+                    if (originalInfo.getQuestionType().isChoice() && originalInfo.getOptions() != null) {
+                        optionUpsertDtoList.add(OptionUpsertDto.builder()
+                            .questionId(info.getQuestionId())
+                            .optionInfoList(originalInfo.getOptions().stream()
+                                .map(opt -> OptionDto.builder()
+                                    .questionId(info.getQuestionId())
+                                    .content(opt.getContent())
+                                    .nextSection(opt.getNextSection())
+                                    .imageUrl(opt.getImageUrl())
+                                    .build()
+                                )
+                                .toList())
+                            .build());
+                    } else if (originalInfo.getQuestionType().isGrid() && originalInfo.getGridOptions() != null) {
+                        gridOptionUpsertDtoList.add(GridOptionUpsertDto.builder()
+                            .questionId(info.getQuestionId())
+                            .gridOptionInfoList(originalInfo.getGridOptions().stream()
+                                .map(opt -> GridOptionDto.builder()
+                                    .questionId(info.getQuestionId())
+                                    .isRow(opt.getIsRow())
+                                    .content(opt.getContent())
+                                    .order(opt.getOrder())
+                                    .build()
+                                )
+                                .toList())
+                            .build());
+                    }
+                });
             if (!optionUpsertDtoList.isEmpty()) {
                 questionCommand.upsertChoiceOptionList(optionUpsertDtoList);
             }
+            if (!gridOptionUpsertDtoList.isEmpty()) {
+                questionCommand.upsertGridOptionList(gridOptionUpsertDtoList);
+            }
         }
         return surveyId;
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormEventListener.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormEventListener.java
index a84e152f..8e3e942f 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormEventListener.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormEventListener.java
@@ -110,7 +110,9 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
                         );
                     });
                 } catch (Exception e) {
-                    log.error("[FormEventListener] 구글폼 변환 및 게시 트랜잭션 커밋 실패 - requestId: {}, formUrl: {}", event.requestId(), formUrl, e);
+                    log.error("[FormEventListener] 구글폼 변환 및 게시 트랜잭션 커밋 실패 - requestId: {}, formUrl: {}, screening: {}, metadata: {}",
+                        event.requestId(), formUrl, event.screening(), event.surveyForm(), e
+                    );
                     return SurveyConversionAlert.ConversionDetails.fail(formUrl, "변환된 설문 저장 및 게시 트랜잭션 수행 중 문제가 발생했습니다.");
                 }
             })
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisAgent.java b/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisAgent.java
index 95b4a869..0b7a87aa 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisAgent.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisAgent.java
@@ -143,6 +143,21 @@ public long getLongValue(String key) {
         }
     }
 
+    /**
+     *
+     *
+     * @param key       조회할 키 (keyPrefix + id 형태로 사용)
+     * @param newValue  새로 저장할 값
+     * @return 덮어씌워진 이전 값, 존재하지 않으면 null 반환
+     */
+    @Override
+    public String getAndSetValue(String key, String newValue) {
+        Long exp = redisTemplate.getExpire(key);
+        Duration ttl = Duration.ofSeconds(exp);
+
+        return redisTemplate.opsForValue().setGet(key, newValue, ttl);
+    }
+
     /**
      * 값을 저장
      *
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisCacheAction.java b/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisCacheAction.java
index 4c25439a..d3020e4e 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisCacheAction.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/redis/RedisCacheAction.java
@@ -11,6 +11,8 @@ public interface RedisCacheAction {
 
     long getLongValue(String key);
 
+    String getAndSetValue(String key, String newValue);
+
     void setValue(String key, String value, Duration ttl);
 
     Boolean setValueIfAbsent(String key, String value, Duration ttl);
diff --git a/src/main/resources/static/bo/scripts/form-request.js b/src/main/resources/static/bo/scripts/form-request.js
index da287531..7310b9c3 100644
--- a/src/main/resources/static/bo/scripts/form-request.js
+++ b/src/main/resources/static/bo/scripts/form-request.js
@@ -1,6 +1,10 @@
 // 페이지네이션 상태
 let currentPage = 0;
-let totalPages = 0;
+
+// 유효성 검사 상태
+let validatedFormLink = null;
+let validationData = null;
+let isValidationInProgress = false;
 
 // 페이지 로드 시 데이터 불러오기
 document.addEventListener('DOMContentLoaded', function() {
@@ -28,8 +32,65 @@ function handleResidenceAllToggle(checkbox) {
     specifics.forEach(cb => { cb.checked = false; cb.disabled = checkbox.checked; });
 }
 
-// ========== 폼 변환 요청 제출 관련 함수 ==========
-async function submitFormRequest() {
+// ========== 유효성 검사 관련 함수 ==========
+function setValidationLoading(isLoading) {
+    isValidationInProgress = isLoading;
+
+    const button = document.getElementById('validationButton');
+    const icon = document.getElementById('validationButtonIcon');
+    const text = document.getElementById('validationButtonText');
+
+    if (!button || !icon || !text) return;
+
+    button.disabled = isLoading;
+    button.classList.toggle('opacity-70', isLoading);
+    button.classList.toggle('cursor-not-allowed', isLoading);
+
+    if (isLoading) {
+        icon.className = 'fas fa-spinner fa-spin mr-1';
+        text.textContent = '검사 중...';
+    } else {
+        icon.className = 'fas fa-check-circle mr-1';
+        text.textContent = '유효성 검사';
+    }
+}
+
+function updateFormRequestRowAfterRegistration(formRequestId, surveyId) {
+    const row = document.getElementById(`form-request-row-${formRequestId}`);
+    if (!row) return false;
+
+    const filterStatus = document.getElementById('filterStatus')?.value ?? '';
+
+    // 현재 목록이 미등록 필터라면 등록 완료 후 행을 제거한다.
+    if (filterStatus === 'false') {
+        row.remove();
+        return true;
+    }
+
+    const surveyCell = document.getElementById(`form-request-survey-${formRequestId}`);
+    const statusCell = document.getElementById(`form-request-status-${formRequestId}`);
+    const actionCell = document.getElementById(`form-request-action-${formRequestId}`);
+
+    if (surveyCell) surveyCell.textContent = surveyId || '-';
+    if (statusCell) {
+        statusCell.innerHTML = '<span class="bg-green-100 text-green-700 px-2 py-0.5 rounded text-xs font-bold">등록완료</span>';
+    }
+    if (actionCell) {
+        actionCell.innerHTML = `
+            <button onclick="openSurveyEditor(${surveyId}, ${formRequestId})" class="px-3 py-1 bg-indigo-600 text-white rounded text-xs font-bold hover:bg-indigo-700">
+                <i class="fas fa-eye mr-1"></i>설문 조회
+            </button>
+        `;
+    }
+
+    row.dataset.isRegistered = 'true';
+    row.dataset.registeredSurveyId = surveyId || '';
+    return true;
+}
+
+async function validateFormLink() {
+    if (isValidationInProgress) return;
+
     const formLink = document.getElementById('newFormLink').value.trim();
     const requesterEmail = document.getElementById('newRequesterEmail').value.trim();
 
@@ -49,22 +110,124 @@ async function submitFormRequest() {
         return;
     }
 
-    // surveyForm
+    setValidationLoading(true);
+
+    try {
+        const response = await apiCall('/form-requests/validation', 'POST', {
+            formLink,
+            requesterEmail
+        });
+
+        if (response) {
+            validatedFormLink = formLink;
+            validationData = response.results[0];
+            // 유효성 검사 결과 표시
+            const resultContainer = document.getElementById('validationResultContainer');
+            const resultText = document.getElementById('validationResultText');
+
+            if (validationData.convertible !== undefined) {
+                resultText.innerHTML = `
+                    변환 가능한 문항: <strong>${validationData.convertible}</strong>개 / 
+                    전체 문항: <strong>${validationData.totalCount ?? 'N/A'}</strong>개
+                `;
+            } else {
+                resultText.textContent = '유효성 검사가 완료되었습니다.';
+            }
+
+            resultContainer.classList.remove('hidden');
+            document.getElementById('validationFailureContainer').classList.add('hidden');
+            showToast('유효성 검사가 완료되었습니다.', 'success');
+        }
+    } catch (error) {
+        console.error('유효성 검사 실패:', error);
+        validatedFormLink = null;
+        validationData = null;
+        document.getElementById('validationResultContainer').classList.add('hidden');
+        document.getElementById('validationFailureText').textContent = '유효성 검사에 실패했습니다. 다시 시도해주세요.';
+        document.getElementById('validationFailureContainer').classList.remove('hidden');
+        showToast('유효성 검사에 실패했습니다.', 'error');
+    } finally {
+        setValidationLoading(false);
+    }
+}
+
+// ========== 폼 변환 요청 제출 관련 함수 ==========
+async function submitFormRequest() {
+    const formLink = document.getElementById('newFormLink').value.trim();
+    const requesterEmail = document.getElementById('newRequesterEmail').value.trim();
+
+    // 유효성 검사 완료 확인
+    if (!validatedFormLink) {
+        showToast('먼저 유효성 검사를 수행해주세요.', 'error');
+        return;
+    }
+
+    // 폼 링크 일치 확인
+    if (validatedFormLink !== formLink) {
+        showToast('유효성 검사된 폼 링크와 현재 폼 링크가 다릅니다. 다시 유효성 검사를 수행해주세요.', 'error');
+        return;
+    }
+
+    // surveyForm (필수)
     const deadline = document.getElementById('newDeadline').value;
     const gender = document.getElementById('newGender').value;
     const dueCount = document.getElementById('newDueCount').value;
     const totalCoin = document.getElementById('newTotalCoin').value;
 
+    // 필수 필드 검증 - 마감일
+    if (!deadline) {
+        showToast('마감일을 입력해주세요.', 'error');
+        document.getElementById('newDeadline').focus();
+        return;
+    }
+
+    // 필수 필드 검증 - 목표 응답 수
+    if (!dueCount || parseInt(dueCount) < 1) {
+        showToast('목표 응답 수를 1 이상 입력해주세요.', 'error');
+        document.getElementById('newDueCount').focus();
+        return;
+    }
+
+    // 필수 필드 검증 - 총 코인
+    if (!totalCoin || parseInt(totalCoin) < 0) {
+        showToast('총 코인을 0 이상 입력해주세요.', 'error');
+        document.getElementById('newTotalCoin').focus();
+        return;
+    }
+
+    // 연령대 검증
     const ageAllChecked = document.querySelector('.new-age-checkbox[value="ALL"]').checked;
+    const ageSpecificsChecked = document.querySelectorAll('.new-age-specific:checked').length > 0;
+
+    if (!ageAllChecked && !ageSpecificsChecked) {
+        showToast('연령대를 최소 1개 이상 선택해주세요.', 'error');
+        return;
+    }
+
     const ages = ageAllChecked
         ? ['ALL']
         : Array.from(document.querySelectorAll('.new-age-specific:checked')).map(cb => cb.value);
 
+    // 거주지 검증
     const residenceAllChecked = document.querySelector('.new-residence-checkbox[value="ALL"]').checked;
+    const residenceSpecificsChecked = document.querySelectorAll('.new-residence-specific:checked').length > 0;
+
+    if (!residenceAllChecked && !residenceSpecificsChecked) {
+        showToast('거주지를 최소 1개 이상 선택해주세요.', 'error');
+        return;
+    }
+
     const residences = residenceAllChecked
         ? ['ALL']
         : Array.from(document.querySelectorAll('.new-residence-specific:checked')).map(cb => cb.value);
 
+    // 관심사 검증 (필수, 최소 1개)
+    const interests = Array.from(document.querySelectorAll('.new-interest-checkbox:checked')).map(cb => cb.value);
+    if (interests.length === 0) {
+        showToast('관심사를 최소 1개 이상 선택해주세요.', 'error');
+        return;
+    }
+
     // screening
     const screeningContent = document.getElementById('newScreeningContent').value.trim();
     const screeningAnswer = document.getElementById('newScreeningAnswer').value;
@@ -72,9 +235,6 @@ async function submitFormRequest() {
         ? { content: screeningContent, answer: screeningAnswer === '' ? null : screeningAnswer === 'true' }
         : null;
 
-    // interests
-    const interests = Array.from(document.querySelectorAll('.new-interest-checkbox:checked')).map(cb => cb.value);
-
     const requestData = {
         formLink,
         requesterEmail,
@@ -95,7 +255,7 @@ async function submitFormRequest() {
         if (response !== undefined) {
             showToast('폼 변환 요청이 등록되었습니다.', 'success');
             clearFormRequestInputs();
-            loadFormRequests();
+            setTimeout(loadFormRequests, 5000);
         }
     } catch (error) {
         console.error('폼 변환 요청 실패:', error);
@@ -114,6 +274,11 @@ function clearFormRequestInputs() {
     document.getElementById('newScreeningAnswer').value = '';
     document.querySelectorAll('.new-age-checkbox, .new-residence-checkbox, .new-interest-checkbox')
         .forEach(cb => { cb.checked = false; cb.disabled = false; });
+
+    // 유효성 검사 상태 초기화
+    validatedFormLink = null;
+    validationData = null;
+    document.getElementById('validationResultContainer').classList.add('hidden');
 }
 
 // ========== 설문 변환 요청 관련 함수 ==========
@@ -166,7 +331,7 @@ function renderFormRequests(requests) {
     }
 
     tbody.innerHTML = requests.map(req => `
-        <tr class="hover:bg-slate-50">
+        <tr id="form-request-row-${req.id}" data-request-id="${req.id}" class="hover:bg-slate-50">
             <td class="px-6 py-4 text-slate-600">${req.id}</td>
             <td class="px-6 py-4">
                 <a href="${req.formLink}" target="_blank" class="text-indigo-600 hover:underline truncate max-w-xs block" title="${req.formLink}">
@@ -174,18 +339,18 @@ function renderFormRequests(requests) {
                 </a>
             </td>
             <td class="px-6 py-4 text-slate-600">${req.requesterEmail || '-'}</td>
+            <td id="form-request-survey-${req.id}" class="px-6 py-4 text-slate-600">${req.registeredSurveyId || '-'}</td>
             <td class="px-6 py-4 text-slate-600">${req.questionCount || '-'}</td>
             <td class="px-6 py-4 text-slate-600">${req.targetResponseCount || '-'}</td>
-            <td class="px-6 py-4 text-slate-600">${req.deadline || '-'}</td>
-            <td class="px-6 py-4 text-slate-600">${req.price ? req.price.toLocaleString() + '원' : '-'}</td>
-            <td class="px-6 py-4">
+            <td class="px-6 py-4 text-slate-600">${req.price ? req.price.toLocaleString() : '0'}</td>
+            <td id="form-request-status-${req.id}" class="px-6 py-4">
                 ${req.isRegistered
                     ? `<span class="bg-green-100 text-green-700 px-2 py-0.5 rounded text-xs font-bold">등록완료</span>`
                     : `<span class="bg-orange-100 text-orange-700 px-2 py-0.5 rounded text-xs font-bold">미등록</span>`
                 }
             </td>
             <td class="px-6 py-4 text-slate-600 text-xs">${formatDateTime(req.createdAt)}</td>
-            <td class="px-6 py-4 text-center">
+            <td id="form-request-action-${req.id}" class="px-6 py-4 text-center">
                 ${req.isRegistered && req.registeredSurveyId
                     ? `<button onclick="openSurveyEditor(${req.registeredSurveyId}, ${req.id})" class="px-3 py-1 bg-indigo-600 text-white rounded text-xs font-bold hover:bg-indigo-700">
                         <i class="fas fa-eye mr-1"></i>설문 조회
@@ -309,12 +474,14 @@ async function submitCreateSurvey() {
         // 2. 폼 요청 등록 처리
         await apiCall(`/form-requests/${formRequestId}/register?surveyId=${surveyId}`, 'POST');
         showToast('폼이 설문에 등록되었습니다.', 'success');
+        console.log(1);
+        // 3. 테이블 행 즉시 갱신
+        updateFormRequestRowAfterRegistration(formRequestId, surveyId);
 
-        // 3. 모달 닫기 및 목록 새로고침
+        // 4. 모달 닫기
         closeSurveyModal();
-        loadFormRequests();
 
-        // 4. 설문 편집 페이지로 이동 (선택사항)
+        // 5. 설문 편집 페이지로 이동 (선택사항)
         if (confirm('생성된 설문의 문항을 편집하시겠습니까?')) {
             const params = new URLSearchParams({
                 surveyId: surveyId,
diff --git a/src/main/resources/templates/bo/form-request.html b/src/main/resources/templates/bo/form-request.html
index 05e64ce9..86b4303a 100644
--- a/src/main/resources/templates/bo/form-request.html
+++ b/src/main/resources/templates/bo/form-request.html
@@ -24,13 +24,13 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
         <!-- 기본 정보 -->
         <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 mb-4">
             <div class="lg:col-span-2">
-                <label class="block text-xs font-bold text-slate-500 mb-1">폼 링크 <span class="text-red-500">*</span></label>
-                <input type="url" id="newFormLink" placeholder="https://docs.google.com/forms/d/e/..."
+                <label class="block text-xs font-bold text-slate-500 mb-1" for="newFormLink">폼 링크 <span class="text-red-500">*</span></label>
+                <input type="url" id="newFormLink" placeholder="https://docs.google.com/forms/d/.../edit" required
                        class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
             </div>
             <div>
-                <label class="block text-xs font-bold text-slate-500 mb-1">신청자 이메일 <span class="text-red-500">*</span></label>
-                <input type="email" id="newRequesterEmail" placeholder="example@email.com"
+                <label class="block text-xs font-bold text-slate-500 mb-1" for="newRequesterEmail">신청자 이메일 <span class="text-red-500">*</span></label>
+                <input type="email" id="newRequesterEmail" placeholder="example@email.com" required
                        class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
             </div>
         </div>
@@ -40,12 +40,12 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
             <p class="text-xs font-bold text-slate-400 mb-3">세그먼트 및 가격</p>
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-1">마감일</label>
-                    <input type="date" id="newDeadline"
+                    <label class="block text-xs font-bold text-slate-500 mb-1" for="newDeadline">마감일</label>
+                    <input type="date" id="newDeadline" required
                            class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                 </div>
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-1">성별</label>
+                    <label class="block text-xs font-bold text-slate-500 mb-1" for="newGender">성별</label>
                     <select id="newGender" class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                         <option value="ALL">전체</option>
                         <option value="MALE">남성</option>
@@ -53,20 +53,20 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
                     </select>
                 </div>
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-1">목표 응답 수</label>
-                    <input type="number" id="newDueCount" placeholder="예: 100" min="1"
+                    <label class="block text-xs font-bold text-slate-500 mb-1" for="newDueCount">목표 응답 수</label>
+                    <input type="number" id="newDueCount" placeholder="예: 100" min="1" required
                            class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                 </div>
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-1">총 코인</label>
-                    <input type="number" id="newTotalCoin" placeholder="예: 10000" min="0"
+                    <label class="block text-xs font-bold text-slate-500 mb-1" for="newTotalCoin">총 코인</label>
+                    <input type="number" id="newTotalCoin" placeholder="예: 10000" min="0" required
                            class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                 </div>
             </div>
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <!-- 연령대 -->
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-2">연령대</label>
+                    <label class="block text-xs font-bold text-slate-500 mb-2">연령대 <span class="text-red-500">*</span></label>
                     <div class="flex flex-wrap gap-2">
                         <label class="flex items-center gap-1 text-xs cursor-pointer">
                             <input type="checkbox" value="ALL" class="new-age-checkbox" onchange="handleAgeAllToggle(this)"> 전체
@@ -82,7 +82,7 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
                 </div>
                 <!-- 거주지 -->
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-2">거주지</label>
+                    <label class="block text-xs font-bold text-slate-500 mb-2">거주지 <span class="text-red-500">*</span></label>
                     <div class="flex flex-wrap gap-2">
                         <label class="flex items-center gap-1 text-xs cursor-pointer">
                             <input type="checkbox" value="ALL" class="new-residence-checkbox" onchange="handleResidenceAllToggle(this)"> 전체
@@ -114,12 +114,12 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
             <p class="text-xs font-bold text-slate-400 mb-3">스크리닝 (선택)</p>
             <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
                 <div class="md:col-span-2">
-                    <label class="block text-xs font-bold text-slate-500 mb-1">스크리닝 문항 내용</label>
+                    <label class="block text-xs font-bold text-slate-500 mb-1" for="newScreeningContent">스크리닝 문항 내용</label>
                     <input type="text" id="newScreeningContent" placeholder="예: 최근 6개월 내 온라인 쇼핑 경험이 있으신가요?"
                            class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                 </div>
                 <div>
-                    <label class="block text-xs font-bold text-slate-500 mb-1">정답</label>
+                    <label class="block text-xs font-bold text-slate-500 mb-1" for="newScreeningAnswer">정답</label>
                     <select id="newScreeningAnswer" class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                         <option value="">없음</option>
                         <option value="true">예 (true)</option>
@@ -127,11 +127,12 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
                     </select>
                 </div>
             </div>
+            <p class="mt-2 text-xs text-slate-400">※ 마감일, 목표 응답 수, 총 코인, 연령대, 거주지는 필수 입력입니다.</p>
         </div>
 
         <!-- 관심사 -->
         <div class="border border-slate-100 rounded-lg p-3 mb-4">
-            <p class="text-xs font-bold text-slate-400 mb-3">관심사 (선택)</p>
+            <p class="text-xs font-bold text-slate-400 mb-3">관심사 <span class="text-red-500">*</span></p>
             <div class="flex flex-wrap gap-2">
                 <label class="flex items-center gap-1 text-xs cursor-pointer"><input type="checkbox" value="CAREER" class="new-interest-checkbox"> 직장/커리어</label>
                 <label class="flex items-center gap-1 text-xs cursor-pointer"><input type="checkbox" value="BUSINESS" class="new-interest-checkbox"> 창업/사업</label>
@@ -145,8 +146,34 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
             </div>
         </div>
 
+        <!-- 유효성 검사 결과 -->
+        <div id="validationResultContainer" class="border border-green-200 bg-green-50 rounded-lg p-3 mb-4 hidden">
+            <div class="flex items-start gap-2">
+                <i class="fas fa-check-circle text-green-600 mt-0.5"></i>
+                <div class="flex-1">
+                    <p class="text-xs font-bold text-green-700 mb-1">유효성 검사 완료</p>
+                    <p id="validationResultText" class="text-xs text-green-600"></p>
+                </div>
+            </div>
+        </div>
+
+        <!-- 유효성 검사 결과 -->
+        <div id="validationFailureContainer" class="border border-red-200 bg-red-50 rounded-lg p-3 mb-4 hidden">
+            <div class="flex items-start gap-2">
+                <i class="fas fa-check-circle text-red-600 mt-0.5"></i>
+                <div class="flex-1">
+                    <p class="text-xs font-bold text-red-700 mb-1">유효성 검사 실패</p>
+                    <p id="validationFailureText" class="text-xs text-red-600"></p>
+                </div>
+            </div>
+        </div>
+
         <!-- 버튼 -->
-        <div class="flex justify-end">
+        <div class="flex justify-end gap-2">
+            <button id="validationButton" onclick="validateFormLink()" class="px-6 py-2 bg-indigo-600 text-white rounded text-sm font-bold hover:bg-indigo-700 transition inline-flex items-center justify-center">
+                <i id="validationButtonIcon" class="fas fa-check-circle mr-1"></i>
+                <span id="validationButtonText">유효성 검사</span>
+            </button>
             <button onclick="submitFormRequest()" class="px-6 py-2 bg-green-600 text-white rounded text-sm font-bold hover:bg-green-700 transition">
                 <i class="fas fa-paper-plane mr-1"></i>변환 요청
             </button>
@@ -158,14 +185,14 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
         <div class="flex flex-wrap gap-4 items-end">
             <!-- 이메일 검색 -->
             <div class="flex-1 min-w-[200px]">
-                <label class="block text-xs font-bold text-slate-500 mb-1">신청자 이메일 검색</label>
+                <label class="block text-xs font-bold text-slate-500 mb-1" for="searchEmail">신청자 이메일 검색</label>
                 <input type="text" id="searchEmail" placeholder="이메일 입력..."
                        class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none"
                        onkeyup="if(event.key === 'Enter') loadFormRequests()">
             </div>
             <!-- 등록 상태 필터 -->
             <div class="min-w-[150px]">
-                <label class="block text-xs font-bold text-slate-500 mb-1">등록 상태</label>
+                <label class="block text-xs font-bold text-slate-500 mb-1" for="filterStatus">등록 상태</label>
                 <select id="filterStatus" class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none" onchange="loadFormRequests()">
                     <option value="">전체</option>
                     <option value="false">미등록</option>
@@ -174,7 +201,7 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
             </div>
             <!-- 페이지 크기 -->
             <div class="min-w-[100px]">
-                <label class="block text-xs font-bold text-slate-500 mb-1">표시 개수</label>
+                <label class="block text-xs font-bold text-slate-500 mb-1" for="pageSize">표시 개수</label>
                 <select id="pageSize" class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none" onchange="loadFormRequests()">
                     <option value="10">10개</option>
                     <option value="20">20개</option>
@@ -201,9 +228,9 @@ <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
                 <th class="px-6 py-4">ID</th>
                 <th class="px-6 py-4">폼 링크</th>
                 <th class="px-6 py-4">신청자 이메일</th>
+                <th class="px-6 py-4">설문 ID</th>
                 <th class="px-6 py-4">질문 수</th>
                 <th class="px-6 py-4">목표 응답</th>
-                <th class="px-6 py-4">마감일</th>
                 <th class="px-6 py-4">가격</th>
                 <th class="px-6 py-4">등록 상태</th>
                 <th class="px-6 py-4">등록일</th>
@@ -238,11 +265,11 @@ <h3 class="text-lg font-bold text-white"><i class="fas fa-plus-circle mr-2"></i>
                 <a id="modalFormLink" href="#" target="_blank" class="text-indigo-600 hover:underline break-all"></a>
             </div>
             <div>
-                <label class="block text-sm font-bold text-slate-700 mb-2">설문 제목 <span class="text-red-500">*</span></label>
+                <label class="block text-sm font-bold text-slate-700 mb-2" for="modalSurveyTitle">설문 제목 <span class="text-red-500">*</span></label>
                 <input type="text" id="modalSurveyTitle" class="w-full border border-slate-300 rounded-lg px-4 py-3 text-sm focus:border-indigo-500 focus:ring-2 focus:ring-indigo-200 outline-none transition" placeholder="설문 제목을 입력하세요">
             </div>
             <div>
-                <label class="block text-sm font-bold text-slate-700 mb-2">설문 설명</label>
+                <label class="block text-sm font-bold text-slate-700 mb-2" for="modalSurveyDescription">설문 설명</label>
                 <textarea id="modalSurveyDescription" class="w-full border border-slate-300 rounded-lg px-4 py-3 text-sm focus:border-indigo-500 focus:ring-2 focus:ring-indigo-200 outline-none transition resize-none" rows="3" placeholder="설문 설명을 입력하세요 (선택사항)"></textarea>
             </div>
             <input type="hidden" id="modalFormRequestId">
diff --git a/src/main/resources/templates/bo/survey.html b/src/main/resources/templates/bo/survey.html
index 72f83374..355c6246 100644
--- a/src/main/resources/templates/bo/survey.html
+++ b/src/main/resources/templates/bo/survey.html
@@ -11,7 +11,6 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
     <style>
         body { font-family: 'Pretendard', sans-serif; }
-        .logic-line { border-bottom: 2px dotted #cbd5e1; }
         ::-webkit-scrollbar { width: 8px; }
         ::-webkit-scrollbar-thumb { background: #cbd5e1; border-radius: 4px; }
         /* 드래그 앤 드롭 스타일 */
@@ -114,12 +113,16 @@ <h1 class="text-2xl font-bold text-slate-800"><i class="fas fa-tasks mr-2 text-i
         <h3 class="text-sm font-bold text-indigo-800 mb-3"><i class="fas fa-pen-nib mr-2"></i>기본 정보 입력</h3>
         <div class="space-y-3">
             <div>
-                <label class="block text-xs font-bold text-slate-500 mb-1">설문 제목</label>
-                <input type="text" id="new-survey-title" class="w-full text-sm border border-slate-300 rounded px-3 py-2 focus:border-indigo-500 outline-none" placeholder="설문 제목을 입력하세요">
+                <label class="block text-xs font-bold text-slate-500 mb-1">
+                    설문 제목
+                    <input type="text" id="new-survey-title" class="w-full text-sm border border-slate-300 rounded px-3 py-2 focus:border-indigo-500 outline-none" placeholder="설문 제목을 입력하세요">
+                </label>
             </div>
             <div>
-                <label class="block text-xs font-bold text-slate-500 mb-1">설문 설명</label>
-                <textarea id="new-survey-description" class="w-full text-sm border border-slate-300 rounded px-3 py-2 focus:border-indigo-500 outline-none resize-none" rows="2" placeholder="설문 설명을 입력하세요"></textarea>
+                <label class="block text-xs font-bold text-slate-500 mb-1">
+                    설문 설명
+                    <textarea id="new-survey-description" class="w-full text-sm border border-slate-300 rounded px-3 py-2 focus:border-indigo-500 outline-none resize-none" rows="2" placeholder="설문 설명을 입력하세요"></textarea>
+                </label>
             </div>
             <div class="flex justify-end gap-2 mt-2">
                 <button onclick="toggleCreateForm()" class="px-3 py-1.5 text-xs text-slate-500 hover:bg-slate-100 rounded">취소</button>
@@ -166,7 +169,7 @@ <h3 class="text-sm font-bold text-indigo-800 mb-3"><i class="fas fa-pen-nib mr-2
                 <!-- 설문 제목 (contenteditable) -->
                 <input type="hidden" id="survey-title-value" value="">
                 <div id="survey-title" class="w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 transition-colors" contenteditable="true" data-placeholder="설문 제목을 입력하세요" oninput="syncSurveyTitleValue(this)"></div>
-                <div class="flex items-center gap-2 mt-1 mb-2">
+                <div class="editable-action-row hidden flex items-center gap-2 mt-1 mb-2">
                     <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(document.getElementById('survey-title'))">
                         <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
                     </button>
@@ -174,7 +177,7 @@ <h3 class="text-sm font-bold text-indigo-800 mb-3"><i class="fas fa-pen-nib mr-2
                 <!-- 설문 설명 (contenteditable) -->
                 <input type="hidden" id="survey-description-value" value="">
                 <div id="survey-description" class="w-full text-sm text-slate-600 border border-slate-200 rounded-lg p-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none min-h-[60px]" contenteditable="true" data-placeholder="설문 설명을 입력하세요" oninput="syncSurveyDescValue(this)"></div>
-                <div class="flex items-center gap-2 mt-1">
+                <div class="editable-action-row hidden flex items-center gap-2 mt-1">
                     <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(document.getElementById('survey-description'))">
                         <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
                     </button>
@@ -234,7 +237,7 @@ <h3 class="font-bold text-slate-700"><i class="fas fa-filter mr-2 text-indigo-50
 
                 <div id="screeningForm" class="space-y-3">
                     <div>
-                        <label class="block text-xs font-medium text-slate-600 mb-1">스크리닝 질문</label>
+                        <label class="block text-xs font-medium text-slate-600 mb-1" for="screeningContent">스크리닝 질문</label>
                         <input type="text" id="screeningContent" class="w-full border border-slate-300 rounded-lg px-3 py-2 text-sm focus:border-indigo-500 outline-none" placeholder="예: 본 설문의 대상인 20대 여성이 맞습니까?">
                     </div>
                     <div>
@@ -316,7 +319,7 @@ <h3 class="font-bold text-slate-700 mb-3"><i class="fas fa-crosshairs mr-2 text-
                 <div class="grid grid-cols-2 gap-4">
                     <!-- 성별 -->
                     <div>
-                        <label class="block text-xs font-medium text-slate-600 mb-1">타겟 성별</label>
+                        <label class="block text-xs font-medium text-slate-600 mb-1" for="targetGender">타겟 성별</label>
                         <select id="targetGender" class="w-full border border-slate-300 rounded-lg px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                             <option value="ALL">전체</option>
                             <option value="MALE">남성</option>
@@ -450,7 +453,7 @@ <h3 class="font-bold text-slate-700 mb-3"><i class="fas fa-chart-bar mr-2 text-b
 
                 <div class="grid grid-cols-2 gap-4">
                     <div>
-                        <label class="block text-xs font-medium text-slate-600 mb-1">목표 응답 수</label>
+                        <label class="block text-xs font-medium text-slate-600 mb-1" for="targetDueCount">목표 응답 수</label>
                         <select id="targetDueCount" class="w-full border border-slate-300 rounded-lg px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                             <option value="50">50명</option>
                             <option value="100">100명</option>
@@ -459,7 +462,7 @@ <h3 class="font-bold text-slate-700 mb-3"><i class="fas fa-chart-bar mr-2 text-b
                         </select>
                     </div>
                     <div>
-                        <label class="block text-xs font-medium text-slate-600 mb-1">마감일</label>
+                        <label class="block text-xs font-medium text-slate-600 mb-1" for="targetDeadline">마감일</label>
                         <input type="date" id="targetDeadline" class="w-full border border-slate-300 rounded-lg px-3 py-2 text-sm focus:border-indigo-500 outline-none">
                     </div>
                 </div>
@@ -664,6 +667,7 @@ <h3 class="text-sm font-bold text-slate-600">검색 결과</h3>
                 <h3 class="text-sm font-bold text-orange-600 mb-2">선택된 새 소유자</h3>
                 <div id="selectedOwnerInfo" class="text-sm text-slate-700"></div>
                 <input type="hidden" id="selectedNewMemberId">
+                <input type="hidden" id="selectedNewUserKey">
             </div>
         </div>
 
@@ -686,11 +690,11 @@ <h3 class="text-sm font-bold text-orange-600 mb-2">선택된 새 소유자</h3>
         <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo-600"></i>하이퍼링크 삽입</h3>
         <div class="space-y-3 mb-4">
             <div>
-                <label class="block text-xs font-medium text-slate-600 mb-1">표시 텍스트</label>
+                <label class="block text-xs font-medium text-slate-600 mb-1" for="hyperlinkText">표시 텍스트</label>
                 <input type="text" id="hyperlinkText" class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none" placeholder="링크에 표시할 텍스트">
             </div>
             <div>
-                <label class="block text-xs font-medium text-slate-600 mb-1">URL</label>
+                <label class="block text-xs font-medium text-slate-600 mb-1" for="hyperlinkUrl">URL</label>
                 <input type="text" id="hyperlinkUrl" class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none" placeholder="https://...">
             </div>
         </div>
@@ -705,11 +709,11 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 <div id="hyperlinkEditPopover" class="hidden absolute z-[70] bg-white border border-slate-200 rounded-lg shadow-lg p-3 w-72">
     <div class="space-y-2 mb-3">
         <div>
-            <label class="block text-xs font-medium text-slate-600 mb-1">표시 텍스트</label>
+            <label class="block text-xs font-medium text-slate-600 mb-1" for="editLinkText">표시 텍스트</label>
             <input type="text" id="editLinkText" class="w-full border border-slate-300 rounded px-2 py-1.5 text-sm focus:border-indigo-500 outline-none">
         </div>
         <div>
-            <label class="block text-xs font-medium text-slate-600 mb-1">URL</label>
+            <label class="block text-xs font-medium text-slate-600 mb-1" for="editLinkUrl">URL</label>
             <input type="text" id="editLinkUrl" class="w-full border border-slate-300 rounded px-2 py-1.5 text-sm focus:border-indigo-500 outline-none">
         </div>
     </div>
@@ -789,7 +793,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         'nps': 'NPS',
         'number': '숫자형',
         'date': '날짜형',
-        'image': '이미지'
+        'image': '이미지',
+        'grid': '그리드',
+        'time': '시간'
     };
 
     // 문항 타입 매핑 (프론트엔드 → 백엔드)
@@ -801,7 +807,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         'nps': 'NPS',
         'number': 'NUMBER',
         'date': 'DATE',
-        'image': 'IMAGE'
+        'image': 'IMAGE',
+        'grid': 'GRID',
+        'time': 'TIME'
     };
 
     // 문항 타입 역매핑 (백엔드 → 프론트엔드)
@@ -813,7 +821,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         'NPS': 'nps',
         'NUMBER': 'number',
         'DATE': 'date',
-        'IMAGE': 'image'
+        'IMAGE': 'image',
+        'GRID': 'grid',
+        'TIME': 'time'
     };
 
     // 생성 폼 토글
@@ -999,7 +1009,25 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 if (questionType === 'DATE') {
                     const dateInput = item.querySelector('.default-date-input');
 
-                    questionData.date = dateInput ? dateInput.value + "T00:00:00" : null;
+                    questionData.date = dateInput.value ? dateInput.value + "T00:00:00" : new Date().toISOString().split('T')[0] + "T00:00:00";
+                }
+
+                // 그리드형인 경우
+                if (questionType === 'GRID') {
+                    const isCheckboxToggle = item.querySelector('.grid-checkbox-toggle');
+                    const isChoiceMixedToggle = item.querySelector('.grid-mixed-toggle');
+                    const isChoiceDistinctToggle = item.querySelector('.grid-distinct-toggle');
+
+                    questionData.isCheckbox = isCheckboxToggle ? isCheckboxToggle.checked : false;
+                    questionData.isChoiceMixed = isChoiceMixedToggle ? isChoiceMixedToggle.checked : false;
+                    questionData.isChoiceDistinct = isChoiceDistinctToggle ? isChoiceDistinctToggle.checked : false;
+                    questionData.gridOptions = collectGridOptionData(item);
+                }
+
+                // 시간형인 경우
+                if (questionType === 'TIME') {
+                    const intervalRadio = item.querySelector('.time-interval-radio:checked');
+                    questionData.isInterval = intervalRadio ? intervalRadio.value === 'true' : false;
                 }
 
                 questions.push(questionData);
@@ -1045,20 +1073,170 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             });
         });
 
-        // 기존 옵션(optionId 있음)을 먼저, 새 옵션(optionId 없음)을 나중에 정렬
-        // 백엔드에서 update 대상 먼저, insert 대상 나중에 처리하고
-        // choice_option_id ASC 정렬로 조회하므로, UI 순서와 일치시키기 위함
+        // optionId 기준 오름차순, 신규(null)는 마지막
         options.sort((a, b) => {
-            const aHasId = a.optionId !== null;
-            const bHasId = b.optionId !== null;
-            if (aHasId && !bHasId) return -1;
-            if (!aHasId && bHasId) return 1;
-            return 0; // 같은 그룹 내에서는 원래 순서 유지
+            if (a.optionId == null && b.optionId == null) return 0;
+            if (a.optionId == null) return 1;
+            if (b.optionId == null) return -1;
+            return a.optionId - b.optionId;
         });
 
         return options;
     }
 
+    // 그리드 옵션 데이터 수집
+    function collectGridOptionData(questionItem) {
+        const gridOptions = [];
+        const rowItems = questionItem.querySelectorAll('.grid-option-list[data-is-row="true"] .grid-option-item');
+        const colItems = questionItem.querySelectorAll('.grid-option-list[data-is-row="false"] .grid-option-item');
+
+        rowItems.forEach((item, index) => {
+            const input = item.querySelector('.grid-option-input');
+            const storedId = item.getAttribute('data-grid-option-id');
+            gridOptions.push({
+                gridOptionId: storedId ? parseInt(storedId) : null,
+                isRow: true,
+                content: sanitizeHtmlForSave(input ? input.value : ''),
+                order: index
+            });
+        });
+
+        colItems.forEach((item, index) => {
+            const input = item.querySelector('.grid-option-input');
+            const storedId = item.getAttribute('data-grid-option-id');
+            gridOptions.push({
+                gridOptionId: storedId ? parseInt(storedId) : null,
+                isRow: false,
+                content: sanitizeHtmlForSave(input ? input.value : ''),
+                order: index
+            });
+        });
+
+        return gridOptions;
+    }
+
+    function addGridOption(target, isRow, content = '', gridOptionId = null) {
+        const questionItem = target.classList && target.classList.contains('question-item')
+            ? target
+            : target.closest('.question-item');
+        const list = questionItem.querySelector(`.grid-option-list[data-is-row="${isRow}"]`);
+        const optionItem = document.createElement('div');
+        optionItem.className = 'grid-option-item flex items-center gap-2';
+        optionItem.setAttribute('data-is-row', String(isRow));
+        if (gridOptionId) {
+            optionItem.setAttribute('data-grid-option-id', gridOptionId);
+        }
+
+        optionItem.innerHTML = `
+            <span class="grid-option-order text-xs text-slate-400 w-5 text-center">0</span>
+            <input type="text" value="${escapeHtml(content)}" class="grid-option-input flex-1 text-sm border border-slate-200 rounded px-2 py-1.5 focus:border-indigo-500 outline-none">
+            <div class="flex items-center gap-1 shrink-0">
+                <button type="button" class="text-slate-300 hover:text-slate-600" onclick="moveGridOption(this, -1)"><i class="fas fa-chevron-up text-[10px]"></i></button>
+                <button type="button" class="text-slate-300 hover:text-slate-600" onclick="moveGridOption(this, 1)"><i class="fas fa-chevron-down text-[10px]"></i></button>
+                <button type="button" class="text-slate-300 hover:text-red-500" onclick="removeGridOption(this)"><i class="fas fa-times text-[10px]"></i></button>
+            </div>
+        `;
+
+        list.appendChild(optionItem);
+        updateGridOptionOrder(questionItem, isRow);
+        return optionItem;
+    }
+
+    function removeGridOption(btn) {
+        const optionItem = btn.closest('.grid-option-item');
+        const questionItem = btn.closest('.question-item');
+        const isRow = optionItem.getAttribute('data-is-row') === 'true';
+        optionItem.remove();
+        updateGridOptionOrder(questionItem, isRow);
+    }
+
+    function moveGridOption(btn, direction) {
+        const optionItem = btn.closest('.grid-option-item');
+        const questionItem = btn.closest('.question-item');
+        const isRow = optionItem.getAttribute('data-is-row') === 'true';
+        const sibling = direction < 0 ? optionItem.previousElementSibling : optionItem.nextElementSibling;
+        if (!sibling) return;
+
+        const parent = optionItem.parentElement;
+        if (direction < 0) {
+            parent.insertBefore(optionItem, sibling);
+        } else {
+            parent.insertBefore(sibling, optionItem);
+        }
+
+        updateGridOptionOrder(questionItem, isRow);
+    }
+
+    function updateGridOptionOrder(questionItem, isRow) {
+        const items = questionItem.querySelectorAll(`.grid-option-list[data-is-row="${isRow}"] .grid-option-item`);
+        items.forEach((item, index) => {
+            item.setAttribute('data-order', String(index));
+            const orderLabel = item.querySelector('.grid-option-order');
+            if (orderLabel) orderLabel.textContent = String(index + 1);
+        });
+        updateGridDistinctWarning(questionItem);
+    }
+
+    function updateGridDistinctWarning(questionItem) {
+        const distinctToggle = questionItem.querySelector('.grid-distinct-toggle');
+        const warning = questionItem.querySelector('.grid-distinct-warning');
+        if (!distinctToggle || !warning) return;
+
+        const rowCount = questionItem.querySelectorAll('.grid-option-list[data-is-row="true"] .grid-option-item').length;
+        const colCount = questionItem.querySelectorAll('.grid-option-list[data-is-row="false"] .grid-option-item').length;
+        const isInvalid = distinctToggle.checked && rowCount > colCount;
+        warning.classList.toggle('hidden', !isInvalid);
+    }
+
+    function handleGridDistinctToggle(checkbox) {
+        const questionItem = checkbox.closest('.question-item');
+        updateGridDistinctWarning(questionItem);
+    }
+
+    function applyGridOptionIds(questionItem, savedGridOptions) {
+        const optionsArray = Array.isArray(savedGridOptions)
+            ? savedGridOptions
+            : Array.from(savedGridOptions || []);
+        const rowOptions = optionsArray.filter(opt => opt.isRow).sort((a, b) => a.order - b.order);
+        const colOptions = optionsArray.filter(opt => !opt.isRow).sort((a, b) => a.order - b.order);
+
+        const rowItems = questionItem.querySelectorAll('.grid-option-list[data-is-row="true"] .grid-option-item');
+        const colItems = questionItem.querySelectorAll('.grid-option-list[data-is-row="false"] .grid-option-item');
+
+        rowItems.forEach((item, index) => {
+            const saved = rowOptions[index];
+            if (saved && saved.gridOptionId) {
+                item.setAttribute('data-grid-option-id', saved.gridOptionId);
+            }
+        });
+        colItems.forEach((item, index) => {
+            const saved = colOptions[index];
+            if (saved && saved.gridOptionId) {
+                item.setAttribute('data-grid-option-id', saved.gridOptionId);
+            }
+        });
+    }
+
+    function sortOptionsById(optionsArray) {
+        return optionsArray.sort((a, b) => {
+            if (a.optionId == null && b.optionId == null) return 0;
+            if (a.optionId == null) return 1;
+            if (b.optionId == null) return -1;
+            return a.optionId - b.optionId;
+        });
+    }
+
+    function sortOptionItemsById(optionItems) {
+        return Array.from(optionItems).sort((a, b) => {
+            const aId = a.getAttribute('data-option-id');
+            const bId = b.getAttribute('data-option-id');
+            if (!aId && !bId) return 0;
+            if (!aId) return 1;
+            if (!bId) return -1;
+            return parseInt(aId) - parseInt(bId);
+        });
+    }
+
     // 문항 일괄 저장 (임시저장)
     async function saveQuestions() {
         if (!currentSurveyId) {
@@ -1104,14 +1282,23 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                     // 2. 옵션 ID 업데이트 (객관식인 경우)
                     if (savedQuestion.questionType === 'CHOICE' && savedQuestion.options) {
                         const optionItems = qItem.querySelectorAll('.option-item[data-option-type="normal"]');
+                        const sortedItems = sortOptionItemsById(optionItems);
+                        const sortedOptions = sortOptionsById(Array.isArray(savedQuestion.options)
+                            ? savedQuestion.options
+                            : Array.from(savedQuestion.options || []));
 
-                        optionItems.forEach((optItem, optIndex) => {
-                            const savedOption = savedQuestion.options[optIndex];
+                        sortedItems.forEach((optItem, optIndex) => {
+                            const savedOption = sortedOptions[optIndex];
                             if (savedOption && savedOption.optionId) {
                                 optItem.setAttribute('data-option-id', savedOption.optionId);
                             }
                         });
                     }
+
+                    // 3. 그리드 옵션 ID 업데이트
+                    if (savedQuestion.questionType === 'GRID' && savedQuestion.gridOptions) {
+                        applyGridOptionIds(qItem, savedQuestion.gridOptions);
+                    }
                 });
             }
 
@@ -1203,6 +1390,50 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 }
             }
 
+            // 4-1. 그리드 문항 검사
+            if (questionType === 'grid') {
+                const rowItems = question.querySelectorAll('.grid-option-list[data-is-row="true"] .grid-option-item');
+                const colItems = question.querySelectorAll('.grid-option-list[data-is-row="false"] .grid-option-item');
+                const distinctToggle = question.querySelector('.grid-distinct-toggle');
+                const gridContainer = question.querySelector('.grid-options');
+
+                if (rowItems.length === 0 || colItems.length === 0) {
+                    isValid = false;
+                    if (gridContainer) {
+                        gridContainer.classList.add('ring-1', 'ring-red-400');
+                        if (!firstInvalidElement) firstInvalidElement = gridContainer;
+                        setTimeout(() => {
+                            gridContainer.classList.remove('ring-1', 'ring-red-400');
+                        }, 3000);
+                    }
+                    showToast('그리드 문항에는 행과 열을 각각 1개 이상 추가해야 합니다.', 'error');
+                }
+
+                const gridInputs = question.querySelectorAll('.grid-option-input');
+                for (const input of gridInputs) {
+                    if (!input.value.trim()) {
+                        isValid = false;
+                        input.classList.add('border-red-400', 'ring-1', 'ring-red-400');
+                        if (!firstInvalidElement) firstInvalidElement = input;
+                        setTimeout(() => {
+                            input.classList.remove('border-red-400', 'ring-1', 'ring-red-400');
+                        }, 3000);
+                    }
+                }
+
+                if (distinctToggle && distinctToggle.checked && rowItems.length > colItems.length) {
+                    isValid = false;
+                    if (gridContainer) {
+                        gridContainer.classList.add('ring-1', 'ring-red-400');
+                        if (!firstInvalidElement) firstInvalidElement = gridContainer;
+                        setTimeout(() => {
+                            gridContainer.classList.remove('ring-1', 'ring-red-400');
+                        }, 3000);
+                    }
+                    showToast('열 중복 선택 금지 옵션이 켜져있으면 행 개수는 열 개수 이하만 가능합니다.', 'error');
+                }
+            }
+
             // 5. 이미지 문항인 경우 이미지가 필수인지 검사
             if (questionType === 'image') {
                 const imageTypeUrlInput = question.querySelector('.question-image-url-input-for-image-type');
@@ -1210,7 +1441,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
                 if (!imageUrl) {
                     isValid = false;
-                    const imageUploadArea = question.querySelector('.image-upload-required');
+                    const imageUploadArea = question.querySelector('.image-options');
                     if (imageUploadArea) {
                         imageUploadArea.classList.add('ring-2', 'ring-red-400');
                         if (!firstInvalidElement) firstInvalidElement = imageUploadArea;
@@ -1340,13 +1571,15 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             const choiceProp = q.choiceProperty || {};
             const ratingProp = q.ratingProperty || {};
             const dateProp = q.dateProperty || {};
+            const gridProp = q.gridProperty || {};
+            const timeProp = q.timeProperty || {};
 
             const isSectionDecidable = choiceProp.isSectionDecidable || false;
             const hasCustomInput = choiceProp.hasCustomInput || false;
             const defaultDate = dateProp.defaultDate || null;
 
             // DOM 생성 (append는 아직)
-            const newQuestionEl = addNewQuestion(q.questionId, q.title, q.description, questionCounter, frontendType, isSectionDecidable, hasCustomInput, defaultDate, q.imageUrl || null);
+            const newQuestionEl = addNewQuestion(q.questionId, q.title, q.description, questionCounter, frontendType, isSectionDecidable, hasCustomInput, defaultDate, q.imageUrl || null, timeProp.isInterval || false);
 
             // 적절한 섹션 찾기 (q.section이 1이면 index 0)
             const targetSection = sectionItems[(q.section || 1) - 1];
@@ -1370,7 +1603,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
                 // options는 Set이므로 Array로 변환
                 const optionsArray = Array.isArray(choiceProp.options) ? choiceProp.options : Array.from(choiceProp.options || []);
-                optionsArray.forEach(opt => {
+                sortOptionsById(optionsArray).forEach(opt => {
                     // 옵션 추가 (optionId 포함)
                     addOptionWithData(newQuestionEl, opt.content, opt.optionId || null, opt.nextSection, isSectionDecidable, opt.imageUrl || null);
                 });
@@ -1406,6 +1639,40 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 if (leftLabel && ratingProp.minValue) leftLabel.value = ratingProp.minValue;
                 if (rightLabel && ratingProp.maxValue) rightLabel.value = ratingProp.maxValue;
             }
+
+            // 그리드 설정
+            if (q.questionType === 'GRID') {
+                const checkboxToggle = newQuestionEl.querySelector('.grid-checkbox-toggle');
+                const mixedToggle = newQuestionEl.querySelector('.grid-mixed-toggle');
+                const distinctToggle = newQuestionEl.querySelector('.grid-distinct-toggle');
+
+                if (checkboxToggle) checkboxToggle.checked = gridProp.isCheckbox || false;
+                if (mixedToggle) mixedToggle.checked = gridProp.isChoiceMixed || false;
+                if (distinctToggle) distinctToggle.checked = gridProp.isChoiceDistinct || false;
+
+                const rowList = newQuestionEl.querySelector('.grid-option-list[data-is-row="true"]');
+                const colList = newQuestionEl.querySelector('.grid-option-list[data-is-row="false"]');
+                if (rowList) rowList.innerHTML = '';
+                if (colList) colList.innerHTML = '';
+
+                const gridOptions = Array.isArray(gridProp.gridOptions)
+                    ? gridProp.gridOptions
+                    : Array.from(gridProp.gridOptions || []);
+                const rowOptions = gridOptions.filter(opt => opt.isRow).sort((a, b) => a.order - b.order);
+                const colOptions = gridOptions.filter(opt => !opt.isRow).sort((a, b) => a.order - b.order);
+
+                rowOptions.forEach(opt => addGridOption(newQuestionEl, true, opt.content, opt.gridOptionId || null));
+                colOptions.forEach(opt => addGridOption(newQuestionEl, false, opt.content, opt.gridOptionId || null));
+
+                updateGridOptionOrder(newQuestionEl, true);
+                updateGridOptionOrder(newQuestionEl, false);
+            }
+
+            // 시간형 설정
+            if (q.questionType === 'TIME') {
+                const intervalRadio = newQuestionEl.querySelector(`.time-interval-radio[value="${timeProp.isInterval ? 'true' : 'false'}"]`);
+                if (intervalRadio) intervalRadio.checked = true;
+            }
         }
 
         updateQuestionNumbers();
@@ -1511,25 +1778,46 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         }
     }
 
+    // 이미지 업로드 (및 교체) 함수
     async function handleQuestionImageUpload(input) {
         const file = input.files[0];
         if (!file) return;
+
         showToast('이미지 업로드 중...', 'info');
         const url = await uploadImageFile(file);
         if (!url) return;
-        const questionItem = input.closest('.question-item');
-        questionItem.querySelector('.question-image-url-input').value = url;
-        const preview = questionItem.querySelector('.question-image-preview');
+
+        // 해당 문항의 이미지 컨테이너 찾기
+        const container = input.closest('.image-upload-container') || input.closest('.question-item');
+
+        // 숨겨진 input에 URL 값 저장
+        container.querySelector('.question-image-url-input').value = url;
+
+        // 이미지 태그에 src 적용
+        const preview = container.querySelector('.question-image-preview');
         preview.querySelector('.question-image-tag').src = url;
+
+        // UI 상태 전환: 프리뷰 영역 보이기, 기본 버튼 영역 숨기기
         preview.classList.remove('hidden');
-        input.value = '';
+        container.querySelector('.question-image-default').classList.add('hidden');
+
+        input.value = ''; // 동일한 파일을 다시 선택할 수 있도록 초기화
         showToast('이미지가 업로드되었습니다. 문항을 저장해주세요.', 'success');
     }
 
-    function removeQuestionImage(btn) {
-        const questionItem = btn.closest('.question-item');
-        questionItem.querySelector('.question-image-url-input').value = '';
-        btn.closest('.question-image-preview').classList.add('hidden');
+    // 이미지 삭제 함수
+    function handleQuestionImageDelete(button) {
+        const container = button.closest('.image-upload-container') || button.closest('.question-item');
+
+        // 숨겨진 URL 값 초기화
+        container.querySelector('.question-image-url-input').value = '';
+
+        // UI 상태 전환: 프리뷰 영역 숨기고 src 제거, 기본 버튼 영역 다시 보이기
+        const preview = container.querySelector('.question-image-preview');
+        preview.classList.add('hidden');
+        preview.querySelector('.question-image-tag').src = '';
+
+        container.querySelector('.question-image-default').classList.remove('hidden');
     }
 
     // 이미지 문항 전용 이미지 업로드
@@ -1547,7 +1835,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const generalImageInput = questionItem.querySelector('.question-image-url-input');
         if (generalImageInput) generalImageInput.value = url;
 
-        const uploadArea = questionItem.querySelector('.image-upload-required');
+        const uploadArea = questionItem.querySelector('.image-options');
         const emptyArea = uploadArea.querySelector('.image-type-empty');
         const preview = uploadArea.querySelector('.image-type-preview');
         const container = preview.querySelector('.image-type-container');
@@ -1576,7 +1864,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const generalImageInput = questionItem.querySelector('.question-image-url-input');
         if (generalImageInput) generalImageInput.value = '';
 
-        const uploadArea = questionItem.querySelector('.image-upload-required');
+        const uploadArea = questionItem.querySelector('.image-options');
         const emptyArea = uploadArea.querySelector('.image-type-empty');
         const preview = uploadArea.querySelector('.image-type-preview');
 
@@ -1867,6 +2155,62 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         });
     }
 
+    // ==================== editable action row (하이퍼링크 버튼) 표시 로직 ====================
+    const EDITABLE_SELECTOR = '#survey-title, #survey-description, .section-title-input, .section-desc-input, .question-title-input, .question-desc-input';
+
+    function findActionRowForEditable(editable) {
+        if (!editable) return null;
+        // 1) 바로 다음 형제에 있는지 확인
+        let el = editable.nextElementSibling;
+        for (let i = 0; i < 4 && el; i++) {
+            if (el.classList && el.classList.contains('editable-action-row')) return el;
+            el = el.nextElementSibling;
+        }
+
+        // 2) 부모 내부에서 찾기
+        if (editable.parentElement) {
+            const found = editable.parentElement.querySelector('.editable-action-row');
+            if (found) return found;
+        }
+
+        // 3) 섹션/문항 블록 내에서 찾기
+        const containers = ['.section-item', '.question-item', '#view-builder', '.flex-1'];
+        for (const sel of containers) {
+            const c = editable.closest(sel);
+            if (c) {
+                const found = c.querySelector('.editable-action-row');
+                if (found) return found;
+            }
+        }
+        return null;
+    }
+
+    function hideAllEditableActionRows() {
+        document.querySelectorAll('.editable-action-row').forEach(el => el.classList.add('hidden'));
+    }
+
+    // 포커스가 들어온 editable만 버튼을 보이게 함
+    document.addEventListener('focusin', function(e) {
+        const target = e.target;
+        if (target && target.matches && target.matches(EDITABLE_SELECTOR)) {
+            hideAllEditableActionRows();
+            const action = findActionRowForEditable(target);
+            if (action) action.classList.remove('hidden');
+        }
+    });
+
+    // 외부 클릭 시 버튼 숨김 (단, 버튼 자체나 다이얼로그/팝오버 내부 클릭은 예외)
+    document.addEventListener('click', function(e) {
+        const t = e.target;
+        const hyperlinkDialog = document.getElementById('hyperlinkDialog');
+        const popover = document.getElementById('hyperlinkEditPopover');
+        // 클릭이 editable, 버튼 영역, 다이얼로그, 팝오버 내부면 숨기지 않음
+        if (t.closest && (t.closest(EDITABLE_SELECTOR) || t.closest('.editable-action-row') || (hyperlinkDialog && !hyperlinkDialog.classList.contains('hidden') && hyperlinkDialog.contains(t)) || (popover && !popover.classList.contains('hidden') && popover.contains(t)))) {
+            return;
+        }
+        hideAllEditableActionRows();
+    });
+
     // contenteditable용 하이퍼링크 삽입 다이얼로그
     let _hyperlinkTargetEditable = null;
     let _savedSelectionRange = null;  // 다이얼로그 열기 전 선택 범위 저장
@@ -2519,14 +2863,14 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 <div class="flex flex-col gap-2 flex-1">
                     <input type="hidden" class="section-title-value" value="섹션 ${newSectionNumber}">
                     <div class="section-title-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-500 text-sm font-bold text-slate-700 w-full focus:outline-none focus:border-indigo-500 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 제목 입력 (필수)" oninput="syncSectionTitleValue(this); onSectionInfoChange(this);">섹션 ${newSectionNumber}</div>
-                    <div class="flex gap-2 mt-1">
+                    <div class="editable-action-row hidden flex gap-2 mt-1">
                         <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-title-input'))">
                             <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
                         </button>
                     </div>
                     <input type="hidden" class="section-desc-value" value="">
                     <div class="section-desc-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-400 text-sm text-slate-500 w-full focus:outline-none focus:border-indigo-400 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 설명 (선택사항)" oninput="syncSectionDescValue(this); onSectionInfoChange(this);"></div>
-                    <div class="flex gap-2 mt-1">
+                    <div class="editable-action-row hidden flex gap-2 mt-1">
                         <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-desc-input'))">
                             <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
                         </button>
@@ -2559,6 +2903,8 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                     </button>
                     <select class="new-question-type text-xs border border-slate-300 rounded px-2 py-1.5 text-slate-600 focus:border-indigo-500 outline-none bg-white" onchange="toggleImageUploadArea(this)">
                         <option value="choice" selected>객관식</option>
+                        <option value="grid">그리드</option>
+                        <option value="time">시간형</option>
                         <option value="text">단답형</option>
                         <option value="textarea">장문형</option>
                         <option value="rating">평가형</option>
@@ -2604,7 +2950,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         refreshAllJumpSelects();
 
         // 섹션 API 즉시 호출
-        const response = await saveSectionsToServer();
+        await saveSectionsToServer();
     }
 
     // 섹션 UI만 추가 (API 호출 없음 - 데이터 로드 시 사용)
@@ -2632,14 +2978,14 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 <div class="flex flex-col gap-2 flex-1">
                     <input type="hidden" class="section-title-value" value="${escapeHtml(title)}">
                     <div class="section-title-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-500 text-sm font-bold text-slate-700 w-full focus:outline-none focus:border-indigo-500 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 제목 입력 (필수)" oninput="syncSectionTitleValue(this); onSectionInfoChange(this);">${title}</div>
-                    <div class="flex gap-2 mt-1">
+                    <div class="editable-action-row hidden flex gap-2 mt-1">
                         <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-title-input'))">
                             <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
                         </button>
                     </div>
                     <input type="hidden" class="section-desc-value" value="${escapeHtml(description)}">
                     <div class="section-desc-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-400 text-sm text-slate-500 w-full focus:outline-none focus:border-indigo-400 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 설명 (선택사항)" oninput="syncSectionDescValue(this); onSectionInfoChange(this);">${description}</div>
-                    <div class="flex gap-2 mt-1">
+                    <div class="editable-action-row hidden flex gap-2 mt-1">
                         <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-desc-input'))">
                             <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
                         </button>
@@ -2672,12 +3018,14 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                     </button>
                     <select class="new-question-type text-xs border border-slate-300 rounded px-2 py-1.5 text-slate-600 focus:border-indigo-500 outline-none bg-white" onchange="toggleImageUploadArea(this)">
                         <option value="choice" selected>객관식</option>
+                        <option value="grid">그리드</option>
                         <option value="text">단답형</option>
                         <option value="textarea">장문형</option>
                         <option value="rating">평가형</option>
                         <option value="nps">NPS</option>
                         <option value="number">숫자형</option>
                         <option value="date">날짜형</option>
+                        <option value="time">시간형</option>
                         <option value="image">이미지</option>
                     </select>
                 </div>
@@ -2807,7 +3155,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             const response = await apiCall(`/survey-form/surveys/${currentSurveyId}/sections`, 'PUT', {
                 sectionInfoList: sections
             });
-            console.log('섹션 저장 완료:', response);
 
             const savedSections = Array.isArray(response) ? response : (response.sectionInfoList || []);
 
@@ -3056,6 +3403,11 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 section: section
             };
 
+            if (frontendType === 'time') {
+                const intervalRadio = formContainer.querySelector('.time-interval-radio:checked');
+                questionData.isInterval = intervalRadio ? intervalRadio.value === 'true' : false;
+            }
+
             // 이미지 URL이 있으면 추가
             if (preUploadedImageUrl) {
                 questionData.imageUrl = preUploadedImageUrl;
@@ -3080,7 +3432,8 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 false, // isSectionDecidable
                 false, // hasCustomInput
                 null,  // defaultDate
-                preUploadedImageUrl || null // imageUrl
+                preUploadedImageUrl || null, // imageUrl
+                questionData.isInterval
             );
 
             // 비어있음 안내문구가 있다면 숨김 처리
@@ -3119,30 +3472,22 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     }
 
     // 새 문항 DOM 생성 (반환만 수행)
-    function addNewQuestion(questionId = null, title = '', description = '', order = 0, type = 'choice', isSectionDecidable = false, hasCustomInput = false, defaultDate = null, imageUrl = null) {
+    function addNewQuestion(questionId = null, title = '', description = '', order = 0, type = 'choice', isSectionDecidable = false, hasCustomInput = false, defaultDate = null, imageUrl = null, isInterval = false) {
         const newQuestion = document.createElement('div');
         newQuestion.className = 'question-item group flex bg-white border border-slate-200 rounded-lg shadow-sm overflow-hidden hover:border-indigo-300 transition-all mb-4';
         newQuestion.setAttribute('data-question-id', questionId);
         newQuestion.setAttribute('data-question-type', type);
-
-        // 드래그 이벤트
-        newQuestion.setAttribute('draggable', 'true');
-        newQuestion.addEventListener('dragstart', handleDragStart);
-        newQuestion.addEventListener('dragend', handleDragEnd);
+        newQuestion.setAttribute('draggable', 'false');
         // dragover/drop은 섹션 컨테이너에서 처리하므로 여기서 제거하거나 유지해도 무방
 
         // 타입별 표시 클래스
         const showChoice = type === 'choice' ? '' : 'hidden';
-        const showText = type === 'text' ? '' : 'hidden';
-        const showTextarea = type === 'textarea' ? '' : 'hidden';
         const showRating = type === 'rating' ? '' : 'hidden';
         const showNps = type === 'nps' ? '' : 'hidden';
-        const showNumber = type === 'number' ? '' : 'hidden';
         const showDate = type === 'date' ? '' : 'hidden';
         const showImage = type === 'image' ? '' : 'hidden';
-
-        // [신규] 섹션 분기 설정 체크박스 표시 여부 (객관식일 때만)
-        const showRouteConfig = type === 'choice' ? '' : 'hidden';
+        const showGrid = type === 'grid' ? '' : 'hidden';
+        const showTime = type === 'time' ? '' : 'hidden';
 
         // 객관식일 때만: 분기 설정, 직접 입력 설정 표시
         const directBtnDisabled = hasCustomInput ? 'disabled class="direct-input-btn text-xs text-slate-300 cursor-not-allowed px-2 py-1 rounded inline-block"' : 'class="direct-input-btn text-xs text-emerald-600 font-bold hover:bg-emerald-50 px-2 py-1 rounded inline-block"';
@@ -3157,7 +3502,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             <div class="w-64 bg-slate-50 border-r border-slate-200 p-4 flex flex-col gap-4 shrink-0">
                 <div class="flex justify-between items-center">
                     <div class="flex items-center gap-2">
-                        <div class="drag-handle cursor-grab active:cursor-grabbing text-slate-400 hover:text-slate-600 mr-1">
+                        <div class="drag-handle cursor-grab active:cursor-grabbing text-slate-400 hover:text-slate-600 mr-1" draggable="true">
                             <i class="fas fa-grip-vertical"></i>
                         </div>
                         <span class="question-number bg-slate-200 text-slate-600 text-xs px-2 py-0.5 rounded font-bold">Q${order}</span>
@@ -3180,53 +3525,89 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 </div>
 
                 <div class="space-y-2">
-                    <div class="flex items-center justify-between">
+                    <label class="flex items-center justify-between">
                         <span class="text-xs text-slate-600 font-medium">필수 응답</span>
                         <input type="checkbox" class="required-checkbox w-4 h-4 text-indigo-600 rounded focus:ring-indigo-500">
+                    </label>
+
+                    <label class="flex items-center justify-between ${showGrid}">
+                        <span class="text-xs text-slate-600 font-medium">체크박스 그리드</span>
+                        <input type="checkbox" class="grid-checkbox-toggle w-4 h-4 text-indigo-600 rounded focus:ring-indigo-500">
+                    </label>
+                    <label class="flex items-center justify-between ${showGrid}">
+                        <span class="text-xs text-slate-600 font-medium">행 순서 무작위로 섞기</span>
+                        <input type="checkbox" class="grid-mixed-toggle w-4 h-4 text-indigo-600 rounded focus:ring-indigo-500">
+                    </label>
+                    <label class="flex items-center justify-between ${showGrid}">
+                        <span class="text-xs text-slate-600 font-medium">1열당 응답을 1개로 제한</span>
+                        <input type="checkbox" class="grid-distinct-toggle w-4 h-4 text-indigo-600 rounded focus:ring-indigo-500">
+                    </label>
+
+                    <label class="flex items-center justify-between ${showChoice}">
+                        <span class="text-xs text-slate-600 font-medium">섹션 분기 설정</span>
+                        <input type="checkbox" class="route-checkbox w-4 h-4 rounded focus:ring-indigo-500"
+                            ${isSectionDecidable ? 'checked' : ''}
+                            onchange="toggleSectionBranching(this)">
+                    </label>
+                </div>
+                <div class="image-upload-container mt-auto flex flex-col gap-2 items-start w-full ${type === 'image' ? 'hidden' : ''}">
+                    <!-- 이미지 URL 저장용 숨김 필드 -->
+                    <input type="hidden" class="question-image-url-input" value="${escapeHtml(imageUrl || '')}">
+
+                    <!-- 상태 1: 업로드된 이미지가 있을 때 (이미지 + 교체/삭제 버튼) -->
+                    <div class="question-image-preview flex flex-col gap-2 w-full ${imageUrl ? '' : 'hidden'}">
+                        <!-- 상단에 렌더링되는 이미지 -->
+                        <img src="${escapeHtml(imageUrl || '')}" class="question-image-tag max-w-full h-auto rounded border border-slate-200" alt="Question Image">
+                        <!-- 이미지 로드 실패 시 표시될 fallback -->
+                        <div class="image-type-fallback hidden flex-1">
+                            <div class="bg-amber-50 border border-amber-200 rounded p-2">
+                                <div class="flex items-center gap-1 text-amber-600 text-xs mb-1">
+                                    <i class="fas fa-exclamation-triangle"></i>
+                                    <span>이미지 로드 실패</span>
+                                </div>
+                                <p class="text-xs text-slate-500 break-all image-type-fallback-url">${escapeHtml(imageUrl || '')}</p>
+                            </div>
+                        </div>
+                        <!-- 하단 교체 및 삭제 버튼 -->
+                        <div class="flex gap-1">
+                            <label class="cursor-pointer px-2 py-1 bg-slate-100 text-slate-600 text-xs rounded hover:bg-slate-200 transition-colors inline-flex items-center gap-1">
+                                <i class="fas fa-sync-alt text-xs"></i> 변경
+                                <input type="file" class="hidden question-image-file-input" accept="image/*" onchange="handleQuestionImageUpload(this)">
+                            </label>
+                            <button type="button" class="cursor-pointer px-2 py-1 bg-red-50 text-red-600 text-xs rounded hover:bg-red-100 transition-colors inline-flex items-center gap-1" onclick="handleQuestionImageDelete(this)">
+                                <i class="fas fa-trash-alt text-xs"></i> 삭제
+                            </button>
+                        </div>
                     </div>
 
-                    <div class="route-config-container flex items-center justify-between ${showRouteConfig}">
-                        <span class="text-xs text-slate-600 font-medium text-orange-600">섹션 분기 설정</span>
-                        <input type="checkbox" class="route-checkbox w-4 h-4 text-orange-600 rounded focus:ring-orange-500"
-                               ${isSectionDecidable ? 'checked' : ''}
-                               onchange="toggleSectionBranching(this)">
+                    <!-- 상태 2: 기본 상태 (이미지 추가 버튼, 이미지가 없을 때만 표시) -->
+                    <div class="question-image-default ${imageUrl ? 'hidden' : ''}">
+                        <label class="cursor-pointer text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 inline-flex items-center gap-1">
+                            <i class="fas fa-image text-xs"></i> 이미지
+                            <input type="file" class="hidden question-image-file-input" accept="image/*" onchange="handleQuestionImageUpload(this)">
+                        </label>
                     </div>
                 </div>
             </div>
 
             <div class="flex-1 p-6">
                 <input type="hidden" class="question-title-value" value="${escapeHtml(title)}">
-                <div class="question-title-input w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 mb-2 transition-colors" contenteditable="true" data-placeholder="질문을 입력하세요" oninput="syncTitleValue(this)">${title || ''}</div>
-                <div class="flex items-center gap-2 mt-1 mb-2">
+                <div class="question-title-input w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 mb-2 transition-colors" contenteditable="true" data-placeholder="질문을 입력하세요" oninput="syncTitleValue(this)">${sanitizeDescHtml(title) || ''}</div>
+                <div class="editable-action-row hidden flex items-center gap-2 mt-1 mb-2">
                     <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(this.closest('.question-item').querySelector('.question-title-input'))">
                         <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
                     </button>
                 </div>
                 <input type="hidden" class="question-desc-value" value="${escapeHtml(description)}">
-                <div class="question-desc-input ${showDescription} w-full text-sm text-slate-500 border-b border-slate-100 focus:border-indigo-400 outline-none pb-2 transition-all min-h-[28px]" contenteditable="true" data-placeholder="문항에 대한 설명을 입력하세요 (선택사항)" oninput="syncDescValue(this)">${description || ''}</div>
-                <div class="flex items-center gap-2 mt-2 mb-3 ${showDescription}">
+                <div class="question-desc-input ${showDescription} w-full text-sm text-slate-500 border-b border-slate-100 focus:border-indigo-400 outline-none pb-2 transition-all min-h-[28px]" contenteditable="true" data-placeholder="문항에 대한 설명을 입력하세요 (선택사항)" oninput="syncDescValue(this)">${sanitizeDescHtml(description) || ''}</div>
+                <div class="editable-action-row hidden flex items-center gap-2 mt-2 mb-3 ${showDescription}">
                     <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(this.closest('.question-item').querySelector('.question-desc-input'))">
                         <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
                     </button>
                 </div>
-                <div class="flex gap-2 mt-2 mb-3 ${type === 'image' ? 'hidden' : ''}">
-                    <input type="hidden" class="question-image-url-input" value="${escapeHtml(imageUrl || '')}">
-                    <label class="cursor-pointer text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 inline-flex items-center gap-1">
-                        <i class="fas fa-image text-xs"></i> 이미지
-                        <input type="file" class="hidden question-image-file-input" accept="image/*" onchange="handleQuestionImageUpload(this)">
-                    </label>
-                </div>
-                <div class="question-image-preview ${imageUrl ? '' : 'hidden'} mb-3 ${type === 'image' ? 'hidden' : ''}">
-                    <div class="relative inline-block">
-                        <img class="question-image-tag max-h-32 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="문항 이미지" referrerpolicy="no-referrer">
-                        <button type="button" class="absolute -top-2 -right-2 w-5 h-5 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeQuestionImage(this)">
-                            <i class="fas fa-times text-[8px]"></i>
-                        </button>
-                    </div>
-                </div>
 
                 <!-- 이미지 문항 전용 이미지 업로드 영역 (단순화) -->
-                <div class="image-upload-required ${type === 'image' ? '' : 'hidden'} mb-3">
+                <div class="image-options ${showImage} mb-3">
                     <input type="hidden" class="question-image-url-input-for-image-type" value="${escapeHtml(imageUrl || '')}">
 
                     <!-- 이미지가 없을 때: 업로드 버튼만 표시 -->
@@ -3268,7 +3649,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         </div>
                     </div>
                 </div>
-
                 <div class="choice-options space-y-3 pl-2 ${showChoice}">
                     <div class="options-container" data-question-id="${questionId}">
                         ${type === 'choice' ? getInitialOptionHTML(questionId, jumpSelectClass) : ''}
@@ -3278,9 +3658,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         <button ${directBtnDisabled} onclick="addDirectInputOption('${questionId}')">+ 직접 입력 추가</button>
                     </div>
                 </div>
-
-                <div class="text-options ${showText}"><div class="bg-slate-50 border border-dashed border-slate-300 rounded p-4 text-slate-400 text-sm">단답형 입력 영역</div></div>
-                <div class="textarea-options ${showTextarea}"><div class="bg-slate-50 border border-dashed border-slate-300 rounded p-4 text-slate-400 text-sm h-24">장문형 입력 영역</div></div>
                 <div class="rating-options ${showRating}">
                     <div class="flex flex-col gap-4">
                         <div class="flex items-center gap-3">
@@ -3294,7 +3671,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                                 </button>
                             </div>
                             <!-- 왼쪽 라벨 -->
-                            <input type="text" class="rating-label-left text-xs border border-slate-200 rounded px-2 py-1 w-16 text-center focus:border-indigo-500 outline-none" value="낮음" maxlength="6" placeholder="낮음">
+                            <input type="text" class="rating-label-left text-xs border border-slate-200 rounded px-2 py-1 w-25 text-center focus:border-indigo-500 outline-none" value="낮음" maxlength="6" placeholder="낮음">
                             <!-- 동그라미들 -->
                             <div class="rating-circles flex items-center gap-2" data-count="5">
                                 <span class="w-8 h-8 rounded-full border-2 border-slate-300 flex items-center justify-center text-xs text-slate-400">1</span>
@@ -3304,7 +3681,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                                 <span class="w-8 h-8 rounded-full border-2 border-slate-300 flex items-center justify-center text-xs text-slate-400">5</span>
                             </div>
                             <!-- 오른쪽 라벨 -->
-                            <input type="text" class="rating-label-right text-xs border border-slate-200 rounded px-2 py-1 w-16 text-center focus:border-indigo-500 outline-none" value="높음" maxlength="6" placeholder="높음">
+                            <input type="text" class="rating-label-right text-xs border border-slate-200 rounded px-2 py-1 w-25 text-center focus:border-indigo-500 outline-none" value="높음" maxlength="6" placeholder="높음">
                         </div>
                         <div class="text-xs text-slate-400 pl-6">
                             <i class="fas fa-info-circle mr-1"></i> +/- 버튼으로 선택 항목 수를 2~10개로 조절할 수 있습니다. 라벨을 클릭하여 수정하세요.
@@ -3314,8 +3691,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 <div class="nps-options ${showNps}">
                     <div class="flex flex-col gap-4">
                         <div class="flex items-center gap-3">
-                            <!-- 왼쪽 표시 -->
-                            <span class="text-xs text-slate-500 font-medium">1</span>
                             <!-- 10개의 동그라미 -->
                             <div class="nps-circles flex items-center gap-2">
                                 <span class="w-8 h-8 rounded-full border-2 border-slate-300 flex items-center justify-center text-xs text-slate-400">1</span>
@@ -3329,33 +3704,67 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                                 <span class="w-8 h-8 rounded-full border-2 border-slate-300 flex items-center justify-center text-xs text-slate-400">9</span>
                                 <span class="w-8 h-8 rounded-full border-2 border-slate-300 flex items-center justify-center text-xs text-slate-400">10</span>
                             </div>
-                            <!-- 오른쪽 표시 -->
-                            <span class="text-xs text-slate-500 font-medium">10</span>
                         </div>
                         <div class="text-xs text-slate-400">
                             <i class="fas fa-info-circle mr-1"></i> NPS(Net Promoter Score)는 1~10점으로 고정됩니다.
                         </div>
                     </div>
                 </div>
-                <div class="number-options ${showNumber}">
-                    <div class="bg-slate-50 border border-dashed border-slate-300 rounded p-4 text-slate-400 text-sm flex items-center gap-2">
-                        <i class="fas fa-hashtag"></i> 사용자가 숫자를 입력하는 영역입니다.
-                    </div>
-                </div>
                 <div class="date-options ${showDate}">
                      <div class="flex flex-col gap-3">
-                        <div class="bg-slate-50 border border-dashed border-slate-300 rounded p-4 text-slate-400 text-sm flex items-center gap-2"><i class="fas fa-calendar-alt"></i> 사용자가 날짜를 선택하는 영역입니다.</div>
                         <div class="flex items-center gap-3">
                             <span class="text-xs text-slate-500 font-medium">기본 날짜 설정:</span>
                             <input type="date" class="default-date-input text-sm border border-slate-200 rounded px-2 py-1.5 focus:border-indigo-500 outline-none" value="${defaultDate || ''}">
                         </div>
                     </div>
                 </div>
-                <div class="image-options ${showImage}">
+                <div class="grid-options space-y-3 pl-2 ${showGrid}">
+                    <div class="grid grid-cols-2 gap-4">
+                        <div>
+                            <div class="flex items-center justify-between">
+                                <span class="text-xs font-bold text-slate-600">행</span>
+                                <button type="button" class="text-xs text-indigo-600 font-bold hover:bg-indigo-50 px-2 py-1 rounded" onclick="addGridOption(this, true)">+ 행 추가</button>
+                            </div>
+                            <div class="grid-option-list mt-2 space-y-2" data-is-row="true"></div>
+                        </div>
+                        <div>
+                            <div class="flex items-center justify-between">
+                                <span class="text-xs font-bold text-slate-600">열</span>
+                                <button type="button" class="text-xs text-indigo-600 font-bold hover:bg-indigo-50 px-2 py-1 rounded" onclick="addGridOption(this, false)">+ 열 추가</button>
+                            </div>
+                            <div class="grid-option-list mt-2 space-y-2" data-is-row="false"></div>
+                        </div>
+                    </div>
+                    <div class="grid-distinct-warning hidden text-xs text-red-500">
+                        열 중복 선택 금지 옵션이 켜져있으면 행 개수가 열 개수보다 많을 수 없습니다.
+                    </div>
+                </div>
+                <div class="time-options ${showTime}">
+                    <div class="flex flex-col gap-3">
+                        <div class="flex items-center gap-4 text-xs text-slate-600">
+                            <label class="flex items-center gap-2">
+                                <input type="radio" class="time-interval-radio w-4 h-4 text-indigo-600 focus:ring-indigo-500" name="time-mode-${questionId || 'new'}-${order}" value="false" ${!isInterval ? 'checked' : ''}>
+                                시간
+                            </label>
+                            <label class="flex items-center gap-2">
+                                <input type="radio" class="time-interval-radio w-4 h-4 text-indigo-600 focus:ring-indigo-500" name="time-mode-${questionId || 'new'}-${order}" value="true" ${isInterval ? 'checked' : ''}>
+                                기간
+                            </label>
+                        </div>
+                        <div class="text-xs text-slate-400">
+                            <i class="fas fa-info-circle mr-1"></i> 기간 선택 시 '시:분:초'를 입력하는 방식으로 응답합니다.
+                        </div>
+                    </div>
                 </div>
             </div>
         `;
 
+        const dragHandle = newQuestion.querySelector('.drag-handle');
+        if (dragHandle) {
+            dragHandle.addEventListener('dragstart', handleDragStart);
+            dragHandle.addEventListener('dragend', handleDragEnd);
+        }
+
         // 주의: 이 함수는 appendChild를 하지 않고 요소를 반환만 합니다.
         // 호출자가 적절한 위치에 append 해야 합니다.
 
@@ -3550,23 +3959,39 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
     // 드래그 앤 드롭 관련 변수
     let draggedQuestion = null;
+    const DRAG_SCROLL_THRESHOLD = 60;
+    const DRAG_SCROLL_STEP = 14;
+
+    function autoScrollOnDrag(clientY) {
+        const builder = document.getElementById('view-builder');
+        if (!builder) return;
+
+        const rect = builder.getBoundingClientRect();
+        const distanceTop = clientY - rect.top;
+        const distanceBottom = rect.bottom - clientY;
+
+        if (distanceTop < DRAG_SCROLL_THRESHOLD) {
+            builder.scrollTop -= DRAG_SCROLL_STEP;
+        } else if (distanceBottom < DRAG_SCROLL_THRESHOLD) {
+            builder.scrollTop += DRAG_SCROLL_STEP;
+        }
+    }
 
     // 드래그 시작
     function handleDragStart(e) {
-        draggedQuestion = this;
-        this.classList.add('opacity-50');
+        const questionItem = this.closest('.question-item');
+        if (!questionItem) return;
+        draggedQuestion = questionItem;
+        questionItem.classList.add('opacity-50');
         e.dataTransfer.effectAllowed = 'move';
-        e.dataTransfer.setData('text/plain', this.getAttribute('data-question-id'));
-
-        // 약간의 딜레이 후 스타일 적용 (드래그 이미지가 제대로 생성되도록)
-        setTimeout(() => {
-            this.classList.add('border-indigo-500', 'border-2');
-        }, 0);
+        e.dataTransfer.setData('text/plain', questionItem.getAttribute('data-question-id'));
     }
 
     // 드래그 종료
     function handleDragEnd(e) {
-        this.classList.remove('opacity-50', 'border-indigo-500', 'border-2');
+        if (draggedQuestion) {
+            draggedQuestion.classList.remove('opacity-50', 'border-indigo-500', 'border-2');
+        }
         document.querySelectorAll('.question-item').forEach(item => {
             item.classList.remove('drag-over-top', 'drag-over-bottom');
         });
@@ -3575,137 +4000,109 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
     // 드래그 오버 (드롭 허용)
     function handleDragOver(e) {
-        if (e.preventDefault) {
-            e.preventDefault();
+        autoScrollOnDrag(e.clientY);
+        const targetSectionList = e.target.closest('.section-questions');
+        if (!targetSectionList) {
+            return;
         }
 
-        // 문항 위로 드래그하는지, 섹션 빈 공간으로 드래그하는지 확인
-        const targetSection = e.target.closest('.section-questions');
-        if (targetSection) {
-            e.dataTransfer.dropEffect = 'move';
+        e.preventDefault();
+        e.dataTransfer.dropEffect = 'move';
+
+        const targetQuestionItem = e.target.closest('.question-item');
+        if (!targetQuestionItem) {
+            return;
         }
 
-        // 드래그 위치에 따라 상단/하단 표시
-        const rect = this.getBoundingClientRect();
+        if (targetQuestionItem === draggedQuestion) {
+            return;
+        }
+
+        const rect = targetQuestionItem.getBoundingClientRect();
         const midY = rect.top + rect.height / 2;
 
-        this.classList.remove('drag-over-top', 'drag-over-bottom');
+        document.querySelectorAll('.question-item').forEach(item => {
+            item.classList.remove('drag-over-top', 'drag-over-bottom');
+        });
 
         if (e.clientY < midY) {
-            this.classList.add('drag-over-top');
+            targetQuestionItem.classList.add('drag-over-top');
         } else {
-            this.classList.add('drag-over-bottom');
-        }
-
-        return false;
-    }
-
-    // 드래그 진입
-    function handleDragEnter(e) {
-        if (e.preventDefault) {
-            e.preventDefault();
+            targetQuestionItem.classList.add('drag-over-bottom');
         }
     }
 
     // 드롭
     function handleDrop(e) {
+        e.preventDefault();
         e.stopPropagation();
 
-        const draggedId = e.dataTransfer.getData('text/plain'); // dragStart에서 id 저장했다고 가정
         if (!draggedQuestion) return; // 전역 변수 draggedQuestion 사용 시
 
+        const clearDragIndicators = () => {
+            document.querySelectorAll('.question-item').forEach(item => {
+                item.classList.remove('drag-over-top', 'drag-over-bottom');
+            });
+        };
+
         // 원래 섹션 저장
+        const originalSectionList = draggedQuestion.closest('.section-questions');
         const originalSection = draggedQuestion.closest('.section-item');
         const originalSectionOrder = originalSection ? originalSection.getAttribute('data-section-order') : null;
 
-        // 드롭된 위치 찾기
-        const dropTarget = e.target;
-        const targetSectionList = dropTarget.closest('.section-questions');
-        const targetQuestionItem = dropTarget.closest('.question-item');
-
-        if (targetSectionList) {
-            // 드롭 대상 섹션
-            const targetSection = targetSectionList.closest('.section-item');
-            const targetSectionOrder = targetSection ? targetSection.getAttribute('data-section-order') : null;
-
-            if (targetQuestionItem && targetQuestionItem !== draggedQuestion) {
-                // 다른 문항 위/아래로 드롭
-                const rect = targetQuestionItem.getBoundingClientRect();
-                if (e.clientY < rect.top + rect.height / 2) {
-                    targetSectionList.insertBefore(draggedQuestion, targetQuestionItem);
-                } else {
-                    targetSectionList.insertBefore(draggedQuestion, targetQuestionItem.nextSibling);
-                }
+        // 드롭된 위치 찾기 (빈 섹션/문항 외 영역 드롭도 허용)
+        const targetSectionList = e.target.closest('.section-questions');
+        if (!targetSectionList) return;
+
+        const targetQuestionItem = e.target.closest('.question-item');
+
+        const targetSection = targetSectionList.closest('.section-item');
+        const targetSectionOrder = targetSection ? targetSection.getAttribute('data-section-order') : null;
+
+        // 같은 문항 위에 그대로 드롭한 경우는 위치 변경 없이 종료
+        if (targetQuestionItem === draggedQuestion) {
+            clearDragIndicators();
+            draggedQuestion.classList.remove('opacity-50', 'border-indigo-500', 'border-2');
+            draggedQuestion = null;
+            return;
+        }
+
+        if (targetQuestionItem && targetQuestionItem !== draggedQuestion) {
+            const rect = targetQuestionItem.getBoundingClientRect();
+            if (e.clientY < rect.top + rect.height / 2) {
+                targetSectionList.insertBefore(draggedQuestion, targetQuestionItem);
             } else {
-                // 섹션의 빈 공간(맨 끝)으로 드롭
-                targetSectionList.appendChild(draggedQuestion);
+                targetSectionList.insertBefore(draggedQuestion, targetQuestionItem.nextSibling);
             }
-
-            // 다른 섹션으로 이동한 경우 분기 드롭다운 기본값으로 리셋
-            if (originalSectionOrder && targetSectionOrder && originalSectionOrder !== targetSectionOrder) {
-                const routeCheckbox = draggedQuestion.querySelector('.route-checkbox');
-                if (routeCheckbox && routeCheckbox.checked) {
-                    // 분기 설정이 켜져 있는 경우 모든 드롭다운을 기본값으로 세팅
-                    updateSectionJumpOptions(draggedQuestion, true, true); // resetToDefault = true
-                }
+        } else {
+            const isSameSection = originalSectionList === targetSectionList;
+            const hasOtherQuestions = targetSectionList.querySelector('.question-item') !== null;
+
+            // 같은 섹션에서 타깃 문항 없이 드롭한 경우(미세 드래그)는 위치 유지
+            if (isSameSection && hasOtherQuestions) {
+                clearDragIndicators();
+                draggedQuestion.classList.remove('opacity-50', 'border-indigo-500', 'border-2');
+                draggedQuestion = null;
+                return;
             }
 
-            // 이동 후 전체 재정렬
-            updateQuestionNumbers();
-            refreshAllJumpSelects(); // 섹션 기반 드롭다운 갱신
+            targetSectionList.appendChild(draggedQuestion);
         }
 
-        draggedQuestion.classList.remove('opacity-50', 'border-indigo-500', 'border-2');
-        draggedQuestion = null;
-    }
+        if (originalSectionOrder && targetSectionOrder && originalSectionOrder !== targetSectionOrder) {
+            const routeCheckbox = draggedQuestion.querySelector('.route-checkbox');
+            if (routeCheckbox && routeCheckbox.checked) {
+                updateSectionJumpOptions(draggedQuestion, true, true); // resetToDefault = true
+            }
+        }
 
-    // 문항 타입 토글
-    function toggleQuestionType(questionId) {
-        const question = document.querySelector(`.question-item[data-question-id="${questionId}"]`);
-        const select = question.querySelector('.question-type');
-        const choiceOptions = question.querySelector('.choice-options');
-        const textOptions = question.querySelector('.text-options');
-        const textareaOptions = question.querySelector('.textarea-options');
-        const ratingOptions = question.querySelector('.rating-options');
-        const npsOptions = question.querySelector('.nps-options');
-        const numberOptions = question.querySelector('.number-options');
-        const dateOptions = question.querySelector('.date-options');
-        const maxSelectContainer = question.querySelector('.max-select-container');
-
-        // 모든 옵션 숨기기
-        const allOptions = [choiceOptions, textOptions, textareaOptions, ratingOptions, npsOptions, numberOptions, dateOptions];
-        allOptions.forEach(opt => {
-            if (opt) opt.classList.add('hidden');
-        });
+        updateQuestionNumbers();
+        refreshAllJumpSelects();
 
-        // 최대 선택 개수는 기본적으로 숨기기
-        if (maxSelectContainer) maxSelectContainer.classList.add('hidden');
-
-        // 선택된 타입에 따라 표시
-        switch (select.value) {
-            case 'choice':
-                if (choiceOptions) choiceOptions.classList.remove('hidden');
-                if (maxSelectContainer) maxSelectContainer.classList.remove('hidden');
-                break;
-            case 'text':
-                if (textOptions) textOptions.classList.remove('hidden');
-                break;
-            case 'textarea':
-                if (textareaOptions) textareaOptions.classList.remove('hidden');
-                break;
-            case 'rating':
-                if (ratingOptions) ratingOptions.classList.remove('hidden');
-                break;
-            case 'nps':
-                if (npsOptions) npsOptions.classList.remove('hidden');
-                break;
-            case 'number':
-                if (numberOptions) numberOptions.classList.remove('hidden');
-                break;
-            case 'date':
-                if (dateOptions) dateOptions.classList.remove('hidden');
-                break;
-        }
+        clearDragIndicators();
+
+        draggedQuestion.classList.remove('opacity-50', 'border-indigo-500', 'border-2');
+        draggedQuestion = null;
     }
 
     // 평가형 동그라미 개수 조절
@@ -3764,70 +4161,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         }
     }
 
-    // 문항 제목 15자 제한 함수
-    function truncateTitle(title, maxLength = 15) {
-        if (!title || title.trim() === '') return '제목 없음';
-        return title.length > maxLength ? title.substring(0, maxLength) + '...' : title;
-    }
-
-    // 모든 이동 문항 드롭다운 업데이트
-    function updateAllJumpSelects() {
-        const questions = document.querySelectorAll('.question-item');
-        const jumpSelects = document.querySelectorAll('.jump-select');
-
-        jumpSelects.forEach(select => {
-            const currentValue = select.value;
-            const currentQuestionItem = select.closest('.question-item');
-            const currentQuestionId = currentQuestionItem ? currentQuestionItem.getAttribute('data-question-id') : null;
-
-            // 현재 문항의 순서(인덱스) 찾기
-            let currentQuestionIndex = -1;
-            questions.forEach((q, idx) => {
-                if (q.getAttribute('data-question-id') === currentQuestionId) {
-                    currentQuestionIndex = idx;
-                }
-            });
-
-            select.innerHTML = `
-                <option value="next">다음 섹션으로 이동 (기본)</option>
-            `;
-
-            questions.forEach((q, index) => {
-                const qId = q.getAttribute('data-question-id');
-                // 자기 자신 문항은 제외
-                if (qId === currentQuestionId) return;
-
-                // 현재 문항보다 이전 문항은 제외 (이전 문항으로 이동 불가)
-                if (index <= currentQuestionIndex) return;
-
-                const titleInput = q.querySelector('.question-title-input');
-                const title = titleInput ? titleInput.value : '';
-                const truncatedTitle = truncateTitle(title);
-                const questionNum = index + 1;
-
-                const option = document.createElement('option');
-                option.value = `q${qId}`;
-                option.textContent = `Q${questionNum}. ${truncatedTitle} 로 이동`;
-                select.appendChild(option);
-            });
-
-            // 설문 종료 옵션 추가 (비활성화)
-            const endOption = document.createElement('option');
-            endOption.value = 'end';
-            endOption.textContent = '설문 종료 (Screen Out)';
-            endOption.disabled = true;
-            endOption.className = 'text-slate-300';
-            select.appendChild(endOption);
-
-            // 기존 선택값 복원 (이전 문항으로 가는 값이었다면 기본값으로 리셋)
-            if (currentValue && select.querySelector(`option[value="${currentValue}"]`)) {
-                select.value = currentValue;
-            } else {
-                select.value = 'next';
-            }
-        });
-    }
-
     // 옵션 추가
     function addOption(questionId) {
         const container = document.querySelector(`.options-container[data-question-id="${questionId}"]`);
@@ -3952,29 +4285,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         updateMaxSelectOptions(questionId);
     }
 
-    // 날짜 입력 동기화 함수
-    function syncDateInputs(inputElement, source) {
-        const dateOptions = inputElement.closest('.date-options');
-        const dateInput = dateOptions.querySelector('.default-date-input');
-        const textInput = dateOptions.querySelector('.default-date-text');
-
-        if (source === 'calendar') {
-            // 캘린더에서 선택한 경우 텍스트 입력란에 동기화
-            textInput.value = dateInput.value;
-        } else if (source === 'text') {
-            // 텍스트로 입력한 경우 캘린더에 동기화
-            const dateValue = textInput.value;
-            // YYYY-MM-DD 형식 검증
-            const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
-            if (dateRegex.test(dateValue)) {
-                const date = new Date(dateValue);
-                if (!isNaN(date.getTime())) {
-                    dateInput.value = dateValue;
-                }
-            }
-        }
-    }
-
     // 페이지 로드 시 초기화
     document.addEventListener('DOMContentLoaded', async function() {
         // 설문 목록 로드
@@ -4636,6 +4946,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         document.getElementById('ownerSearchResults').classList.add('hidden');
         document.getElementById('selectedNewOwner').classList.add('hidden');
         document.getElementById('selectedNewMemberId').value = '';
+        document.getElementById('selectedNewUserKey').value = '';
         document.getElementById('confirmOwnerChangeBtn').disabled = true;
 
         // 현재 소유자 정보 표시
@@ -4710,11 +5021,11 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 return `
                     <div class="flex items-center justify-between px-4 py-3 bg-slate-100 border-b border-slate-100 last:border-b-0 cursor-not-allowed opacity-60">
                         <div class="flex-1">
-                            <p class="font-medium text-slate-700">${member.name || '이름 없음'} <span class="text-orange-500 text-xs">(현재 소유자)</span></p>
+                            <p class="font-medium text-slate-700">${member.name || '이름 없음'}</p>
                             <p class="text-xs text-slate-500">ID: ${member.id} | ${member.email || '이메일 없음'}</p>
                         </div>
                         <span class="px-3 py-1 bg-slate-200 text-slate-500 rounded text-xs font-bold">
-                            선택 불가
+                            현재 소유자
                         </span>
                     </div>
                 `;
@@ -4722,7 +5033,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
             return `
                 <div class="flex items-center justify-between px-4 py-3 hover:bg-slate-50 border-b border-slate-100 last:border-b-0 cursor-pointer"
-                     onclick="selectNewOwner(${member.id}, '${member.name || ''}', '${member.email || ''}')">
+                     onclick="selectNewOwner(${member.id}, ${member.userKey}, '${member.name || ''}', '${member.email || ''}')">
                     <div class="flex-1">
                         <p class="font-medium text-slate-700">${member.name || '이름 없음'}</p>
                         <p class="text-xs text-slate-500">ID: ${member.id} | ${member.email || '이메일 없음'}</p>
@@ -4738,7 +5049,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     }
 
     // 새 소유자 선택
-    function selectNewOwner(memberId, name, email) {
+    function selectNewOwner(memberId, userKey, name, email) {
         // 현재 소유자와 동일한지 확인
         const survey = globalSurveyList.find(s => s.surveyId === currentSurveyId);
         const currentOwnerId = survey?.memberId;
@@ -4749,6 +5060,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         }
 
         document.getElementById('selectedNewMemberId').value = memberId;
+        document.getElementById('selectedNewUserKey').value = userKey;
         document.getElementById('selectedOwnerInfo').innerHTML = `
             <p><strong>회원 ID:</strong> ${memberId}</p>
             <p><strong>이름:</strong> ${name || '-'}</p>
@@ -4767,19 +5079,21 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     // 소유자 변경 확인
     async function confirmOwnerChange() {
         const newMemberId = document.getElementById('selectedNewMemberId').value;
+        const newUserKey = document.getElementById('selectedNewUserKey').value;
 
-        if (!newMemberId) {
+        if (!newMemberId && !newUserKey) {
             showToast('새 소유자를 선택해주세요.', 'warning');
             return;
         }
 
-        if (!confirm('정말 설문 소유자를 변경하시겠습니까?\n이 작업은 되돌릴 수 없습니다.')) {
+        if (!confirm('정말 설문 소유자를 변경하시겠습니까?')) {
             return;
         }
 
         try {
             await apiCall(`/admin/surveys/${currentSurveyId}/owner`, 'PATCH', {
-                newMemberId: parseInt(newMemberId)
+                newMemberId: parseInt(newMemberId),
+                newUserKey: parseInt(newUserKey)
             });
 
             showToast('설문 소유자가 변경되었습니다.', 'success');