diff --git a/AIMS.sln b/AIMS.sln index ffddf67..82499a5 100644 --- a/AIMS.sln +++ b/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 diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index 8f0cbc5..7ba186f 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -63,7 +63,7 @@ False Extensions\Mono.Security.dll - + False Extensions\Newtonsoft.Json.dll diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index 8009fcd..5caa23a 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/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; diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs index f8a0337..74443e0 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs +++ b/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); } diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs index ac62a5e..2949f38 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/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); - plRefresh_Click(null, null); + myEditControl.ExecuteCommand("FilePrint", false, null); + plRefresh_Click(null, null); + new frmMessageBox("打印完成！").Show(); } catch (Exception exp) { diff --git a/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill.cs b/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill.cs index c958846..2e63425 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill.cs +++ b/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())); - foreach (DataRow row in dtOperationRecord.Rows) - { - if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString()) - { - 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; + // } + //} frmInstrumentRecord frmAnasRecord = null; if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) diff --git a/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill2.cs b/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill2.cs index edd61b4..48d80ca 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill2.cs +++ b/AIMS/OperationAanesthesia/frmSelectPatientGoodsBill2.cs @@ -20,7 +20,7 @@ namespace AIMS.OperationAanesthesia public int SelPatientId; public int SelApplyId; public bool isMainOpen = false; - public AIMS.OperationAanesthesia.frmInstrumentRecord2 tempfrmAnasRecord; + public AIMS.OperationAanesthesia.frmInstrumentRecord2 tempfrmAnasRecord; public frmSelectPatientGoodsBill2() { @@ -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 list = new List(); 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())); - foreach (DataRow row in dtOperationRecord.Rows) - { - if (row["OperationRoomId"].ToString() == operA.OperationRoomId.ToString()) - { - 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; + // } + //} 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 @@ -395,7 +401,7 @@ namespace AIMS.OperationAanesthesia if (DModel != null && DModel.Id > 0) { DocumentDAL.DeletePrintDocument(DModel); - } + } if (isMainOpen == false) { diff --git a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs index fe66007..8d4c525 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs +++ b/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); @@ -70,6 +69,12 @@ namespace AIMS.OperationAanesthesia dt2 = SelectPatient.GetRelieveLockingPatientDataTable(txtquery.Text); 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 list = new List(); for (int i = 0; i < ControlExtension.SiteRooms.Count; i++) diff --git a/AIMS/OperationAanesthesia/frmSelectPatientNew3.Designer.cs b/AIMS/OperationAanesthesia/frmSelectPatientNew3.Designer.cs index 1c8edc1..efaa740 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientNew3.Designer.cs +++ b/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.labelSite = new System.Windows.Forms.Label(); + this.dtpSelectPatientTime2 = new System.Windows.Forms.DateTimePicker(); + 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.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; + this.dtpSelectPatientTime2.CustomFormat = "yyyy-MM-dd"; + this.dtpSelectPatientTime2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpSelectPatientTime2.Location = new System.Drawing.Point(203, 9); + this.dtpSelectPatientTime2.Name = "dtpSelectPatientTime2"; + this.dtpSelectPatientTime2.Size = new System.Drawing.Size(111, 23); + this.dtpSelectPatientTime2.TabIndex = 0; // - // labelSite + // label6 // - 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; + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(189, 9); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(15, 20); + this.label6.TabIndex = 7; + this.label6.Text = "-"; // // 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; } } \ No newline at end of file diff --git a/AIMS/OperationAanesthesia/frmSelectPatientNew3.cs b/AIMS/OperationAanesthesia/frmSelectPatientNew3.cs index ae097d1..0a93ea4 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientNew3.cs +++ b/AIMS/OperationAanesthesia/frmSelectPatientNew3.cs @@ -22,19 +22,29 @@ namespace AIMS.OperationAanesthesia public int SelPatientId; public int SelApplyId; public bool isMainOpen = false; - public AIMS.OperationAanesthesia.frmAanesthesiaPainlessRecord tempfrmAnasRecord; + public AIMS.OperationAanesthesia.frmAanesthesiaPainlessRecord tempfrmAnasRecord; public frmSelectPatientNew3() { 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 list = new List(); - for (int i = 0; i < ControlExtension.SiteRooms.Count; i++) + if (CboOperationSite.Visible == true && CboOperationSite.SelectedIndex > 0) { - 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); - } - } + dt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", ""); + dt2 = AIMSExtension.PublicMethod.GetNewDataTable(dt2, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", ""); + } - foreach (DataRow dr in dt2.Rows) + //List list = new List(); + //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() != 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) * numi + 30); + panel3.Controls.Add(uc); + j++; + if (j == 5) { - if (dr["OperationRoom"].ToString() == ControlExtension.SiteRooms[i].Name && !list.Contains(ControlExtension.SiteRooms[i].Name)) - { - list.Add(ControlExtension.SiteRooms[i].Name); - } + numi++; + j = 0; } } - if (cboRoom.Text != "") + foreach (DataRow dr in dt.Rows) { - 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) * numi + 30); + panel3.Controls.Add(uc); + j++; + if (j == 5) { - 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); - panel3.Controls.Add(uc); - j++; - if (j == 5) - { - i++; - j = 0; - } - } - - foreach (DataRow dr in dt2.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); - panel3.Controls.Add(uc); - j++; - if (j == 5) - { - i++; - 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) - { - 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); - } + 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) + // { + // 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; @@ -250,21 +264,7 @@ 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); } } } \ No newline at end of file diff --git a/AIMS/OperationAfter/frmExportConfig.cs b/AIMS/OperationAfter/frmExportConfig.cs index b1cf3a0..7ac5bf0 100644 --- a/AIMS/OperationAfter/frmExportConfig.cs +++ b/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,24 +34,27 @@ namespace AIMS.OperationAfter.UI { if (_dgv == null) return; LoadSettingSource(_dgv); - if (exportConfig != null && exportConfig.Value != null) + if (exportConfig != null) { - ExportConfig dataGridViewSetting = JsonConvert.DeserializeObject(exportConfig.Value); - txtName.Text = dataGridViewSetting.Title; - txtFontSize.Value = dataGridViewSetting.FontSize; - cmbIsHD.Checked = dataGridViewSetting.Landscape; - - foreach (DataGridViewRow column in dataGridView2.Rows) + if (exportConfig.Value != null) { - foreach (var item in dataGridViewSetting.exports) + ExportConfig dataGridViewSetting = JsonConvert.DeserializeObject(exportConfig.Value); + txtName.Text = dataGridViewSetting.Title; + txtFontSize.Value = dataGridViewSetting.FontSize; + cmbIsHD.Checked = dataGridViewSetting.Landscape; + + foreach (DataGridViewRow column in dataGridView2.Rows) { - if (column.Cells[0].Value.ToString() == item.Name) + foreach (var item in dataGridViewSetting.Exports) { - column.Cells["widthDataGridViewTextBoxColumn"].Value = item.Width; - column.Cells["visibleDataGridViewCheckBoxColumn"].Value = item.IsVisible; - column.Cells["printShow"].Value = item.IsPrint; - column.Cells["printWidth"].Value = item.PrintWidth; - column.Cells["PrintSize"].Value = item.PrintSize; + if (column.Cells[0].Value.ToString() == item.Name) + { + column.Cells["widthDataGridViewTextBoxColumn"].Value = item.Width; + column.Cells["visibleDataGridViewCheckBoxColumn"].Value = item.IsVisible; + column.Cells["printShow"].Value = item.IsPrint; + column.Cells["printWidth"].Value = item.PrintWidth; + column.Cells["PrintSize"].Value = item.PrintSize; + } } } } @@ -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.Value = JsonConvert.SerializeObject(dataGridViewSetting); + ExportConfig dgvSetting = CreateDataGridViewSetting(dataGridView2); + 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(); + dataGridViewSetting.Exports = new List(); 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; } diff --git a/AIMS/OperationAfter/frmExportConfig.designer.cs b/AIMS/OperationAfter/frmExportConfig.designer.cs index 9dab6e8..4c1f5b8 100644 --- a/AIMS/OperationAfter/frmExportConfig.designer.cs +++ b/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; - private System.Windows.Forms.NumericUpDown txtFontSize; + public DevComponents.DotNetBar.Controls.CheckBoxX cmbIsHD; + public System.Windows.Forms.NumericUpDown txtFontSize; private DevComponents.DotNetBar.LabelX labelX2; private System.Windows.Forms.DataGridViewTextBoxColumn dataPropertyNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn headerTextDataGridViewTextBoxColumn; diff --git a/AIMS/OperationAfter/frmOperationCharg3.cs b/AIMS/OperationAfter/frmOperationCharg3.cs index 8cfc5ee..6204650 100644 --- a/AIMS/OperationAfter/frmOperationCharg3.cs +++ b/AIMS/OperationAfter/frmOperationCharg3.cs @@ -125,7 +125,7 @@ namespace AIMS.OperationAfter.UI dataGridViewSetting = JsonConvert.DeserializeObject(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) { diff --git a/AIMS/OperationAfter/frmOperationManage.cs b/AIMS/OperationAfter/frmOperationManage.cs index 50116fd..8f70a82 100644 --- a/AIMS/OperationAfter/frmOperationManage.cs +++ b/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 list = new List(); @@ -89,6 +90,7 @@ namespace AIMS.OperationAfter.UI //this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged); btnFind_Click(null, null); + } /// @@ -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.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") { diff --git a/AIMS/OperationAfter/frmReportExport.cs b/AIMS/OperationAfter/frmReportExport.cs index 33e5d40..59e98cf 100644 --- a/AIMS/OperationAfter/frmReportExport.cs +++ b/AIMS/OperationAfter/frmReportExport.cs @@ -68,7 +68,7 @@ namespace AIMS dataGridViewSetting = JsonConvert.DeserializeObject(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) { diff --git a/AIMS/OperationFront/frmOperationApply.Designer.cs b/AIMS/OperationFront/frmOperationApply.Designer.cs index 5841a0e..cb999c6 100644 --- a/AIMS/OperationFront/frmOperationApply.Designer.cs +++ b/AIMS/OperationFront/frmOperationApply.Designer.cs @@ -141,7 +141,7 @@ this.CboOperationSite.Name = "CboOperationSite"; this.CboOperationSite.Size = new System.Drawing.Size(115, 25); this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.CboOperationSite.TabIndex = 502; + this.CboOperationSite.TabIndex = 502; // // labelSite // @@ -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 diff --git a/AIMS/OperationFront/frmOperationApply.cs b/AIMS/OperationFront/frmOperationApply.cs index 2febc55..f1aa145 100644 --- a/AIMS/OperationFront/frmOperationApply.cs +++ b/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; } } } @@ -229,8 +229,8 @@ namespace AIMS.OperationFront.UI } private void CboOperationSite_SelectedIndexChanged(object sender, EventArgs e) { - ControlExtension.SetOperationSite(CboOperationSite); - } - + ControlExtension.SetOperationSite(CboOperationSite); + btnFind_Click(null, null); + } } } diff --git a/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs b/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs index 3476da9..6844e9f 100644 --- a/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs +++ b/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); diff --git a/AIMS/OperationFront/frmOperationApplyDetail.cs b/AIMS/OperationFront/frmOperationApplyDetail.cs index 0381dce..a640770 100644 --- a/AIMS/OperationFront/frmOperationApplyDetail.cs +++ b/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) - { - MessageBox.Show("床位不能为空!"); - } + //else if (txtSickBed.Text.Trim().Length < 1) + //{ + // MessageBox.Show("床位不能为空!"); + //} else if (cboDepartment.Text.Trim().Length < 1) { MessageBox.Show("所在科室不能为空!"); diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 7a9a28a..e61de96 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/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"; @@ -2434,7 +2434,7 @@ namespace AIMS.OperationFront.UI this.CboOperationSite.Name = "CboOperationSite"; this.CboOperationSite.Size = new System.Drawing.Size(115, 25); this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.CboOperationSite.TabIndex = 505; + this.CboOperationSite.TabIndex = 505; // // labelSite // @@ -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); + } } } \ No newline at end of file diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.resx b/AIMS/OperationFront/frmOperationSchedulePlan.resx index 04416f1..bcf4445 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.resx +++ b/AIMS/OperationFront/frmOperationSchedulePlan.resx @@ -244,62 +244,65 @@ True - 245, 17 + 355, 17 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD4 - CAAAAk1TRnQBSQFMAgEBAgEABBQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEoAwABQAMA - ARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHAAQAB8AHK - AaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5AQABgAF8 - Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMAAWYDAAGZ - AwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFmAZkCAAFm - AcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHMAWYCAAHM - AZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEAATMBAAGZ - AQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEzAWYCAAEz - AWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZAWYBAAEz - ApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLMAQABMwHM - Af8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEAAWYBAAFm - AQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEAAWYBMwHM - AQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZAWYBAAFm - ApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/AQABZgH/ - AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEAAZkBAAGZ - AQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFmATMBAAGZ - ATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZAf8BAAGZ - AcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEzAQABmQHM - AWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEAAcwBAAHM - AQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHMAWYBMwEA - AZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHMApkBAAHM - AZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHMAf8BMwEA - AZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEAAcwBMwIA - Af8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHMAmYBAAH/ - AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZAcwBAAH/ - AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEzAQABzAH/ - AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFmAQABIQEA - AaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHwAfsB/wEA - AaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAASoLKTMAAioLUgEpMgABUgFR - AVkIUgFRAW4BSgIAASoLKSQAAlIEWQFYAVIBdAJzAnQBSgEAASoBWQtSASkiAAVGAUwBRgJ0AXkDegF5 - AXMBSgFSAlkIWAJSASoiAALjAxcB4wFMBZoBegF5AXQB6gFSAXoJWQFYAVIBKSIAAUYBFgTjAW8BmQGa - BJkBegF0AYwBUgF6CVkBWAJSASkiAAFMAhYB4wFGAXMEHAGZAhwBdAGnAVIBegpZAlIBKiIABEwCWQHP - AfMBtQHyAs8BtQHzAc8BUgF6C1kBWAEqIgABUgJ0AVICWQHPAd0BtQHyAvEBvAK1AVIBegVZBHoDWQEq - IQABUgSaAVIBWQGuAbUB8gO1AQkB8AEJAVICegNZBnoBWQEqIgABUgF1A3oBdQFLAQABzwG8AQkBzwHz - AfIB8QEJAXQDegNZAVIDdAJSIwABOAFZAlIBdQF6AgABzwLxAQkCtQHPAacBAAF0A3oBWQEqKQABWQHl - AaABmgF5AVICAAGnAs8DpwMAAf8CdAJSKgABUgKgAsMBdAIAAqc4AAJSPAABQgFNAT4HAAE+AwABKAMA - AUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAwL/BAABgAEBAv8EAAGAAQEBgAEHBAABgAEBAQABAwcA - AQMHAAEDBwABAQQAAYACAAEBBAABgAIAAQEEAAGAAgABAQcAAQMEAAEBAgABBwQAAQMBAAGBAf8EAAID - AYMB/wQAAQMBPwL/BAABzwP/BAAL + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+ + CAAAAk1TRnQBSQFMAgEBAgEAARwBFAEcARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAASoLKTMAAioLUgEp + MgABUgFRAVkIUgFRAW4BSgIAASoLKSQAAlIEWQFYAVIBdAJzAnQBSgEAASoBWQtSASkiAAVGAUwBRgJ0 + AXkDegF5AXMBSgFSAlkIWAJSASoiAALjAxcB4wFMBZoBegF5AXQB6gFSAXoJWQFYAVIBKSIAAUYBFgTj + AW8BmQGaBJkBegF0AYwBUgF6CVkBWAJSASkiAAFMAhYB4wFGAXMEHAGZAhwBdAGnAVIBegpZAlIBKiIA + BEwCWQHPAfMBtQHyAs8BtQHzAc8BUgF6C1kBWAEqIgABUgJ0AVICWQHPAd0BtQHyAvEBvAK1AVIBegVZ + BHoDWQEqIQABUgSaAVIBWQGuAbUB8gO1AQkB8AEJAVICegNZBnoBWQEqIgABUgF1A3oBdQFLAQABzwG8 + AQkBzwHzAfIB8QEJAXQDegNZAVIDdAJSIwABOAFZAlIBdQF6AgABzwLxAQkCtQHPAacBAAF0A3oBWQEq + KQABWQHlAaABmgF5AVICAAGnAs8DpwMAAf8CdAJSKgABUgKgAsMBdAIAAqc4AAJSPAABQgFNAT4HAAE+ + AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAwL/BAABgAEBAv8EAAGAAQEBgAEHBAABgAEB + AQABAwcAAQMHAAEDBwABAQQAAYACAAEBBAABgAIAAQEEAAGAAgABAQcAAQMEAAEBAgABBwQAAQMBAAGB + Af8EAAIDAYMB/wQAAQMBPwL/BAABzwP/BAAL - 144, 17 + 254, 17 + 127, 17 + + 17, 17 - 360, 17 + 470, 17 True diff --git a/AIMS/OremrUserControl/ControlExtension.cs b/AIMS/OremrUserControl/ControlExtension.cs index 43e369b..3af0cf1 100644 --- a/AIMS/OremrUserControl/ControlExtension.cs +++ b/AIMS/OremrUserControl/ControlExtension.cs @@ -336,7 +336,7 @@ namespace AIMS } } public static List 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 == "") { @@ -361,7 +365,7 @@ namespace AIMS else { SiteRooms = BOperationRoom.GetOperationRooms("IsValid=1 and Site='" + comboBoxEx.Text + "'"); - SiteRooms.Insert(0, new OperationRoom() { Id = -1, Name = "" }); + SiteRooms.Insert(0, new OperationRoom() { Id = -1, Name = "" }); } if (cboRoom != null) diff --git a/AIMS/OremrUserControl/ExportConfig.cs b/AIMS/OremrUserControl/ExportConfig.cs index 9c4b8b5..0a05be5 100644 --- a/AIMS/OremrUserControl/ExportConfig.cs +++ b/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 exports { get; set; } + public List Exports { get; set; } } public class ExportItem diff --git a/AIMSEntity/Extensions/SelectPatient.cs b/AIMSEntity/Extensions/SelectPatient.cs index 5ebef36..c9a47d5 100644 --- a/AIMSEntity/Extensions/SelectPatient.cs +++ b/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 " + - "FROM V_OperationFront of1 WHERE of1.State in('已审核','预排程','已排程','已访视') and of1.OrderOperationTime>='" + BeginDate + "' AND of1.OrderOperationTime<'" + BeginDate.AddDays(1) + "'"; + "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<'" + (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) diff --git a/AIMSEntity/Model/AutoGenerate/SysConfig.cs b/AIMSEntity/Model/AutoGenerate/SysConfig.cs index df9f70f..0a9ea88 100644 --- a/AIMSEntity/Model/AutoGenerate/SysConfig.cs +++ b/AIMSEntity/Model/AutoGenerate/SysConfig.cs @@ -45,7 +45,7 @@ namespace AIMSModel public string Value { get { return value; } - set { value = value; } + set { this.value = value; } } /// /// diff --git a/DataCollectorService/DataCollectorService.csproj b/DataCollectorService/DataCollectorService.csproj new file mode 100644 index 0000000..076fa4f --- /dev/null +++ b/DataCollectorService/DataCollectorService.csproj @@ -0,0 +1,55 @@ + + + + + Debug + AnyCPU + {A445F69B-9EA6-40F8-87EA-D524A40FB90B} + WinExe + DataCollectorService + DataCollectorService + v4.0 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + Component + + + Service1.cs + + + + + + \ No newline at end of file diff --git a/DataCollectorService/Program.cs b/DataCollectorService/Program.cs new file mode 100644 index 0000000..6c6a064 --- /dev/null +++ b/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 + { + /// + /// 应用程序的主入口点。 + /// + static void Main() + { + ServiceBase[] ServicesToRun; + ServicesToRun = new ServiceBase[] + { + new Service1() + }; + ServiceBase.Run(ServicesToRun); + } + } +} diff --git a/DataCollectorService/Properties/AssemblyInfo.cs b/DataCollectorService/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d1c7223 --- /dev/null +++ b/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")] diff --git a/DataCollectorService/Service1.Designer.cs b/DataCollectorService/Service1.Designer.cs new file mode 100644 index 0000000..a371bcb --- /dev/null +++ b/DataCollectorService/Service1.Designer.cs @@ -0,0 +1,37 @@ +namespace DataCollectorService +{ + partial class Service1 + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + this.ServiceName = "Service1"; + } + + #endregion + } +} diff --git a/DataCollectorService/Service1.cs b/DataCollectorService/Service1.cs new file mode 100644 index 0000000..4e19adc --- /dev/null +++ b/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() + { + } + } +} diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index d126233..4a88d2a 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/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 == "麻醉诱导用药") - { - myOpeRecord.AnesBeforListstr.Add(string.Format("{0}{1} {2} {3}{4}{5}", "", item.DrugName.Trim(), "", dose, "", item.DrugChannel == null ? "" : " " + item.DrugChannel.ToString())); - x++; - } + //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())); + // 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 _FactDrugList = myOpeRecord.FactDrugList.Where(s => IfInTimeExist(s.DrugBeginTime, s.End) == true).ToList(); - //存在氧气从第二行开始画 - if (_FactDrugList.Where(s => s.DrugName == "氧气" && s.GiveDrugType != "麻醉前用药" && s.GiveDrugType != "术后镇痛药" && s.GiveDrugType != "麻醉诱导用药").ToList().Count > 0) rowDrugsIndex = 1; + //存在氧气从第二行开始画 && s.GiveDrugType != "麻醉诱导用药" + 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(); //如果加药品ID相同并且加加药ID不同，则认为加了同一种加药 if (addDrug1.Equal(temp) && temp.ParentId == 0 && addDrug1.ParentId == 0 && addDrug1.ChildFactDrugList.Count == 0 && temp.ChildFactDrugList.Count == 0) diff --git a/DrawGraph/AreaManage/IconManage.cs b/DrawGraph/AreaManage/IconManage.cs index 5f9022e..b9e7c26 100644 --- a/DrawGraph/AreaManage/IconManage.cs +++ b/DrawGraph/AreaManage/IconManage.cs @@ -191,14 +191,15 @@ namespace DrawGraph TextPackObj packObj2 = template.GetPackObjectOTag("IconManage_TextPackObj_14_OperationRecord_AnalgesiaRecord_Extend2"); if (packObj2 != null) { - List AfterDrugsListstr = new List(); + List AfterDrugsListstr = new List(); + 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 PunctureAndIntubatios, TextPackObj remarkPpack, int remarkRowscount, float fontsize, int fontlength) + private void SetRemarkInfo(List 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,13 +252,13 @@ 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++; } } } - } + } private static void ListAddDrugs(List DrugListstr, FactDrug temp) { diff --git a/DrawGraph/AreaManage/OperationRecord.cs b/DrawGraph/AreaManage/OperationRecord.cs index 0c7f13f..aa8db79 100644 --- a/DrawGraph/AreaManage/OperationRecord.cs +++ b/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;