From 0ea7f83cc2970ec7ee5eff48df3879ac895be6e8 Mon Sep 17 00:00:00 2001
From: "GukSang.Jin" <guksang_chen@163.com>
Date: Sat, 9 May 2026 11:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=9B=B4=E6=96=B020260508?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EngineeringRegistersWindow.xaml           |   11 +-
 Cardiopulmonarybypasssystems/MainWindow.xaml  | 1157 ++++-------------
 .../MainWindow.xaml.cs                        |  532 +++++++-
 .../Models/ValveControlChannel.cs             |    3 +
 .../Services/ModbusTelemetryService.cs        |    2 +-
 5 files changed, 784 insertions(+), 921 deletions(-)

diff --git a/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml b/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml
index 1e67f78..639bc98 100644
--- a/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml
+++ b/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="Cardiopulmonarybypasssystems.EngineeringRegistersWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="工程寄存器"
+        Title="泵/流量系数"
         Width="920"
         Height="640"
         MinWidth="860"
@@ -29,19 +29,14 @@
                     <TextBlock FontSize="20"
                                FontWeight="Bold"
                                Foreground="White"
-                               Text="工程寄存器" />
-                    <TextBlock Margin="0,6,0,0"
-                               FontSize="12"
-                               Foreground="#EFFAFC"
-                               Text="长按左上角空白区可关闭窗口。这里只保留 8 泵默认配置和 8 路流量系数配置；流量系数以 PLC 当前寄存器值为准。"
-                               TextWrapping="Wrap" />
+                               Text="泵/流量系数" />
                 </StackPanel>
                 <StackPanel DockPanel.Dock="Right"
                             Orientation="Horizontal"
                             VerticalAlignment="Center">
                     <Button Padding="12,6"
                             Command="{Binding RefreshEngineeringRegistersCommand}"
-                            Content="刷新寄存器"
+                            Content="刷新"
                             Background="#FFFFFFFF"
                             Foreground="{StaticResource HeaderBrush}" />
                 </StackPanel>
diff --git a/Cardiopulmonarybypasssystems/MainWindow.xaml b/Cardiopulmonarybypasssystems/MainWindow.xaml
index ce3bdb6..7cf6922 100644
--- a/Cardiopulmonarybypasssystems/MainWindow.xaml
+++ b/Cardiopulmonarybypasssystems/MainWindow.xaml
@@ -99,6 +99,27 @@
                         <WrapPanel.Resources>
                             <Style TargetType="Button" BasedOn="{StaticResource HeroCompactButtonStyle}" />
                         </WrapPanel.Resources>
+                        <Button MinWidth="104"
+                                MinHeight="36"
+                                Padding="12,7"
+                                Margin="0,0,8,8"
+                                Command="{Binding ToggleValveControlCommand}"
+                                CommandParameter="{Binding CirculatingWaterControl}"
+                                Content="{Binding CirculatingWaterControl.ReservoirToggleText}"
+                                Background="#FFFFFFFF"
+                                Foreground="{StaticResource HeaderBrush}"
+                                IsEnabled="{Binding CanModifySession}">
+                            <Button.Style>
+                                <Style TargetType="Button" BasedOn="{StaticResource HeroCompactButtonStyle}">
+                                    <Setter Property="Visibility" Value="Visible" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding HasCirculatingWaterControl}" Value="False">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Button.Style>
+                        </Button>
                         <Button MinWidth="92" MinHeight="36" Padding="12,7" Margin="0,0,8,8" Command="{Binding ToggleAcquisitionCommand}" Content="采集" Background="#FFFFFFFF" Foreground="{StaticResource HeaderBrush}" IsEnabled="{Binding CanModifySession}" />
                         <Button MinWidth="108" MinHeight="36" Padding="12,7" Margin="0,0,8,8" Command="{Binding CompleteDetectionCommand}" Content="完成检测" Background="#FFF0B145" IsEnabled="{Binding CanModifySession}" />
                         <Button MinWidth="156" MinHeight="36" Padding="12,7" Margin="0,0,0,8" Command="{Binding ExportReportCommand}" Content="导出报表" Background="#FFEA7E3C" IsEnabled="{Binding CanExportReport}" ToolTip="导出为 Excel（.xlsx）检查报告" />
@@ -114,8 +135,27 @@
 
         <Grid Grid.Row="2">
             <Border Style="{StaticResource CardBorderStyle}" Margin="0">
-                <TabControl x:Name="RootTabControl">
-                    <TabItem Header="实时数据">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <Border Grid.Row="0"
+                            Margin="0,0,0,8"
+                            Padding="0,0,0,4"
+                            BorderBrush="#FFD8E3E7"
+                            BorderThickness="0,0,0,1">
+                        <WrapPanel x:Name="NavigationButtonPanel" />
+                    </Border>
+
+                    <ContentControl x:Name="MainContentHost" Grid.Row="1" />
+
+                    <TabControl x:Name="RootTabControl"
+                                Grid.Row="2"
+                                Visibility="Collapsed">
+                    <TabItem x:Name="RealtimeDataTab" Header="实时数据">
                         <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <StackPanel Margin="0,6,0,0">
                                 <Border Style="{StaticResource CardBorderStyle}" Padding="14" Visibility="Collapsed">
@@ -154,24 +194,14 @@
                                                                            Text="{Binding Rs485SlaveAddress, StringFormat=从站 {0}}" />
                                                             </Border>
                                                         </DockPanel>
-                                                        <TextBox Margin="0,10,0,0"
-                                                                 Height="34"
-                                                                 VerticalContentAlignment="Center"
-                                                                 Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <UniformGrid Margin="0,10,0,0" Columns="3">
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="目标" />
-                                                                <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding PendingSetpointText, StringFormat={}{0} L/min}" />
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="读回" />
-                                                                <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding SetpointReadbackDisplay}" />
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="实时" />
-                                                                <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding FlowDisplay}" />
-                                                            </StackPanel>
-                                                        </UniformGrid>
+                                                         <TextBox Margin="0,10,0,0"
+                                                                  Height="34"
+                                                                  VerticalContentAlignment="Center"
+                                                                  Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}"
+                                                                  IsReadOnly="True"
+                                                                  Cursor="Hand"
+                                                                  PreviewMouseLeftButtonDown="PumpSetpointTextBox_OnPreviewMouseLeftButtonDown"
+                                                                  GotKeyboardFocus="PumpSetpointTextBox_OnGotKeyboardFocus" />
                                                         <Border Margin="0,10,0,0"
                                                                 Padding="10,6"
                                                                 Background="{Binding SetpointStatusBackground}"
@@ -193,12 +223,6 @@
                                                                 Margin="10,0,0,0"
                                                                 VerticalAlignment="Stretch">
                                                         <Button Height="34"
-                                                                Padding="12,4"
-                                                                Command="{Binding DataContext.WritePumpSetpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="写入" />
-                                                        <Button Height="34"
-                                                                Margin="0,8,0,0"
                                                                 Padding="12,4"
                                                                 Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
                                                                 CommandParameter="{Binding}"
@@ -430,9 +454,6 @@
                                                         <Button Style="{StaticResource Rs485BatchActionButtonStyle}"
                                                                 Command="{Binding RefreshAllPumpSetpointsCommand}"
                                                                 Content="全部读取" />
-                                                        <Button Style="{StaticResource Rs485BatchActionButtonStyle}"
-                                                                Command="{Binding WriteAllPumpSetpointsCommand}"
-                                                                Content="全部写入" />
                                                         <Button Style="{StaticResource Rs485BatchActionButtonStyle}"
                                                                 Command="{Binding TestAllRs485ConnectionsCommand}"
                                                                 Content="全泵巡检" />
@@ -484,90 +505,7 @@
 
                                 <Border Style="{StaticResource CardBorderStyle}" Padding="14">
                                     <StackPanel>
-                                        <TextBlock Style="{StaticResource SectionTitleStyle}" FontSize="18" Margin="0,0,0,8" Text="关键实时读数" />
-                                        <WrapPanel Margin="0,6,0,0">
-                                       
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="近端压力" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding ProximalPressureDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="远端压力" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding DistalPressureDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="压力降" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding PressureDropPumpFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="再循环主" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding RecirculationPumpFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="回流泵" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding ReturnFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="引流泵" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding DrainageFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="抗扭结" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding KinkResistancePumpFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="破坏单腔" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding HemolysisDrainageSingleFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="双腔回路" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding HemolysisReturnSingleFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="双管腔" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding HemolysisDualLumenFlowDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="负压" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding NegativeAssistPressureDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="压力降 ΔP" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding DeltaPressureDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                            <Border Width="132" Margin="0,0,6,6" Padding="8" Background="#FFF5F9FA" CornerRadius="10" BorderBrush="#FFDCE7EA" BorderThickness="1">
-                                                <StackPanel>
-                                                    <TextBlock Style="{StaticResource CaptionStyle}" FontSize="11" Text="再循环率" />
-                                                    <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding RealtimeRecirculationDisplay}" />
-                                                </StackPanel>
-                                            </Border>
-                                        </WrapPanel>
-
-                                        <DockPanel Margin="0,10,0,8" LastChildFill="False">
+                                        <DockPanel Margin="0,0,0,8" LastChildFill="False">
                                             <Button DockPanel.Dock="Right"
                                                     VerticalAlignment="Center"
                                                     MinWidth="78"
@@ -984,179 +922,31 @@
                     <TabItem x:Name="ProjectListTab" Header="项目检查">
                         <ScrollViewer Margin="0,6,0,0" VerticalScrollBarVisibility="Auto" CanContentScroll="False">
                             <StackPanel>
