手术申请手术地点

内镜选择患者默认两天
内镜选择患者横向排列
麻醉诱导用药显示到上面
麻醉记录单默认手术室 镇痛单默认胃肠镜

AIMS.sln

@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeginScreen", "BeginScreen\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocumentManagement", "DocumentManagement\DocumentManagement.csproj", "{80E69D05-8436-4342-B0B1-5ADAA8E83D41}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataCollectorService", "DataCollectorService\DataCollectorService.csproj", "{A445F69B-9EA6-40F8-87EA-D524A40FB90B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -171,6 +173,22 @@ Global
 		{80E69D05-8436-4342-B0B1-5ADAA8E83D41}.Release|x64.Build.0 = Release|Any CPU
 		{80E69D05-8436-4342-B0B1-5ADAA8E83D41}.Release|x86.ActiveCfg = Release|Any CPU
 		{80E69D05-8436-4342-B0B1-5ADAA8E83D41}.Release|x86.Build.0 = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|x64.Build.0 = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Debug|x86.Build.0 = Debug|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|x64.ActiveCfg = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|x64.Build.0 = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|x86.ActiveCfg = Release|Any CPU
+		{A445F69B-9EA6-40F8-87EA-D524A40FB90B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

AIMS/AIMS.csproj

@@ -63,7 +63,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Extensions\Mono.Security.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Extensions\Newtonsoft.Json.dll</HintPath>
     </Reference>

AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs

@@ -4,9 +4,7 @@ using AIMS.PublicUI.UI;
 using AIMSBLL;
 using AIMSExtension;
 using AIMSModel;
-using DCSoftDotfuscate;
 using DevComponents.DotNetBar;
-using DevComponents.DotNetBar.Controls;
 using DevComponents.Editors.DateTimeAdv;
 using DocumentManagement;
 using DrawGraph;
@@ -15,7 +13,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Printing;
 using System.Linq;

AIMS/OperationAanesthesia/frmInstrumentRecord.cs

@@ -473,7 +473,7 @@ namespace AIMS.OperationAanesthesia
                 pan.Size = new System.Drawing.Size(templateManage.ZedControl.Width, (int)(templateManage.ZedControl.Height * 0.4));
 
                 panelQX2.Visible = true;
-                panelQX2.Size = new Size(panel9.Size.Width - 10, pan.Size.Height);
+                panelQX2.Size = zgcAnaesRecord.Size;
                 panelQX2.Location = new Point(pan.Location.X, 40);
 
             }

AIMS/OperationAanesthesia/frmInstrumentRecord2.cs

@@ -73,7 +73,7 @@ namespace AIMS.OperationAanesthesia
             labOperatorName.Text = "(" + AIMSExtension.PublicMethod.OperatorNo + ")" + "  " + AIMSExtension.PublicMethod.OperatorName;
             if (NowRoom != null) lblRoom.Text = NowRoom.Name;
             //this.MaximizeBox = false;
-            this.MinimizeBox = false;
+            //this.MinimizeBox = false;
 
             if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("护士收费记录"))
             {
@@ -1875,8 +1875,9 @@ namespace AIMS.OperationAanesthesia
             SaveInstrument(sender);
             try
             {
-                myEditControl.ExecuteCommand("FilePrint", true, null);
+                myEditControl.ExecuteCommand("FilePrint", false, null);
                 plRefresh_Click(null, null); 
+                new frmMessageBox("打印完成！").Show();
             }
             catch (Exception exp)
             {

AIMS/OperationAanesthesia/frmSelectPatientGoodsBill.cs

@@ -281,15 +281,15 @@ namespace AIMS.OperationAanesthesia
                         return;
                     }
 
-                    DataTable dtOperationRecord = SelectPatient.GetTodayDoOpePatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
+                    //DataTable dtOperationRecord = SelectPatient.GetTodayDoOpePatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
-                    foreach (DataRow row in dtOperationRecord.Rows)
+                    //foreach (DataRow row in dtOperationRecord.Rows)
-                    {
+                    //{
-                        if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString())
+                    //    if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString())
-                        {
+                    //    {
-                            MessageBox.Show("当前有未完成的手术占用手术间，请先选择解锁术中手术！", "系统提示");
+                    //        MessageBox.Show("当前有未完成的手术占用手术间，请先选择解锁术中手术！", "系统提示");
-                            return;
+                    //        return;
-                        }
+                    //    }
-                    }
+                    //}
 
                     frmInstrumentRecord frmAnasRecord = null;
                     if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null)

AIMS/OperationAanesthesia/frmSelectPatientGoodsBill2.cs

@@ -29,7 +29,7 @@ namespace AIMS.OperationAanesthesia
 
         private void frmSelectPatientGoodsBill2_Load(object sender, EventArgs e)
         {
-            ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom);
+            ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom, "手术室");
 
             FillDgv();
 
@@ -75,6 +75,12 @@ namespace AIMS.OperationAanesthesia
             else
                 dt2 = SelectPatient.GetRelieveLockingPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString());
 
+            if (CboOperationSite.Visible == true && CboOperationSite.SelectedIndex > 0)
+            {
+                dt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", "");
+                dt2 = AIMSExtension.PublicMethod.GetNewDataTable(dt2, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", "");
+            }
+
             List<string> list = new List<string>();
             for (int i = 0; i < ControlExtension.SiteRooms.Count; i++)
             {
@@ -284,15 +290,15 @@ namespace AIMS.OperationAanesthesia
                         return;
                     }
 
-                    DataTable dtOperationRecord = SelectPatient.GetTodayDoOpePatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
+                    //DataTable dtOperationRecord = SelectPatient.GetTodayDoOpePatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
-                    foreach (DataRow row in dtOperationRecord.Rows)
+                    //foreach (DataRow row in dtOperationRecord.Rows)
-                    {
+                    //{
-                        if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString())
+                    //    if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString())
-                        {
+                    //    {
-                            MessageBox.Show("当前有未完成的手术占用手术间，请先选择解锁术中手术！", "系统提示");
+                    //        MessageBox.Show("当前有未完成的手术占用手术间，请先选择解锁术中手术！", "系统提示");
-                            return;
+                    //        return;
-                        }
+                    //    }
-                    }
+                    //}
 
                     frmInstrumentRecord2 frmAnasRecord = null;
                     if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null)
@@ -320,7 +326,7 @@ namespace AIMS.OperationAanesthesia
 
                     if (isMainOpen == false)
                     {
-                        frmAnasRecord.ShowDialog();
+                        frmAnasRecord.Show();
                         FillDgv();
                     }
                     else

AIMS/OperationAanesthesia/frmSelectPatientNew2.cs

@@ -32,8 +32,7 @@ namespace AIMS.OperationAanesthesia
 
         private void frmSelectPatientNew2_Load(object sender, EventArgs e)
         {
-            ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom);
+            ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom,"手术室");
-
             FillDgv();
 
             this.cboRoom.SelectedIndexChanged += new System.EventHandler(this.cboRoom_SelectedIndexChanged);
@@ -71,6 +70,12 @@ namespace AIMS.OperationAanesthesia
             else
                 dt2 = SelectPatient.GetRelieveLockingPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString());
              
+            if (CboOperationSite.Visible == true && CboOperationSite.SelectedIndex > 0)
+            {
+                dt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", ""); 
+                dt2 = AIMSExtension.PublicMethod.GetNewDataTable(dt2, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", "");
+            }
+
             List<string> list = new List<string>();
             for (int i = 0; i < ControlExtension.SiteRooms.Count; i++)
             {

AIMS/OperationAanesthesia/frmSelectPatientNew3.Designer.cs

@@ -30,6 +30,8 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSelectPatientNew3));
             this.panel1 = new System.Windows.Forms.Panel();
+            this.CboOperationSite = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+            this.labelSite = new System.Windows.Forms.Label();
             this.txtquery = new DevComponents.DotNetBar.Controls.TextBoxX();
             this.btnQuery = new DevComponents.DotNetBar.ButtonX();
             this.buttonX3 = new DevComponents.DotNetBar.ButtonX();
