MainWindow 预览出现bug，回退历史解决，临时保存

WpfTest1/MainWindow.xaml

@@ -63,7 +63,13 @@
                 <ColumnDefinition Width="395*"/>
                 <ColumnDefinition Width="959*"/>
             </Grid.ColumnDefinitions>
-            <TabControl x:Name="tabControlGeneral"  HorizontalAlignment="Left" Height="694" VerticalAlignment="Top" Width="1358" SelectionChanged="tabControlGeneral_SelectionChanged" Grid.ColumnSpan="2" Controls:TabControlHelper.Underlined="TabPanel">
+            <TabControl x:Name="tabControlGeneral" 
+                        HorizontalAlignment="Left"
+                        Height="694" VerticalAlignment="Top"
+                        Width="1358" SelectionChanged="tabControlGeneral_SelectionChanged" 
+                        Grid.ColumnSpan="2"
+                        Controls:TabControlHelper.Underlined="TabPanel">
+                <!--首页按钮-->
                 <TabItem Header="首页" Style="{StaticResource smallHeader}" x:Uid="1000" Height="31" VerticalAlignment="Top">
                     <Grid  Margin="-1,-1,-1,-1">
                         <Grid.ColumnDefinitions>
@@ -143,7 +149,12 @@
                                 </DataTemplate>
                             </Button.ContentTemplate>
                         </Button>
-                        <Button x:Name="buttonHomePageSystemSettings" Content="Button" HorizontalAlignment="Left" Margin="529.089,359,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008080" Click="buttonHomePageSystemSettings_Click" Grid.Column="1">
+                        <Button x:Name="buttonHomePageSystemSettings"
+                                Content="Button" HorizontalAlignment="Left"
+                                Margin="529.089,359,0,0" 
+                                VerticalAlignment="Top"
+                                Width="160" Height="150" Background="#008080"
+                                Click="buttonHomePageSystemSettings_Click" Grid.Column="1">
                             <Button.ContentTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -171,7 +182,10 @@
                                 </DataTemplate>
                             </Button.ContentTemplate>
                         </Button>-->
-                        <!--<Button x:Name="buttonHomePageHelp" Content="Button" HorizontalAlignment="Left" Margin="886,359,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008080" Click="buttonHomePageHelp_Click">
+                        <!--<Button x:Name="buttonHomePageHelp" Content="Button"
+                        HorizontalAlignment="Left" Margin="886,359,0,0" 
+                        VerticalAlignment="Top" Width="160" Height="150" Background="#008080"
+                        Click="buttonHomePageHelp_Click">
                             <Button.ContentTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -187,7 +201,13 @@
                         </Button>-->
 
 
-                        <Button x:Name="buttonHomePageTreatmentRecords" Content="Button" HorizontalAlignment="Left" Margin="723,359,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008080" Click="buttonHomePageTreatmentRecords_Click" Grid.Column="1">
+                        <Button x:Name="buttonHomePageTreatmentRecords" 
+                                Content="Button" HorizontalAlignment="Left"
+                                Margin="723,359,0,0" VerticalAlignment="Top" 
+                                Width="160" Height="150" 
+                                Background="#008080"
+                                Click="buttonHomePageTreatmentRecords_Click"
+                                Grid.Column="1">
                             <Button.ContentTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -201,11 +221,33 @@
                                 </DataTemplate>
                             </Button.ContentTemplate>
                         </Button>
+
+                        <Button x:Name="buttonHomePageTreatmentPlan" 
+                                Content="Button" HorizontalAlignment="Left"
+                                Margin="917,359,0,0" VerticalAlignment="Top"
+                                Width="160" Height="150"
+                                Background="#008080"
+                                Click="buttonHomePageTreatmentPlan_Click"
+                                Grid.Column="1">
+                            <Button.ContentTemplate>
+                                <DataTemplate>
+                                    <StackPanel>
+                                        <Rectangle Fill="#ffffff" Width="80" Height="80">
+                                            <Rectangle.OpacityMask>
+                                                <VisualBrush Visual="{StaticResource appbar_home_question}" Stretch="Fill" />
+                                            </Rectangle.OpacityMask>
+                                        </Rectangle>
+                                        <TextBlock Text="治疗方案"  Margin="5 10 4 4" VerticalAlignment="Center" FontSize="20" Foreground="White" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </Button.ContentTemplate>
+                        </Button>
                         <Label x:Name="labelSoftwareName" Content="欢迎使用劳拉" FontSize="32" HorizontalAlignment="Center" Margin="487.089,61,577,0" VerticalAlignment="Top" Foreground="White" Grid.Column="1"/>
                         <Label x:Name="labelHomepageCversion" Content="编译版本：20200411" HorizontalAlignment="Center" Margin="529.089,109,619,0" VerticalAlignment="Top" Foreground="White" Grid.Column="1"/>
                         <Label x:Name="labelHomepageUSBDogStatus" Visibility="Hidden" Content="系统Key已授权，当前Key可使用XX次，已使用XX次" HorizontalAlignment="Center" Margin="451.089,550,541,0" VerticalAlignment="Top" Foreground="White" Grid.Column="1"/>
                     </Grid>
                 </TabItem>
