diff --git a/Src/CodeSpirit.ExamApi/Controllers/ExamPapersController.cs b/Src/CodeSpirit.ExamApi/Controllers/ExamPapersController.cs
index 79ec67929f183dd08e0e556d6de717cdfaf70a51..29aa81f9a9cfae386574026c11a23bc19c29d784 100644
--- a/Src/CodeSpirit.ExamApi/Controllers/ExamPapersController.cs
+++ b/Src/CodeSpirit.ExamApi/Controllers/ExamPapersController.cs
@@ -58,6 +58,7 @@ public class ExamPapersController : ApiControllerBase
     /// <param name="createDto">创建试卷DTO</param>
     /// <returns>创建的试卷</returns>
     [HttpPost]
+    [HeaderOperation("生成固定试卷", "form")]
     public async Task<ActionResult<ApiResponse<ExamPaperDto>>> CreateExamPaper(CreateExamPaperDto createDto)
     {
         var result = await _examPaperService.CreateAsync(createDto);
diff --git a/Src/CodeSpirit.ExamApi/Controllers/QuestionsController.cs b/Src/CodeSpirit.ExamApi/Controllers/QuestionsController.cs
index 92890b042e3c5925142e77a006c7ac22617e4c3a..907728823a8ce327386f9a801a5c58afa3d68b84 100644
--- a/Src/CodeSpirit.ExamApi/Controllers/QuestionsController.cs
+++ b/Src/CodeSpirit.ExamApi/Controllers/QuestionsController.cs
@@ -44,6 +44,18 @@ public class QuestionsController : ApiControllerBase
         return SuccessResponse(questions);
     }
 
+    /// <summary>
+    /// 获取题目选择列表
+    /// </summary>
+    /// <param name="queryDto"></param>
+    /// <returns></returns>
+    [HttpGet("select-list")]
+    public async Task<ActionResult<ApiResponse<List<QuestionSelectListDto>>>> GetSelectList([FromQuery] QuestionSelectListQueryDto queryDto)
+    {
+        List<QuestionSelectListDto> questions = await _questionService.GetQuestionSelectListAsync(queryDto);
+        return SuccessResponse(questions);
+    }
+
     /// <summary>
     /// 获取题目详情
     /// </summary>
diff --git a/Src/CodeSpirit.ExamApi/Dtos/ExamPaper/CreateExamPaperDto.cs b/Src/CodeSpirit.ExamApi/Dtos/ExamPaper/CreateExamPaperDto.cs
index e5e8988632b9bce717072059feade45008eaf711..b033c2b993bbd68ef12115dc9cbf9c2aebd6591d 100644
--- a/Src/CodeSpirit.ExamApi/Dtos/ExamPaper/CreateExamPaperDto.cs
+++ b/Src/CodeSpirit.ExamApi/Dtos/ExamPaper/CreateExamPaperDto.cs
@@ -1,4 +1,5 @@
-using CodeSpirit.ExamApi.Data.Models;
+using CodeSpirit.Amis.Attributes.FormFields;
+using CodeSpirit.ExamApi.Data.Models;
 
 namespace CodeSpirit.ExamApi.Dtos.ExamPaper;
 
@@ -28,6 +29,7 @@ public class CreateExamPaperDto
     /// </summary>
     [DisplayName("试卷类型")]
     [Required(ErrorMessage = "试卷类型不能为空")]
+    [AmisFormField(VisibleOn = "false")]
     public ExamPaperType Type { get; set; } = ExamPaperType.Fixed;
     
     /// <summary>
@@ -52,16 +54,20 @@ public class CreateExamPaperDto
     [Range(1, 1440, ErrorMessage = "考试时长必须在1-1440分钟之间")]
     public int Duration { get; set; } = 120;
     
-    /// <summary>
-    /// 随机试卷规则
-    /// </summary>
-    [DisplayName("随机试卷规则")]
-    [StringLength(2000, ErrorMessage = "随机规则不能超过2000个字符")]
-    public string? RandomRules { get; set; }
-    
     /// <summary>
     /// 题目列表
     /// </summary>
-    [DisplayName("题目列表")]
-    public List<CreateExamPaperQuestionDto>? Questions { get; set; }
+    [AmisSelectField(
+        Source = "${ROOT_API}/api/exam/Questions/select-list",
+        ValueField = "id",
+        LabelField = "content",
+        Multiple = true,
+        JoinValues = false,
+        ExtractValue = true,
+        Searchable = true,
+        Clearable = true,
+        Required = true,
+        Placeholder = "请选择题目"
+    )]
+    public List<string> QuestionIds { get; set; }
 }