@@ -71,8 +73,8 @@
             this.label3 = new System.Windows.Forms.Label();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.CboOperationSite = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+            this.dtpSelectPatientTime2 = new System.Windows.Forms.DateTimePicker();
-            this.labelSite = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -93,7 +95,9 @@
             this.panel1.Controls.Add(this.cboRoom);
             this.panel1.Controls.Add(this.btnFrontDay);
             this.panel1.Controls.Add(this.btnNextDay);
+            this.panel1.Controls.Add(this.dtpSelectPatientTime2);
             this.panel1.Controls.Add(this.dtpSelectPatientTime);
+            this.panel1.Controls.Add(this.label6);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Font = new System.Drawing.Font("宋体", 10.5F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
@@ -101,6 +105,33 @@
             this.panel1.Size = new System.Drawing.Size(1035, 39);
             this.panel1.TabIndex = 0;
             // 
+            // CboOperationSite
+            // 
+            this.CboOperationSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.CboOperationSite.DisplayMember = "Text";
+            this.CboOperationSite.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.CboOperationSite.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CboOperationSite.FormattingEnabled = true;
+            this.CboOperationSite.ItemHeight = 19;
+            this.CboOperationSite.Location = new System.Drawing.Point(910, 7);
+            this.CboOperationSite.Name = "CboOperationSite";
+            this.CboOperationSite.Size = new System.Drawing.Size(115, 25);
+            this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.CboOperationSite.TabIndex = 506;
+            // 
+            // labelSite
+            // 
+            this.labelSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelSite.AutoSize = true;
+            this.labelSite.BackColor = System.Drawing.Color.AliceBlue;
+            this.labelSite.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.labelSite.Location = new System.Drawing.Point(844, 9);
+            this.labelSite.Name = "labelSite";
+            this.labelSite.Size = new System.Drawing.Size(65, 20);
+            this.labelSite.TabIndex = 507;
+            this.labelSite.Text = "手术地点";
+            this.labelSite.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            // 
             // txtquery
             // 
             // 
@@ -108,10 +139,10 @@
             // 
             this.txtquery.Border.Class = "TextBoxBorder";
             this.txtquery.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.txtquery.Location = new System.Drawing.Point(550, 8);
+            this.txtquery.Location = new System.Drawing.Point(660, 8);
             this.txtquery.Name = "txtquery";
             this.txtquery.PreventEnterBeep = true;
-            this.txtquery.Size = new System.Drawing.Size(100, 23);
+            this.txtquery.Size = new System.Drawing.Size(101, 23);
             this.txtquery.TabIndex = 9;
             // 
             // btnQuery
@@ -119,9 +150,9 @@
             this.btnQuery.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btnQuery.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnQuery.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnQuery.Location = new System.Drawing.Point(656, 9);
+            this.btnQuery.Location = new System.Drawing.Point(766, 9);
             this.btnQuery.Name = "btnQuery";
-            this.btnQuery.Size = new System.Drawing.Size(80, 23);
+            this.btnQuery.Size = new System.Drawing.Size(81, 23);
             this.btnQuery.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnQuery.TabIndex = 8;
             this.btnQuery.Text = "查询";
@@ -138,6 +169,7 @@
             this.buttonX3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.buttonX3.TabIndex = 8;
             this.buttonX3.Text = "+新增手术申请";
+            this.buttonX3.Visible = false;
             this.buttonX3.Click += new System.EventHandler(this.buttonX3_Click);
             // 
             // label1
@@ -154,7 +186,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(481, 8);
+            this.label4.Location = new System.Drawing.Point(591, 8);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(65, 20);
             this.label4.TabIndex = 6;
@@ -164,7 +196,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(291, 8);
+            this.label2.Location = new System.Drawing.Point(401, 8);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(51, 20);
             this.label2.TabIndex = 6;
@@ -173,9 +205,9 @@
             // cboRoom
             // 
             this.cboRoom.FormattingEnabled = true;
-            this.cboRoom.Location = new System.Drawing.Point(345, 8);
+            this.cboRoom.Location = new System.Drawing.Point(455, 8);
             this.cboRoom.Name = "cboRoom";
-            this.cboRoom.Size = new System.Drawing.Size(121, 22);
+            this.cboRoom.Size = new System.Drawing.Size(122, 22);
             this.cboRoom.TabIndex = 5;
             // 
             // btnFrontDay
@@ -186,9 +218,9 @@
             this.btnFrontDay.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnFrontDay.FlatAppearance.BorderSize = 0;
             this.btnFrontDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnFrontDay.Location = new System.Drawing.Point(213, 7);
+            this.btnFrontDay.Location = new System.Drawing.Point(323, 7);
             this.btnFrontDay.Name = "btnFrontDay";
-            this.btnFrontDay.Size = new System.Drawing.Size(34, 24);
+            this.btnFrontDay.Size = new System.Drawing.Size(35, 24);
             this.btnFrontDay.TabIndex = 2;
             this.btnFrontDay.UseVisualStyleBackColor = false;
             this.btnFrontDay.Click += new System.EventHandler(this.btnFrontDay_Click);
@@ -201,9 +233,9 @@
             this.btnNextDay.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnNextDay.FlatAppearance.BorderSize = 0;
             this.btnNextDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNextDay.Location = new System.Drawing.Point(251, 7);
+            this.btnNextDay.Location = new System.Drawing.Point(361, 7);
             this.btnNextDay.Name = "btnNextDay";
-            this.btnNextDay.Size = new System.Drawing.Size(34, 24);
+            this.btnNextDay.Size = new System.Drawing.Size(35, 24);
             this.btnNextDay.TabIndex = 1;
             this.btnNextDay.UseVisualStyleBackColor = false;
             this.btnNextDay.Click += new System.EventHandler(this.btnNext_Click);
@@ -216,7 +248,6 @@
             this.dtpSelectPatientTime.Name = "dtpSelectPatientTime";
             this.dtpSelectPatientTime.Size = new System.Drawing.Size(111, 23);
             this.dtpSelectPatientTime.TabIndex = 0;
-            this.dtpSelectPatientTime.ValueChanged += new System.EventHandler(this.dtpSelectPatientTime_ValueChanged);
             // 
             // groupBox1
             // 
@@ -544,32 +575,24 @@
             this.panel3.Size = new System.Drawing.Size(1029, 499);
             this.panel3.TabIndex = 0;
             // 
-            // CboOperationSite
+            // dtpSelectPatientTime2
             // 
-            this.CboOperationSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtpSelectPatientTime2.CustomFormat = "yyyy-MM-dd";
-            this.CboOperationSite.DisplayMember = "Text";
+            this.dtpSelectPatientTime2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.CboOperationSite.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.dtpSelectPatientTime2.Location = new System.Drawing.Point(203, 9);
-            this.CboOperationSite.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.dtpSelectPatientTime2.Name = "dtpSelectPatientTime2";
-            this.CboOperationSite.FormattingEnabled = true;
+            this.dtpSelectPatientTime2.Size = new System.Drawing.Size(111, 23);
-            this.CboOperationSite.ItemHeight = 19;
+            this.dtpSelectPatientTime2.TabIndex = 0;
-            this.CboOperationSite.Location = new System.Drawing.Point(910, 7);
-            this.CboOperationSite.Name = "CboOperationSite";
-            this.CboOperationSite.Size = new System.Drawing.Size(115, 25);
-            this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.CboOperationSite.TabIndex = 506;
             // 
-            // labelSite
+            // label6
             // 
-            this.labelSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.AutoSize = true;
-            this.labelSite.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelSite.BackColor = System.Drawing.Color.AliceBlue;
+            this.label6.Location = new System.Drawing.Point(189, 9);
-            this.labelSite.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label6.Name = "label6";
-            this.labelSite.Location = new System.Drawing.Point(844, 9);
+            this.label6.Size = new System.Drawing.Size(15, 20);
-            this.labelSite.Name = "labelSite";
+            this.label6.TabIndex = 7;
-            this.labelSite.Size = new System.Drawing.Size(65, 20);
+            this.label6.Text = "-";
-            this.labelSite.TabIndex = 507;
-            this.labelSite.Text = "手术地点";
-            this.labelSite.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             // 
             // frmSelectPatientNew3
             // 
@@ -643,5 +666,7 @@
         private DevComponents.DotNetBar.ButtonX buttonX2;
         private DevComponents.DotNetBar.Controls.ComboBoxEx CboOperationSite;
         private System.Windows.Forms.Label labelSite;
+        private System.Windows.Forms.DateTimePicker dtpSelectPatientTime2;
+        private System.Windows.Forms.Label label6;
     }
 }