+                
                 <TabItem Header="用户管理" Style="{StaticResource smallHeader}" >
                     <TabControl x:Name="tabPatientManagent" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
                         <TabItem  Header="用户管理" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
@@ -262,7 +304,11 @@
                                     </Grid.RowDefinitions>
                                     <Button x:Name="buttonStart" Content="开始" HorizontalAlignment="Left" Margin="134,499,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" Background="#FF317602" Foreground="White" Grid.RowSpan="2" Click="buttonStartTreat_Click"/>
                                     <Button x:Name="buttonStop" Content="停止" HorizontalAlignment="Left" Margin="344,499,0,0" VerticalAlignment="Top" Width="132" Height="50" FontSize="18" Background="#FFB92424" Foreground="White" IsEnabled="False" Grid.RowSpan="2" Click="buttonStop_Click"/>
-                                    <Button x:Name="buttonSelectTreatment" Content="治疗方案" HorizontalAlignment="Left"  Margin="134,10,0,0" VerticalAlignment="Top" Width="197" Height="62" FontSize="30" Click="buttonChooseTreatmentPlan_Click" RenderTransformOrigin="-1.554,0.551"/>
+                                    <Button x:Name="buttonSelectTreatment" 
+                                            Content="治疗方案" HorizontalAlignment="Left" 
+                                            Margin="134,10,0,0" VerticalAlignment="Top"
+                                            Width="197" Height="62" FontSize="30" 
+                                            RenderTransformOrigin="-1.554,0.551"/>
                                     <Label x:Name="labelTreatmentName" Content="请选择治疗方案" HorizontalAlignment="Left" Margin="25,77,0,0" VerticalAlignment="Top" Height="96" Width="408" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="40" />
                                     <Slider x:Name="sliderStrength" HorizontalAlignment="Left" Margin="153,267,0,0" VerticalAlignment="Top" Height="9" Width="219" ValueChanged="sliderStrength_ValueChanged"/>
                                     <Label Content="强度调节" HorizontalAlignment="Left" Margin="47,260,0,0" VerticalAlignment="Top" FontSize="18"/>
@@ -273,7 +319,22 @@
                                     <Button Content="-" HorizontalAlignment="Left" Margin="167,315,0,0" VerticalAlignment="Top" Width="35" Height="43" FontSize="18" VerticalContentAlignment="Top" Click="decreaseTreatmentTime"/>
                                     <Label Content="温度" HorizontalAlignment="Left" Margin="47,384,0,0" VerticalAlignment="Top" FontSize="18"/>
                                     <Label Content="温度值" HorizontalAlignment="Left" Margin="230,384,0,0" VerticalAlignment="Top" FontSize="18"/>
-                                    <CheckBox x:Name="checkBoxCustomMode" Content="自定义模式" HorizontalAlignment="Left" Margin="534,10,0,0" VerticalAlignment="Top" Height="62" Width="184" FontSize="30" RenderTransformOrigin="0.486,0.085" Unchecked="checkBoxCustomMode_CheckedChanged" Checked="checkBoxCustomMode_CheckedChanged"/>
+
+                                    <!--治疗方案列表-->
+                                    <DataGrid x:Name="dataGrid" 
+                                              HorizontalAlignment="Left"
+                                              Height="466" Margin="10,10,0,0" 
+                                              VerticalAlignment="Top" Width="330"
+                                              IsReadOnly="True" SelectionMode="Single"
+                                              AutoGenerateColumns="False"
+                                              CanUserReorderColumns="False">
+                                        <DataGrid.Columns>
+                                            <DataGridTextColumn Header="ID" Binding="{Binding Path=id}" Width="35"/>
+                                            <DataGridTextColumn Header="方案名" Binding="{Binding Path=disease}" Width="215"/>
+                                            <DataGridTextColumn Header="刺激部位" Binding="{Binding Path=bodyParts}" Width="80"/>
+                                        </DataGrid.Columns>
+                                    </DataGrid>
+                                    <!--<CheckBox x:Name="checkBoxCustomMode" Content="自定义模式" HorizontalAlignment="Left" Margin="534,10,0,0" VerticalAlignment="Top" Height="62" Width="184" FontSize="30" RenderTransformOrigin="0.486,0.085" Unchecked="checkBoxCustomMode_CheckedChanged" Checked="checkBoxCustomMode_CheckedChanged"/>
                                     <DataGrid x:Name="dataGridCustomMode" HorizontalAlignment="Left" Height="372" Margin="534,77,0,0" VerticalAlignment="Top" Width="480" SelectionChanged="dataGridCustomMode_SelectionChanged" RowEditEnding="dataGridCustomMode_RowEditEnding" IsEnabled="False" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserSortColumns="False" SelectionMode="Single" CanUserResizeRows="False" CanUserAddRows="False" CanUserDeleteRows="False">
                                         <DataGrid.Columns>
                                             <DataGridTextColumn Header="序号" Binding="{Binding Path=tcID}" Width="45" IsReadOnly="True"/>
@@ -282,8 +343,15 @@
                                             <DataGridTextColumn Header="间歇时间" Binding="{Binding Path=tcInactiveTime}" Width="120"/>
                                         </DataGrid.Columns>
                                     </DataGrid>
