@@ -54,6 +54,9 @@ public class Post extends BaseEntity {
     @OneToMany(mappedBy = "post",orphanRemoval = true)
     private List<PostComment> postCommentList = new ArrayList<>();
 
+    @OneToMany(mappedBy = "post",orphanRemoval = true)
+    private List<PostAnswer> postAnswerList = new ArrayList<>();
+
     @Enumerated(EnumType.STRING)
     private PostBoard board;
 
 
@@ -7,6 +7,7 @@
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Getter
@@ -18,7 +19,26 @@ public class PostMainResponseDto {
     public PostMainResponseDto(List<PostPageMain> postMainPage) {
         this.postMainPage = postMainPage;
     }
-    public static PostMainResponseDto from(List<Post> postList) {
+    public static PostMainResponseDto from(List<Post> postList, String board) {
+
+        if (Objects.equals(board, "QNA")) {
+            return PostMainResponseDto.builder()
+                    .postMainPage(postList.stream()
+                            .map(post -> new PostPageMain(post.getId(),
+                                    post.getAccount().getId(),
+                                    post.getAccount().getNickname(),
+                                    post.getAccount().getProfileImg(),
+                                    post.getTitle(),
+                                    post.getContent(),
+                                    post.getCategory(),
+                                    post.getCreated(),
+                                    post.isSelected(),
+                                    (long) post.getPostLikeList().size(),
+                                    post.getPostTagList(),
+                                    (long) post.getPostAnswerList().size()))
+                            .collect(Collectors.toList()))
+                    .build();
+        }
         return PostMainResponseDto.builder()
                 .postMainPage(postList.stream()
                         .map(post -> new PostPageMain(post.getId(),
 
@@ -69,15 +69,15 @@ public PostMainReccomendationDto showPostRecommendation(String board){
     @Transactional(readOnly = true)
     public PostMainResponseDto showPostMain(Long lastPostId, String board, String category) {
         List<Post> postList = postRepository.findCategoryPostOrderByCreated(lastPostId, board, category);
-        return PostMainResponseDto.from(postList);
+        return PostMainResponseDto.from(postList,board);
     }
 
     // 디모페이지 카테고리별 좋아요
     @Transactional(readOnly = true)
     public PostMainResponseDto showPostMainLikeSort(int start, String board, String category) {
         Pageable pageable = PageRequest.of(start, 12);
         List<Post> postList = postRepository.findCategoryPostOrderByLikeDesc(pageable, board, category);
-        return PostMainResponseDto.from(postList);
+        return PostMainResponseDto.from(postList,board);
     }
 
     // 상세 게시글 (디플 - 정보공유)