-                            <Border Style="{StaticResource CardBorderStyle}" Padding="14">
-                                <StackPanel>
-                                    <DockPanel LastChildFill="False">
-                                        <TextBlock DockPanel.Dock="Left" FontSize="18" FontWeight="Bold" Text="项目检索与采集策略" />
-                                        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
-                                            <TextBlock Margin="0,4,12,0" Style="{StaticResource CaptionStyle}" Text="{Binding FilteredItemSummary}" />
-                                            <Border Padding="10,4"
-                                                    Background="#FF123744"
-                                                    CornerRadius="999">
-                                                <TextBlock Foreground="White"
-                                                           FontSize="12"
-                                                           FontWeight="SemiBold"
-                                                           Text="单击项目行进入详情" />
-                                            </Border>
-                                        </StackPanel>
-                                    </DockPanel>
-
-                                    <Grid Margin="0,8,0,0">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="180" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <TextBox Grid.Column="0"
-                                                 Margin="0,0,8,0"
-                                                  MinHeight="36"
-                                                  Padding="10,0"
-                                                  VerticalContentAlignment="Center"
-                                                  Text="{Binding ItemSearchText, UpdateSourceTrigger=PropertyChanged}" />
-                                        <ComboBox Grid.Column="1"
-                                                  Margin="0,0,8,0"
-                                                  MinHeight="36"
-                                                  Padding="10,0"
-                                                  VerticalContentAlignment="Center"
-                                                  ItemsSource="{Binding ItemFilterOptions}"
-                                                  SelectedItem="{Binding ActiveFilter, Mode=TwoWay}" />
-                                        <StackPanel Grid.Column="2"
-                                                    Orientation="Horizontal">
-                                            <Button Width="88"
-                                                    Height="36"
-                                                    Padding="10,4"
-                                                    Margin="0,0,8,0"
-                                                    Command="{Binding ShowPendingItemsCommand}"
-                                                    Content="待处理"
-                                                    Background="#FF6B8791" />
-                                            <Button Width="88"
-                                                    Height="36"
-                                                    Padding="10,4"
-                                                    Margin="0,0,8,0"
-                                                    Command="{Binding ShowAllItemsCommand}"
-                                                    Content="全部"
-                                                    Background="#FF6B8791" />
-                                            <Button Width="88"
-                                                    Height="36"
-                                                    Padding="10,4"
-                                                    Margin="0,0,8,0"
-                                                    Command="{Binding ClearItemSearchCommand}"
-                                                    Content="清空"
-                                                    Background="#FF6B8791" />
-                                        </StackPanel>
-                                    </Grid>
-
-                                    <TextBlock Margin="0,8,0,0"
-                                               FontSize="13"
-                                               Foreground="{StaticResource WarningBrush}"
-                                               Text="未匹配到项目。">
-                                        <TextBlock.Style>
-                                            <Style TargetType="TextBlock">
-                                                <Setter Property="Visibility" Value="Collapsed" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding HasFilteredItems}" Value="False">
-                                                        <Setter Property="Visibility" Value="Visible" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
-                                </StackPanel>
-                            </Border>
-
-                            <Border>
-                                    <StackPanel>
-                                        <TextBlock Style="{StaticResource SectionTitleStyle}" Text="项目检查" />
-                                        <DataGrid x:Name="InspectionItemsGrid"
-                                                  Margin="0,4,0,0"
-                                                  ItemsSource="{Binding FilteredItemsView}"
-                                                  SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
-                                                  PreviewMouseLeftButtonUp="InspectionItemsGrid_OnPreviewMouseLeftButtonUp"
-                                                  CanUserSortColumns="False"
-                                                  IsReadOnly="True"
-                                                  CanUserAddRows="False"
-                                                  CanUserDeleteRows="False"
-                                                  SelectionMode="Single"
-                                                  SelectionUnit="FullRow"
-                                                  ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                                                  VirtualizingPanel.ScrollUnit="Pixel">
-                                            <DataGrid.Columns>
-                                                <DataGridTextColumn Header="项目" Binding="{Binding Item}" Width="180" />
-                                                <DataGridTemplateColumn Header="采集方式" Width="170">
-                                                    <DataGridTemplateColumn.CellTemplate>
-                                                        <DataTemplate>
-                                                            <Border Margin="0,4" Padding="10,4" Background="{Binding CaptureModeBadgeBackground}" CornerRadius="999">
-                                                                <Border.Style>
-                                                                    <Style TargetType="Border">
-                                                                        <Setter Property="Visibility" Value="Visible" />
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding ShowProjectListCaptureMode}" Value="False">
-                                                                                <Setter Property="Visibility" Value="Collapsed" />
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Border.Style>
-                                                                <TextBlock HorizontalAlignment="Center" Foreground="{Binding CaptureModeBadgeForeground}" FontWeight="Bold" Text="{Binding ProjectListCaptureModeText}" />
-                                                            </Border>
-                                                        </DataTemplate>
-                                                    </DataGridTemplateColumn.CellTemplate>
-                                                </DataGridTemplateColumn>
-                                                <DataGridTemplateColumn Header="当前状态" Width="96">
-                                                    <DataGridTemplateColumn.CellTemplate>
-                                                        <DataTemplate>
-                                                            <Border Margin="0,4" Padding="10,4" Background="{Binding StatusBadgeBackground}" CornerRadius="999">
-                                                                <TextBlock HorizontalAlignment="Center" Foreground="{Binding StatusBadgeForeground}" FontWeight="Bold" Text="{Binding StatusText}" />
-                                                            </Border>
-                                                        </DataTemplate>
-                                                    </DataGridTemplateColumn.CellTemplate>
-                                                </DataGridTemplateColumn>
-                                                <DataGridTemplateColumn Header="完成情况" Width="130">
-                                                    <DataGridTemplateColumn.CellTemplate>
-                                                        <DataTemplate>
-                                                            <StackPanel Margin="0,2">
-                                                                <TextBlock FontWeight="Bold" Text="{Binding CompletionText}" />
-                                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="{Binding CompletionHint}" TextWrapping="Wrap" />
-                                                            </StackPanel>
-                                                        </DataTemplate>
-                                                    </DataGridTemplateColumn.CellTemplate>
-                                                </DataGridTemplateColumn>
-                                                <DataGridTextColumn Header="结果" Binding="{Binding Measured}" Width="*" />
-                                            </DataGrid.Columns>
-                                        </DataGrid>
-                                    </StackPanel>
-                                </Border>
-
-                            <Border>
-                                <Border.Style>
-                                    <Style TargetType="Border" BasedOn="{StaticResource CardBorderStyle}">
-                                        <Setter Property="Visibility" Value="Collapsed" />
+                            <ContentControl x:Name="ProjectDetailContentHost">
+                                <ContentControl.Style>
+                                    <Style TargetType="ContentControl">
+                                        <Setter Property="Visibility" Value="Visible" />
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding HasSelectedItem}" Value="False">
-                                                <Setter Property="Visibility" Value="Visible" />
+                                                <Setter Property="Visibility" Value="Collapsed" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
-                                </Border.Style>
-                                <StackPanel>
-                                    <TextBlock Style="{StaticResource SectionTitleStyle}" Text="当前筛选为空" />
-                                    <TextBlock FontSize="14"
-                                               Text="当前筛选条件下没有可编辑项目。请清空搜索、切换“全部”，或调整筛选条件后继续。"
-                                               TextWrapping="Wrap" />
-                                </StackPanel>
-                            </Border>
+                                </ContentControl.Style>
+                            </ContentControl>
 
                             </StackPanel>
                         </ScrollViewer>
                     </TabItem>
 
-                    <TabItem Header="项目检查补充">
+                    <TabItem x:Name="ManualSupplementTab" Header="项目补充">
                         <ScrollViewer Margin="0,6,0,0" VerticalScrollBarVisibility="Auto" CanContentScroll="False">
                             <StackPanel>
                                 <Border Style="{StaticResource CardBorderStyle}" Padding="14">
                                     <StackPanel>
                                         <DockPanel LastChildFill="False">
                                             <StackPanel DockPanel.Dock="Left">
-                                                <TextBlock FontSize="18" FontWeight="Bold" Text="项目检查补充" />
+                                                <TextBlock FontSize="18" FontWeight="Bold" Text="项目补充" />
                                                 <TextBlock Margin="0,6,0,0"
                                                            Style="{StaticResource CaptionStyle}"
                                                            Text="本页集中显示项目检查中需要手动录入的项目，便于补充填写与复核。"
@@ -1196,9 +986,8 @@
                                 </Border>
 
                                 <Border>
-                                    <StackPanel>
-                                        <TextBlock Style="{StaticResource SectionTitleStyle}" Text="手动录入项目" />
-                                        <DataGrid x:Name="ManualSupplementGrid"
+                                        <StackPanel>
+                                            <DataGrid x:Name="ManualSupplementGrid"
                                                   Margin="0,4,0,0"
                                                   ItemsSource="{Binding ManualSupplementItemsView}"
                                                   SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
@@ -1264,84 +1053,6 @@
                     <TabItem x:Name="ProjectDetailTab" Header="项目详情/结果">
                         <ScrollViewer Margin="0,6,0,0" VerticalScrollBarVisibility="Auto" CanContentScroll="False">
                             <StackPanel>
-                            <Border Style="{StaticResource CardBorderStyle}" Padding="14" Background="#FFF3F7F8" BorderBrush="#FFC8D8DD">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="12" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <TextBlock FontSize="18" FontWeight="Bold" Text="{Binding SelectedItemTitle}" />
-                                        <TextBlock Margin="0,6,0,0"
-                                                   Style="{StaticResource CaptionStyle}"
-                                                   Text="{Binding SelectedItemStatusText}" />
-                                    </StackPanel>
-                                    <WrapPanel Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center">
-                                        <WrapPanel.Resources>
-                                            <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                                <Setter Property="MinWidth" Value="128" />
-                                                <Setter Property="MinHeight" Value="34" />
-                                                <Setter Property="Padding" Value="10,6" />
-                                                <Setter Property="Margin" Value="0,0,6,6" />
-                                                <Setter Property="FontSize" Value="14" />
-                                            </Style>
-                                        </WrapPanel.Resources>
-                                        <Button Command="{Binding ToggleValveControlCommand}"
-                                                CommandParameter="{Binding CirculatingWaterControl}"
-                                                Content="{Binding CirculatingWaterControl.CirculatingWaterToggleText}"
-                                                Background="#FFD64545"
-                                                IsEnabled="{Binding CanModifySession}">
-                                            <Button.Style>
-                                                <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                                    <Setter Property="MinWidth" Value="128" />
-                                                    <Setter Property="MinHeight" Value="34" />
-                                                    <Setter Property="Padding" Value="10,6" />
-                                                    <Setter Property="Margin" Value="0,0,6,6" />
-                                                    <Setter Property="FontSize" Value="14" />
-                                                    <Setter Property="Visibility" Value="Visible" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding HasCirculatingWaterControl}" Value="False">
-                                                            <Setter Property="Visibility" Value="Collapsed" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Button.Style>
-                                        </Button>
-                                        <Button Click="ReturnToProjectListButton_OnClick"
-                                                Content="返回项目检查"
-                                                Background="#FF6B8791" />
-                                        <Button Command="{Binding SelectPreviousItemCommand}"
-                                                Content="上一项"
-                                                Background="#FF6B8791" />
-                                        <Button Command="{Binding ApplyResultCommand}"
-                                                Content="保存结果"
-                                                Background="#FF2B8F6A"
-                                                IsEnabled="{Binding CanModifySession}" />
-                                        <Button Command="{Binding SelectNextItemCommand}"
-                                                Content="下一项"
-                                                Background="#FF2B8F6A" />
-                                    </WrapPanel>
-                                </Grid>
-                            </Border>
-                            <Border>
-                                <Border.Style>
-                                    <Style TargetType="Border" BasedOn="{StaticResource CardBorderStyle}">
-                                        <Setter Property="Visibility" Value="Collapsed" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding HasSelectedItem}" Value="False">
-                                                <Setter Property="Visibility" Value="Visible" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Border.Style>
-                                <StackPanel>
-                                    <TextBlock Style="{StaticResource SectionTitleStyle}" Text="当前未选择项目" />
-                                    <TextBlock FontSize="14"
-                                               Text="请先在“项目检查”页选择一项检测项目，系统会自动切换到本页显示相应的项目详情与结果填写区域。"
-                                               TextWrapping="Wrap" />
-                                </StackPanel>
-                            </Border>
                             <Border>
                                 <Border.Style>
                                     <Style TargetType="Border" BasedOn="{StaticResource CardBorderStyle}">
@@ -1361,90 +1072,26 @@
                                 </Border.Style>
                                 <Border.Resources>
                                     <DataTemplate x:Key="KinkResistanceRs485PumpCardTemplate" DataType="{x:Type models:PumpControlChannel}">