-                                    <Button x:Name="buttonAddCustomModeItem" Content="增行" HorizontalAlignment="Left" Margin="929,38,0,0" VerticalAlignment="Top" FontSize="15" Width="40" IsEnabled="False" Click="buttonAddCustomModeItem_Click" />
-                                    <Button x:Name="buttonDelCustomModeItem" Content="减行" HorizontalAlignment="Left" Margin="974,38,0,0" VerticalAlignment="Top" FontSize="15" Width="40" IsEnabled="False" Click="buttonDelCustomModeItem_Click" />
+                                    <Button x:Name="buttonAddCustomModeItem" 
+                                            Content="增行"
+                                            HorizontalAlignment="Left" Margin="929,38,0,0"
+                                            VerticalAlignment="Top" FontSize="15" Width="40" IsEnabled="False" 
+                                            Click="buttonAddCustomModeItem_Click" />
+                                    <Button x:Name="buttonDelCustomModeItem" 
+                                            Content="减行" HorizontalAlignment="Left" Margin="974,38,0,0" 
+                                            VerticalAlignment="Top" FontSize="15" Width="40" IsEnabled="False"
+                                            Click="buttonDelCustomModeItem_Click" />-->
                                 </Grid>
                             </Grid>
                         </TabItem>
@@ -421,15 +489,15 @@
                         </TabItem>
                     </TabControl>
                 </TabItem>
+                <!--诊疗记录-->
                 <TabItem Header="诊疗记录" Style="{StaticResource smallHeader}" Visibility="Visible" Width="Auto" Margin="0" >
-                    <TabControl x:Name="tabFilter1" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
+                    <TabControl x:Name="tabTreatmentRecord" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
                         <TabItem  Header="选择用户" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                             <Grid Background="White" Margin="0,0,0,0">
                                 <my:TreatmentRecordsPageSelectUser x:Name="selectUserfilter1" Margin="0,0,0,0"/>
-                                <Button x:Name="buttonFilterSelectTreatment1" IsEnabled="True" Content="开始治疗" HorizontalAlignment="Left" Margin="41,531,0,0" VerticalAlignment="Top" Width="240" Height="36" FontSize="15" Click="buttonFilterSelectTreatment_Click"/>
                             </Grid>
                         </TabItem>
-                        <TabItem  Header="治疗" Style="{StaticResource smallerHeader}"  IsEnabled="False">
+                        <!--<TabItem  Header="治疗" Style="{StaticResource smallerHeader}"  IsEnabled="False">
                             <Grid x:Name="filterProcessGrid1" Background="White" Margin="0,0,0,0">
                                 <Grid x:Name="userInfoGrid1" HorizontalAlignment="Left" Height="592" Margin="10,10,0,0" VerticalAlignment="Top" Width="285">
                                     <Label Content="病例编号：" HorizontalAlignment="Left" Margin="10,60,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.498,1.882" FontSize="18"/>
@@ -464,7 +532,9 @@
                                     </Grid.RowDefinitions>
                                     <Button x:Name="buttonStart1" Content="开始" HorizontalAlignment="Left" Margin="134,499,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" Background="#FF317602" Foreground="White" Grid.RowSpan="2" Click="buttonStartTreat_Click"/>
                                     <Button x:Name="buttonStop1" Content="停止" HorizontalAlignment="Left" Margin="344,499,0,0" VerticalAlignment="Top" Width="132" Height="50" FontSize="18" Background="#FFB92424" Foreground="White" IsEnabled="False" Grid.RowSpan="2" Click="buttonStop_Click"/>
-                                    <Button x:Name="buttonSelectTreatment1" Content="治疗方案" HorizontalAlignment="Left"  Margin="134,10,0,0" VerticalAlignment="Top" Width="197" Height="62" FontSize="30" Click="buttonChooseTreatmentPlan_Click" RenderTransformOrigin="-1.554,0.551"/>
+                                    <Button x:Name="buttonSelectTreatment1"
+                                            Content="治疗方案"
+                                            HorizontalAlignment="Left"  Margin="134,10,0,0" VerticalAlignment="Top" Width="197" Height="62" FontSize="30" Click="buttonChooseTreatmentPlan_Click" RenderTransformOrigin="-1.554,0.551"/>
                                     <Label x:Name="labelTreatmentName1" Content="请选择治疗方案" HorizontalAlignment="Left" Margin="25,77,0,0" VerticalAlignment="Top" Height="96" Width="408" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="40" />
                                     <Slider x:Name="sliderStrength1" HorizontalAlignment="Left" Margin="153,267,0,0" VerticalAlignment="Top" Height="9" Width="219" ValueChanged="sliderStrength_ValueChanged"/>
                                     <Label Content="强度调节" HorizontalAlignment="Left" Margin="47,260,0,0" VerticalAlignment="Top" FontSize="18"/>
@@ -488,13 +558,21 @@
                                     <Button x:Name="buttonDelCustomModeItem1" Content="减行" HorizontalAlignment="Left" Margin="974,38,0,0" VerticalAlignment="Top" FontSize="15" Width="40" IsEnabled="False" Click="buttonDelCustomModeItem_Click" />
                                 </Grid>
                             </Grid>
