diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
index c27ec65..f9d63ef 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -76,18 +76,13 @@
 
                 <Button
                     x:Name="ReCheckButton"
-                    Height="40"
+                    Width="120"
                     HorizontalAlignment="Right"
-                    IsEnabled="False">
-                    <StackPanel Orientation="Horizontal">
-                        <Image
-                            Width="20"
-                            Height="20"
-                            Margin="0,0,5,0"
-                            Source="/Correlator;component/Image/tubiao_45.png" />
-                        <TextBlock FontSize="18" Text="检查" />
-                    </StackPanel>
-                </Button>
+                    hc:BorderElement.CornerRadius="22"
+                    Content="检查"
+                    FontSize="18"
+                    IsEnabled="False"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <Grid Grid.Row="1">
@@ -113,12 +108,13 @@
                     <Button
                         x:Name="RedNextStepButton"
                         Grid.Row="1"
+                        Width="75"
                         Height="35"
                         Margin="0,10"
                         VerticalAlignment="Top"
+                        hc:BorderElement.CornerRadius="17.5"
                         Content="下一步"
-                        FontSize="18"
-                        Style="{StaticResource ButtonPrimary}" />
+                        Style="{StaticResource FunctionButtonStyle}" />
                 </Grid>
 
                 <StackPanel
@@ -182,13 +178,14 @@
                     <Button
                         x:Name="BlueNextStepButton"
                         Grid.Row="1"
+                        Width="75"
                         Height="35"
                         Margin="0,10"
                         VerticalAlignment="Top"
+                        hc:BorderElement.CornerRadius="17.5"
                         Content="下一步"
-                        FontSize="18"
                         IsEnabled="{Binding ElementName=RedSensorStepBar, Path=StepIndex, Converter={StaticResource StepButtonStateConverter}}"
-                        Style="{StaticResource ButtonPrimary}" />
+                        Style="{StaticResource FunctionButtonStyle}" />
                 </Grid>
 
                 <StackPanel

diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
index c27ec65..f9d63ef 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -76,18 +76,13 @@
 
                 <Button
                     x:Name="ReCheckButton"
-                    Height="40"
+                    Width="120"
                     HorizontalAlignment="Right"
-                    IsEnabled="False">
-                    <StackPanel Orientation="Horizontal">
-                        <Image
-                            Width="20"
-                            Height="20"
-                            Margin="0,0,5,0"
-                            Source="/Correlator;component/Image/tubiao_45.png" />
-                        <TextBlock FontSize="18" Text="检查" />
-                    </StackPanel>
-                </Button>
+                    hc:BorderElement.CornerRadius="22"
+                    Content="检查"
+                    FontSize="18"
+                    IsEnabled="False"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <Grid Grid.Row="1">
@@ -113,12 +108,13 @@
                     <Button
                         x:Name="RedNextStepButton"
                         Grid.Row="1"
+                        Width="75"
                         Height="35"
                         Margin="0,10"
                         VerticalAlignment="Top"
+                        hc:BorderElement.CornerRadius="17.5"
                         Content="下一步"
-                        FontSize="18"
-                        Style="{StaticResource ButtonPrimary}" />
+                        Style="{StaticResource FunctionButtonStyle}" />
                 </Grid>
 
                 <StackPanel
@@ -182,13 +178,14 @@
                     <Button
                         x:Name="BlueNextStepButton"
                         Grid.Row="1"
+                        Width="75"
                         Height="35"
                         Margin="0,10"
                         VerticalAlignment="Top"
+                        hc:BorderElement.CornerRadius="17.5"
                         Content="下一步"
-                        FontSize="18"
                         IsEnabled="{Binding ElementName=RedSensorStepBar, Path=StepIndex, Converter={StaticResource StepButtonStateConverter}}"
-                        Style="{StaticResource ButtonPrimary}" />
+                        Style="{StaticResource FunctionButtonStyle}" />
                 </Grid>
 
                 <StackPanel
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
index 45bad60..ca8ad0b 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml.cs
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -37,8 +37,9 @@
             Interval = TimeSpan.FromSeconds(1)
         };
 
-        private static readonly Lazy<DataBaseManager> LazyDataBase =
-            new Lazy<DataBaseManager>(() => new DataBaseManager());
+        private static readonly Lazy<DataBaseManager> LazyDataBase = new Lazy<DataBaseManager>(
+            () => new DataBaseManager()
+        );
 
         private bool _isCheckRedSensor;
         private bool _isCheckBlueSensor;
@@ -309,7 +310,18 @@
 
                     //关闭窗口
                     _checkResponseTimer.Stop();
-                    _eventAggregator.GetEvent<CheckResponseEvent>().Publish(new DialogResult(ButtonResult.OK));
+                    //再次检查数据是否收集完整
+                    DialogResult dialogResult;
+                    if (IsDataCollectedCompleted())
+                    {
+                        dialogResult = new DialogResult(ButtonResult.OK);
+                    }
+                    else
+                    {
+                        dialogResult = new DialogResult(ButtonResult.Abort);
+                    }
+
+                    _eventAggregator.GetEvent<CheckResponseEvent>().Publish(dialogResult);
                 }
             };
 
@@ -359,5 +371,19 @@
                 }
             };
         }
+
+        /// <summary>
+        /// 判断数据是否收集完整
+        /// </summary>
+        /// <returns></returns>
+        private bool IsDataCollectedCompleted()
+        {
+            return RedResponsePanel.Children
+                       .Cast<Ellipse>()
+                       .All(child => child.Fill != new SolidColorBrush(Colors.LightGray)) &&
+                   BlueResponsePanel.Children
+                       .Cast<Ellipse>()
+                       .All(child => child.Fill != new SolidColorBrush(Colors.LightGray));
+        }
     }
 }
\ No newline at end of file