-                                        <Border MinWidth="420"
+                                        <Border MinWidth="640"
                                                 Margin="0,0,10,10"
-                                                Padding="12"
-                                                Background="#FFF8FBFC"
-                                                CornerRadius="12"
-                                                BorderBrush="#FFD8E4E8"
-                                                BorderThickness="1">
+                                                Padding="0">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="150" />
+                                                    <ColumnDefinition Width="116" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="96" />
                                                 </Grid.ColumnDefinitions>
-                                                <StackPanel Grid.Column="0">
-                                                    <TextBlock FontSize="14"
-                                                               FontWeight="Bold"
-                                                               Text="{Binding Name}"
-                                                               TextWrapping="Wrap" />
-                                                    <Grid Margin="0,10,0,0">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <TextBox Grid.Column="0"
-                                                                 Height="34"
-                                                                 VerticalContentAlignment="Center"
-                                                                 Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <Button Grid.Column="1"
-                                                                MinWidth="76"
-                                                                Margin="8,0,0,0"
-                                                                Padding="8,2"
-                                                                Command="{Binding DataContext.WritePumpSetpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="写入" />
-                                                    </Grid>
-                                                    <UniformGrid Margin="0,10,0,0" Columns="3">
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="目标" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding PendingSetpointText, StringFormat={}{0} L/min}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="读回" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding SetpointReadbackDisplay}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="实时" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding FlowDisplay}" />
-                                                        </StackPanel>
-                                                    </UniformGrid>
-                                                    <Border Margin="0,10,0,0"
-                                                            Padding="10,6"
-                                                            Background="{Binding SetpointStatusBackground}"
-                                                            CornerRadius="8">
-                                                        <TextBlock FontSize="12"
-                                                                   FontWeight="Bold"
-                                                                   Foreground="{Binding SetpointStatusForeground}"
-                                                                   Text="{Binding Rs485RunStateText}" />
-                                                    </Border>
-                                                </StackPanel>
-                                                <StackPanel Grid.Column="1"
-                                                            Margin="12,0,0,0"
-                                                            VerticalAlignment="Stretch">
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Padding="12,4"
-                                                            Margin="0,44,0,0"
-                                                            Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="启动"
-                                                            IsEnabled="{Binding CanStartRs485Action}"
-                                                            Background="#FF2B8F6A"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StartActionHint}" />
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Margin="0,8,0,0"
-                                                            Padding="12,4"
-                                                            Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="停止"
-                                                            IsEnabled="{Binding CanStopRs485Action}"
-                                                            Background="#FFB85C38"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StopActionHint}" />
-                                                </StackPanel>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Column="0" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" Text="{Binding Name}" TextWrapping="Wrap" />
+                                                <TextBox Grid.Column="1" Width="108" Height="32" Margin="8,0,0,0" VerticalContentAlignment="Center" Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Hand" PreviewMouseLeftButtonDown="PumpSetpointTextBox_OnPreviewMouseLeftButtonDown" GotKeyboardFocus="PumpSetpointTextBox_OnGotKeyboardFocus" />
+                                                <Button Grid.Column="2" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="启动" IsEnabled="{Binding CanStartRs485Action}" Background="#FF2B8F6A" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StartActionHint}" />
+                                                <Button Grid.Column="3" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="停止" IsEnabled="{Binding CanStopRs485Action}" Background="#FFB85C38" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StopActionHint}" />
+                                                <TextBlock Grid.Column="4" Margin="10,0,0,0" VerticalAlignment="Center" FontSize="12" FontWeight="Bold" Foreground="{Binding SetpointStatusForeground}" Text="{Binding Rs485RunStateText}" TextWrapping="Wrap" />
                                             </Grid>
                                         </Border>
                                     </DataTemplate>
@@ -1487,90 +1134,26 @@
                                 </Border.Style>
                                 <Border.Resources>
                                     <DataTemplate x:Key="PressureDropRs485QuickPumpCardTemplate" DataType="{x:Type models:PumpControlChannel}">
-                                        <Border MinWidth="420"
+                                        <Border MinWidth="640"
                                                 Margin="0,0,10,10"
-                                                Padding="12"
-                                                Background="#FFF8FBFC"
-                                                CornerRadius="12"
-                                                BorderBrush="#FFD8E4E8"
-                                                BorderThickness="1">
+                                                Padding="0">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="150" />
+                                                    <ColumnDefinition Width="116" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="96" />
                                                 </Grid.ColumnDefinitions>
-                                                <StackPanel Grid.Column="0">
-                                                    <TextBlock FontSize="14"
-                                                               FontWeight="Bold"
-                                                               Text="{Binding Name}"
-                                                               TextWrapping="Wrap" />
-                                                    <Grid Margin="0,10,0,0">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <TextBox Grid.Column="0"
-                                                                 Height="34"
-                                                                 VerticalContentAlignment="Center"
-                                                                 Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <Button Grid.Column="1"
-                                                                MinWidth="76"
-                                                                Margin="8,0,0,0"
-                                                                Padding="8,2"
-                                                                Command="{Binding DataContext.WritePumpSetpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="写入" />
-                                                    </Grid>
-                                                    <UniformGrid Margin="0,10,0,0" Columns="3">
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="目标" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding PendingSetpointText, StringFormat={}{0} L/min}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="读回" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding SetpointReadbackDisplay}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="实时" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding FlowDisplay}" />
-                                                        </StackPanel>
-                                                    </UniformGrid>
-                                                    <Border Margin="0,10,0,0"
-                                                            Padding="10,6"
-                                                            Background="{Binding SetpointStatusBackground}"
-                                                            CornerRadius="8">
-                                                        <TextBlock FontSize="12"
-                                                                   FontWeight="Bold"
-                                                                   Foreground="{Binding SetpointStatusForeground}"
-                                                                   Text="{Binding Rs485RunStateText}" />
-                                                    </Border>
-                                                </StackPanel>
-                                                <StackPanel Grid.Column="1"
-                                                            Margin="12,0,0,0"
-                                                            VerticalAlignment="Stretch">
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Padding="12,4"
-                                                            Margin="0,44,0,0"
-                                                            Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="启动"
-                                                            IsEnabled="{Binding CanStartRs485Action}"
-                                                            Background="#FF2B8F6A"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StartActionHint}" />
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Margin="0,8,0,0"
-                                                            Padding="12,4"
-                                                            Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="停止"
-                                                            IsEnabled="{Binding CanStopRs485Action}"
-                                                            Background="#FFB85C38"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StopActionHint}" />
-                                                </StackPanel>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Column="0" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" Text="{Binding Name}" TextWrapping="Wrap" />
+                                                <TextBox Grid.Column="1" Width="108" Height="32" Margin="8,0,0,0" VerticalContentAlignment="Center" Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Hand" PreviewMouseLeftButtonDown="PumpSetpointTextBox_OnPreviewMouseLeftButtonDown" GotKeyboardFocus="PumpSetpointTextBox_OnGotKeyboardFocus" />
+                                                <Button Grid.Column="2" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="启动" IsEnabled="{Binding CanStartRs485Action}" Background="#FF2B8F6A" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StartActionHint}" />
+                                                <Button Grid.Column="3" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="停止" IsEnabled="{Binding CanStopRs485Action}" Background="#FFB85C38" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StopActionHint}" />
+                                                <TextBlock Grid.Column="4" Margin="10,0,0,0" VerticalAlignment="Center" FontSize="12" FontWeight="Bold" Foreground="{Binding SetpointStatusForeground}" Text="{Binding Rs485RunStateText}" TextWrapping="Wrap" />
                                             </Grid>
                                         </Border>
                                     </DataTemplate>
@@ -1602,27 +1185,26 @@
                                             </ItemsPanelTemplate>
                                         </ItemsControl.ItemsPanel>
                                     </ItemsControl>
-                                    <ItemsControl Grid.Column="2"
-                                                  VerticalAlignment="Center"
-                                                  HorizontalAlignment="Center"
-                                                  ItemsSource="{Binding PressureDropSecondaryValveControls}"
-                                                  ItemTemplate="{StaticResource PressureDropValveControlCardTemplate}">
-                                        <ItemsControl.Style>
-                                            <Style TargetType="ItemsControl">
-                                                <Setter Property="Visibility" Value="Visible" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding HasPressureDropSecondaryValveControls}" Value="False">
-                                                        <Setter Property="Visibility" Value="Collapsed" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </ItemsControl.Style>
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <WrapPanel HorizontalAlignment="Center" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
+                                    <WrapPanel Grid.Column="2" VerticalAlignment="Top">
+                                        <ItemsControl ItemsSource="{Binding PressureDropSecondaryValveControls}"
+                                                      ItemTemplate="{StaticResource PressureDropValveControlCardTemplate}">
+                                            <ItemsControl.Style>
+                                                <Style TargetType="ItemsControl">
+                                                    <Setter Property="Visibility" Value="Visible" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding HasPressureDropSecondaryValveControls}" Value="False">
+                                                            <Setter Property="Visibility" Value="Collapsed" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ItemsControl.Style>
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <WrapPanel />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                    </WrapPanel>
                                 </Grid>
                             </Border>
                             <Border>
@@ -1644,59 +1226,27 @@
                                 </Border.Style>
                                 <Border.Resources>
                                     <DataTemplate x:Key="RecirculationRs485PumpCardTemplate" DataType="{x:Type models:PumpControlChannel}">
-                                        <Border MinWidth="360"
+                                        <Border MinWidth="640"
                                                 Margin="0,0,10,10"
-                                                Padding="12"
-                                                Background="#FFF8FBFC"
-                                                CornerRadius="12"
-                                                BorderBrush="#FFD8E4E8"
-                                                BorderThickness="1">
-                                            <StackPanel>
-                                                <TextBlock FontSize="14"
-                                                           FontWeight="Bold"
-                                                           Text="{Binding Name}"
-                                                           TextWrapping="Wrap" />
-                                                <Grid Margin="0,10,0,0">
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*" />
-                                                        <ColumnDefinition Width="Auto" />
-                                                    </Grid.ColumnDefinitions>
-                                                    <TextBox Grid.Column="0"
-                                                             Height="34"
-                                                             VerticalContentAlignment="Center"
-                                                             Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" />
-                                                    <Button Grid.Column="1"
-                                                            MinWidth="76"
-                                                            Margin="8,0,0,0"
-                                                            Padding="8,2"
-                                                            Command="{Binding DataContext.WritePumpSetpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="写入" />
-                                                </Grid>
-                                                <UniformGrid Margin="0,10,0,0" Columns="3">
-                                                    <StackPanel>
-                                                        <TextBlock Style="{StaticResource CaptionStyle}" Text="目标" />
-                                                        <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding PendingSetpointText, StringFormat={}{0} L/min}" />
-                                                    </StackPanel>
-                                                    <StackPanel>
-                                                        <TextBlock Style="{StaticResource CaptionStyle}" Text="读回" />
-                                                        <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding SetpointReadbackDisplay}" />
-                                                    </StackPanel>
-                                                    <StackPanel>
-                                                        <TextBlock Style="{StaticResource CaptionStyle}" Text="实时" />
-                                                        <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding FlowDisplay}" />
-                                                    </StackPanel>
-                                                </UniformGrid>
-                                                <Border Margin="0,10,0,0"
-                                                        Padding="10,6"
-                                                        Background="{Binding SetpointStatusBackground}"
-                                                        CornerRadius="8">
-                                                    <TextBlock FontSize="12"
-                                                               FontWeight="Bold"
-                                                               Foreground="{Binding SetpointStatusForeground}"
-                                                               Text="{Binding Rs485RunStateText}" />
-                                                </Border>
-                                            </StackPanel>
+                                                Padding="0">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="150" />
+                                                    <ColumnDefinition Width="116" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Column="0" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" Text="{Binding Name}" TextWrapping="Wrap" />
+                                                <TextBox Grid.Column="1" Width="108" Height="32" Margin="8,0,0,0" VerticalContentAlignment="Center" Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Hand" PreviewMouseLeftButtonDown="PumpSetpointTextBox_OnPreviewMouseLeftButtonDown" GotKeyboardFocus="PumpSetpointTextBox_OnGotKeyboardFocus" />
+                                                <Button Grid.Column="2" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="启动" IsEnabled="{Binding CanStartRs485Action}" Background="#FF2B8F6A" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StartActionHint}" />
+                                                <Button Grid.Column="3" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="停止" IsEnabled="{Binding CanStopRs485Action}" Background="#FFB85C38" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StopActionHint}" />
+                                                <TextBlock Grid.Column="4" Margin="10,0,0,0" VerticalAlignment="Center" FontSize="12" FontWeight="Bold" Foreground="{Binding SetpointStatusForeground}" Text="{Binding Rs485RunStateText}" TextWrapping="Wrap" />
+                                            </Grid>
                                         </Border>
                                     </DataTemplate>
                                 </Border.Resources>