AIMS/OperationAanesthesia/frmSelectPatientNew3.cs

@@ -29,12 +29,22 @@ namespace AIMS.OperationAanesthesia
             InitializeComponent();
         }
 
+        private string[] Day = new string[] { "周日", "周一", "周二", "周三", "周四", "周五", "周六" };
         private void frmSelectPatientNew3_Load(object sender, EventArgs e)
         {
-            ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom);
+            ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom,"内镜室");
+            string week = Day[Convert.ToInt32(DateTime.Now.DayOfWeek.ToString("d"))].ToString();
+            cboRoom.Text = "";
+            if (week == "周一")
+                dtpSelectPatientTime.Value = DateTime.Now.AddDays(-3);
+            else
+                dtpSelectPatientTime.Value = DateTime.Now.AddDays(-1);
+            dtpSelectPatientTime2.Value = DateTime.Now;
 
             FillDgv();
 
+            this.dtpSelectPatientTime.ValueChanged += new System.EventHandler(this.dtpSelectPatientTime_ValueChanged);
+            this.dtpSelectPatientTime2.ValueChanged += new System.EventHandler(this.dtpSelectPatientTime_ValueChanged);
             this.cboRoom.SelectedIndexChanged += new System.EventHandler(this.cboRoom_SelectedIndexChanged);
             this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged);
         }
@@ -62,115 +72,119 @@ namespace AIMS.OperationAanesthesia
             if (txtquery.Text.Trim() != "")
                 dt = SelectPatient.GetSelectPatientDataTable(txtquery.Text);
             else
-                dt = SelectPatient.GetSelectPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString());
+                dt = SelectPatient.GetSelectPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString(), DateTime.Parse(dtpSelectPatientTime2.Value.ToString("yyyy-MM-dd 23:59:59").ToString()));
 
             DataTable dt2 = new DataTable();
             if (txtquery.Text.Trim() != "")
                 dt2 = SelectPatient.GetRelieveLockingPatientDataTable(txtquery.Text);
             else
-                dt2 = SelectPatient.GetRelieveLockingPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString());
+                dt2 = SelectPatient.GetRelieveLockingPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString(), DateTime.Parse(dtpSelectPatientTime2.Value.ToString("yyyy-MM-dd 23:59:59").ToString()));
 
-            List<string> list = new List<string>();
+            if (CboOperationSite.Visible == true && CboOperationSite.SelectedIndex > 0)
-            for (int i = 0; i < ControlExtension.SiteRooms.Count; i++)
             {
-                foreach (DataRow dr in dt.Rows)
+                dt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", "");
-                {
+                dt2 = AIMSExtension.PublicMethod.GetNewDataTable(dt2, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", "");
-                    if (dr["OperationRoom"].ToString() == ControlExtension.SiteRooms[i].Name && !list.Contains(ControlExtension.SiteRooms[i].Name))
-                    {
-                        list.Add(ControlExtension.SiteRooms[i].Name);
-                    }
             }
 
+            //List<string> list = new List<string>();
+            //for (int i = 0; i < ControlExtension.SiteRooms.Count; i++)
+            //{
+            //    foreach (DataRow dr in dt.Rows)
+            //    {
+            //        if (dr["OperationRoom"].ToString() == ControlExtension.SiteRooms[i].Name && !list.Contains(ControlExtension.SiteRooms[i].Name))
+            //        {
+            //            list.Add(ControlExtension.SiteRooms[i].Name);
+            //        }
+            //    }
+
+            //    foreach (DataRow dr in dt2.Rows)
+            //    {
+            //        if (dr["OperationRoom"].ToString() == ControlExtension.SiteRooms[i].Name && !list.Contains(ControlExtension.SiteRooms[i].Name))
+            //        {
+            //            list.Add(ControlExtension.SiteRooms[i].Name);
+            //        }
+            //    }
+            //}
+            //if (cboRoom.Text != "")
+            //{
+            int numi = 0, j = 0;
             foreach (DataRow dr in dt2.Rows)
             {
-                    if (dr["OperationRoom"].ToString() == ControlExtension.SiteRooms[i].Name && !list.Contains(ControlExtension.SiteRooms[i].Name))
+                //if (dr["OperationRoom"].ToString() != cboRoom.Text) continue;
-                    {
-                        list.Add(ControlExtension.SiteRooms[i].Name);
-                    }
-                }
-            }
-            if (cboRoom.Text != "")
-            {
-                int i = 0, j = 0;
-                foreach (DataRow dr in dt.Rows)
-                {
-                    if (dr["OperationRoom"].ToString() != cboRoom.Text) continue;
                 ucPatientCard uc = new ucPatientCard(dr);
                 uc.InRoom += Uc_InRoom;
                 uc.QxRoom += Uc_QxRoom;
                 uc.Clicks += Uc_Clicks;
-                    uc.Location = new Point((uc.Width + 9) * j, (uc.Height + 10) * i + 30);
+                uc.Location = new Point((uc.Width + 9) * j, (uc.Height + 10) * numi + 30);
                 panel3.Controls.Add(uc);
                 j++;
                 if (j == 5)
                 {
-                        i++;
+                    numi++;
                     j = 0;
                 }
             }
-
+            foreach (DataRow dr in dt.Rows)
-                foreach (DataRow dr in dt2.Rows)
             {
-                    if (dr["OperationRoom"].ToString() != cboRoom.Text) continue;
+                //if (dr["OperationRoom"].ToString() != cboRoom.Text) continue;
                 ucPatientCard uc = new ucPatientCard(dr);
                 uc.InRoom += Uc_InRoom;
                 uc.QxRoom += Uc_QxRoom;
                 uc.Clicks += Uc_Clicks;
-                    uc.Location = new Point((uc.Width + 9) * j, (uc.Height + 10) * i + 30);
+                uc.Location = new Point((uc.Width + 9) * j, (uc.Height + 10) * numi + 30);
                 panel3.Controls.Add(uc);
                 j++;
                 if (j == 5)
                 {
-                        i++;
+                    numi++;
                     j = 0;
                 }
             }
-            }
-            else
-            {
-                for (int i = 0; i < list.Count; i++)
-                {
-                    int j = 0;
-                    int Pointx = 0;
-                    foreach (DataRow dr in dt.Rows)
-                    {
-                        if (dr["OperationRoom"].ToString() != list[i]) continue;
-                        ucPatientCard uc = new ucPatientCard(dr);
-                        uc.InRoom += Uc_InRoom;
-                        uc.QxRoom += Uc_QxRoom;
-                        uc.Clicks += Uc_Clicks;
-                        uc.Location = new Point((uc.Width + 9) * i, (uc.Height + 10) * j + 30);
-                        panel3.Controls.Add(uc);
-                        j++; Pointx = (uc.Width + 9) * i;
-                    }
 
-                    foreach (DataRow dr in dt2.Rows)
+            //}
-                    {
+            //else
-                        if (dr["OperationRoom"].ToString() != list[i]) continue;
+            //{
-                        ucPatientCard uc = new ucPatientCard(dr);
+            //    for (int i = 0; i < list.Count; i++)
-                        uc.InRoom += Uc_InRoom;
+            //    {
-                        uc.QxRoom += Uc_QxRoom;
+            //        int j = 0;
-                        uc.Clicks += Uc_Clicks;
+            //        int Pointx = 0;
-                        uc.Location = new Point((uc.Width + 9) * i, (uc.Height + 10) * j + 30);
+            //        foreach (DataRow dr in dt.Rows)
-                        panel3.Controls.Add(uc);
+            //        {
-                        j++;
+            //            if (dr["OperationRoom"].ToString() != list[i]) continue;
-                        Pointx = (uc.Width + 9) * i;
+            //            ucPatientCard uc = new ucPatientCard(dr);
-                    }
+            //            uc.InRoom += Uc_InRoom;
-
+            //            uc.QxRoom += Uc_QxRoom;
-                    if (Pointx > 0)
+            //            uc.Clicks += Uc_Clicks;
-                    {
+            //            uc.Location = new Point((uc.Width + 9) * i, (uc.Height + 10) * j + 30);
-                        DevComponents.DotNetBar.Controls.Line line1 = new DevComponents.DotNetBar.Controls.Line();
+            //            panel3.Controls.Add(uc);
-                        line1.Location = new System.Drawing.Point(Pointx - 10, 0);
+            //            j++; Pointx = (uc.Width + 9) * i;
-                        line1.DashStyle = System.Drawing.Drawing2D.DashStyle.DashDotDot;
+            //        }
-                        line1.Size = new System.Drawing.Size(10, panel3.Height);
-                        line1.ForeColor = Color.DarkGray;
-                        line1.VerticalLine = true;
-                        panel3.Controls.Add(line1);
-                    }
-                }
-            }
 
+            //        foreach (DataRow dr in dt2.Rows)
+            //        {
+            //            if (dr["OperationRoom"].ToString() != list[i]) continue;
+            //            ucPatientCard uc = new ucPatientCard(dr);
+            //            uc.InRoom += Uc_InRoom;
+            //            uc.QxRoom += Uc_QxRoom;
+            //            uc.Clicks += Uc_Clicks;
+            //            uc.Location = new Point((uc.Width + 9) * i, (uc.Height + 10) * j + 30);
+            //            panel3.Controls.Add(uc);
+            //            j++;
+            //            Pointx = (uc.Width + 9) * i;
+            //        }
 
+            //        if (Pointx > 0)
+            //        {
+            //            DevComponents.DotNetBar.Controls.Line line1 = new DevComponents.DotNetBar.Controls.Line();
+            //            line1.Location = new System.Drawing.Point(Pointx - 10, 0);
+            //            line1.DashStyle = System.Drawing.Drawing2D.DashStyle.DashDotDot;
+            //            line1.Size = new System.Drawing.Size(10, panel3.Height);
+            //            line1.ForeColor = Color.DarkGray;
+            //            line1.VerticalLine = true;
+            //            panel3.Controls.Add(line1);
+            //        }
+            //    }
+            //} 
         }
 
         public ucPatientCard SelUc;