diff --git a/Src/CodeSpirit.ExamApi/Dtos/Question/QuestionSelectListDto.cs b/Src/CodeSpirit.ExamApi/Dtos/Question/QuestionSelectListDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a8d3bc69700a915a02ed2336d58c6fee54052d0e
--- /dev/null
+++ b/Src/CodeSpirit.ExamApi/Dtos/Question/QuestionSelectListDto.cs
@@ -0,0 +1,15 @@
+namespace CodeSpirit.ExamApi.Dtos.Question
+{
+    public class QuestionSelectListDto
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 题目内容
+        /// </summary>
+        public string Content { get; set; }
+    }
+}
diff --git a/Src/CodeSpirit.ExamApi/Dtos/Question/QuestionSelectListQueryDto.cs b/Src/CodeSpirit.ExamApi/Dtos/Question/QuestionSelectListQueryDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..4bcd1f0bedc94bb427ef83316bdb532ca73646ae
--- /dev/null
+++ b/Src/CodeSpirit.ExamApi/Dtos/Question/QuestionSelectListQueryDto.cs
@@ -0,0 +1,24 @@
+using CodeSpirit.ExamApi.Data.Models;
+
+namespace CodeSpirit.ExamApi.Dtos.Question
+{
+    public class QuestionSelectListQueryDto
+    {
+        /// <summary>
+        /// 题目类型
+        /// </summary>
+        [DisplayName("题目类型")]
+        public QuestionType? Type { get; set; }
+
+        /// <summary>
+        /// 题目难度
+        /// </summary>
+        [DisplayName("难度")]
+        public QuestionDifficulty? Difficulty { get; set; }
+
+        /// <summary>
+        /// 题目分类
+        /// </summary>
+        public List<long>? CategoryIds { get; set; }
+    }
+}
diff --git a/Src/CodeSpirit.ExamApi/MappingProfiles/ExamPaperProfile.cs b/Src/CodeSpirit.ExamApi/MappingProfiles/ExamPaperProfile.cs
index 7176a77451135def494547d1d40b0df08d73651e..0c4bb82f3b5afa134489d4727e04d9d549a1e40d 100644
--- a/Src/CodeSpirit.ExamApi/MappingProfiles/ExamPaperProfile.cs
+++ b/Src/CodeSpirit.ExamApi/MappingProfiles/ExamPaperProfile.cs
@@ -34,5 +34,13 @@ public class ExamPaperProfile : Profile
 
         // 创建试卷题目映射
         CreateMap<CreateExamPaperQuestionDto, ExamPaperQuestion>();
+
+        // 题目版本映射考题
+        CreateMap<QuestionVersion, ExamPaperQuestion>()
+            .ForMember(dest => dest.QuestionId, opt => opt.MapFrom(src => src.QuestionId))
+            .ForMember(dest => dest.QuestionVersionId, opt => opt.MapFrom(src => src.Id))
+            .ForMember(dest => dest.Score, opt => opt.MapFrom(src => src.DefaultScore))
+            .ForMember(dest => dest.QuestionVersion, opt => opt.Ignore())
+            ;
     }
 } 
\ No newline at end of file
diff --git a/Src/CodeSpirit.ExamApi/Services/Implementations/ExamPaperService.cs b/Src/CodeSpirit.ExamApi/Services/Implementations/ExamPaperService.cs
index 4d397aa73d290ee585fdd51e40f94bd9d2fe3fc4..e304851446a5cfa9dd7b6c10e29509388e302fc3 100644
--- a/Src/CodeSpirit.ExamApi/Services/Implementations/ExamPaperService.cs
+++ b/Src/CodeSpirit.ExamApi/Services/Implementations/ExamPaperService.cs
@@ -125,32 +125,34 @@ namespace CodeSpirit.ExamApi.Services.Implementations
             examPaper.UsageCount = 0;
             examPaper.AverageScore = 0;
             examPaper.PassRate = 0;
-            
+
+            var lastVersionQuestions = await _questionVersionRepository.CreateQuery().Include(s => s.Question)
+                .Where(s => createDto.QuestionIds.Select(i => long.Parse(i)).ToList().Contains(s.QuestionId))
+                .GroupBy(s => s.QuestionId)
+                .Select(g => g.OrderByDescending(s => s.Version).First())
+                .ToListAsync();
+
+            var questions = lastVersionQuestions.Select(s => s.Question).ToList();
+
             // 计算难度系数