@@ -1715,7 +1265,7 @@
                                             <Button MinWidth="120"
                                                     Height="34"
                                                     Padding="12,4"
-                                                    Margin="0,0,0,8"
+                                                    Margin="0,0,8,8"
                                                     Command="{Binding StopRecirculationRs485PumpsCommand}"
                                                     Content="统一停止三泵"
                                                     Background="#FFB85C38" />
@@ -1763,90 +1313,26 @@
                                 </Border.Style>
                                 <Border.Resources>
                                     <DataTemplate x:Key="AntiCollapseRs485QuickPumpCardTemplate" DataType="{x:Type models:PumpControlChannel}">
-                                        <Border MinWidth="420"
+                                        <Border MinWidth="640"
                                                 Margin="0,0,10,10"
-                                                Padding="12"
-                                                Background="#FFF8FBFC"
-                                                CornerRadius="12"
-                                                BorderBrush="#FFD8E4E8"
-                                                BorderThickness="1">
+                                                Padding="0">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="150" />
+                                                    <ColumnDefinition Width="116" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="96" />
                                                 </Grid.ColumnDefinitions>
-                                                <StackPanel Grid.Column="0">
-                                                    <TextBlock FontSize="14"
-                                                               FontWeight="Bold"
-                                                               Text="{Binding Name}"
-                                                               TextWrapping="Wrap" />
-                                                    <Grid Margin="0,10,0,0">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <TextBox Grid.Column="0"
-                                                                 Height="34"
-                                                                 VerticalContentAlignment="Center"
-                                                                 Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <Button Grid.Column="1"
-                                                                MinWidth="76"
-                                                                Margin="8,0,0,0"
-                                                                Padding="8,2"
-                                                                Command="{Binding DataContext.WritePumpSetpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="写入" />
-                                                    </Grid>
-                                                    <UniformGrid Margin="0,10,0,0" Columns="3">
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="目标" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding PendingSetpointText, StringFormat={}{0} L/min}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="读回" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding SetpointReadbackDisplay}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="实时" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding FlowDisplay}" />
-                                                        </StackPanel>
-                                                    </UniformGrid>
-                                                    <Border Margin="0,10,0,0"
-                                                            Padding="10,6"
-                                                            Background="{Binding SetpointStatusBackground}"
-                                                            CornerRadius="8">
-                                                        <TextBlock FontSize="12"
-                                                                   FontWeight="Bold"
-                                                                   Foreground="{Binding SetpointStatusForeground}"
-                                                                   Text="{Binding Rs485RunStateText}" />
-                                                    </Border>
-                                                </StackPanel>
-                                                <StackPanel Grid.Column="1"
-                                                            Margin="12,0,0,0"
-                                                            VerticalAlignment="Stretch">
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Padding="12,4"
-                                                            Margin="0,44,0,0"
-                                                            Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="启动"
-                                                            IsEnabled="{Binding CanStartRs485Action}"
-                                                            Background="#FF2B8F6A"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StartActionHint}" />
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Margin="0,8,0,0"
-                                                            Padding="12,4"
-                                                            Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="停止"
-                                                            IsEnabled="{Binding CanStopRs485Action}"
-                                                            Background="#FFB85C38"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StopActionHint}" />
-                                                </StackPanel>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Column="0" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" Text="{Binding Name}" TextWrapping="Wrap" />
+                                                <TextBox Grid.Column="1" Width="108" Height="32" Margin="8,0,0,0" VerticalContentAlignment="Center" Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Hand" PreviewMouseLeftButtonDown="PumpSetpointTextBox_OnPreviewMouseLeftButtonDown" GotKeyboardFocus="PumpSetpointTextBox_OnGotKeyboardFocus" />
+                                                <Button Grid.Column="2" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="启动" IsEnabled="{Binding CanStartRs485Action}" Background="#FF2B8F6A" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StartActionHint}" />
+                                                <Button Grid.Column="3" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="停止" IsEnabled="{Binding CanStopRs485Action}" Background="#FFB85C38" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StopActionHint}" />
+                                                <TextBlock Grid.Column="4" Margin="10,0,0,0" VerticalAlignment="Center" FontSize="12" FontWeight="Bold" Foreground="{Binding SetpointStatusForeground}" Text="{Binding Rs485RunStateText}" TextWrapping="Wrap" />
                                             </Grid>
                                         </Border>
                                     </DataTemplate>
@@ -1876,7 +1362,7 @@
                                     </DataTemplate>
                                 </Border.Resources>
                                 <StackPanel>
-                                    <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
+                                    <WrapPanel Margin="0,8,0,0">
                                         <ItemsControl ItemsSource="{Binding PressureDropRs485FlowPumpControls}"
                                                       ItemTemplate="{StaticResource AntiCollapseRs485QuickPumpCardTemplate}">
                                             <ItemsControl.Style>
@@ -1931,7 +1417,7 @@
                                                 </ItemsPanelTemplate>
                                             </ItemsControl.ItemsPanel>
                                         </ItemsControl>
-                                    </StackPanel>
+                                    </WrapPanel>
                                 </StackPanel>
                             </Border>
                             <Border>
@@ -1942,7 +1428,7 @@
                                             <DataTrigger Binding="{Binding HasSelectedItem}" Value="False">
                                                 <Setter Property="Visibility" Value="Collapsed" />
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding IsHemolysisPrimaryInputSelected}" Value="True">
+                                            <DataTrigger Binding="{Binding IsHemolysisSelected}" Value="True">
                                                 <Setter Property="Visibility" Value="Visible" />
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding HasHemolysisRs485FlowPumpControls}" Value="False">
@@ -1953,90 +1439,26 @@
                                 </Border.Style>
                                 <Border.Resources>
                                     <DataTemplate x:Key="HemolysisRs485PumpCardTemplate" DataType="{x:Type models:PumpControlChannel}">
-                                        <Border MinWidth="420"
+                                        <Border MinWidth="640"
                                                 Margin="0,0,10,10"
-                                                Padding="12"
-                                                Background="#FFF8FBFC"
-                                                CornerRadius="12"
-                                                BorderBrush="#FFD8E4E8"
-                                                BorderThickness="1">
+                                                Padding="0">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="150" />
+                                                    <ColumnDefinition Width="116" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="96" />
                                                 </Grid.ColumnDefinitions>
-                                                <StackPanel Grid.Column="0">
-                                                    <TextBlock FontSize="14"
-                                                               FontWeight="Bold"
-                                                               Text="{Binding Name}"
-                                                               TextWrapping="Wrap" />
-                                                    <Grid Margin="0,10,0,0">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <TextBox Grid.Column="0"
-                                                                 Height="34"
-                                                                 VerticalContentAlignment="Center"
-                                                                 Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <Button Grid.Column="1"
-                                                                MinWidth="76"
-                                                                Margin="8,0,0,0"
-                                                                Padding="8,2"
-                                                                Command="{Binding DataContext.WritePumpSetpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="写入" />
-                                                    </Grid>
-                                                    <UniformGrid Margin="0,10,0,0" Columns="3">
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="目标" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding PendingSetpointText, StringFormat={}{0} L/min}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="读回" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding SetpointReadbackDisplay}" />
-                                                        </StackPanel>
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="实时" />
-                                                            <TextBlock FontSize="13" FontWeight="Bold" Text="{Binding FlowDisplay}" />
-                                                        </StackPanel>
-                                                    </UniformGrid>
-                                                    <Border Margin="0,10,0,0"
-                                                            Padding="10,6"
-                                                            Background="{Binding SetpointStatusBackground}"
-                                                            CornerRadius="8">
-                                                        <TextBlock FontSize="12"
-                                                                   FontWeight="Bold"
-                                                                   Foreground="{Binding SetpointStatusForeground}"
-                                                                   Text="{Binding Rs485RunStateText}" />
-                                                    </Border>
-                                                </StackPanel>
-                                                <StackPanel Grid.Column="1"
-                                                            Margin="12,0,0,0"
-                                                            VerticalAlignment="Stretch">
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Padding="12,4"
-                                                            Margin="0,44,0,0"
-                                                            Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="启动"
-                                                            IsEnabled="{Binding CanStartRs485Action}"
-                                                            Background="#FF2B8F6A"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StartActionHint}" />
-                                                    <Button Height="34"
-                                                            MinWidth="84"
-                                                            Margin="0,8,0,0"
-                                                            Padding="12,4"
-                                                            Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}"
-                                                            CommandParameter="{Binding}"
-                                                            Content="停止"
-                                                            IsEnabled="{Binding CanStopRs485Action}"
-                                                            Background="#FFB85C38"
-                                                            ToolTipService.ShowOnDisabled="True"
-                                                            ToolTip="{Binding StopActionHint}" />
-                                                </StackPanel>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Column="0" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" Text="{Binding Name}" TextWrapping="Wrap" />
+                                                <TextBox Grid.Column="1" Width="108" Height="32" Margin="8,0,0,0" VerticalContentAlignment="Center" Text="{Binding PendingSetpointText, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Cursor="Hand" PreviewMouseLeftButtonDown="PumpSetpointTextBox_OnPreviewMouseLeftButtonDown" GotKeyboardFocus="PumpSetpointTextBox_OnGotKeyboardFocus" />
+                                                <Button Grid.Column="2" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StartSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="启动" IsEnabled="{Binding CanStartRs485Action}" Background="#FF2B8F6A" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StartActionHint}" />
+                                                <Button Grid.Column="3" MinWidth="66" Height="32" Margin="8,0,0,0" Padding="8,2" Command="{Binding DataContext.StopSingleRs485PumpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" Content="停止" IsEnabled="{Binding CanStopRs485Action}" Background="#FFB85C38" ToolTipService.ShowOnDisabled="True" ToolTip="{Binding StopActionHint}" />
+                                                <TextBlock Grid.Column="4" Margin="10,0,0,0" VerticalAlignment="Center" FontSize="12" FontWeight="Bold" Foreground="{Binding SetpointStatusForeground}" Text="{Binding Rs485RunStateText}" TextWrapping="Wrap" />
                                             </Grid>
                                         </Border>
                                     </DataTemplate>