@@ -251,20 +265,6 @@ namespace AIMS.OperationAanesthesia
                         MessageBox.Show("当前手术已停止 ，请确认后重新选择！", "系统提示");
                         return;
                     } 
-                    if (operA.OrderOperationTime.Value.Date != DateTime.Now.Date)// && operA.OrderOperationTime.Value.Hour < 20)
-                    {
-                        MessageBox.Show("该手术预约时间不是当前日期 ，请确认后重新选择！", "系统提示");
-                        return;
-                    }
-                    DataTable dtOperationRecord = SelectPatient.GetTodayDoOpePatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
-                    foreach (DataRow row in dtOperationRecord.Rows)
-                    {
-                        if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString())
-                        {
-                            MessageBox.Show("当前有未完成的手术占用手术间，请先选择解锁术中手术！", "系统提示");
-                            return;
-                        }
-                    }
 
                     frmAanesthesiaPainlessRecord frmAnasRecord = null;
                     if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null)
@@ -537,8 +537,11 @@ namespace AIMS.OperationAanesthesia
         }
         private void CboOperationSite_SelectedIndexChanged(object sender, EventArgs e)
         {
+            this.cboRoom.SelectedIndexChanged -= new System.EventHandler(this.cboRoom_SelectedIndexChanged);
             ControlExtension.SetOperationSiteRoom(CboOperationSite, cboRoom);
+            cboRoom.Text = "";
             FillDgv();
+            this.cboRoom.SelectedIndexChanged += new System.EventHandler(this.cboRoom_SelectedIndexChanged);
         }
     }
 }

AIMS/OperationAfter/frmExportConfig.cs

@@ -1,13 +1,9 @@
-using AIMS;
+using AIMSBLL;
-using AIMSBLL;
 using AIMSExtension;
 using AIMSModel;
-using DCSoftDotfuscate;
-using DevComponents.DotNetBar.Controls;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 
 namespace AIMS.OperationAfter.UI
