diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
index 016fe85..65360b5 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
@@ -104,13 +104,10 @@ class CompositeLayupTaskActivity :
         binding.tvTaskHeader.text = "复材铺贴任务"
         viewModel.taskDetail.observe(this) { detail ->
             if (detail == null) return@observe
-            val currentDetail = viewModel.currentDetail()
-            binding.tvTaskName.text = currentDetail?.ply?.ifBlank {
-                detail.taskName.ifBlank { "铺贴任务" }
-            } ?: detail.taskName.ifBlank { "铺贴任务" }
+            binding.tvTaskName.text = "铺贴任务${viewModel.currentStepSeq}"
             binding.content1.text = "零件号：${detail.partNo.ifBlank { "-" }}"
             binding.content2.text = "任务编号：${detail.taskNo.ifBlank { taskNoFromIntent }}"
-            binding.content3.text = "任务进度：${viewModel.currentStepSeq}/${detail.taskSteps}"
+            binding.content3.text = "任务进度：${viewModel.currentStepSeq}/${viewModel.totalSteps}"
             binding.hint.text = "单击或语音输入“开始”，进入下一步"
         }
         viewModel.taskDetailError.observe(this) { message ->
diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
index 4e037cf..03ee686 100644
--- a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
+++ b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
@@ -107,7 +107,7 @@ class CompositeLayupTaskVM : BaseListViewModel<ItemItem>() {
     fun currentDetail(): CompositeLayupDetailItem? =
         taskDetail.value?.detailList
             ?.sortedBy { it.stepSeq }
-            ?.getOrNull((currentStepSeq - 1).coerceAtLeast(0))
+            ?.find { it.stepSeq == currentStepSeq }
 
     fun currentProgressText(): String = "${currentStepSeq}/${totalSteps}"