@@ -2060,93 +1482,6 @@
                                     </Grid>
                                 </StackPanel>
                             </Border>
-                            <Border>
-                                <Border.Style>
-                                    <Style TargetType="Border" BasedOn="{StaticResource CardBorderStyle}">
-                                        <Setter Property="Visibility" Value="Visible" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding HasSelectedItem}" Value="False">
-                                                <Setter Property="Visibility" Value="Collapsed" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Border.Style>
-                                <StackPanel>
-                                    <TextBlock Style="{StaticResource SectionTitleStyle}" Text="当前选择摘要" />
-                                    <WrapPanel Margin="0,4,0,0" ItemHeight="Auto" Orientation="Horizontal">
-                                        <Border Margin="0,0,8,6" Padding="12,8" MinWidth="280" Background="#FFF4F8FA" CornerRadius="12">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="66" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock VerticalAlignment="Top" Style="{StaticResource CaptionStyle}" Text="当前项目" />
-                                                <TextBlock Grid.Column="1"
-                                                           FontSize="15"
-                                                           FontWeight="SemiBold"
-                                                           Foreground="{StaticResource TextBrush}"
-                                                           Text="{Binding SelectedItemTitle}"
-                                                           TextWrapping="Wrap" />
-                                            </Grid>
-                                        </Border>
-                                        <Border Margin="0,0,8,6" Padding="12,8" MinWidth="170" Background="#FFF4F8FA" CornerRadius="12">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="66" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="采集方式" />
-                                                <TextBlock Grid.Column="1"
-                                                           VerticalAlignment="Center"
-                                                           FontSize="15"
-                                                           FontWeight="SemiBold"
-                                                           Foreground="{StaticResource AccentBrush}"
-                                                           Text="{Binding SelectedItemCaptureModeText}"
-                                                           TextWrapping="Wrap" />
-                                            </Grid>
-                                        </Border>
-                                        <Border Margin="0,0,8,6" Padding="12,8" MinWidth="220" Background="#FFF4F8FA" CornerRadius="12">
-                                            <StackPanel>
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="66" />
-                                                        <ColumnDefinition Width="*" />
-                                                    </Grid.ColumnDefinitions>
-                                                    <TextBlock VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="状态" />
-                                                    <TextBlock Grid.Column="1"
-                                                               VerticalAlignment="Center"
-                                                               FontSize="15"
-                                                               FontWeight="SemiBold"
-                                                               Foreground="{StaticResource TextBrush}"
-                                                               Text="{Binding SelectedItemStatusText}"
-                                                               TextWrapping="Wrap" />
-                                                </Grid>
-                                                <TextBlock Margin="66,4,0,0"
-                                                           Style="{StaticResource CaptionStyle}"
-                                                           Text="{Binding SelectedItem.CompletionHint}"
-                                                           TextWrapping="Wrap" />
-                                            </StackPanel>
-                                        </Border>
-                                        <Border Margin="0,0,0,6" Padding="12,8" MinWidth="180" Background="#FFF4F8FA" CornerRadius="12">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="66" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="记录时间" />
-                                                <TextBlock Grid.Column="1"
-                                                           VerticalAlignment="Center"
-                                                           FontSize="14"
-                                                           FontWeight="SemiBold"
-                                                           Foreground="{StaticResource TextBrush}"
-                                                           Text="{Binding SelectedItem.RecordedAtText}"
-                                                           TextWrapping="Wrap" />
-                                            </Grid>
-                                        </Border>
-                                    </WrapPanel>
-                                </StackPanel>
-                            </Border>
-
                             <Border Margin="0">
                                 <Border.Style>
                                     <Style TargetType="Border" BasedOn="{StaticResource CardBorderStyle}">
@@ -2160,36 +1495,21 @@
                                     </Style>
                                 </Border.Style>
                                 <StackPanel>
-                                    <TextBlock Style="{StaticResource SectionTitleStyle}" Text="项目详情与结果填写" />
+                                            <DockPanel LastChildFill="False">
+                                                <Button DockPanel.Dock="Right"
+                                                MinWidth="112"
+                                                MinHeight="32"
+                                                Padding="12,5"
+                                                Margin="12,0,0,8"
+                                                Click="OpenProjectInfoDialogButton_OnClick"
+                                                Background="#FFE3F6EF"
+                                                Foreground="{StaticResource HeaderBrush}"
+                                                BorderBrush="#FF9CCBBF"
+                                                Content="查看项目说明" />
+                                    </DockPanel>
                                     <Grid Margin="0,2,0,0">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="0.7*" />
-                                                <ColumnDefinition Width="12" />
-                                                <ColumnDefinition Width="1.3*" />
-                                            </Grid.ColumnDefinitions>
-                                            <StackPanel Grid.Column="0" Margin="0,0,0,4">
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="类别" />
-                                                <TextBlock FontSize="15" FontWeight="SemiBold" Margin="0,0,0,8" Text="{Binding SelectedItem.Category}" />
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="判定要求" />
-                                                <TextBlock FontSize="14" Margin="0,0,0,8" TextWrapping="Wrap" Text="{Binding SelectedItem.AcceptanceCriteria}" />
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="检测方法" />
-                                                <TextBlock FontSize="14" Margin="0,0,0,8" TextWrapping="Wrap" Text="{Binding SelectedItem.TestMethod}" />
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="记录要点" />
-                                                <TextBlock FontSize="14" Margin="0,0,0,8" TextWrapping="Wrap" Text="{Binding SelectedItem.RecordFocus}" />
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="数据来源" />
-                                                <TextBlock FontSize="14" Margin="0,0,0,8" TextWrapping="Wrap" Text="{Binding SelectedItemMeasurementSource}" />
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="实时数据预览" />
-                                                <Border Padding="10" Background="#FFF4F8FA" CornerRadius="12" Margin="0,0,0,8">
-                                                    <StackPanel>
-                                                        <TextBlock FontSize="15" FontWeight="SemiBold" Text="{Binding SelectedItemLiveDisplay}" TextWrapping="Wrap" />
-                                                        <TextBlock Margin="0,4,0,0" Style="{StaticResource CaptionStyle}" Text="{Binding SelectedItemLiveHint}" TextWrapping="Wrap" />
-                                                    </StackPanel>
-                                                </Border>
-                                            </StackPanel>
-                                            <StackPanel Grid.Column="2" Margin="0,0,0,4" IsEnabled="{Binding CanModifySession}">
-                                                <TextBlock Style="{StaticResource CaptionStyle}" Text="填写说明" />
-                                                <TextBlock Margin="0,0,0,6" Foreground="{StaticResource MutedTextBrush}" FontSize="13" Text="{Binding RealtimeMeasurementHint}" TextWrapping="Wrap" />
-                                                <Border Margin="0,0,0,8" Padding="12" Background="#FFF8F4EA" CornerRadius="14">
+                                            <StackPanel Margin="0,0,0,4" IsEnabled="{Binding CanModifySession}">
+                                                <Border Margin="0,0,0,16" Padding="0">
                                                     <StackPanel>
                                                         <StackPanel.Style>
                                                             <Style TargetType="StackPanel">
@@ -2202,6 +1522,16 @@
                                                             </Style>
                                                         </StackPanel.Style>
                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="压力降三点采样" />
+                                                        <WrapPanel Margin="0,4,0,4">
+                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="近端 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding ProximalPressureDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="远端 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding DistalPressureDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="ΔP " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding DeltaPressureDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="主泵 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding PressureDropPumpFlowDisplay}" />
+                                                        </WrapPanel>
                                                         <TextBlock FontSize="13" Text="{Binding PressureDropFlowPointDisplay}" TextWrapping="Wrap" />
                                                         <WrapPanel Margin="0,6,0,0">
                                                             <TextBlock VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="声明限值 mmHg" />
@@ -2243,7 +1573,7 @@
                                                         </ScrollViewer>
                                                     </StackPanel>
                                                 </Border>
-                                                <Border Margin="0,0,0,8" Padding="12" Background="#FFF3F7EF" CornerRadius="14">
+                                                <Border Margin="0,0,0,16" Padding="0">
                                                     <StackPanel>
                                                         <StackPanel.Style>
                                                             <Style TargetType="StackPanel">
@@ -2256,6 +1586,10 @@
                                                             </Style>
                                                         </StackPanel.Style>
                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="抗扭结标准采样" />
+                                                        <WrapPanel Margin="0,4,0,4">
+                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="抗扭结主泵 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding KinkResistancePumpFlowDisplay}" />
+                                                        </WrapPanel>
                                                         <TextBlock FontSize="13" Text="{Binding KinkResistanceFlowPointDisplay}" TextWrapping="Wrap" />
                                                         <TextBlock Margin="0,4,0,0" FontSize="13" Text="{Binding KinkResistanceMandrelDiameterDisplay}" TextWrapping="Wrap" />
                                                         <WrapPanel Margin="0,6,0,0">
@@ -2289,7 +1623,7 @@
                                                         </DataGrid>
                                                     </StackPanel>
                                                 </Border>
-                                                <Border Margin="0,0,0,8" Padding="12" Background="#FFF8F4EA" CornerRadius="14">
+                                                <Border Margin="0,0,0,16" Padding="0">
                                                     <StackPanel>
                                                         <StackPanel.Style>
                                                             <Style TargetType="StackPanel">
@@ -2302,6 +1636,12 @@
                                                             </Style>
                                                         </StackPanel.Style>
                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="抗塌陷快速采样" />
+                                                        <WrapPanel Margin="0,4,0,4">
+                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="主泵 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding PressureDropPumpFlowDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="ΔP " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding DeltaPressureDisplay}" />
+                                                        </WrapPanel>
                                                         <WrapPanel Margin="0,6,0,0">
                                                             <TextBlock VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="允许增幅 %" />
                                                             <TextBox Width="64" Margin="8,0,0,0" Text="{Binding AntiCollapseAllowedIncreaseRate, UpdateSourceTrigger=PropertyChanged}" />
@@ -2314,7 +1654,7 @@
                                                         </WrapPanel>
                                                     </StackPanel>
                                                 </Border>
-                                                <Border Margin="0,0,0,8" Padding="12" Background="#FFEFF4FB" CornerRadius="14">
+                                                <Border Margin="0,0,0,16" Padding="0">
                                                     <StackPanel>
                                                         <StackPanel.Style>
                                                             <Style TargetType="StackPanel">
@@ -2327,6 +1667,16 @@
                                                             </Style>
                                                         </StackPanel.Style>
                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="再循环标准采样" />