@@ -38,7 +34,9 @@ namespace AIMS.OperationAfter.UI
         {
             if (_dgv == null) return;
             LoadSettingSource(_dgv);
-            if (exportConfig != null && exportConfig.Value != null)
+            if (exportConfig != null)
+            {
+                if (exportConfig.Value != null)
                 {
                     ExportConfig dataGridViewSetting = JsonConvert.DeserializeObject<ExportConfig>(exportConfig.Value);
                     txtName.Text = dataGridViewSetting.Title;
@@ -47,7 +45,7 @@ namespace AIMS.OperationAfter.UI
 
                     foreach (DataGridViewRow column in dataGridView2.Rows)
                     {
-                    foreach (var item in dataGridViewSetting.exports)
+                        foreach (var item in dataGridViewSetting.Exports)
                         {
                             if (column.Cells[0].Value.ToString() == item.Name)
                             {
@@ -60,6 +58,7 @@ namespace AIMS.OperationAfter.UI
                         }
                     }
                 }
+            }
             else
             {
                 exportConfig = new SysConfig();
@@ -101,11 +100,11 @@ namespace AIMS.OperationAfter.UI
         private void tsbSave_Click(object sender, EventArgs e)
         {
             EndEdit();
-
             exportConfig.Name = txtName.Text;
             exportConfig.Note = DataGridViewPath;
-            ExportConfig dataGridViewSetting = CreateDataGridViewSetting(dataGridView2);
+            ExportConfig dgvSetting = CreateDataGridViewSetting(dataGridView2);
-            exportConfig.Value = JsonConvert.SerializeObject(dataGridViewSetting);
+            string ss = JsonConvert.SerializeObject(dgvSetting);
+            exportConfig.Value = ss;
             exportConfig.IsValid = 1;
             exportConfig.OperatorNo = PublicMethod.OperatorNo;
             exportConfig.OperatorName = PublicMethod.OperatorName;
@@ -130,7 +129,7 @@ namespace AIMS.OperationAfter.UI
             dataGridViewSetting.Path = DataGridViewPath;
             dataGridViewSetting.FontSize = int.Parse(txtFontSize.Value.ToString());
             dataGridViewSetting.Landscape = cmbIsHD.Checked;
-            dataGridViewSetting.exports = new List<ExportItem>();
+            dataGridViewSetting.Exports = new List<ExportItem>();
             foreach (DataGridViewRow column in dataGridView.Rows)
             {
                 ExportItem export = new ExportItem();
@@ -143,7 +142,7 @@ namespace AIMS.OperationAfter.UI
                 export.PrintWidth = int.Parse(column.Cells["printWidth"].Value.ToString());
                 export.PrintSize = int.Parse(column.Cells["PrintSize"].Value.ToString());
 
-                dataGridViewSetting.exports.Add(export);
+                dataGridViewSetting.Exports.Add(export);
             }
             return dataGridViewSetting;
         }

AIMS/OperationAfter/frmExportConfig.designer.cs

@@ -286,13 +286,13 @@
         private System.Windows.Forms.GroupBox gbDataGridViewSetting;
         public System.Windows.Forms.ToolStripButton tsbSave;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.DataGridView dataGridView2;
+        public System.Windows.Forms.DataGridView dataGridView2;
         private System.Windows.Forms.ToolStripButton tsbCancel;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private DevComponents.DotNetBar.Controls.TextBoxX txtName;
         private DevComponents.DotNetBar.LabelX labelX1;
-        private DevComponents.DotNetBar.Controls.CheckBoxX cmbIsHD;
+        public DevComponents.DotNetBar.Controls.CheckBoxX cmbIsHD;
-        private System.Windows.Forms.NumericUpDown txtFontSize;
+        public System.Windows.Forms.NumericUpDown txtFontSize;
         private DevComponents.DotNetBar.LabelX labelX2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataPropertyNameDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn headerTextDataGridViewTextBoxColumn;

AIMS/OperationAfter/frmOperationCharg3.cs

@@ -125,7 +125,7 @@ namespace AIMS.OperationAfter.UI
                 dataGridViewSetting = JsonConvert.DeserializeObject<ExportConfig>(exportConfig.Value);
                 foreach (DataGridViewColumn column in dgvDrugs.Columns)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (column.Name == "Id")
                         {
@@ -206,7 +206,7 @@ namespace AIMS.OperationAfter.UI
             {
                 if (dataGridViewSetting != null)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (dgvDrugs.Columns[i].Name == item.Name)
                         {
@@ -233,7 +233,7 @@ namespace AIMS.OperationAfter.UI
                 myExcel.Cells[startIndex, i + 1] = ColumnsStr[i].Value;
                 if (dataGridViewSetting != null)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (ColumnsStr[i].Value == item.Text)
                         {

AIMS/OperationAfter/frmOperationManage.cs

@@ -2,6 +2,7 @@
 using AIMSBLL;
 using AIMSExtension;
 using AIMSModel;
+using DevComponents.DotNetBar.Controls;
 using Microsoft.Office.Interop.Excel;
 using Newtonsoft.Json;
 using System;
@@ -35,7 +36,7 @@ namespace AIMS.OperationAfter.UI
             dgv.BackgroundColor = System.Drawing.Color.Snow;
             ControlExtension.SetDgvAttribute(dgv);
             DataGridViewPath = GetControlPath(dgv);
-            exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "' and (Extend1 = null or Extend1='" + PublicMethod.RoleId + "')", null, RecursiveType.None, 0);
+            exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "' and (Extend1 = null or Extend1='" + PublicMethod.RoleId + "')", null, RecursiveType.None, 0);// 
             if (exportConfig != null)
                 ConfigDataGridView(exportConfig);
             List<Department> list = new List<Department>();
@@ -89,6 +90,7 @@ namespace AIMS.OperationAfter.UI
             //this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged);
 
             btnFind_Click(null, null);
+             
         }
 
         /// <summary>
@@ -291,7 +293,7 @@ namespace AIMS.OperationAfter.UI
             {
                 if (dataGridViewSetting != null)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (dgv.Columns[i].Name == item.Name)
                         {
@@ -318,7 +320,7 @@ namespace AIMS.OperationAfter.UI
                 myExcel.Cells[2, i + 1] = ColumnsStr[i].Value;
                 if (dataGridViewSetting != null)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (ColumnsStr[i].Value == item.Text)
                         {
@@ -500,7 +502,7 @@ namespace AIMS.OperationAfter.UI
                 dataGridViewSetting = JsonConvert.DeserializeObject<ExportConfig>(exportConfig.Value);
                 foreach (DataGridViewColumn column in dgv.Columns)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (column.Name == "序号" || column.Name == "ApplyId")
                         {

AIMS/OperationAfter/frmReportExport.cs

@@ -68,7 +68,7 @@ namespace AIMS
                 dataGridViewSetting = JsonConvert.DeserializeObject<ExportConfig>(exportConfig.Value);
                 foreach (DataGridViewColumn column in dgv.Columns)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (column.Name == item.Name)
                         {
@@ -137,7 +137,7 @@ namespace AIMS
             {
                 if (dataGridViewSetting != null)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (selectdgv.Columns[i].Name == item.Name)
                         {
@@ -164,7 +164,7 @@ namespace AIMS
                 myExcel.Cells[2, i + 1] = ColumnsStr[i].Value;
                 if (dataGridViewSetting != null)
                 {
-                    foreach (var item in dataGridViewSetting.exports)
+                    foreach (var item in dataGridViewSetting.Exports)
                     {
                         if (ColumnsStr[i].Value == item.Text)
                         {

AIMS/OperationFront/frmOperationApply.Designer.cs

@@ -372,12 +372,13 @@
             // 
             // btnFind
             // 
+            this.btnFind.BackColor = System.Drawing.Color.Transparent;
             this.btnFind.Location = new System.Drawing.Point(783, 11);
             this.btnFind.Name = "btnFind";
             this.btnFind.Size = new System.Drawing.Size(66, 23);
             this.btnFind.TabIndex = 16;
             this.btnFind.Text = "查询";
-            this.btnFind.UseVisualStyleBackColor = true;
+            this.btnFind.UseVisualStyleBackColor = false;
             this.btnFind.Click += new System.EventHandler(this.btnFind_Click);
             // 
             // panel3

AIMS/OperationFront/frmOperationApply.cs

@@ -130,7 +130,7 @@ namespace AIMS.OperationFront.UI
             {
                 if (dgv.Rows[i].Cells["OperationTypeColumn"].Value.ToString() == "急诊")
                 {
-                    dgv.Rows[i].DefaultCellStyle.BackColor = Color.Red;
+                    dgv.Rows[i].DefaultCellStyle.BackColor = Color.MistyRose;
                 }
             }
         }
@@ -230,7 +230,7 @@ namespace AIMS.OperationFront.UI
         private void CboOperationSite_SelectedIndexChanged(object sender, EventArgs e)
         {
             ControlExtension.SetOperationSite(CboOperationSite);
+            btnFind_Click(null, null);
         } 
-
     }
 }

AIMS/OperationFront/frmOperationApplyDetail.Designer.cs

@@ -1059,7 +1059,7 @@
             // label11
             // 
             this.label11.AutoSize = true;
-            this.label11.ForeColor = System.Drawing.Color.Red;
+            this.label11.ForeColor = System.Drawing.Color.Black;
             this.label11.Location = new System.Drawing.Point(398, 68);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(35, 14);

AIMS/OperationFront/frmOperationApplyDetail.cs

@@ -849,6 +849,7 @@ namespace AIMS.OperationFront.UI
                 OperationApplyObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo;
                 OperationApplyObj.OperatorName = AIMSExtension.PublicMethod.OperatorName;
                 OperationApplyObj.OperateDate = AIMSExtension.PublicMethod.SystemDate();
+                if(OperationApplyObj.OperationSite==null || OperationApplyObj.OperationSite=="")
                 OperationApplyObj.OperationSite = "手术室";
 
                 try
@@ -1108,10 +1109,10 @@ namespace AIMS.OperationFront.UI
             {
                 MessageBox.Show("性别不能为空!");
             }
-            else if (txtSickBed.Text.Trim().Length < 1)
+            //else if (txtSickBed.Text.Trim().Length < 1)
-            {
+            //{
-                MessageBox.Show("床位不能为空!");
+            //    MessageBox.Show("床位不能为空!");
-            }
+            //}
             else if (cboDepartment.Text.Trim().Length < 1)
             {
                 MessageBox.Show("所在科室不能为空!");

AIMS/OperationFront/frmOperationSchedulePlan.cs

@@ -320,7 +320,7 @@ namespace AIMS.OperationFront.UI
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOperationSchedulePlanOld));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOperationSchedulePlan));
             DevComponents.DotNetBar.SuperGrid.Style.Background background1 = new DevComponents.DotNetBar.SuperGrid.Style.Background();
             DevComponents.DotNetBar.SuperGrid.Style.Background background2 = new DevComponents.DotNetBar.SuperGrid.Style.Background();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -2149,7 +2149,7 @@ namespace AIMS.OperationFront.UI
             // 
             this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label14.AutoSize = true;
-            this.label14.BackColor = System.Drawing.Color.Red;
+            this.label14.BackColor = System.Drawing.Color.MistyRose;
             this.label14.Location = new System.Drawing.Point(42, 256);
             this.label14.Margin = new System.Windows.Forms.Padding(3);
             this.label14.Name = "label14";
@@ -3864,7 +3864,7 @@ namespace AIMS.OperationFront.UI
             {
                 if (item.Cells["OperationType"].Value != null && item.Cells["OperationType"].Value.ToString() == "¼±Õï")
                 {
-                    item.DefaultCellStyle.BackColor = Color.Red;
+                    item.DefaultCellStyle.BackColor = Color.MistyRose;
                 }
                 if (item.Cells["OperationType"].Value != null && item.Cells["OperationType"].Value.ToString() == "ÈÕ¼ä")
                 {
@@ -4841,7 +4841,7 @@ namespace AIMS.OperationFront.UI
         {
             ControlExtension.SetOperationSite(CboOperationSite);
             FirstLoad();
+            btnSearchOperation_Click(null, null);
         } 
-
     }
 }

AIMS/OperationFront/frmOperationSchedulePlan.resx

@@ -244,62 +244,65 @@
     <value>True</value>
   </metadata>
   <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>245, 17</value>
+    <value>355, 17</value>
   </metadata>
   <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD4
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+
-        CAAAAk1TRnQBSQFMAgEBAgEABBQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEoAwABQAMA
+        CAAAAk1TRnQBSQFMAgEBAgEAARwBFAEcARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
-        ARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHAAQAB8AHK
+        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
-        AaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5AQABgAF8
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
-        Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMAAWYDAAGZ
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
-        AwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFmAZkCAAFm
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
-        AcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHMAWYCAAHM
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
-        AZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEAATMBAAGZ
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
-        AQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEzAWYCAAEz
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
-        AWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZAWYBAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
-        ApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLMAQABMwHM
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
-        Af8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEAAWYBAAFm
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
-        AQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEAAWYBMwHM
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
-        AQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZAWYBAAFm
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
-        ApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/AQABZgH/
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
-        AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEAAZkBAAGZ
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
-        AQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFmATMBAAGZ
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
-        ATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZAf8BAAGZ
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
-        AcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEzAQABmQHM
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
-        AWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEAAcwBAAHM
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
-        AQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHMAWYBMwEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
-        AZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHMApkBAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
-        AZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHMAf8BMwEA
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
-        AZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEAAcwBMwIA
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
-        Af8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHMAmYBAAH/
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
-        AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZAcwBAAH/
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
-        AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEzAQABzAH/
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
-        AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFmAQABIQEA
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
-        AaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHwAfsB/wEA
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAASoLKTMAAioLUgEpMgABUgFR
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAASoLKTMAAioLUgEp
-        AVkIUgFRAW4BSgIAASoLKSQAAlIEWQFYAVIBdAJzAnQBSgEAASoBWQtSASkiAAVGAUwBRgJ0AXkDegF5
+        MgABUgFRAVkIUgFRAW4BSgIAASoLKSQAAlIEWQFYAVIBdAJzAnQBSgEAASoBWQtSASkiAAVGAUwBRgJ0
-        AXMBSgFSAlkIWAJSASoiAALjAxcB4wFMBZoBegF5AXQB6gFSAXoJWQFYAVIBKSIAAUYBFgTjAW8BmQGa
+        AXkDegF5AXMBSgFSAlkIWAJSASoiAALjAxcB4wFMBZoBegF5AXQB6gFSAXoJWQFYAVIBKSIAAUYBFgTj
-        BJkBegF0AYwBUgF6CVkBWAJSASkiAAFMAhYB4wFGAXMEHAGZAhwBdAGnAVIBegpZAlIBKiIABEwCWQHP
+        AW8BmQGaBJkBegF0AYwBUgF6CVkBWAJSASkiAAFMAhYB4wFGAXMEHAGZAhwBdAGnAVIBegpZAlIBKiIA
-        AfMBtQHyAs8BtQHzAc8BUgF6C1kBWAEqIgABUgJ0AVICWQHPAd0BtQHyAvEBvAK1AVIBegVZBHoDWQEq
+        BEwCWQHPAfMBtQHyAs8BtQHzAc8BUgF6C1kBWAEqIgABUgJ0AVICWQHPAd0BtQHyAvEBvAK1AVIBegVZ
-        IQABUgSaAVIBWQGuAbUB8gO1AQkB8AEJAVICegNZBnoBWQEqIgABUgF1A3oBdQFLAQABzwG8AQkBzwHz
+        BHoDWQEqIQABUgSaAVIBWQGuAbUB8gO1AQkB8AEJAVICegNZBnoBWQEqIgABUgF1A3oBdQFLAQABzwG8
-        AfIB8QEJAXQDegNZAVIDdAJSIwABOAFZAlIBdQF6AgABzwLxAQkCtQHPAacBAAF0A3oBWQEqKQABWQHl
+        AQkBzwHzAfIB8QEJAXQDegNZAVIDdAJSIwABOAFZAlIBdQF6AgABzwLxAQkCtQHPAacBAAF0A3oBWQEq
-        AaABmgF5AVICAAGnAs8DpwMAAf8CdAJSKgABUgKgAsMBdAIAAqc4AAJSPAABQgFNAT4HAAE+AwABKAMA
+        KQABWQHlAaABmgF5AVICAAGnAs8DpwMAAf8CdAJSKgABUgKgAsMBdAIAAqc4AAJSPAABQgFNAT4HAAE+
-        AUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAwL/BAABgAEBAv8EAAGAAQEBgAEHBAABgAEBAQABAwcA
+        AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAwL/BAABgAEBAv8EAAGAAQEBgAEHBAABgAEB
-        AQMHAAEDBwABAQQAAYACAAEBBAABgAIAAQEEAAGAAgABAQcAAQMEAAEBAgABBwQAAQMBAAGBAf8EAAID
+        AQABAwcAAQMHAAEDBwABAQQAAYACAAEBBAABgAIAAQEEAAGAAgABAQcAAQMEAAEBAgABBwQAAQMBAAGB
-        AYMB/wQAAQMBPwL/BAABzwP/BAAL
+        Af8EAAIDAYMB/wQAAQMBPwL/BAABzwP/BAAL
 </value>
   </data>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>144, 17</value>
+    <value>254, 17</value>
   </metadata>
   <metadata name="ctsThisRoom.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>360, 17</value>
+    <value>470, 17</value>
   </metadata>
   <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>

AIMS/OremrUserControl/ControlExtension.cs

@@ -336,7 +336,7 @@ namespace AIMS
             }
         }
         public static List<OperationRoom> SiteRooms;
-        public static void GetOperationSiteRoom(Label labelSite, ComboBoxEx comboBoxEx, ComboBox cboRoom)
+        public static void GetOperationSiteRoom(Label labelSite, ComboBoxEx comboBoxEx, ComboBox cboRoom,string DefaultSite="")
         {
             if (PublicMethod.OperationSite.Count <= 2) 
             {
@@ -352,6 +352,10 @@ namespace AIMS
                 {
                     comboBoxEx.Text = PublicMethod.LastOperationSite;
                 }
+                if (DefaultSite!="")
+                {
+                    comboBoxEx.Text = DefaultSite;
+                }
             }
             if (comboBoxEx.Visible == false || comboBoxEx.Text == "")
             {

AIMS/OremrUserControl/ExportConfig.cs

@@ -5,6 +5,7 @@ using System.Text;
 
 namespace AIMS
 {
+    [Serializable] 
     public class ExportConfig
     {  
         public string Title { get; set; } 
@@ -12,7 +13,7 @@ namespace AIMS
         public int FontSize { get; set; }
         public bool Landscape { get; set; } 
 
-       public  List<ExportItem> exports { get; set; } 
+       public  List<ExportItem> Exports { get; set; } 
             
     }
     public class ExportItem

AIMSEntity/Extensions/SelectPatient.cs

@@ -12,12 +12,12 @@ namespace AIMSBLL
 {
     public class SelectPatient
     {
-        public static DataTable GetSelectPatientDataTable(DateTime BeginDate, string Room)
+        public static DataTable GetSelectPatientDataTable(DateTime BeginDate, string Room, DateTime? EndDate = null)
         {
             string strSql = "SELECT of1.ApplyId Id, of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, " +
                               "of1.ApplyOperationInfoName, of1.OperationDoctor, " +
-                              "of1.AnesthesiaDoctor,of1.OperationRoomId , of1.State ,of1.Sex,Age,of1.PlanOperationTime,of1.InstrumentNurse,of1.TourNurse,of1.ApplyDiagnoseInfoName,of1.OperationRoom ,of1.Contagion,of1.OrderOperationTime " +
+                              "of1.AnesthesiaDoctor,of1.OperationRoomId , of1.State ,of1.Sex,Age,of1.PlanOperationTime,of1.InstrumentNurse,of1.TourNurse,of1.ApplyDiagnoseInfoName,of1.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of1.OperationSite " +
-                              "FROM V_OperationFront of1 WHERE of1.State in('已审核','预排程','已排程','已访视') and of1.OrderOperationTime>='" + BeginDate + "' AND of1.OrderOperationTime<'" + BeginDate.AddDays(1) + "'";
+                              "FROM V_OperationFront of1 WHERE of1.State in('已审核','预排程','已排程','已访视') and of1.OrderOperationTime>='" + BeginDate + "' AND of1.OrderOperationTime<'" + (EndDate == null ? BeginDate.AddDays(1) : EndDate) + "'";
             if (Room != "" && Room != "-1") strSql += " and of1.OperationRoomId='" + Room + "'";
             strSql += " order by OperationRoomId,PlanOrder";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
@@ -27,39 +27,39 @@ namespace AIMSBLL
         {
             string strSql = "SELECT of1.ApplyId Id, of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, " +
                               "of1.ApplyOperationInfoName, of1.OperationDoctor, " +
-                              "of1.AnesthesiaDoctor,of1.OperationRoomId , of1.State ,of1.Sex,Age,of1.PlanOperationTime,of1.InstrumentNurse,of1.TourNurse,of1.ApplyDiagnoseInfoName,of1.OperationRoom ,of1.Contagion,of1.OrderOperationTime " +
+                              "of1.AnesthesiaDoctor,of1.OperationRoomId , of1.State ,of1.Sex,Age,of1.PlanOperationTime,of1.InstrumentNurse,of1.TourNurse,of1.ApplyDiagnoseInfoName,of1.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of1.OperationSite " +
                               "FROM V_OperationFront of1 WHERE of1.State in('已审核','预排程','已排程','已访视') and ( of1.MdrecNo like '%" + PatientName + "%' or  of1.PatientName like '%" + PatientName + "%')";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
 
-        public static DataTable GetRelieveLockingPatientDataTable(DateTime BeginDate, string Room)
+        public static DataTable GetRelieveLockingPatientDataTable(DateTime BeginDate, string Room, DateTime? EndDate = null)
         {
-            string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中','手术结束','停止手术') and of2.InRoomTime >= '" + BeginDate + "' AND of2.InRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1";
+            string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime,of1.OperationSite FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中','手术结束','停止手术') and of2.InRoomTime >= '" + BeginDate + "' AND of2.InRoomTime<'" + (EndDate == null ? BeginDate.AddDays(1) : EndDate) + "' and RecoverId=1";
             if (Room != "" && Room != "-1") strSql += " and of1.OperationRoomId='" + Room + "'";
             strSql += " order by [StateId],of2.InRoomTime ";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
         public static DataTable GetRelieveLockingPatientDataTable(string PatientName)
         {
-            string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中','手术结束','停止手术') and RecoverId=1 and ( of1.MdrecNo like '%" + PatientName + "%' or  of1.PatientName like '%" + PatientName + "%')";
+            string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime,of1.OperationSite FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中','手术结束','停止手术') and RecoverId=1 and ( of1.MdrecNo like '%" + PatientName + "%' or  of1.PatientName like '%" + PatientName + "%')";
             strSql += " order by [StateId] asc";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
         public static DataTable GetTodayDoOpePatientDataTable(DateTime BeginDate, string Room = "")
         {
-            string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中' ) and of2.InRoomTime >= '" + BeginDate + "' AND of2.InRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 ";
+            string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime,of1.OperationSite FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中' ) and of2.InRoomTime >= '" + BeginDate + "' AND of2.InRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 ";
             if (Room != "" && Room != "-1") strSql += " and of1.OperationRoomId='" + Room + "'";
             strSql += " order by [StateId] asc";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
         public static DataTable GetRecoverPatientDataTable(DateTime BeginDate)
         {
-            string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom,of2.Whereabouts,of2.AnaesthesiaMethodName FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '手术结束') and (of2.Pulse='PACU' OR of2.Pulse='恢复室') and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 and of2.Id not in (select iD from OperationRecord where RecoverId<>1)";
+            string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom,of2.Whereabouts,of2.AnaesthesiaMethodName,of1.OperationSite FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '手术结束') and (of2.Pulse='PACU' OR of2.Pulse='恢复室') and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 and of2.Id not in (select iD from OperationRecord where RecoverId<>1)";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
         public static DataTable GetRecoverPatientOutDataTable(DateTime BeginDate, DateTime EndDate)
         {
-            string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom,of2.AnaesthesiaMethodName FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '麻醉复苏结束') and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + EndDate + "' and RecoverId=2   order by OutRoomTime desc ";
+            string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom,of2.AnaesthesiaMethodName,of1.OperationSite FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '麻醉复苏结束') and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + EndDate + "' and RecoverId=2   order by OutRoomTime desc ";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
         public static DataTable GetSelectPatientDataTable(DateTime BeginDate, DateTime EndDate, bool isLoginPerson, string person, bool isEnOpe)

AIMSEntity/Model/AutoGenerate/SysConfig.cs

@@ -45,7 +45,7 @@ namespace AIMSModel
         public string Value
         {
             get { return value; }
-            set { value = value; }
+            set { this.value = value; }
         }
         /// <summary>
         /// 

DataCollectorService/DataCollectorService.csproj

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A445F69B-9EA6-40F8-87EA-D524A40FB90B}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>DataCollectorService</RootNamespace>
+    <AssemblyName>DataCollectorService</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Service1.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Service1.Designer.cs">
+      <DependentUpon>Service1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

DataCollectorService/Program.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.ServiceProcess;
+using System.Text;
+
+namespace DataCollectorService
+{
+    internal static class Program
+    {
+        /// <summary>
+        /// 应用程序的主入口点。
+        /// </summary>
+        static void Main()
+        {
+            ServiceBase[] ServicesToRun;
+            ServicesToRun = new ServiceBase[]
+            {
+                new Service1()
+            };
+            ServiceBase.Run(ServicesToRun);
+        }
+    }
+}

DataCollectorService/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("DataCollectorService")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DataCollectorService")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("a445f69b-9ea6-40f8-87ea-d524a40fb90b")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DataCollectorService/Service1.Designer.cs

@@ -0,0 +1,37 @@
+namespace DataCollectorService
+{
+    partial class Service1
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            this.ServiceName = "Service1";
+        }
+
+        #endregion
+    }
+}

DataCollectorService/Service1.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+using System.ServiceProcess;
+using System.Text;
+
+namespace DataCollectorService
+{
+    public partial class Service1 : ServiceBase
+    {
+        public Service1()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnStart(string[] args)
+        {
+        }
+
+        protected override void OnStop()
+        {
+        }
+    }
+}

DrawGraph/AreaManage/DrugsManage.cs

@@ -209,18 +209,18 @@ namespace DrawGraph
                     {
                         myOpeRecord.BackListstr.Add(string.Format("{0}{1} {2} {3}{4}{5}", "", ((item.DrugBeginTime == item.DrugEndTime) ? item.DrugBeginTime.ToShortTimeString() : item.DrugBeginTime.ToShortTimeString() + "->" + item.DrugEndTime.ToShortTimeString()), item.DrugName.Trim(), dose, "", ""));
                     }
-                    else if (item.GiveDrugType == "麻醉诱导用药")
+                    //else if (item.GiveDrugType == "麻醉诱导用药")
-                    {
+                    //{
-                        myOpeRecord.AnesBeforListstr.Add(string.Format("{0}{1} {2} {3}{4}{5}", "", item.DrugName.Trim(), "", dose, "", item.DrugChannel == null ? "" : " " + item.DrugChannel.ToString()));
+                    //    myOpeRecord.AnesBeforListstr.Add(string.Format("{0}{1} {2} {3}{4}{5}", "", item.DrugName.Trim(), "", dose, "", item.DrugChannel == null ? "" : " " + item.DrugChannel.ToString()));
-                        x++;
+                    //    x++;
-                    }
+                    //}
                     else if (item.GiveDrugType == "术后镇痛药")
                     {
                         myOpeRecord.AfterDrugsListstr.Add(string.Format("({0}){1} {2} {3}{4}{5}", x + 1, "", item.DrugName.Trim(), dose, "", item.DrugChannel == null ? "" : " " + item.DrugChannel.ToString()));
                         myOpeRecord.AnalgesiaDrug += string.Format("{0}{1} ", item.DrugName.Trim(), dose);
                         x++;
                     }
-                    else if (item.Access == "下" && item.ParentId == 0)
+                    else if (item.Access == "下")
                     {
                         ListAddDrugs(DrugListstr, drugsi, item);
                         drugsi++;
@@ -234,8 +234,8 @@ namespace DrawGraph
                     else if (drug.DrugEndTime != null) drug.End = drug.DrugEndTime;
                 });
                 List<FactDrug> _FactDrugList = myOpeRecord.FactDrugList.Where(s => IfInTimeExist(s.DrugBeginTime, s.End) == true).ToList();
-                //存在氧气从第二行开始画
+                //存在氧气从第二行开始画 && s.GiveDrugType != "麻醉诱导用药"
-                if (_FactDrugList.Where(s => s.DrugName == "氧气" && s.GiveDrugType != "麻醉前用药" && s.GiveDrugType != "术后镇痛药" && s.GiveDrugType != "麻醉诱导用药").ToList().Count > 0) rowDrugsIndex = 1;
+                if (_FactDrugList.Where(s => s.DrugName == "氧气" && s.GiveDrugType != "麻醉前用药" && s.GiveDrugType != "术后镇痛药").ToList().Count > 0) rowDrugsIndex = 1;
                 //加药按加药时间排序
                 _FactDrugList.Sort(new FactDrugComparer());
 
@@ -243,7 +243,7 @@ namespace DrawGraph
                 for (int i = 0; i < _FactDrugList.Count; i++)
                 {
                     FactDrug temp = _FactDrugList[i];
-                    if (temp.GiveDrugType == "麻醉前用药" || temp.GiveDrugType == "术后镇痛药" || temp.DrugChannel == "备用" || temp.GiveDrugType == "麻醉诱导用药" || temp.DrugChannel == "配药" || temp.Access == "下") continue;
+                    if (temp.GiveDrugType == "麻醉前用药" || temp.GiveDrugType == "术后镇痛药" || temp.DrugChannel == "备用"  || temp.DrugChannel == "配药" || temp.Access == "下") continue;//|| temp.GiveDrugType == "麻醉诱导用药"
                     //子药不画
                     if (temp.ParentId > 0) continue;
 
@@ -263,7 +263,7 @@ namespace DrawGraph
                         for (int j = 0; j < i; j++)
                         {
                             FactDrug addDrug1 = _FactDrugList[j];
-                            if (addDrug1.GiveDrugType == "麻醉前用药" || addDrug1.GiveDrugType == "术后镇痛药" || addDrug1.GiveDrugType == "麻醉诱导用药" || addDrug1.DrugChannel == "备用" || addDrug1.DrugChannel == "配药") continue;
+                            if (addDrug1.GiveDrugType == "麻醉前用药" || addDrug1.GiveDrugType == "术后镇痛药"  || addDrug1.DrugChannel == "备用" || addDrug1.DrugChannel == "配药") continue;//|| addDrug1.GiveDrugType == "麻醉诱导用药"
                             if (addDrug1.ChildFactDrugList == null) addDrug1.ChildFactDrugList = new List<FactDrug>();
                             //如果加药品ID相同并且加加药ID不同，则认为加了同一种加药
                             if (addDrug1.Equal(temp) && temp.ParentId == 0 && addDrug1.ParentId == 0 && addDrug1.ChildFactDrugList.Count == 0 && temp.ChildFactDrugList.Count == 0)

DrawGraph/AreaManage/IconManage.cs

@@ -192,13 +192,14 @@ namespace DrawGraph
             if (packObj2 != null)
             {
                 List<string> AfterDrugsListstr = new List<string>(); 
+                myOpeRecord.ClearIconstr(ZedControl) ;
                 foreach (var item in myOpeRecord.FactDrugList)
                 {
                     ListAddDrugs(AfterDrugsListstr, item);
                 }
                 if (AfterDrugsListstr.Count > 0)
                 {
-                    SetRemarkInfo(AfterDrugsListstr, packObj2, 15, 6.5f, 40);
+                    SetRemarkInfo(AfterDrugsListstr, packObj2, 15, 6.5f, 40,"IconDrugRemarkRow");
 
                     //packObj2.PackText = "";
                     //foreach (var item in AfterDrugsListstr)
@@ -220,7 +221,7 @@ namespace DrawGraph
                 }
                 if (Eventststr.Count > 0)
                 {
-                    SetRemarkInfo(Eventststr, packObj, 15, 7f, 38);
+                    SetRemarkInfo(Eventststr, packObj, 15, 7f, 38, "IconeventRemarkRow");
                 }
 
                 //packObj.PackText = "";
@@ -233,7 +234,7 @@ namespace DrawGraph
                 //packObj.Draw();
             }
         }
-        private void SetRemarkInfo(List<string> PunctureAndIntubatios, TextPackObj remarkPpack, int remarkRowscount, float fontsize, int fontlength)
+        private void SetRemarkInfo(List<string> PunctureAndIntubatios, TextPackObj remarkPpack, int remarkRowscount, float fontsize, int fontlength,string TagName )
         {
             int remarkRow = 0;
             int AllRemarkRow = 0;
@@ -241,7 +242,7 @@ namespace DrawGraph
             double x = remarkPpack.RealX;
             double y = remarkPpack.RealY + getYPositionByListIndex(remarkRow, remarkPpack.RealY, lastIndex, remarkRowscount);
 
-            if (PunctureAndIntubatios != null && PunctureAndIntubatios.Count > 1)
+            if (PunctureAndIntubatios != null )
             {
                 foreach (string item in PunctureAndIntubatios)
                 {
@@ -251,7 +252,7 @@ namespace DrawGraph
                         if (PunStr[m] == null) continue;
                         y = remarkPpack.RealY + getYPositionByListIndex(remarkRow, remarkPpack.RealY, lastIndex, remarkRowscount);
                         if (PunStr[m] == null || PunStr[m].Trim() == "") break;
-                        ZUtil.DrawText(PunStr[m], x, y, ZedControl, fontsize, "IconDrugRemarkRow" + AllRemarkRow);
+                        ZUtil.DrawText(PunStr[m], x, y, ZedControl, fontsize,  TagName + AllRemarkRow);
                         remarkRow++;
                         AllRemarkRow++;
                     }

DrawGraph/AreaManage/OperationRecord.cs

@@ -1450,6 +1450,19 @@ namespace DrawGraph
             delAddObj("allSapDosedate");
         }
 
+        public void ClearIconstr(ZedGraphControl zgc)
+        {
+            if (zgcAnas == null || zgcAnas != zgc) zgcAnas = zgc;
+            for (int i = 0; i <= 20; i++)
+            {
+                delAddObj("IconDrugRemarkRow" + i); 
+            } 
+            for (int i = 0; i <= 20; i++)
+            {
+                delAddObj("IconeventRemarkRow" + i); 
+            } 
+        }
+
         public void ClearDrugsDose(ZedGraphControl zgc)
         {
             if (zgcAnas == null || zgcAnas != zgc) zgcAnas = zgc;