diff --git a/DM_Weight/Services/UserService.cs b/DM_Weight/Services/UserService.cs
index 38e1ae4..325962f 100644
--- a/DM_Weight/Services/UserService.cs
+++ b/DM_Weight/Services/UserService.cs
@@ -8,12 +8,14 @@ using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace DM_Weight.Services
 {
     public class UserService
     {
+        private readonly ILog logger = LogManager.GetLogger(typeof(UserService));
         //public static string connStr = ConfigurationManager.AppSettings["database"].ToString();
         public static string connStr = ConfigurationManager.ConnectionStrings["database"].ToString();
         public UserList CheckUserByFingerPrinter(int fingerPrinterId)
@@ -22,12 +24,24 @@ namespace DM_Weight.Services
 
             using (MySqlConnection con = new MySqlConnection(connStr))
             {
-                con.Open();
+                logger.Info($"connStr：{connStr}");
+                try
+                {
+                    con.Open();
+                }
+                catch (Exception ex)
+                {
+                    logger.Info($"Open失败：{ex.ToString()}");
+                    Thread.Sleep(200);
+                    logger.Info("再次Open");
+                    con.Open();
+                }
+                logger.Info("数据库连接已打开");
                 string sql = @"select ul.id as id,ul.User_name as userName,r.id,r.role_name,r.permissions,r.machine_id from user_list ul 
                                 INNER JOIN role r on ul.machine_role_id=r.id where ul.Id=@ID and ul.machine_id=@machine_id and r.machine_id=@machine_id;";
                 MySqlCommand cmd = new MySqlCommand(sql, con);
                 cmd.Parameters.Clear();
-                MySqlParameter[] mySqlParameter = new MySqlParameter[] {new MySqlParameter("ID", fingerPrinterId),new MySqlParameter("machine_id", (ConfigurationManager.AppSettings["machineId"] ?? "DM1")) };
+                MySqlParameter[] mySqlParameter = new MySqlParameter[] { new MySqlParameter("ID", fingerPrinterId), new MySqlParameter("machine_id", (ConfigurationManager.AppSettings["machineId"] ?? "DM1")) };
                 cmd.Parameters.AddRange(mySqlParameter);
                 //执行语句
                 MySqlDataReader reader = cmd.ExecuteReader();
@@ -37,17 +51,17 @@ namespace DM_Weight.Services
                     user.Id = reader.GetInt32("id");
                     user.UserName = reader["userName"] is DBNull ? "" : reader.GetString("userName");
                     //user.UserName = reader["id"] is DBNull ? "" : reader.GetString("id");
-                    user.Nickname= reader["userName"] is DBNull ? "" : reader.GetString("userName");
+                    user.Nickname = reader["userName"] is DBNull ? "" : reader.GetString("userName");
                     user.MachineId = reader["machine_id"] is DBNull ? "" : reader.GetString("machine_id");
-                    RoleDm role= new RoleDm();
-                    role.Id= reader.GetInt32("id");
+                    RoleDm role = new RoleDm();
+                    role.Id = reader.GetInt32("id");
                     //role.Permissions = reader["permissions"] is DBNull ? "" : reader.GetString("permissions");
                     role.RoleName = reader["role_name"] is DBNull ? "" : reader.GetString("role_name");
                     role.Permissions = JsonConvert.DeserializeObject<List<PremissionDm>>(reader["permissions"] is DBNull ? "" : reader.GetString("permissions"));  // JsonConvert.SerializeObject(reader.GetString("permissions")).ToList();
                     user.Role = role;
                 }
                 reader.Close();
-
+                logger.Info($"sql：{sql}");
                 return user;
             }
 
diff --git a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
index 52f36f0..5d971ef 100644
--- a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
@@ -249,7 +249,6 @@ namespace DM_Weight.ViewModels
         //接收导航传过来的参数  现在是在此处初始化了表格数据
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
-
             logger.Info("进入OrderTakeDrugWindowViewModel_OnNavigatedTo");
             _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
             //RequestData();
diff --git a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
index 6e1f72c..41f83b3 100644
--- a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
+++ b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
@@ -72,7 +72,7 @@
                     SelectedItem="{Binding DrugInfo}"
                     DisplayMemberPath="drug_name_spec" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
                 />
-            <StackPanel HorizontalAlignment="Right"  Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal">
+            <StackPanel HorizontalAlignment="Right"  Grid.Column="3" Orientation="Horizontal">
                 <!--<Button
                         Style="{StaticResource MaterialDesignOutlinedLightButton}"
                         ToolTip="渲染标签"
@@ -81,7 +81,7 @@
                         materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
                         materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
                             
-                    />-->
+                    />
                 <Button
                         Style="{StaticResource MaterialDesignOutlinedLightButton}"
                         ToolTip="渲染标签"
@@ -90,7 +90,7 @@
                         materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, UpdateSourceTrigger=PropertyChanged}"
                         materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, UpdateSourceTrigger=PropertyChanged}"
                             
-                    />
+                    />-->
                     <Button
                         Margin="6 0 6 0"
                         Style="{StaticResource MaterialDesignOutlinedLightButton}"