diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta
index b333c70..c82612d 100644
Binary files a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta and b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta
index f9912c5..65ae8ab 100644
Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta
index 2d6e931..53346c4 100644
Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta
index def5088..9f84cbc 100644
Binary files a/minio_data/.minio.sys/buckets/.usage.json/xl.meta and b/minio_data/.minio.sys/buckets/.usage.json/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta
index c69711a..95433bf 100644
Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta
index 7789ac6..c9c6fa3 100644
Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta
index 19047b6..f53c756 100644
Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta differ
diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta
index 5e798e8..81eb346 100644
Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta differ
diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialRegistrationOrderServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialRegistrationOrderServiceImpl.java
index 35534f0..7977045 100644
--- a/src/main/java/org/springblade/modules/martial/service/impl/MartialRegistrationOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialRegistrationOrderServiceImpl.java
@@ -45,14 +45,36 @@ public class MartialRegistrationOrderServiceImpl extends ServiceImpl<MartialRegi
 		return convertToVO(order);
 	}
 
+	/**
+	 * Calculate competition status based on time
+	 * 1: pending (not started), 2: ongoing, 3: finished
+	 */
+	private Integer calculateCompetitionStatus(MartialCompetition competition) {
+		if (competition == null) {
+			return 1;
+		}
+		java.time.LocalDateTime now = java.time.LocalDateTime.now();
+		java.time.LocalDateTime startTime = competition.getCompetitionStartTime();
+		java.time.LocalDateTime endTime = competition.getCompetitionEndTime();
+		
+		if (startTime == null || endTime == null) {
+			return 1;
+		}
+		
+		if (now.isBefore(startTime)) {
+			return 1; // pending
+		} else if (now.isAfter(endTime)) {
+			return 3; // finished
+		} else {
+			return 2; // ongoing
+		}
+	}
+
 	@Override
 	public IPage<MartialRegistrationOrderVO> getListWithRelations(Long userId, Integer status, Integer current, Integer size) {
-		// Build query
+		// Build query - don't filter by status here, we'll filter after calculating
 		LambdaQueryWrapper<MartialRegistrationOrder> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(MartialRegistrationOrder::getUserId, userId);
-		if (status != null) {
-			queryWrapper.eq(MartialRegistrationOrder::getStatus, status);
-		}
 		queryWrapper.orderByDesc(MartialRegistrationOrder::getCreateTime);
 
 		// Paginate
@@ -110,7 +132,7 @@ public class MartialRegistrationOrderServiceImpl extends ServiceImpl<MartialRegi
 					MartialRegistrationOrderVO vo = new MartialRegistrationOrderVO();
 					BeanUtils.copyProperties(order, vo);
 
-					// Set competition info
+					// Set competition info and calculate dynamic status
 					MartialCompetition competition = competitionMap.get(order.getCompetitionId());
 					if (competition != null) {
 						vo.setCompetitionName(competition.getCompetitionName());
@@ -119,6 +141,10 @@ public class MartialRegistrationOrderServiceImpl extends ServiceImpl<MartialRegi
 								competition.getCompetitionStartTime().toString() : null);
 						vo.setEndTime(competition.getCompetitionEndTime() != null ? 
 								competition.getCompetitionEndTime().toString() : null);
+						// Calculate status based on competition time
+						vo.setStatus(calculateCompetitionStatus(competition));
+					} else {
+						vo.setStatus(1); // Default to pending
 					}
 
 					// Set athlete info
@@ -177,7 +203,16 @@ public class MartialRegistrationOrderServiceImpl extends ServiceImpl<MartialRegi
 				})
 				.collect(Collectors.toList());
 
+		// Filter by status if specified
+		final Integer filterStatus = status;
+		if (filterStatus != null && filterStatus > 0) {
+			voList = voList.stream()
+					.filter(vo -> filterStatus.equals(vo.getStatus()))
+					.collect(Collectors.toList());
+		}
+		
 		voPage.setRecords(voList);
+		voPage.setTotal(voList.size());
 		return voPage;
 	}