diff --git a/frontend/issues-management.html b/frontend/issues-management.html
index e92225e..2288e14 100644
--- a/frontend/issues-management.html
+++ b/frontend/issues-management.html
@@ -473,10 +473,19 @@
 
             emptyState.classList.add('hidden');
             
-            // 날짜별로 그룹화
+            // 날짜별로 그룹화 (상태에 따라 다른 날짜 기준 사용)
             const groupedByDate = {};
             filteredIssues.forEach(issue => {
-                const date = new Date(issue.report_date).toLocaleDateString('ko-KR');
+                let date;
+                if (currentTab === 'in_progress') {
+                    // 진행 중: 업로드한 날짜 기준
+                    date = new Date(issue.report_date).toLocaleDateString('ko-KR');
+                } else {
+                    // 완료됨: 완료된 날짜 기준 (없으면 업로드 날짜)
+                    const completionDate = issue.actual_completion_date || issue.report_date;
+                    date = new Date(completionDate).toLocaleDateString('ko-KR');
+                }
+                
                 if (!groupedByDate[date]) {
                     groupedByDate[date] = [];
                 }
@@ -496,6 +505,9 @@
                                 <i class="fas fa-chevron-down transition-transform duration-200" id="icon-${groupId}"></i>
                                 <h3 class="font-semibold text-gray-800">${date}</h3>
                                 <span class="text-sm text-gray-500">(${issues.length}건)</span>
+                                <span class="text-xs px-2 py-1 rounded-full ${currentTab === 'in_progress' ? 'bg-blue-100 text-blue-600' : 'bg-green-100 text-green-600'}">
+                                    ${currentTab === 'in_progress' ? '업로드일' : '완료일'}
+                                </span>
                             </div>
                         </div>