-            if (createDto.Questions != null && createDto.Questions.Any())
+            if (questions != null && questions.Count != 0)
             {
-                var questionIds = createDto.Questions.Select(q => q.QuestionId).ToList();
-                var questions = await _questionRepository
-                    .Find(q => questionIds.Contains(q.Id))
-                    .ToListAsync();
-                
-                if (questions.Any())
-                {
-                    // 根据题目难度计算试卷难度系数
-                    examPaper.DifficultyLevel = CalculateDifficultyLevel(questions);
-                }
+                // 根据题目难度计算试卷难度系数
+                examPaper.DifficultyLevel = CalculateDifficultyLevel(questions);
             }
             
             await _examPaperRepository.AddAsync(examPaper);
             
             // 添加试卷题目
-            if (createDto.Questions != null && createDto.Questions.Any())
+            if (lastVersionQuestions != null && lastVersionQuestions.Count != 0)
             {
                 var examPaperQuestions = new List<ExamPaperQuestion>();
-                foreach (var questionDto in createDto.Questions)
+                var order = 1;
+                foreach (var questionDto in lastVersionQuestions)
                 {
                     var examPaperQuestion = _mapper.Map<ExamPaperQuestion>(questionDto);
                     examPaperQuestion.ExamPaperId = examPaper.Id;
+                    examPaperQuestion.OrderNumber = order++;
                     examPaperQuestions.Add(examPaperQuestion);
                 }
                 
diff --git a/Src/CodeSpirit.ExamApi/Services/Implementations/QuestionService.cs b/Src/CodeSpirit.ExamApi/Services/Implementations/QuestionService.cs
index dac8568d16889ea2d5503f657759bf1e389d7cec..05f76eeb124d75abdcb5744c4ff12d32b70c5e25 100644
--- a/Src/CodeSpirit.ExamApi/Services/Implementations/QuestionService.cs
+++ b/Src/CodeSpirit.ExamApi/Services/Implementations/QuestionService.cs
@@ -88,6 +88,30 @@ namespace CodeSpirit.ExamApi.Services.Implementations
             );
         }
 
+        /// <summary>
+        /// 获取选择题选项列表
+        /// </summary>
+        /// <param name="queryDto"></param>
+        /// <returns></returns>
+        public async Task<List<QuestionSelectListDto>> GetQuestionSelectListAsync(QuestionSelectListQueryDto queryDto)
+        {
+            var query = _repository.CreateQuery();
+            if (queryDto.CategoryIds != null && queryDto.CategoryIds.Any())
+                query = query.Where(s => queryDto.CategoryIds.Contains(s.CategoryId));
+
+            if (queryDto.Difficulty.HasValue)
+                query = query.Where(s => s.Difficulty == queryDto.Difficulty.Value);
+
+            if (queryDto.Type.HasValue)
+                query = query.Where(s => s.Type == queryDto.Type.Value);
+
+            return await query.Select(s => new QuestionSelectListDto()
+            {
+                Id = s.Id,
+                Content = s.Content
+            }).ToListAsync();
+        }
+
         /// <summary>
         /// 获取题目详情
         /// </summary>
diff --git a/Src/CodeSpirit.ExamApi/Services/Interfaces/IQuestionService.cs b/Src/CodeSpirit.ExamApi/Services/Interfaces/IQuestionService.cs
index 4df4d76e253c83e7c99598d8669601537c13489a..b0c967a4d4febd963894b9f29f53323b7c8287a4 100644
--- a/Src/CodeSpirit.ExamApi/Services/Interfaces/IQuestionService.cs
+++ b/Src/CodeSpirit.ExamApi/Services/Interfaces/IQuestionService.cs
@@ -13,6 +13,13 @@ public interface IQuestionService
     /// <returns>题目分页列表</returns>
     Task<PageList<QuestionDto>> GetQuestionsAsync(QuestionQueryDto queryDto);
 
+    /// <summary>
+    /// 获取题目选项列表
+    /// </summary>
+    /// <param name="queryDto">查询条件</param>
+    /// <returns></returns>
+    Task<List<QuestionSelectListDto>> GetQuestionSelectListAsync(QuestionSelectListQueryDto queryDto);
+
     /// <summary>
     /// 获取题目详情
     /// </summary>