+                                                        <WrapPanel Margin="0,4,0,4">
+                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="再循环主 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding RecirculationPumpFlowDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="回流泵 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding ReturnFlowDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="引流泵 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding DrainageFlowDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="再循环率 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding RealtimeRecirculationDisplay}" />
+                                                        </WrapPanel>
                                                         <TextBlock FontSize="13" Text="{Binding RecirculationFlowPointDisplay}" TextWrapping="Wrap" />
                                                         <WrapPanel Margin="0,6,0,0">
                                                             <TextBlock VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="R 限值 %" />
@@ -2357,7 +1707,7 @@
                                                         </DataGrid>
                                                     </StackPanel>
                                                 </Border>
-                                                <Border Margin="0,0,0,8" Padding="12" Background="#FFF8F1EA" CornerRadius="14">
+                                                <Border Margin="0,0,0,16" Padding="0">
                                                     <StackPanel>
                                                         <StackPanel.Style>
                                                             <Style TargetType="StackPanel">
@@ -2370,9 +1720,17 @@
                                                             </Style>
                                                         </StackPanel.Style>
                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="共用试验记录要点" />
+                                                        <WrapPanel Margin="0,4,0,4">
+                                                            <TextBlock Style="{StaticResource CaptionStyle}" Text="破坏单腔 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding HemolysisDrainageSingleFlowDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="双腔回路 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding HemolysisReturnSingleFlowDisplay}" />
+                                                            <TextBlock Margin="12,0,0,0" Style="{StaticResource CaptionStyle}" Text="双管腔 " />
+                                                            <TextBlock FontSize="13" FontWeight="SemiBold" Text="{Binding HemolysisDualLumenFlowDisplay}" />
+                                                        </WrapPanel>
                                                         <TextBlock FontSize="13" Text="{Binding HemolysisStandardSummary}" TextWrapping="Wrap" />
                                                         <TextBlock Margin="0,6,0,0" FontSize="13" Text="{Binding HemolysisTemplateGuidance}" TextWrapping="Wrap" />
-                                                        <Border Margin="0,8,0,0" Padding="10" Background="#FFFFFAF6" CornerRadius="12" BorderBrush="#FFE8D9CC" BorderThickness="1">
+                                                        <Border Margin="0,8,0,0" Padding="0">
                                                             <TextBlock FontSize="13" Text="{Binding HemolysisSharedRecordHint}" TextWrapping="Wrap" />
                                                         </Border>
 
@@ -2389,13 +1747,13 @@
                                                             </StackPanel.Style>
                                                             <TextBlock Margin="0,10,0,0" Style="{StaticResource CaptionStyle}" Text="共享基础条件" />
                                                             <WrapPanel Margin="0,6,0,0" Orientation="Horizontal">
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="血液来源" />
                                                                         <ComboBox Margin="0,4,0,0" ItemsSource="{Binding HemolysisBloodSourceOptions}" SelectedItem="{Binding HemolysisTestParameters.BloodSource, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="228" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="228" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="采血日期" />
                                                                         <DatePicker MinWidth="180"
@@ -2404,37 +1762,37 @@
                                                                                     SelectedDateFormat="Short" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="抗凝剂" />
                                                                         <ComboBox Margin="0,4,0,0" ItemsSource="{Binding HemolysisAnticoagulantOptions}" SelectedItem="{Binding HemolysisTestParameters.Anticoagulant, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="初始 Hct" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.InitialHematocrit, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="调整后 Hct" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.AdjustedHematocrit, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="葡萄糖 mmol/L" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.Glucose, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="血红蛋白 g/dL" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.TotalHemoglobin, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,0,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,0,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="初始游离Hb" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.InitialFreeHemoglobin, UpdateSourceTrigger=PropertyChanged}" />
@@ -2444,31 +1802,31 @@
 
                                                             <TextBlock Margin="0,10,0,0" Style="{StaticResource CaptionStyle}" Text="测试回路与运行条件" />
                                                             <WrapPanel Margin="0,6,0,0" Orientation="Horizontal">
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="充盈量 mL" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.CircuitPrimingVolume, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="容积差 %" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.CircuitVolumeDifference, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="设定流量 L/min" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.SetFlow, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,8,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,8,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="运行时间 min" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.RunTimeMinutes, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </StackPanel>
                                                                 </Border>
-                                                                <Border Width="190" Margin="0,0,0,8" Padding="10,8" Background="#FFFFFAF6" CornerRadius="10">
+                                                                <Border Width="190" Margin="0,0,0,8" Padding="0">
                                                                     <StackPanel>
                                                                         <TextBlock Style="{StaticResource CaptionStyle}" Text="目标温度 ℃" />
                                                                         <TextBox Margin="0,4,0,0" Text="{Binding HemolysisTestParameters.TargetTemperature, UpdateSourceTrigger=PropertyChanged}" />
@@ -2477,7 +1835,7 @@
                                                             </WrapPanel>
                                                         </StackPanel>
 
-                                                        <Border Margin="0,10,0,0" Padding="10" Background="#FFF4F8FA" CornerRadius="12" BorderBrush="#FFD4E1E6" BorderThickness="1">
+                                                        <Border Margin="0,10,0,0" Padding="0">
                                                             <Border.Style>
                                                                 <Style TargetType="Border">
                                                                     <Setter Property="Visibility" Value="Collapsed" />
@@ -2496,7 +1854,7 @@
                                                         <TextBlock Margin="0,10,0,0" Style="{StaticResource CaptionStyle}" Text="{Binding HemolysisCalculationTitle}" />
                                                         <TextBlock FontSize="13" Text="{Binding HemolysisSamplingCompletionSummary}" TextWrapping="Wrap" />
                                                         <TextBlock Margin="0,4,0,0" FontSize="13" Text="{Binding HemolysisCalculationDetail}" TextWrapping="Wrap" />
-                                                        <Border Margin="0,8,0,0" Padding="10" Background="#FFFBE8E6" CornerRadius="12" BorderBrush="#FFF0C6C1" BorderThickness="1">
+                                                        <Border Margin="0,8,0,0" Padding="0">
                                                             <TextBlock Foreground="{StaticResource DangerBrush}" FontSize="13" FontWeight="SemiBold" Text="{Binding HemolysisRequiredPointAlert}" TextWrapping="Wrap">
                                                                 <TextBlock.Style>
                                                                     <Style TargetType="TextBlock">
@@ -2512,7 +1870,7 @@
                                                         </Border>
 
                                                         <TextBlock Margin="0,10,0,0" Style="{StaticResource CaptionStyle}" Text="{Binding HemolysisSamplingSectionTitle}" />
-                                                        <Border Margin="0,6,0,0" Padding="12" Background="#FFFFFAF6" CornerRadius="12" BorderBrush="#FFE8D9CC" BorderThickness="1">
+                                                        <Border Margin="0,6,0,0" Padding="0">
                                                             <StackPanel>
                                                                 <DockPanel LastChildFill="False">
                                                                     <TextBlock DockPanel.Dock="Left"
@@ -2522,11 +1880,7 @@
                                                                                TextWrapping="Wrap" />
                                                                     <Border DockPanel.Dock="Right"
                                                                             Margin="12,0,0,0"
-                                                                            Padding="10,4"
-                                                                            Background="#FFF4F8FA"
-                                                                            CornerRadius="999"
-                                                                            BorderBrush="#FFD4E1E6"
-                                                                            BorderThickness="1">
+                                                                            Padding="0">
                                                                         <TextBlock FontSize="12"
                                                                                    FontWeight="SemiBold"
                                                                                    Foreground="{StaticResource HeaderBrush}"
@@ -2585,7 +1939,7 @@
                                                     </StackPanel>
                                                 </Border>
                                                 <TextBlock Style="{StaticResource CaptionStyle}" Text="结果记录" />
-                                                <Border Style="{StaticResource FieldPanelStyle}">
+                                                <Border Margin="0,0,0,8" Padding="0">
                                                     <TextBox Margin="0"
                                                              Text="{Binding ResultValue, UpdateSourceTrigger=PropertyChanged}"
                                                              MinHeight="136"
@@ -2594,7 +1948,7 @@
                                                              VerticalScrollBarVisibility="Auto"
                                                              IsReadOnly="{Binding SelectedItemUsesRealtimeValue}" />
                                                 </Border>
-                                                <Border Style="{StaticResource FieldPanelStyle}">
+                                                <Border Margin="0,0,0,8" Padding="0">
                                                     <Grid>
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="*" />
@@ -2618,7 +1972,7 @@
                                                     </Grid>
                                                 </Border>
                                                 <TextBlock Style="{StaticResource CaptionStyle}" Text="复核备注" />
-                                                <Border Style="{StaticResource FieldPanelStyle}">
+                                                <Border Margin="0,0,0,8" Padding="0">
                                                     <TextBox Margin="0"
                                                              Text="{Binding ResultNote, UpdateSourceTrigger=PropertyChanged}"
                                                              MinHeight="120"
@@ -2636,20 +1990,6 @@
                                             <ColumnDefinition Width="Auto" />
                                         </Grid.ColumnDefinitions>
                                         <TextBlock Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource CaptionStyle}" Text="{Binding LatestAction}" TextWrapping="Wrap" />
-                                        <WrapPanel Grid.Column="2" HorizontalAlignment="Right">
-                                            <WrapPanel.Resources>
-                                                <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                                    <Setter Property="MinWidth" Value="180" />
-                                                    <Setter Property="MinHeight" Value="32" />
-                                                    <Setter Property="Padding" Value="10,4" />
-                                                    <Setter Property="Margin" Value="0,0,6,0" />
-                                                    <Setter Property="FontSize" Value="14" />
-                                                </Style>
-                                            </WrapPanel.Resources>
-                                            <Button Command="{Binding SelectPreviousItemCommand}" Content="上一项" Background="#FF6B8791" />
-                                            <Button Command="{Binding SelectNextItemCommand}" Content="下一项" Background="#FF6B8791" />
-                                            <Button Command="{Binding ApplyResultCommand}" Content="保存并更新状态" Background="#FF2B8F6A" IsEnabled="{Binding CanModifySession}" />
-                                        </WrapPanel>
                                     </Grid>
                                 </StackPanel>
                             </Border>
@@ -2657,7 +1997,7 @@
                         </ScrollViewer>
                     </TabItem>
 
-                    <TabItem Header="配置">
+                    <TabItem x:Name="ConfigurationTab" Header="配置">
                         <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <StackPanel Margin="0,6,0,0">
                                 <Border Style="{StaticResource CardBorderStyle}">
@@ -2758,12 +2098,12 @@
                                         <TextBlock DockPanel.Dock="Left"
                                                    VerticalAlignment="Center"
                                                    Style="{StaticResource CaptionStyle}"
-                                                   Text="工程维护参数请在工程寄存器窗口中调整。"
+                                                   Text="泵维护参数调整和流量系数调整。"
                                                    TextWrapping="Wrap" />
                                         <Button DockPanel.Dock="Right"
                                                 Padding="12,6"
                                                 Click="OpenEngineeringRegistersButton_OnClick"
-                                                Content="进入工程寄存器"
+                                                Content="进入配置"
                                                 Background="#FF6B8791" />
                                     </DockPanel>
                                 </Border>
@@ -2771,7 +2111,7 @@
                         </ScrollViewer>
                     </TabItem>
 
-                    <TabItem Header="追溯">
+                    <TabItem x:Name="TraceTab" Header="追溯">
                         <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <StackPanel Margin="0,6,0,0">
                                 <Border Style="{StaticResource CardBorderStyle}">