+                        </TabItem>-->
+                    </TabControl>
+                </TabItem>
+               
+                <!--治疗方案-->
+                <TabItem Header="治疗方案" Style="{StaticResource smallHeader}" Visibility="Visible" Width="Auto" Margin="0" >
+                    <TabControl x:Name="tabTreatmentPlan" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
+                        <TabItem  Header="管理方案" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
+                            <Grid Background="White" Margin="0,0,0,0">
+                                <my:TreatmentPlanPage x:Name="treatmentPlanPage" Margin="0,0,0,0"/>
+                            </Grid>
                         </TabItem>
                     </TabControl>
-
                 </TabItem>
 
-
-
             </TabControl>
 
 

WpfTest1/MainWindow.xaml.cs

@@ -72,6 +72,7 @@ namespace WpfTest1
             selectUserfilter.setMainWindow(this);
             selectUserevaluation.setMainWindow(this);
             selectUserHistory.setMainWindow(this);
+            treatmentPlanPage.setMainWindow(this);
             textBoxOrganizationName.Text = cfg.organization_name;
         }
 
@@ -287,6 +288,14 @@ namespace WpfTest1
             tabControlGeneral.SelectedIndex = 6;
         }
 
+        //首页--诊疗记录
+        private void buttonHomePageTreatmentPlan_Click(object sender, RoutedEventArgs e)
+        {
+            tabControlGeneral.SelectedIndex = 7;
+        }
+
+     
+
         //关于程序
         private void buttonHomePageDataTransfer_Click(object sender, RoutedEventArgs e)
         {
@@ -444,13 +453,13 @@ namespace WpfTest1
 
             //*/
             treatmentCustomModeList = new List<TreatmentCustomItem>();
-            dataGridCustomMode.ItemsSource = treatmentCustomModeList;/*/
-            treatmentCustomDataTable = new DataTable();
-            treatmentCustomDataTable.Columns.Add("tcID", typeof(int));
-            treatmentCustomDataTable.Columns.Add("tcRate", typeof(double));
-            treatmentCustomDataTable.Columns.Add("tcActiveTime", typeof(double));
-            treatmentCustomDataTable.Columns.Add("tcInactiveTime", typeof(double));
-            dataGridCustomMode.ItemsSource = treatmentCustomDataTable.DefaultView;//*/
+            //dataGridCustomMode.ItemsSource = treatmentCustomModeList;/*/
+            //treatmentCustomDataTable = new DataTable();
+            //treatmentCustomDataTable.Columns.Add("tcID", typeof(int));
+            //treatmentCustomDataTable.Columns.Add("tcRate", typeof(double));
+            //treatmentCustomDataTable.Columns.Add("tcActiveTime", typeof(double));
+            //treatmentCustomDataTable.Columns.Add("tcInactiveTime", typeof(double));
+            //dataGridCustomMode.ItemsSource = treatmentCustomDataTable.DefaultView;//*/
         }
 
         /// <summary>
@@ -468,11 +477,11 @@ namespace WpfTest1
         /// </summary>
         /// <param name="sender">默认</param>
         /// <param name="e">默认</param>