@@ -2815,7 +2155,8 @@
                             </StackPanel>
                         </ScrollViewer>
                     </TabItem>
-                </TabControl>
+                    </TabControl>
+                </Grid>
             </Border>
         </Grid>
     </Grid>
diff --git a/Cardiopulmonarybypasssystems/MainWindow.xaml.cs b/Cardiopulmonarybypasssystems/MainWindow.xaml.cs
index cd23a02..d20319e 100644
--- a/Cardiopulmonarybypasssystems/MainWindow.xaml.cs
+++ b/Cardiopulmonarybypasssystems/MainWindow.xaml.cs
@@ -1,11 +1,15 @@
+using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
 using System.Windows.Threading;
+using Cardiopulmonarybypasssystems.Models;
 using Cardiopulmonarybypasssystems.ViewModels;
 
 namespace Cardiopulmonarybypasssystems;
@@ -13,11 +17,23 @@ namespace Cardiopulmonarybypasssystems;
 public partial class MainWindow : Window
 {
     private EngineeringRegistersWindow? _engineeringRegistersWindow;
+    private readonly List<Button> _navigationButtons = [];
+    private readonly List<Button> _projectInspectionButtons = [];
+    private object? _projectInspectionContent;
+    private object? _realtimeContent;
+    private object? _manualSupplementContent;
+    private object? _configurationContent;
+    private object? _traceContent;
+    private NavigationPage _currentPage = NavigationPage.RealtimeData;
+    private InspectionItem? _currentProjectItem;
+    private bool _isPumpSetpointKeypadOpen;
 
     public MainWindow(MainViewModel viewModel)
     {
         InitializeComponent();
         DataContext = viewModel;
+        EmbedProjectDetailContent();
+        ConfigureNavigation(viewModel);
         ConfigureTrendBindings();
     }
 
@@ -31,17 +47,525 @@ public partial class MainWindow : Window
 
         Dispatcher.BeginInvoke(() =>
         {
-            if (sender is DataGrid { SelectedItem: not null })
+            if (sender is DataGrid { SelectedItem: InspectionItem inspectionItem })
             {
-                ProjectDetailTab.IsSelected = true;
+                NavigateToProjectItem(inspectionItem);
             }
         }, DispatcherPriority.Background);
     }
 
     private void ReturnToProjectListButton_OnClick(object sender, RoutedEventArgs e)
     {
-        ProjectListTab.IsSelected = true;
-        InspectionItemsGrid.Focus();
+        NavigateToFixedPage(NavigationPage.RealtimeData);
+    }
+
+    private void EmbedProjectDetailContent()
+    {
+        if (ProjectDetailContentHost.Content is not null)
+        {
+            return;
+        }
+
+        if (ProjectDetailTab.Content is ScrollViewer detailScrollViewer)
+        {
+            var detailContent = detailScrollViewer.Content;
+            detailScrollViewer.Content = null;
+            ProjectDetailContentHost.Content = detailContent;
+        }
+        else
+        {
+            ProjectDetailContentHost.Content = ProjectDetailTab.Content;
+        }
+
+        ProjectDetailTab.Content = null;
+        RootTabControl.Items.Remove(ProjectDetailTab);
+    }
+
+    private void ConfigureNavigation(MainViewModel viewModel)
+    {
+        _realtimeContent = ExtractTabContent(RealtimeDataTab);
+        _projectInspectionContent = ExtractTabContent(ProjectListTab);
+        _manualSupplementContent = ExtractTabContent(ManualSupplementTab);
+        _configurationContent = ExtractTabContent(ConfigurationTab);
+        _traceContent = ExtractTabContent(TraceTab);
+
+        viewModel.PropertyChanged += ViewModel_OnPropertyChanged;
+
+        if (viewModel.FilteredItemsView is INotifyCollectionChanged filteredItems)
+        {
+            filteredItems.CollectionChanged += (_, _) => RebuildNavigationButtons();
+        }
+
+        RebuildNavigationButtons();
+        NavigateToFixedPage(NavigationPage.RealtimeData);
+    }
+
+    private static object? ExtractTabContent(TabItem tab)
+    {
+        var content = tab.Content;
+        tab.Content = null;
+        return content;
+    }
+
+    private void RebuildNavigationButtons()
+    {
+        if (DataContext is not MainViewModel viewModel)
+        {
+            return;
+        }
+
+        NavigationButtonPanel.Children.Clear();
+        _navigationButtons.Clear();
+        _projectInspectionButtons.Clear();
+
+        AddNavigationButton("实时数据", new NavigationTarget(NavigationPage.RealtimeData, null));
+
+        foreach (var item in viewModel.FilteredItemsView.Cast<InspectionItem>())
+        {
+            var button = AddNavigationButton(item.Item, new NavigationTarget(NavigationPage.ProjectItem, item));
+            _projectInspectionButtons.Add(button);
+        }
+
+        AddNavigationButton("项目补充", new NavigationTarget(NavigationPage.ManualSupplement, null));
+        AddNavigationButton("配置", new NavigationTarget(NavigationPage.Configuration, null));
+        AddNavigationButton("追溯", new NavigationTarget(NavigationPage.Trace, null));
+
+        if (_currentPage == NavigationPage.ProjectItem
+            && (_currentProjectItem is null || !_projectInspectionButtons.Any(button => ReferenceEquals(((NavigationTarget)button.Tag).ProjectItem, _currentProjectItem))))
+        {
+            NavigateToFixedPage(NavigationPage.RealtimeData);
+            return;
+        }
+
+        RefreshNavigationButtonStates();
+    }
+
+    private Button AddNavigationButton(string text, NavigationTarget target)
+    {
+        var button = new Button
+        {
+            Content = new TextBlock
+            {
+                MaxWidth = 132,
+                Text = text,
+                TextAlignment = TextAlignment.Center,
+                TextWrapping = TextWrapping.Wrap
+            },
+            Tag = target,
+            MinWidth = 92,
+            MinHeight = 38,
+            Padding = new Thickness(10, 6, 10, 6),
+            Margin = new Thickness(0, 0, 6, 6),
+            FontSize = 14
+        };
+
+        button.Click += NavigationButton_OnClick;
+        NavigationButtonPanel.Children.Add(button);
+        _navigationButtons.Add(button);
+        return button;
+    }
+
+    private void NavigationButton_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button { Tag: NavigationTarget target })
+        {
+            Navigate(target);
+        }
+    }
+
+    private void Navigate(NavigationTarget target)
+    {
+        if (target.Page == NavigationPage.ProjectItem)
+        {
+            NavigateToProjectItem(target.ProjectItem);
+            return;
+        }
+
+        NavigateToFixedPage(target.Page);
+    }
+
+    private void NavigateToFixedPage(NavigationPage page)
+    {
+        _currentPage = page;
+        _currentProjectItem = null;
+        MainContentHost.Content = page switch
+        {
+            NavigationPage.RealtimeData => _realtimeContent,
+            NavigationPage.ManualSupplement => _manualSupplementContent,
+            NavigationPage.Configuration => _configurationContent,
+            NavigationPage.Trace => _traceContent,
+            _ => _realtimeContent
+        };
+
+        RefreshNavigationButtonStates();
+    }
+
+    private void NavigateToProjectItem(InspectionItem? item)
+    {
+        if (item is null)
+        {
+            return;
+        }
+
+        if (DataContext is MainViewModel viewModel && !ReferenceEquals(viewModel.SelectedItem, item))
+        {
+            viewModel.SelectedItem = item;
+        }
+
+        _currentPage = NavigationPage.ProjectItem;
+        _currentProjectItem = item;
+        MainContentHost.Content = _projectInspectionContent;
+        RefreshNavigationButtonStates();
+    }
+
+    private void RefreshNavigationButtonStates()
+    {
+        foreach (var button in _navigationButtons)
+        {
+            if (button.Tag is not NavigationTarget target)
+            {
+                continue;
+            }
+
+            var isSelected = target.Page == _currentPage
+                && (_currentPage != NavigationPage.ProjectItem || ReferenceEquals(target.ProjectItem, _currentProjectItem));
+
+            button.Background = isSelected ? BrushFromRgb(0xE3, 0xF6, 0xEF) : BrushFromRgb(0xE1, 0xE9, 0xEC);
+            button.Foreground = isSelected ? BrushFromRgb(0x0E, 0x6C, 0x58) : BrushFromRgb(0x54, 0x65, 0x70);
+            button.BorderBrush = isSelected ? BrushFromRgb(0x6E, 0xB2, 0xA9) : BrushFromRgb(0xC6, 0xD5, 0xDB);
+            button.FontWeight = isSelected ? FontWeights.Bold : FontWeights.SemiBold;
+        }
+    }
+
+    private static SolidColorBrush BrushFromRgb(byte red, byte green, byte blue) => new(Color.FromRgb(red, green, blue));
+
+    private void ViewModel_OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(MainViewModel.SelectedItem) && sender is MainViewModel viewModel)
+        {
+            if (viewModel.SelectedItem is not null && _currentPage == NavigationPage.ProjectItem)
+            {
+                NavigateToProjectItem(viewModel.SelectedItem);
+            }
+        }
+    }
+
+    private enum NavigationPage
+    {
+        RealtimeData,
+        ProjectItem,
+        ManualSupplement,
+        Configuration,
+        Trace
+    }
+
+    private sealed record NavigationTarget(NavigationPage Page, InspectionItem? ProjectItem);
+
+    private void PumpSetpointTextBox_OnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        e.Handled = true;
+
+        if (sender is TextBox { DataContext: PumpControlChannel pump })
+        {
+            ShowPumpSetpointKeypad(pump);
+        }
+    }
+
+    private void PumpSetpointTextBox_OnGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+    {
+        if (sender is TextBox { DataContext: PumpControlChannel pump })
+        {
+            ShowPumpSetpointKeypad(pump);
+        }
+    }
+
+    private void ShowPumpSetpointKeypad(PumpControlChannel pump)
+    {
+        if (_isPumpSetpointKeypadOpen)
+        {
+            return;
+        }
+
+        _isPumpSetpointKeypadOpen = true;
+
+        var valueBox = new TextBox
+        {
+            Text = string.IsNullOrWhiteSpace(pump.PendingSetpointText) ? "0" : pump.PendingSetpointText.Trim(),
+            IsReadOnly = true,
+            Height = 46,
+            FontSize = 22,
+            FontWeight = FontWeights.SemiBold,
+            TextAlignment = TextAlignment.Right,
+            VerticalContentAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(0, 0, 0, 10),
+            Padding = new Thickness(10, 0, 10, 0)
+        };
+
+        var errorText = new TextBlock
+        {
+            Foreground = Brushes.Firebrick,
+            FontSize = 12,
+            MinHeight = 18,
+            Margin = new Thickness(0, 0, 0, 8)
+        };
+
+        var keypad = new UniformGrid
+        {
+            Columns = 3,
+            Rows = 4,
+            Margin = new Thickness(0, 0, 0, 12)
+        };
+
+        foreach (var key in new[] { "7", "8", "9", "4", "5", "6", "1", "2", "3", ".", "0", "退格" })
+        {
+            keypad.Children.Add(CreateKeypadButton(key, (_, _) =>
+            {
+                errorText.Text = string.Empty;
+                ApplyKeypadInput(valueBox, key);
+            }));
+        }
+
+        var actions = new Grid();
+        actions.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        actions.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        actions.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+        var clearButton = CreateKeypadButton("清空", (_, _) =>
+        {
+            errorText.Text = string.Empty;
+            valueBox.Text = string.Empty;
+        });
+
+        var cancelButton = CreateKeypadButton("取消", (_, _) =>
+        {
+            if (Window.GetWindow(valueBox) is Window owner)
+            {
+                owner.DialogResult = false;
+            }
+        });
+
+        var okButton = CreateKeypadButton("确定", (_, _) =>
+        {
+            var normalizedValue = NormalizePumpSetpointText(valueBox.Text);
+
+            if (!double.TryParse(
+                    normalizedValue,
+                    NumberStyles.Float,
+                    CultureInfo.InvariantCulture,
+                    out var parsedValue)
+                || parsedValue < 0)
+            {
+                errorText.Text = "请输入有效流量";
+                return;
+            }
+
+            pump.PendingSetpointText = parsedValue.ToString("0.##", CultureInfo.InvariantCulture);
+
+            if (DataContext is MainViewModel viewModel
+                && viewModel.WritePumpSetpointCommand.CanExecute(pump))
+            {
+                viewModel.WritePumpSetpointCommand.Execute(pump);
+            }
+
+            if (Window.GetWindow(valueBox) is Window owner)
+            {
+                owner.DialogResult = true;
+            }
+        });
+
+        Grid.SetColumn(clearButton, 0);
+        Grid.SetColumn(cancelButton, 1);
+        Grid.SetColumn(okButton, 2);
+        actions.Children.Add(clearButton);
+        actions.Children.Add(cancelButton);
+        actions.Children.Add(okButton);
+
+        var panel = new StackPanel
+        {
+            Margin = new Thickness(18)
+        };
+        panel.Children.Add(new TextBlock
+        {
+            Text = pump.Name,
+            FontSize = 16,
+            FontWeight = FontWeights.SemiBold,
+            Foreground = BrushFromRgb(0x1F, 0x3B, 0x46),
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Thickness(0, 0, 0, 10)
+        });
+        panel.Children.Add(valueBox);
+        panel.Children.Add(errorText);
+        panel.Children.Add(keypad);
+        panel.Children.Add(actions);
+
+        var dialog = new Window
+        {
+            Owner = this,
+            Title = "输入目标流量",
+            Width = 450,
+            Height = 500,
+            MinWidth = 280,
+            MinHeight = 390,
+            ResizeMode = ResizeMode.NoResize,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            Content = panel
+        };
+
+        dialog.Closed += (_, _) => _isPumpSetpointKeypadOpen = false;
+        dialog.ShowDialog();
+    }
+
+    private static Button CreateKeypadButton(string text, RoutedEventHandler handler)
+    {
+        var button = new Button
+        {
+            Content = text,
+            MinHeight = 46,
+            Margin = new Thickness(4),
+            FontSize = 16,
+            FontWeight = FontWeights.SemiBold,
+            Background = BrushFromRgb(0xE3, 0xF6, 0xEF),
+            Foreground = BrushFromRgb(0x1F, 0x3B, 0x46),
+            BorderBrush = BrushFromRgb(0x9C, 0xCB, 0xBF)
+        };
+
+        button.Click += handler;
+        return button;
+    }
+
+    private static void ApplyKeypadInput(TextBox valueBox, string key)
+    {
+        if (key == "退格")
+        {
+            valueBox.Text = valueBox.Text.Length > 0 ? valueBox.Text[..^1] : string.Empty;
+            return;
+        }
+
+        if (key == "." && valueBox.Text.Contains('.', StringComparison.Ordinal))
+        {
+            return;
+        }
+
+        if (valueBox.Text == "0" && key != ".")
+        {
+            valueBox.Text = key;
+            return;
+        }
+
+        valueBox.Text += key;
+    }
+
+    private static string NormalizePumpSetpointText(string value)
+    {
+        var normalizedValue = value.Trim();
+
+        if (normalizedValue.StartsWith(".", StringComparison.Ordinal))
+        {
+            normalizedValue = "0" + normalizedValue;
+        }
+
+        return normalizedValue;
+    }
+
+    private void OpenProjectInfoDialogButton_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is not MainViewModel viewModel || viewModel.SelectedItem is null)
+        {
+            return;
+        }
+
+        var item = viewModel.SelectedItem;
+        var panel = new StackPanel
+        {
+            Margin = new Thickness(18)
+        };
+
+        AddDialogSection(panel, "类别", item.Category);
+        AddDialogSection(panel, "判定要求", item.AcceptanceCriteria);
+        AddDialogSection(panel, "检验方法", item.TestMethod);
+        AddDialogSection(panel, "记录要点", item.RecordFocus);
+        AddDialogSection(panel, "数据来源", viewModel.SelectedItemMeasurementSource);
+        AddDialogSection(panel, "填写说明", viewModel.RealtimeMeasurementHint);
+        AddDialogSection(panel, "实时数据预览", viewModel.SelectedItemLiveDisplay);
+        AddDialogSection(panel, "实时数据说明", viewModel.SelectedItemLiveHint);
+
+        var scrollViewer = new ScrollViewer
+        {
+            Content = panel,
+            VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+            HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled
+        };
+
+        var closeButton = new Button
+        {
+            Content = "关闭",
+            MinWidth = 88,
+            MinHeight = 34,
+            Padding = new Thickness(12, 5, 12, 5),
+            Margin = new Thickness(0, 10, 18, 14),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            Background = BrushFromRgb(0xE3, 0xF6, 0xEF),
+            Foreground = BrushFromRgb(0x1F, 0x3B, 0x46),
+            BorderBrush = BrushFromRgb(0x9C, 0xCB, 0xBF)
+        };
+
+        var content = new Grid();
+        content.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+        content.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
+        content.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+        var title = new TextBlock
+        {
+            Text = item.Item,
+            Margin = new Thickness(18, 16, 18, 6),
+            FontSize = 18,
+            FontWeight = FontWeights.Bold,
+            Foreground = BrushFromRgb(0x1F, 0x3B, 0x46),
+            TextWrapping = TextWrapping.Wrap
+        };
+
+        Grid.SetRow(title, 0);
+        Grid.SetRow(scrollViewer, 1);
+        Grid.SetRow(closeButton, 2);
+        content.Children.Add(title);
+        content.Children.Add(scrollViewer);
+        content.Children.Add(closeButton);
+
+        var dialog = new Window
+        {
+            Owner = this,
+            Title = "项目说明",
+            Width = Math.Min(760, Math.Max(420, ActualWidth - 120)),
+            Height = Math.Min(620, Math.Max(420, ActualHeight - 140)),
+            MinWidth = 360,
+            MinHeight = 320,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            Content = content
+        };
+
+        closeButton.Click += (_, _) => dialog.Close();
+        dialog.ShowDialog();
+    }
+
+    private static void AddDialogSection(Panel panel, string title, string? value)
+    {
+        panel.Children.Add(new TextBlock
+        {
+            Text = title,
+            FontSize = 13,
+            FontWeight = FontWeights.SemiBold,
+            Foreground = BrushFromRgb(0x54, 0x65, 0x70),
+            Margin = new Thickness(0, 0, 0, 4)
+        });
+
+        panel.Children.Add(new TextBlock
+        {
+            Text = string.IsNullOrWhiteSpace(value) ? "-" : value.Trim(),
+            FontSize = 14,
+            Foreground = BrushFromRgb(0x1F, 0x3B, 0x46),
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Thickness(0, 0, 0, 12)
+        });
     }
 
     private void OpenEngineeringRegistersButton_OnClick(object sender, RoutedEventArgs e)
diff --git a/Cardiopulmonarybypasssystems/Models/ValveControlChannel.cs b/Cardiopulmonarybypasssystems/Models/ValveControlChannel.cs
index eddc5fd..3f25579 100644
--- a/Cardiopulmonarybypasssystems/Models/ValveControlChannel.cs
+++ b/Cardiopulmonarybypasssystems/Models/ValveControlChannel.cs
@@ -22,6 +22,7 @@ public partial class ValveControlChannel : ObservableObject
             ? $"停止{Name}"
             : $"启动{Name}";
     public string CirculatingWaterToggleText => IsOpen ? "停止循环水温" : "启动循环水温";
+    public string ReservoirToggleText => IsOpen ? "关闭贮液" : "开启贮液";
     public string IndicatorColor => !StateAvailable ? "#FF94A6AE" : IsOpen ? "#FF32B06A" : "#FFC8D4DA";
     public string StateHint => !StateAvailable ? "未取得 PLC 状态" : $"{Name}已{StateText}";
     public bool HideRealtimeCardStateDescription => Key is "TestLoopValve1" or "TestLoopValve2" or "CirculatingWaterTemperature";
@@ -32,6 +33,7 @@ public partial class ValveControlChannel : ObservableObject
         OnPropertyChanged(nameof(ActionText));
         OnPropertyChanged(nameof(ToggleButtonText));
         OnPropertyChanged(nameof(CirculatingWaterToggleText));
+        OnPropertyChanged(nameof(ReservoirToggleText));
         OnPropertyChanged(nameof(IndicatorColor));
         OnPropertyChanged(nameof(StateHint));
     }
@@ -41,6 +43,7 @@ public partial class ValveControlChannel : ObservableObject
         OnPropertyChanged(nameof(StateText));
         OnPropertyChanged(nameof(ToggleButtonText));
         OnPropertyChanged(nameof(CirculatingWaterToggleText));
+        OnPropertyChanged(nameof(ReservoirToggleText));
         OnPropertyChanged(nameof(IndicatorColor));
         OnPropertyChanged(nameof(StateHint));
     }
diff --git a/Cardiopulmonarybypasssystems/Services/ModbusTelemetryService.cs b/Cardiopulmonarybypasssystems/Services/ModbusTelemetryService.cs
index 64a6006..987dd68 100644
--- a/Cardiopulmonarybypasssystems/Services/ModbusTelemetryService.cs
+++ b/Cardiopulmonarybypasssystems/Services/ModbusTelemetryService.cs
@@ -70,7 +70,7 @@ public sealed class ModbusTelemetryService : IModbusTelemetryService, IDisposabl
     private readonly List<PumpControlChannel> _pumpControls =
     [
         new() { Key = "NegativeAssistPump", Name = "负压泵", StartAddress = 0 },
-        new() { Key = "PressureDropPump", Name = "压力降/抗塌陷泵", StartAddress = 1, FlowAddress = FlowRegisters["PressureDropPump"] },
+        new() { Key = "PressureDropPump", Name = "压力降泵", StartAddress = 1, FlowAddress = FlowRegisters["PressureDropPump"] },
         new() { Key = "RecirculationMainPump", Name = "再循环主泵", StartAddress = 2, FlowAddress = FlowRegisters["RecirculationMainPump"] },
         new() { Key = "RecirculationReturnPump", Name = "回流泵", StartAddress = 3, FlowAddress = FlowRegisters["RecirculationReturnPump"] },
         new() { Key = "RecirculationDrainagePump", Name = "引流泵", StartAddress = 4, FlowAddress = FlowRegisters["RecirculationDrainagePump"] },