-        private void buttonChooseTreatmentPlan_Click(object sender, RoutedEventArgs e)
-        {
-            TreatmentPlan a_new_one = new TreatmentPlan(this);
-            a_new_one.Show();
-        }
+        //private void buttonChooseTreatmentPlan_Click(object sender, RoutedEventArgs e)
+        //{
+        //    TreatmentPlan a_new_one = new TreatmentPlan(this);
+        //    a_new_one.Show();
+        //}
 
         public void setTreatment(Treatment target)
         {
@@ -492,50 +501,50 @@ namespace WpfTest1
         /// </summary>
         /// <param name="sender">默认</param>
         /// <param name="e">默认</param>
-        private void checkBoxCustomMode_CheckedChanged(object sender, RoutedEventArgs e)
-        {
-            if (checkBoxCustomMode.IsChecked == true) {
-                labelTreatmentName.Content = "自定义模式";
-                buttonSelectTreatment.IsEnabled = false;
-                dataGridCustomMode.IsEnabled = true;
-                //dataGridCustomMode.CanUserAddRows = true;
-                //dataGridCustomMode.CanUserDeleteRows = true;
-                buttonAddCustomModeItem.IsEnabled = true;
-                buttonDelCustomModeItem.IsEnabled = true;
-            } else {
-                if (targetTreatment == null) {
-                    labelTreatmentName.Content = "请选择治疗方案";
-                } else {
-                    labelTreatmentName.Content = targetTreatment.disease;
-                }
-                buttonSelectTreatment.IsEnabled = true;
-                dataGridCustomMode.IsEnabled = false;
-                buttonAddCustomModeItem.IsEnabled = false;
-                buttonDelCustomModeItem.IsEnabled = false;
-            }
-        }
-
-        private void buttonAddCustomModeItem_Click(object sender, RoutedEventArgs e)
-        {
-            TreatmentCustomItem item = new TreatmentCustomItem();
-            item.tcID = treatmentCustomModeList.Count + 1;
-            treatmentCustomModeList.Add(item);
-            dataGridCustomMode.ItemsSource = null;
-            dataGridCustomMode.ItemsSource = treatmentCustomModeList;
-        }
-
-        private void buttonDelCustomModeItem_Click(object sender, RoutedEventArgs e)
-        {
-            int index = dataGridCustomMode.SelectedIndex;
-            if (index == -1) { return; }
-            treatmentCustomModeList.RemoveAt(index);
-            for (int i = 0; i < treatmentCustomModeList.Count; i++)
-            {
-                treatmentCustomModeList[i].tcID = i + 1;
-            }
-            dataGridCustomMode.ItemsSource = null;
-            dataGridCustomMode.ItemsSource = treatmentCustomModeList;
-        }
+        //private void checkBoxCustomMode_CheckedChanged(object sender, RoutedEventArgs e)
+        //{
+        //    if (checkBoxCustomMode.IsChecked == true) {
+        //        labelTreatmentName.Content = "自定义模式";
+        //        buttonSelectTreatment.IsEnabled = false;
+        //        dataGridCustomMode.IsEnabled = true;
+        //        //dataGridCustomMode.CanUserAddRows = true;
+        //        //dataGridCustomMode.CanUserDeleteRows = true;
+        //        buttonAddCustomModeItem.IsEnabled = true;
+        //        buttonDelCustomModeItem.IsEnabled = true;
+        //    } else {
+        //        if (targetTreatment == null) {
+        //            labelTreatmentName.Content = "请选择治疗方案";
+        //        } else {
+        //            labelTreatmentName.Content = targetTreatment.disease;
+        //        }
+        //        buttonSelectTreatment.IsEnabled = true;
+        //        dataGridCustomMode.IsEnabled = false;
+        //        buttonAddCustomModeItem.IsEnabled = false;
+        //        buttonDelCustomModeItem.IsEnabled = false;
+        //    }
+        //}
+
+        //private void buttonAddCustomModeItem_Click(object sender, RoutedEventArgs e)
+        //{
+        //    TreatmentCustomItem item = new TreatmentCustomItem();
+        //    item.tcID = treatmentCustomModeList.Count + 1;
+        //    treatmentCustomModeList.Add(item);
+        //    dataGridCustomMode.ItemsSource = null;
+        //    dataGridCustomMode.ItemsSource = treatmentCustomModeList;
+        //}
+
+        //private void buttonDelCustomModeItem_Click(object sender, RoutedEventArgs e)
+        //{
+        //    int index = dataGridCustomMode.SelectedIndex;
+        //    if (index == -1) { return; }
+        //    treatmentCustomModeList.RemoveAt(index);
+        //    for (int i = 0; i < treatmentCustomModeList.Count; i++)
+        //    {
+        //        treatmentCustomModeList[i].tcID = i + 1;
+        //    }
+        //    dataGridCustomMode.ItemsSource = null;
+        //    dataGridCustomMode.ItemsSource = treatmentCustomModeList;
+        //}
 
         private void dataGridCustomMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
@@ -1688,44 +1697,64 @@ namespace WpfTest1
 
         private void buttonStartTreat_Click(object sender, RoutedEventArgs e)
         {
-            if (targetTreatment == null && !checkBoxCustomMode.IsChecked.Value)
+            //if (targetTreatment == null && !checkBoxCustomMode.IsChecked.Value)
+            if (targetTreatment == null)
             {
                 MessageBox.Show("请选择或添加一个治疗方案", "", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
 
 
-            if (checkBoxCustomMode.IsChecked.Value)
-            {
-                TreatmentStep[] steps = new TreatmentStep[treatmentCustomModeList.Count];
-                for (int i = 0; i < steps.Length; i++)
-                {
-                    steps[i] = new TreatmentStep((ushort)treatmentCustomModeList[i].tcRate,
-                        (byte)treatmentCustomModeList[i].tcActiveTime,
-                        (byte)treatmentCustomModeList[i].tcInactiveTime,
-                        (ushort)(treatmentCustomModeList[i].tcActiveTime + treatmentCustomModeList[i].tcInactiveTime));
-                }
-                comAgent.enqueueCommand(Com.createStartManualCommand(parseTreatmentTime(treatmentTime), (byte)sliderStrength.Value, steps));
-            }
-            else
-            {
-                //获取当前时间戳并转换为格式化日期 yyyy-MM-dd hh:mm:ss
-                DateTime_TimeStamp dateTimeFormatter = new DateTime_TimeStamp();
-                int timestamp = dateTimeFormatter.GetTimeStamp(DateTime.Now);
-                DateTime now = dateTimeFormatter.GetDateTime(timestamp);
-
-                //装配诊疗记录对象
-                TreatmentRecord treatmentRecordToInsert = new TreatmentRecord();
-                treatmentRecordToInsert.patient_id = filterPatient.p_id;
-                treatmentRecordToInsert.strength = Convert.ToInt32(sliderStrength.Value.ToString("0."));
-                treatmentRecordToInsert.duration = treatmentTime;
-                treatmentRecordToInsert.start_time = now;
-
-                //插入诊疗记录
-                int inserted_row_id = SQLiteModel.insertTreatmentRecord(treatmentRecordToInsert);
-
-                comAgent.enqueueCommand(Com.createStartDefinedCommand(targetTreatment.id, parseTreatmentTime(treatmentTime), (byte)sliderStrength.Value));
-            }
+            //if (checkBoxCustomMode.IsChecked.Value)
+            //{
+            //    TreatmentStep[] steps = new TreatmentStep[treatmentCustomModeList.Count];
+            //    for (int i = 0; i < steps.Length; i++)
+            //    {
+            //        steps[i] = new TreatmentStep((ushort)treatmentCustomModeList[i].tcRate,
+            //            (byte)treatmentCustomModeList[i].tcActiveTime,
+            //            (byte)treatmentCustomModeList[i].tcInactiveTime,
+            //            (ushort)(treatmentCustomModeList[i].tcActiveTime + treatmentCustomModeList[i].tcInactiveTime));
+            //    }
+            //    comAgent.enqueueCommand(Com.createStartManualCommand(parseTreatmentTime(treatmentTime), (byte)sliderStrength.Value, steps));
+            //}
+            //else
+            //{
+            //    //获取当前时间戳并转换为格式化日期 yyyy-MM-dd hh:mm:ss
+            //    DateTime_TimeStamp dateTimeFormatter = new DateTime_TimeStamp();
+            //    int timestamp = dateTimeFormatter.GetTimeStamp(DateTime.Now);
+            //    DateTime now = dateTimeFormatter.GetDateTime(timestamp);
+
+            //    //装配诊疗记录对象
+            //    TreatmentRecord treatmentRecordToInsert = new TreatmentRecord();
+            //    treatmentRecordToInsert.patient_record_id = filterPatient.p_record_id;
+            //    treatmentRecordToInsert.patient_id = filterPatient.p_id;
+            //    treatmentRecordToInsert.strength = Convert.ToInt32(sliderStrength.Value.ToString("0."));
+            //    treatmentRecordToInsert.duration = treatmentTime;
+            //    treatmentRecordToInsert.start_time = now;
+
+            //    //插入诊疗记录
+            //    int inserted_row_id = SQLiteModel.insertTreatmentRecord(treatmentRecordToInsert);
+
+            //    comAgent.enqueueCommand(Com.createStartDefinedCommand(targetTreatment.id, parseTreatmentTime(treatmentTime), (byte)sliderStrength.Value));
+            //}
+
+            //获取当前时间戳并转换为格式化日期 yyyy-MM - dd hh: mm: ss
+            DateTime_TimeStamp dateTimeFormatter = new DateTime_TimeStamp();
+            int timestamp = dateTimeFormatter.GetTimeStamp(DateTime.Now);
+            DateTime now = dateTimeFormatter.GetDateTime(timestamp);
+
+            //装配诊疗记录对象
+            TreatmentRecord treatmentRecordToInsert = new TreatmentRecord();
+            treatmentRecordToInsert.patient_record_id = filterPatient.p_record_id;
+            treatmentRecordToInsert.patient_id = filterPatient.p_id;
+            treatmentRecordToInsert.strength = Convert.ToInt32(sliderStrength.Value.ToString("0."));
+            treatmentRecordToInsert.duration = treatmentTime;
+            treatmentRecordToInsert.start_time = now;
+
+            //插入诊疗记录
+            int inserted_row_id = SQLiteModel.insertTreatmentRecord(treatmentRecordToInsert);
+
+            comAgent.enqueueCommand(Com.createStartDefinedCommand(targetTreatment.id, parseTreatmentTime(treatmentTime), (byte)sliderStrength.Value));
 
             isRunning = true;
             updateUIIsRunning();
@@ -1740,14 +1769,16 @@ namespace WpfTest1
 
         private void buttonStop_Click(object sender, RoutedEventArgs e)
         {
-            if (checkBoxCustomMode.IsChecked.Value)
-            {
-                comAgent.enqueueCommand(Com.createStopCommand());
-            }
-            else
-            {
-                comAgent.enqueueCommand(Com.createStopCommand(Com.getTCIDByIndex(targetTreatment.id)));
-            }
+            //if (checkBoxCustomMode.IsChecked.Value)
+            //{
+            //    comAgent.enqueueCommand(Com.createStopCommand());
+            //}
+            //else
+            //{
+            //    comAgent.enqueueCommand(Com.createStopCommand(Com.getTCIDByIndex(targetTreatment.id)));
+            //}
+
+            comAgent.enqueueCommand(Com.createStopCommand(Com.getTCIDByIndex(targetTreatment.id)));
 
             isRunning = false;
             updateUIIsRunning();

WpfTest1/SQLite/SQLiteModel.cs

@@ -1148,12 +1148,13 @@ namespace WpfTest1.SQLite
         public static int insertTreatmentRecord(TreatmentRecord treatmentRecordToInsert)
         {
             
-        string sql = "INSERT INTO Treatment_record(patient_id,strength,duration,start_time)" +
-                            "values(@p_id,@strength,@duration,@s_time)";
+        string sql = "INSERT INTO Treatment_record(patient_id,patient_record_id,strength,duration,start_time)" +
+                            "values(@p_id,@patient_record_id,@strength,@duration,@s_time)";
             SQLiteHelper db = new SQLiteHelper(dbPath);
             SQLiteParameter[] parameters = new SQLiteParameter[]{
                                                                new SQLiteParameter("@p_id",treatmentRecordToInsert.patient_id),
                                                                new SQLiteParameter("@strength",treatmentRecordToInsert.strength),
+                                                               new SQLiteParameter("@patient_record_id",treatmentRecordToInsert.patient_record_id),
                                                                new SQLiteParameter("@duration",treatmentRecordToInsert.duration),
                                                                new SQLiteParameter("@s_time",treatmentRecordToInsert.start_time),
                                                                };
@@ -1197,6 +1198,7 @@ namespace WpfTest1.SQLite
                     tempTreatmentRecord.strength = reader.IsDBNull(2) ? 0 : reader.GetInt32(2);
                     tempTreatmentRecord.duration = reader.IsDBNull(3) ? 0 : reader.GetDouble(3);
                     tempTreatmentRecord.start_time = reader.IsDBNull(4) ? new DateTime() : reader.GetDateTime(4);
+                    tempTreatmentRecord.patient_record_id = reader.IsDBNull(5) ? "" : reader.GetString(5);
                     treatmentRecordResultList.Add(tempTreatmentRecord);
                 }
             }

WpfTest1/SQLite/TreatmentRecord.cs

@@ -9,6 +9,7 @@ namespace WpfTest1.SQLite
     public class TreatmentRecord
     {
         public int id { get; set; }
+        public String patient_record_id { get; set; }
         public int patient_id { get; set; }
         public int strength { get; set; }
         public double duration { get; set; }

WpfTest1/SmallDialogs/TreatmentPlan.xaml → WpfTest1/TreatmentPlan.xaml

@@ -1,12 +1,12 @@
-<Window x:Class="WpfTest1.TreatmentPlan"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WpfTest1.SmallDialogs"
-        mc:Ignorable="d"
-        Title="治疗方案" Height="513.745" Width="864.286">
-    <Grid>
+<UserControl x:Class="WpfTest1.TreatmentPlanPage"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WpfTest1"
+             mc:Ignorable="d" Height="600" Width="1300">
+
+    <Grid Background="White" Margin="0,0,0,0">
         <Button x:Name="buttonAdd" Content="新增" HorizontalAlignment="Left" Margin="385,431,0,0" VerticalAlignment="Top" Width="75" FontSize="18" Click="buttonAdd_Click" />
         <Button x:Name="buttonDelete" Content="删除" HorizontalAlignment="Left" Margin="507,431,0,0" VerticalAlignment="Top" Width="75" FontSize="18" Click="buttonDelete_Click" />
         <Button x:Name="buttonChange" Content="修改" HorizontalAlignment="Left" Margin="630,431,0,0" VerticalAlignment="Top" Width="75" FontSize="18" Click="buttonChange_Click" />
@@ -48,4 +48,4 @@
         <TextBox x:Name="textBoxTotalNum" HorizontalAlignment="Left" Height="23" Margin="690,376,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120" IsReadOnly="True" Visibility="Hidden"/>
 
     </Grid>
-</Window>
+</UserControl>

WpfTest1/SmallDialogs/TreatmentPlan.xaml.cs → WpfTest1/TreatmentPlan.xaml.cs

@@ -13,18 +13,26 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using WpfTest1.SQLite;
 
+
+
 namespace WpfTest1
 {
     /// <summary>
-    /// TreatmentPlan.xaml 的交互逻辑
+    /// TreatmentPlanPage.xaml 的交互逻辑
     /// </summary>
-    public partial class TreatmentPlan : Window
+    public partial class TreatmentPlanPage : UserControl
     {
         MainWindow father;
         public List<Treatment> treatmentList;
         private Treatment target = null;
 
-        public TreatmentPlan(MainWindow father)
+        public TreatmentPlanPage()
+        {
+            InitializeComponent();
+            loadDataGrid();
+        }
+
+        public TreatmentPlanPage(MainWindow father)
         {
             this.father = father;
             InitializeComponent();
@@ -32,6 +40,13 @@ namespace WpfTest1
             loadDataGrid();
         }
 
+       
+
+        public void setMainWindow(MainWindow father)
+        {
+            this.father = father;
+        }
+
         public void loadDataGrid()
         {
             treatmentList = SQLiteModel.getALLTreatment();
@@ -381,7 +396,7 @@ namespace WpfTest1
                 return;
             }
             father.setTreatment(target);
-            Close();
+      
         }
     }
 }

WpfTest1/TreatmentRecordsPageSelectUser.xaml

@@ -26,14 +26,21 @@
                 <!--<DataGridTextColumn Header=" " Binding="{Binding Path=p_delete_flag}" Width="75"/>-->
             </DataGrid.Columns>
         </DataGrid>
-        <DataGrid x:Name="treatmentRecords_DataGrid"  Loaded="treatmentRecords_DataGrid_Loaded" AutoGenerateColumns="False" HorizontalAlignment="Left" VerticalAlignment="Top" Height="572" Width="398" IsReadOnly="True" Margin="902,0,0,0" >
+        <DataGrid x:Name="treatmentRecords_DataGrid" 
+                  AutoGenerateColumns="False" 
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Top" 
+                  Height="572"
+                  Width="398" 
+                  IsReadOnly="True" 
+                  Margin="902,0,0,0" >
             <DataGrid.Columns>
                 <!--<DataGridTextColumn Header=" " Binding="{Binding Path=p_delete_flag}" Width="75"/>-->
                 <!---->
-                <DataGridTextColumn Header="病例编号" Binding="{Binding p_record_id}" Width="120"/>
-                <DataGridTextColumn Header="强度" Binding="{Binding p_name}" Width="90"/>
-                <DataGridTextColumn Header="时间" Binding="{Binding p_name_py}" Width="90"/>
-                <DataGridTextColumn Header="开始时间戳" Binding="{Binding p_gender}" Width="100"/>
+                <DataGridTextColumn Header="病例编号" Binding="{Binding patient_record_id}" Width="120"/>
+                <DataGridTextColumn Header="强度" Binding="{Binding strength}" Width="90"/>
+                <DataGridTextColumn Header="时间" Binding="{Binding duration}" Width="90"/>
+                <DataGridTextColumn Header="开始时间" Binding="{Binding start_time}" Width="100"/>
             </DataGrid.Columns>
         </DataGrid>
 

WpfTest1/TreatmentRecordsPageSelectUser.xaml.cs

@@ -228,40 +228,21 @@ namespace WpfTest1
         //    con.Close();
         //}
 
-        //双击某一行触发的事件
+        //双击用户列表某一行触发的事件
         private void dataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
+            DataRowView selectedPatient = (DataRowView)dataGrid.SelectedItem;
 
+            int patientId = Convert.ToInt32(selectedPatient["p_id"].ToString());
+            
+            List<TreatmentRecord> treatmentRecordOfSelectedPatient = SQLiteModel.getAllTreatmentRecordByPatientId(patientId);
 
-            if (father != null)
-            {
-                if (this.Name == "selectUserfilter")
-                {
-                    father.buttonFilterSelectTreatment_Click(this.father, e);
-                }
-                if (this.Name == "selectUserPatientManagent")
-                {
-                    father.buttonModifyPatient_Click(this.father, e);
-                }
-                if (this.Name == "selectUserevaluation")
-                {
-                    father.buttonEvaluationSelectPatient_Click(this.father, e);
-                }
-                if (this.Name == "selectUserHistory")
-                {
-                    father.buttonHistorySelectPatient_Click(this.father, e);
-                }
-            }
-        }
+            treatmentRecords_DataGrid.ItemsSource = treatmentRecordOfSelectedPatient;
 
-        //双击某一行触发的事件
-        private void treatmentRecords_DataGrid_Loaded(object sender, RoutedEventArgs e)
-        {
-            String str = sender.ToString();
-            Type type = sender.GetType();
-            //SQLiteModel.getAllTreatmentRecordByPatientId();
         }
 
+      
+
        
     }
 }

WpfTest1/WpTest.csproj

@@ -210,7 +210,7 @@
     <Compile Include="SmallDialogs\LoginWindow.xaml.cs">
       <DependentUpon>LoginWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SmallDialogs\TreatmentPlan.xaml.cs">
+    <Compile Include="TreatmentPlan.xaml.cs">
       <DependentUpon>TreatmentPlan.xaml</DependentUpon>
     </Compile>
     <Compile Include="SQLite\Bar1.cs" />
@@ -320,7 +320,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SmallDialogs\TreatmentPlan.xaml">
+    <Page Include="TreatmentPlan.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

WpfTest1/selectUser.xaml

@@ -9,7 +9,6 @@
     <Grid Background="White" Margin="0,0,0,0">
         <DataGrid x:Name="dataGrid"  Loaded="dataGrid_Loaded" AutoGenerateColumns="False" HorizontalAlignment="Left" Margin="314,10,0,0" VerticalAlignment="Top" Height="580" Width="976" IsReadOnly="True" MouseDoubleClick="dataGrid_MouseDoubleClick">
             <DataGrid.Columns>
-                <!---->
                 <DataGridTextColumn Header="病例编号" Binding="{Binding Path=p_record_id}" Width="120"/>
                 <DataGridTextColumn Header="病例姓名" Binding="{Binding Path=p_name}" Width="90"/>
                 <DataGridTextColumn Header="拼音首字母" Binding="{Binding Path=p_name_py}" Width="90"/>

WpfTest1/selectUser.xaml.cs

@@ -74,8 +74,9 @@ namespace WpfTest1
             {
                 orderCondition = "p_last_filter_time desc";
             }
-            
-            string selectCmd = "SELECT * FROM Patient WHERE p_delete_flag = 0 ORDER BY " + orderCondition + " LIMIT 100";
+
+            string selectCmd = "SELECT * FROM Patient ORDER BY " + orderCondition + " LIMIT 100";
+            //string selectCmd = "SELECT * FROM Patient WHERE p_delete_flag = 0 ORDER BY " + orderCondition + " LIMIT 100";
             con.Open();
             da = new SQLiteDataAdapter(selectCmd, con);
             ds = new DataSet();