From 79a3cb8cddde0c67a47ca83037e5ee0e6f257df9 Mon Sep 17 00:00:00 2001 From: leomon Date: Wed, 10 May 2023 21:52:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E5=91=BD=E4=BD=93?= =?UTF-8?q?=E5=BE=81=E6=9C=89=E5=88=9B=E6=97=A0=E5=88=9B=E5=86=B2=E7=AA=81?= =?UTF-8?q?=20BMI=E6=B2=A1=E8=AE=A1=E7=AE=97=E9=BB=98=E8=AE=A4-=20?= =?UTF-8?q?=E9=BA=BB=E9=86=89=E6=95=B0=E6=8D=AE=E6=8C=89=E7=85=A710?= =?UTF-8?q?=E5=88=86=E9=92=9F=E9=97=B4=E9=9A=94=E6=8F=92=E5=85=A5=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E9=BA=BB=E9=86=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=20=E5=8F=8C=E5=87=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E5=85=B8=E5=80=BC=20=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E8=8D=AF=E6=98=BE=E7=A4=BA=E5=9C=A8=E4=B8=8B=E9=9D=A2?= =?UTF-8?q?=20=E6=88=96=E8=80=85=E7=94=A8=E8=8D=AF=E9=87=8C=E5=8A=A0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmAanesthesiaPainlessRecord.Designer.cs | 49 +- .../frmAanesthesiaPainlessRecord.cs | 26 +- .../frmAanesthesiaRecord.Designer.cs | 25 +- .../frmAanesthesiaRecord.cs | 20 +- .../frmAanesthesiaRecover.Designer.cs | 48 +- .../frmAanesthesiaRecover.cs | 19 +- .../frmFactDrugNew.Designer.cs | 658 +++++++++--------- AIMS/OperationAanesthesia/frmFactDrugNew.cs | 20 +- AIMS/OperationAanesthesia/frmFactDrugNew.resx | 8 +- AIMS/OperationAfter/frmExportConfig.cs | 7 +- AIMS/OperationAfter/frmOperationManage.cs | 10 +- AIMS/OremrUserControl/ExportConfig.cs | 2 +- AIMSEntity/BLL/Extension/BOperationRecord.cs | 14 +- AIMSEntity/DAL/AutoGenerate/DSysConfig.cs | 486 +++++++------ AIMSEntity/DAL/Extension/DOperationRecord.cs | 7 +- AIMSEntity/Model/AutoGenerate/SysConfig.cs | 163 +++-- AIMSEntity/ObjectQuery/SysConfigMap.cs | 5 + DrawGraph/AreaManage/BaseInfoBottomManage.cs | 17 +- DrawGraph/AreaManage/BaseInfoTopManage.cs | 22 +- DrawGraph/AreaManage/DrugsManage.cs | 20 +- DrawGraph/AreaManage/SapManage.cs | 2 +- 21 files changed, 929 insertions(+), 699 deletions(-) diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs index 27da14f..52c647c 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs @@ -95,6 +95,7 @@ this.picOpeBegin = new System.Windows.Forms.PictureBox(); this.button2 = new System.Windows.Forms.Button(); this.panel16 = new System.Windows.Forms.Panel(); + this.cmbBGType = new System.Windows.Forms.ComboBox(); this.txtBG = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.picBG = new System.Windows.Forms.PictureBox(); this.panel12 = new System.Windows.Forms.Panel(); @@ -119,7 +120,7 @@ this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.cmbBGType = new System.Windows.Forms.ComboBox(); + this.PanelSave = new System.Windows.Forms.Panel(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -862,6 +863,7 @@ // // panel21 // + this.panel21.Controls.Add(this.PanelSave); this.panel21.Controls.Add(this.panel17); this.panel21.Controls.Add(this.btnNextPage); this.panel21.Controls.Add(this.panel18); @@ -870,9 +872,9 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1035, 0); + this.panel21.Location = new System.Drawing.Point(989, 0); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(354, 40); + this.panel21.Size = new System.Drawing.Size(400, 40); this.panel21.TabIndex = 10; // // panel17 @@ -932,7 +934,7 @@ this.plPrintBrowse.BackgroundImage = global::AIMS.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; - this.plPrintBrowse.Location = new System.Drawing.Point(206, 4); + this.plPrintBrowse.Location = new System.Drawing.Point(256, 4); this.plPrintBrowse.Name = "plPrintBrowse"; this.plPrintBrowse.Size = new System.Drawing.Size(28, 28); this.plPrintBrowse.TabIndex = 4; @@ -944,7 +946,7 @@ this.plPrint.BackgroundImage = global::AIMS.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; - this.plPrint.Location = new System.Drawing.Point(165, 4); + this.plPrint.Location = new System.Drawing.Point(216, 4); this.plPrint.Name = "plPrint"; this.plPrint.Size = new System.Drawing.Size(28, 28); this.plPrint.TabIndex = 3; @@ -956,7 +958,7 @@ this.plRefresh.BackgroundImage = global::AIMS.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; - this.plRefresh.Location = new System.Drawing.Point(247, 4); + this.plRefresh.Location = new System.Drawing.Point(296, 4); this.plRefresh.Name = "plRefresh"; this.plRefresh.Size = new System.Drawing.Size(28, 28); this.plRefresh.TabIndex = 2; @@ -1218,6 +1220,19 @@ this.panel16.Size = new System.Drawing.Size(150, 53); this.panel16.TabIndex = 56; // + // cmbBGType + // + this.cmbBGType.Font = new System.Drawing.Font("微软雅黑", 9F); + this.cmbBGType.FormattingEnabled = true; + this.cmbBGType.Items.AddRange(new object[] { + "拔管", + "拔喉罩"}); + this.cmbBGType.Location = new System.Drawing.Point(42, 0); + this.cmbBGType.Name = "cmbBGType"; + this.cmbBGType.Size = new System.Drawing.Size(101, 25); + this.cmbBGType.TabIndex = 48; + this.cmbBGType.Text = "拔管"; + // // txtBG // this.txtBG.AutoAdvance = true; @@ -1752,18 +1767,17 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // cmbBGType + // PanelSave // - this.cmbBGType.Font = new System.Drawing.Font("微软雅黑", 9F); - this.cmbBGType.FormattingEnabled = true; - this.cmbBGType.Items.AddRange(new object[] { - "拔管", - "拔喉罩"}); - this.cmbBGType.Location = new System.Drawing.Point(42, 0); - this.cmbBGType.Name = "cmbBGType"; - this.cmbBGType.Size = new System.Drawing.Size(101, 25); - this.cmbBGType.TabIndex = 48; - this.cmbBGType.Text = "拔管"; + this.PanelSave.BackgroundImage = global::AIMS.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; + this.PanelSave.Location = new System.Drawing.Point(176, 4); + this.PanelSave.Name = "PanelSave"; + this.PanelSave.Size = new System.Drawing.Size(28, 28); + this.PanelSave.TabIndex = 10; + this.toolTip1.SetToolTip(this.PanelSave, "保存"); + this.PanelSave.Click += new System.EventHandler(this.PanelSave_Click); // // frmAanesthesiaPainlessRecord // @@ -1908,5 +1922,6 @@ private DrawGraph.ZedGraphControl zgcAnaesRecord; private System.Windows.Forms.Button button6; private System.Windows.Forms.ComboBox cmbBGType; + private System.Windows.Forms.Panel PanelSave; } } \ No newline at end of file diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs index 440fc2d..0bd9d1c 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs @@ -875,8 +875,8 @@ namespace AIMS.OperationAanesthesia } private void plRefresh_Click(object sender, EventArgs e) { - if (PatientId == 0) return; - plRefresh.Select(); + if (PatientId == 0) return; + plRefresh.Select(); //刷新到当前页 ReviewEvent(); } @@ -884,7 +884,7 @@ namespace AIMS.OperationAanesthesia { if (PatientId == 0) return; if (_record.pageCount == 1) return; - btnUpPage.Select(); + btnUpPage.Select(); SetUpPageTime(); ReviewEvent(); } @@ -1099,7 +1099,7 @@ namespace AIMS.OperationAanesthesia frmFact.factDrugs = factDrugs; frmFact.zgcAnaesRecord = zgcAnaesRecord; frmFact.DrugTypeId = RecoverId; // 事件类型 1 麻醉单事件 2 麻醉恢复单 - frmFact.DrugsParam += frmFactEventsNew_EventsParam; + frmFact.DrugsParam += frmFactEventsNew_EventsParam; frmFact.ShowDialog(); } @@ -1126,7 +1126,7 @@ namespace AIMS.OperationAanesthesia frmFactDrug._record = _record; frmFactDrug.zgcAnaesRecord = zgcAnaesRecord; frmFactDrug.DrugTypeId = RecoverId; // 事件类型 1 麻醉单事件 2 麻醉恢复单 - frmFactDrug.DrugsParam += frmFactEventsNew_EventsParam; + frmFactDrug.DrugsParam += frmFactEventsNew_EventsParam; frmFactDrug.ShowDialog(); } else @@ -1134,7 +1134,7 @@ namespace AIMS.OperationAanesthesia MessageBox.Show("请选择患者"); } } - + private void btnAddEvents_Click(object sender, EventArgs e) { if (PatientId != 0) @@ -2265,12 +2265,24 @@ namespace AIMS.OperationAanesthesia //_record.AnalgesiaRecord.PainScore = "10"; _record.AnalgesiaRecord.HighFallRisk = "无"; _record.AnalgesiaRecord.StewardScoreDischarge = "";//评估者麻醉师 - _record.AnalgesiaRecord. AssessmentTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm"); + _record.AnalgesiaRecord.AssessmentTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm"); BOperationRecordAnalgesia.Update(_record.AnalgesiaRecord); ReviewEvent(); } } } + private void PanelSave_Click(object sender, EventArgs e) + { + PanelSave.Select(); + if (_record != null) + { + BOperationRecord.Update(_record); + if (_record.AnalgesiaRecord != null) + BOperationRecordAnalgesia.Update(_record.AnalgesiaRecord); + new frmMessageBox().Show(); + ReviewEvent(); + } + } #endregion } diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index 65a1716..e8be1b2 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -86,6 +86,7 @@ this.spTabBM = new DevComponents.DotNetBar.SuperTabItem(); this.panel7 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel(); + this.PanelSave = new System.Windows.Forms.Panel(); this.panel17 = new System.Windows.Forms.Panel(); this.btnNextPage = new System.Windows.Forms.Panel(); this.panel18 = new System.Windows.Forms.Panel(); @@ -1083,6 +1084,7 @@ // // panel21 // + this.panel21.Controls.Add(this.PanelSave); this.panel21.Controls.Add(this.panel17); this.panel21.Controls.Add(this.btnNextPage); this.panel21.Controls.Add(this.panel18); @@ -1091,11 +1093,23 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1035, 0); + this.panel21.Location = new System.Drawing.Point(989, 0); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(354, 40); + this.panel21.Size = new System.Drawing.Size(400, 40); this.panel21.TabIndex = 10; // + // PanelSave + // + this.PanelSave.BackgroundImage = global::AIMS.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; + this.PanelSave.Location = new System.Drawing.Point(174, 4); + this.PanelSave.Name = "PanelSave"; + this.PanelSave.Size = new System.Drawing.Size(28, 28); + this.PanelSave.TabIndex = 9; + this.toolTip1.SetToolTip(this.PanelSave, "保存"); + this.PanelSave.Click += new System.EventHandler(this.PanelSave_Click); + // // panel17 // this.panel17.BackgroundImage = global::AIMS.Properties.Resources.图标_末尾页; @@ -1153,7 +1167,7 @@ this.plPrintBrowse.BackgroundImage = global::AIMS.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; - this.plPrintBrowse.Location = new System.Drawing.Point(206, 4); + this.plPrintBrowse.Location = new System.Drawing.Point(264, 4); this.plPrintBrowse.Name = "plPrintBrowse"; this.plPrintBrowse.Size = new System.Drawing.Size(28, 28); this.plPrintBrowse.TabIndex = 4; @@ -1165,7 +1179,7 @@ this.plPrint.BackgroundImage = global::AIMS.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; - this.plPrint.Location = new System.Drawing.Point(165, 4); + this.plPrint.Location = new System.Drawing.Point(219, 4); this.plPrint.Name = "plPrint"; this.plPrint.Size = new System.Drawing.Size(28, 28); this.plPrint.TabIndex = 3; @@ -1177,7 +1191,7 @@ this.plRefresh.BackgroundImage = global::AIMS.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; - this.plRefresh.Location = new System.Drawing.Point(247, 4); + this.plRefresh.Location = new System.Drawing.Point(309, 4); this.plRefresh.Name = "plRefresh"; this.plRefresh.Size = new System.Drawing.Size(28, 28); this.plRefresh.TabIndex = 2; @@ -2148,5 +2162,6 @@ private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Button button10; private System.Windows.Forms.ComboBox cmbBGType; + private System.Windows.Forms.Panel PanelSave; } } \ No newline at end of file diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index d640171..8009fcd 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -1110,6 +1110,7 @@ namespace AIMS.OperationAanesthesia btnCancelOperation.Enabled = false; btnCancelIn.Enabled = false; LastMonitorDataTime = null; + LastAnesMonitorDataTime = null; ClearTimeText(); if (templateManage != null) { @@ -1419,6 +1420,7 @@ namespace AIMS.OperationAanesthesia #region 采集程序 public DateTime? LastMonitorDataTime = null; + public DateTime? LastAnesMonitorDataTime = null; private void timerGetCollectorData_Tick() { if (State == AIMSExtension.EditState.BROWSE || _record.StateName != "手术中" || NowRoom == null || isReadOnly == true) return; @@ -1466,6 +1468,9 @@ namespace AIMS.OperationAanesthesia string value = addPP.Enname; if (addPP.IsValid == false) continue; if (value == null || value == "") continue; + if (_record.AnesthesiaBeginTime != null && InsertTime < _record.AnesthesiaBeginTime) continue; + if (LastAnesMonitorDataTime != null && dtTime < LastAnesMonitorDataTime.Value.AddMinutes(9)) continue; + LastAnesMonitorDataTime = dtTime; int minMinutes = -5; DataTable dtPhysioData = BOperationRecord.getPhysioDataByTimeName(NowRoom.Ip, value, InsertTime.AddMinutes(minMinutes), InsertTime.AddSeconds(1)); @@ -1691,6 +1696,7 @@ namespace AIMS.OperationAanesthesia if (timerGetTextCollectorData != null) { LastMonitorDataTime = null; + LastAnesMonitorDataTime = null; timerGetTextCollectorData.Enabled = false; timerGetTextCollectorData.Stop(); } @@ -2428,7 +2434,19 @@ namespace AIMS.OperationAanesthesia ReviewEvent(); } } - #endregion + private void PanelSave_Click(object sender, EventArgs e) + { + PanelSave.Select(); + if (_record != null) + { + BOperationRecord.Update(_record); + if (_record.OpeRecordInfo != null) + BOperationRecordInfo.Update(_record.OpeRecordInfo); + new frmMessageBox().Show(); + ReviewEvent(); + } + } + #endregion } } diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs index ea7071d..756c959 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs @@ -89,6 +89,7 @@ this.picOutRoom = new System.Windows.Forms.PictureBox(); this.button5 = new System.Windows.Forms.Button(); this.panel16 = new System.Windows.Forms.Panel(); + this.cmbBGType = new System.Windows.Forms.ComboBox(); this.txtBG = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.picBG = new System.Windows.Forms.PictureBox(); this.panel12 = new System.Windows.Forms.Panel(); @@ -100,7 +101,7 @@ this.picInRoom = new System.Windows.Forms.PictureBox(); this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.cmbBGType = new System.Windows.Forms.ComboBox(); + this.PanelSave = new System.Windows.Forms.Panel(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -786,6 +787,7 @@ // // panel21 // + this.panel21.Controls.Add(this.PanelSave); this.panel21.Controls.Add(this.panel17); this.panel21.Controls.Add(this.btnNextPage); this.panel21.Controls.Add(this.plPrintBrowse); @@ -794,9 +796,9 @@ this.panel21.Controls.Add(this.btnUpPage); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(697, 0); + this.panel21.Location = new System.Drawing.Point(638, 0); this.panel21.Name = "panel21"; - this.panel21.Size = new System.Drawing.Size(341, 40); + this.panel21.Size = new System.Drawing.Size(400, 40); this.panel21.TabIndex = 10; // // panel17 @@ -828,7 +830,7 @@ this.plPrintBrowse.BackgroundImage = global::AIMS.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; - this.plPrintBrowse.Location = new System.Drawing.Point(208, 4); + this.plPrintBrowse.Location = new System.Drawing.Point(254, 4); this.plPrintBrowse.Name = "plPrintBrowse"; this.plPrintBrowse.Size = new System.Drawing.Size(28, 28); this.plPrintBrowse.TabIndex = 4; @@ -839,7 +841,7 @@ this.plPrint.BackgroundImage = global::AIMS.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; - this.plPrint.Location = new System.Drawing.Point(167, 4); + this.plPrint.Location = new System.Drawing.Point(214, 4); this.plPrint.Name = "plPrint"; this.plPrint.Size = new System.Drawing.Size(28, 28); this.plPrint.TabIndex = 3; @@ -874,7 +876,7 @@ this.plRefresh.BackgroundImage = global::AIMS.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; - this.plRefresh.Location = new System.Drawing.Point(249, 4); + this.plRefresh.Location = new System.Drawing.Point(294, 4); this.plRefresh.Name = "plRefresh"; this.plRefresh.Size = new System.Drawing.Size(28, 28); this.plRefresh.TabIndex = 2; @@ -1038,6 +1040,19 @@ this.panel16.Size = new System.Drawing.Size(150, 53); this.panel16.TabIndex = 51; // + // cmbBGType + // + this.cmbBGType.Font = new System.Drawing.Font("微软雅黑", 9F); + this.cmbBGType.FormattingEnabled = true; + this.cmbBGType.Items.AddRange(new object[] { + "拔管", + "拔喉罩"}); + this.cmbBGType.Location = new System.Drawing.Point(40, 0); + this.cmbBGType.Name = "cmbBGType"; + this.cmbBGType.Size = new System.Drawing.Size(101, 25); + this.cmbBGType.TabIndex = 48; + this.cmbBGType.Text = "拔管"; + // // txtBG // this.txtBG.AutoAdvance = true; @@ -1297,18 +1312,16 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // cmbBGType + // PanelSave // - this.cmbBGType.Font = new System.Drawing.Font("微软雅黑", 9F); - this.cmbBGType.FormattingEnabled = true; - this.cmbBGType.Items.AddRange(new object[] { - "拔管", - "拔喉罩"}); - this.cmbBGType.Location = new System.Drawing.Point(40, 0); - this.cmbBGType.Name = "cmbBGType"; - this.cmbBGType.Size = new System.Drawing.Size(101, 25); - this.cmbBGType.TabIndex = 48; - this.cmbBGType.Text = "拔管"; + this.PanelSave.BackgroundImage = global::AIMS.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; + this.PanelSave.Location = new System.Drawing.Point(174, 4); + this.PanelSave.Name = "PanelSave"; + this.PanelSave.Size = new System.Drawing.Size(28, 28); + this.PanelSave.TabIndex = 10; + this.PanelSave.Paint += new System.Windows.Forms.PaintEventHandler(this.PanelSave_Paint); // // frmAanesthesiaRecover // @@ -1422,5 +1435,6 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox cmbBGType; + private System.Windows.Forms.Panel PanelSave; } } \ No newline at end of file diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs index 134a640..dde6f47 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs @@ -694,7 +694,7 @@ namespace AIMS.OperationAanesthesia _record.OperationApplyId = ApplyId; _record.PatientId = PatientId; _record.RecoverId = RecoverId; - _record.Id = BOperationRecord.AddTitleTime2(PatientId, ApplyId, RecoverId, 3, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd HH:mm:00")), NowRoom.Id.Value); + _record.Id = BOperationRecord.AddTitleTime2(PatientId, ApplyId, RecoverId, 3, NowRoom.Id.Value); HelperDB.DbHelperSQL.CommitTrans(); //_record.currentPage = 1; @@ -1662,6 +1662,23 @@ namespace AIMS.OperationAanesthesia frmAnasRecord.Show(); } } + private void PanelSave_Paint(object sender, PaintEventArgs e) + { + PanelSave.Select(); + if (_record != null) + { + BOperationRecord.Update(_record); + if (_record.OpeRecordInfo != null) + BOperationRecordInfo.Update(_record.OpeRecordInfo); + if (_record.OpeRecoverInInfo != null) + BOperationRecoverInInfo.Update(_record.OpeRecoverInInfo); + if (_record.OpeRecoverOutInfo != null) + BOperationRecoverOutInfo.Update(_record.OpeRecoverOutInfo); + ReviewEvent(); + new frmMessageBox().Show(); + } + } #endregion + } } diff --git a/AIMS/OperationAanesthesia/frmFactDrugNew.Designer.cs b/AIMS/OperationAanesthesia/frmFactDrugNew.Designer.cs index fcc6910..347be6b 100644 --- a/AIMS/OperationAanesthesia/frmFactDrugNew.Designer.cs +++ b/AIMS/OperationAanesthesia/frmFactDrugNew.Designer.cs @@ -29,11 +29,6 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -44,6 +39,10 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -53,6 +52,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmFactDrugNew)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel(); this.tabDrugs = new DevComponents.DotNetBar.SuperTabControl(); @@ -100,24 +100,6 @@ this.P3 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel5 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dgvDrugsSZ = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewComboEditBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewComboBoxColumn1 = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewComboBoxColumn2 = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewComboBoxColumn3 = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewComboBoxColumn4 = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.dataGridViewComboBoxColumn23 = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.dataGridViewComboBoxColumn24 = new System.Windows.Forms.DataGridViewComboBoxColumn(); - this.dataGridViewDateTimeInputColumn3 = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewDateTimeInputColumn4 = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); - this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.P2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel4 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dgvDrugsSQ = new DevComponents.DotNetBar.Controls.DataGridViewX(); @@ -169,6 +151,24 @@ this.dgvDosage = new System.Windows.Forms.DataGridView(); this.Dosage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewComboEditBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewComboBoxColumn1 = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewComboBoxColumn2 = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewComboBoxColumn3 = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewComboBoxColumn4 = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.dataGridViewComboBoxColumn23 = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.dataGridViewComboBoxColumn24 = new System.Windows.Forms.DataGridViewComboBoxColumn(); + this.dataGridViewDateTimeInputColumn3 = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); + this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewDateTimeInputColumn4 = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tabDrugs)).BeginInit(); @@ -228,9 +228,9 @@ this.tabDrugs.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.tabDrugs.ControlBox.MenuBox, this.tabDrugs.ControlBox.CloseBox}); + this.tabDrugs.Controls.Add(this.superTabControlPanel5); this.tabDrugs.Controls.Add(this.superTabControlPanel3); this.tabDrugs.Controls.Add(this.superTabControlPanel6); - this.tabDrugs.Controls.Add(this.superTabControlPanel5); this.tabDrugs.Controls.Add(this.superTabControlPanel4); this.tabDrugs.Controls.Add(this.superTabControlPanel1); this.tabDrugs.Controls.Add(this.superTabControlPanel2); @@ -267,18 +267,18 @@ this.dgvDrugsYD.AllowUserToAddRows = false; this.dgvDrugsYD.AllowUserToResizeColumns = false; this.dgvDrugsYD.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream; - this.dgvDrugsYD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.MintCream; + this.dgvDrugsYD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvDrugsYD.BackgroundColor = System.Drawing.Color.White; this.dgvDrugsYD.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugsYD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugsYD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dgvDrugsYD.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvDrugsYD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewImageColumn3, @@ -299,14 +299,14 @@ this.dataGridViewTextBoxColumn24, this.dataGridViewDateTimeInputColumn8, this.dataGridViewComboBoxColumn15}); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvDrugsYD.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvDrugsYD.DefaultCellStyle = dataGridViewCellStyle9; this.dgvDrugsYD.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvDrugsYD.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.dgvDrugsYD.EnableHeadersVisualStyles = false; @@ -315,14 +315,14 @@ this.dgvDrugsYD.Margin = new System.Windows.Forms.Padding(0); this.dgvDrugsYD.MultiSelect = false; this.dgvDrugsYD.Name = "dgvDrugsYD"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugsYD.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugsYD.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvDrugsYD.RowHeadersVisible = false; this.dgvDrugsYD.RowTemplate.Height = 25; this.dgvDrugsYD.ShowCellErrors = false; @@ -342,8 +342,8 @@ // // dataGridViewTextBoxColumn17 // - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Red; - this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Red; + this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn17.HeaderText = "组"; this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; this.dataGridViewTextBoxColumn17.Width = 30; @@ -562,18 +562,18 @@ this.dgvDrugsSH.AllowUserToAddRows = false; this.dgvDrugsSH.AllowUserToResizeColumns = false; this.dgvDrugsSH.AllowUserToResizeRows = false; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.MintCream; - this.dgvDrugsSH.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.MintCream; + this.dgvDrugsSH.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; this.dgvDrugsSH.BackgroundColor = System.Drawing.Color.White; this.dgvDrugsSH.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugsSH.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugsSH.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dgvDrugsSH.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvDrugsSH.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewImageColumn2, @@ -594,14 +594,14 @@ this.dataGridViewTextBoxColumn15, this.dataGridViewDateTimeInputColumn6, this.dataGridViewTextBoxColumn16}); - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvDrugsSH.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvDrugsSH.DefaultCellStyle = dataGridViewCellStyle14; this.dgvDrugsSH.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvDrugsSH.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.dgvDrugsSH.EnableHeadersVisualStyles = false; @@ -610,14 +610,14 @@ this.dgvDrugsSH.Margin = new System.Windows.Forms.Padding(0); this.dgvDrugsSH.MultiSelect = false; this.dgvDrugsSH.Name = "dgvDrugsSH"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugsSH.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugsSH.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dgvDrugsSH.RowHeadersVisible = false; this.dgvDrugsSH.RowTemplate.Height = 25; this.dgvDrugsSH.ShowCellErrors = false; @@ -637,8 +637,8 @@ // // dataGridViewTextBoxColumn9 // - dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Red; - this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Red; + this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle13; this.dataGridViewTextBoxColumn9.HeaderText = "组"; this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; this.dataGridViewTextBoxColumn9.Width = 30; @@ -857,18 +857,18 @@ this.dgvDrugsSZ.AllowUserToAddRows = false; this.dgvDrugsSZ.AllowUserToResizeColumns = false; this.dgvDrugsSZ.AllowUserToResizeRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.MintCream; - this.dgvDrugsSZ.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream; + this.dgvDrugsSZ.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvDrugsSZ.BackgroundColor = System.Drawing.Color.White; this.dgvDrugsSZ.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugsSZ.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugsSZ.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvDrugsSZ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvDrugsSZ.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewImageColumn1, @@ -889,14 +889,14 @@ this.dataGridViewTextBoxColumn7, this.dataGridViewDateTimeInputColumn4, this.dataGridViewTextBoxColumn8}); - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvDrugsSZ.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvDrugsSZ.DefaultCellStyle = dataGridViewCellStyle4; this.dgvDrugsSZ.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvDrugsSZ.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.dgvDrugsSZ.EnableHeadersVisualStyles = false; @@ -905,14 +905,14 @@ this.dgvDrugsSZ.Margin = new System.Windows.Forms.Padding(0); this.dgvDrugsSZ.MultiSelect = false; this.dgvDrugsSZ.Name = "dgvDrugsSZ"; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugsSZ.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugsSZ.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dgvDrugsSZ.RowHeadersVisible = false; this.dgvDrugsSZ.RowTemplate.Height = 25; this.dgvDrugsSZ.ShowCellErrors = false; @@ -921,214 +921,6 @@ this.dgvDrugsSZ.TabIndex = 16; this.dgvDrugsSZ.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dgvDrugs_DataError); // - // dataGridViewImageColumn1 - // - this.dataGridViewImageColumn1.HeaderText = " "; - this.dataGridViewImageColumn1.Image = global::AIMS.Properties.Resources.SYSCRL; - this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; - this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; - this.dataGridViewImageColumn1.Width = 30; - // - // dataGridViewTextBoxColumn1 - // - dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Red; - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle13; - this.dataGridViewTextBoxColumn1.HeaderText = "组"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.Width = 30; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.HeaderText = "类型"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.Visible = false; - this.dataGridViewTextBoxColumn2.Width = 60; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dataGridViewTextBoxColumn3.HeaderText = "名称"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; - // - // dataGridViewComboEditBoxColumn2 - // - this.dataGridViewComboEditBoxColumn2.HeaderText = "备注"; - this.dataGridViewComboEditBoxColumn2.Name = "dataGridViewComboEditBoxColumn2"; - this.dataGridViewComboEditBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; - // - // dataGridViewComboBoxColumn1 - // - this.dataGridViewComboBoxColumn1.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewComboBoxColumn1.HeaderText = "途径"; - this.dataGridViewComboBoxColumn1.Name = "dataGridViewComboBoxColumn1"; - this.dataGridViewComboBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewComboBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewComboBoxColumn1.Width = 85; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.HeaderText = "浓度"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn4.Width = 45; - // - // dataGridViewComboBoxColumn2 - // - this.dataGridViewComboBoxColumn2.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewComboBoxColumn2.HeaderText = "浓度单位"; - this.dataGridViewComboBoxColumn2.Name = "dataGridViewComboBoxColumn2"; - this.dataGridViewComboBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewComboBoxColumn2.Width = 75; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.HeaderText = "速度"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.Width = 45; - // - // dataGridViewComboBoxColumn3 - // - this.dataGridViewComboBoxColumn3.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewComboBoxColumn3.HeaderText = "速度单位"; - this.dataGridViewComboBoxColumn3.Name = "dataGridViewComboBoxColumn3"; - this.dataGridViewComboBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewComboBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewComboBoxColumn3.Width = 85; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.HeaderText = "用量"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn6.Width = 60; - // - // dataGridViewComboBoxColumn4 - // - this.dataGridViewComboBoxColumn4.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewComboBoxColumn4.HeaderText = "单位"; - this.dataGridViewComboBoxColumn4.Name = "dataGridViewComboBoxColumn4"; - this.dataGridViewComboBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewComboBoxColumn4.Width = 60; - // - // dataGridViewComboBoxColumn23 - // - this.dataGridViewComboBoxColumn23.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewComboBoxColumn23.HeaderText = "血型"; - this.dataGridViewComboBoxColumn23.Name = "dataGridViewComboBoxColumn23"; - this.dataGridViewComboBoxColumn23.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewComboBoxColumn23.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewComboBoxColumn23.Width = 45; - // - // dataGridViewComboBoxColumn24 - // - this.dataGridViewComboBoxColumn24.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewComboBoxColumn24.HeaderText = "加药方式"; - this.dataGridViewComboBoxColumn24.Name = "dataGridViewComboBoxColumn24"; - this.dataGridViewComboBoxColumn24.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewComboBoxColumn24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewComboBoxColumn24.Visible = false; - this.dataGridViewComboBoxColumn24.Width = 80; - // - // dataGridViewDateTimeInputColumn3 - // - this.dataGridViewDateTimeInputColumn3.AutoAdvance = true; - // - // - // - this.dataGridViewDateTimeInputColumn3.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.dataGridViewDateTimeInputColumn3.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; - this.dataGridViewDateTimeInputColumn3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn3.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; - this.dataGridViewDateTimeInputColumn3.ButtonDropDown.Visible = true; - this.dataGridViewDateTimeInputColumn3.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; - this.dataGridViewDateTimeInputColumn3.HeaderText = "开始时间"; - this.dataGridViewDateTimeInputColumn3.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Center; - // - // - // - // - // - // - this.dataGridViewDateTimeInputColumn3.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn3.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - // - // - // - this.dataGridViewDateTimeInputColumn3.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn3.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); - this.dataGridViewDateTimeInputColumn3.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; - // - // - // - this.dataGridViewDateTimeInputColumn3.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn3.MonthCalendar.Visible = false; - this.dataGridViewDateTimeInputColumn3.Name = "dataGridViewDateTimeInputColumn3"; - this.dataGridViewDateTimeInputColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewDateTimeInputColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewDateTimeInputColumn3.Width = 80; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.HeaderText = "持续"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.Width = 45; - // - // dataGridViewDateTimeInputColumn4 - // - this.dataGridViewDateTimeInputColumn4.AutoAdvance = true; - // - // - // - this.dataGridViewDateTimeInputColumn4.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.dataGridViewDateTimeInputColumn4.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; - this.dataGridViewDateTimeInputColumn4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn4.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; - this.dataGridViewDateTimeInputColumn4.ButtonDropDown.Visible = true; - this.dataGridViewDateTimeInputColumn4.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; - this.dataGridViewDateTimeInputColumn4.HeaderText = "结束时间"; - this.dataGridViewDateTimeInputColumn4.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; - // - // - // - // - // - // - this.dataGridViewDateTimeInputColumn4.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn4.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - // - // - // - this.dataGridViewDateTimeInputColumn4.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn4.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); - this.dataGridViewDateTimeInputColumn4.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; - // - // - // - this.dataGridViewDateTimeInputColumn4.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewDateTimeInputColumn4.MonthCalendar.Visible = false; - this.dataGridViewDateTimeInputColumn4.Name = "dataGridViewDateTimeInputColumn4"; - this.dataGridViewDateTimeInputColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewDateTimeInputColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewDateTimeInputColumn4.Width = 80; - // - // dataGridViewTextBoxColumn8 - // - this.dataGridViewTextBoxColumn8.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; - this.dataGridViewTextBoxColumn8.HeaderText = "通路"; - this.dataGridViewTextBoxColumn8.Items.AddRange(new object[] { - "", - "1", - "2", - "3", - "4"}); - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewTextBoxColumn8.Width = 50; - // // P2 // this.P2.AttachedControl = this.superTabControlPanel5; @@ -1752,6 +1544,208 @@ this.imageList1.Images.SetKeyName(0, "插入列.png"); this.imageList1.Images.SetKeyName(1, "未插入列 .png"); // + // dataGridViewImageColumn1 + // + this.dataGridViewImageColumn1.HeaderText = " "; + this.dataGridViewImageColumn1.Image = global::AIMS.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; + this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; + this.dataGridViewImageColumn1.Width = 30; + // + // dataGridViewTextBoxColumn1 + // + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Red; + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewTextBoxColumn1.HeaderText = "组"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.Width = 30; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.HeaderText = "类型"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.Visible = false; + this.dataGridViewTextBoxColumn2.Width = 60; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn3.HeaderText = "名称"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; + // + // dataGridViewComboEditBoxColumn2 + // + this.dataGridViewComboEditBoxColumn2.HeaderText = "备注"; + this.dataGridViewComboEditBoxColumn2.Name = "dataGridViewComboEditBoxColumn2"; + this.dataGridViewComboEditBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; + // + // dataGridViewComboBoxColumn1 + // + this.dataGridViewComboBoxColumn1.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewComboBoxColumn1.HeaderText = "途径"; + this.dataGridViewComboBoxColumn1.Name = "dataGridViewComboBoxColumn1"; + this.dataGridViewComboBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewComboBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewComboBoxColumn1.Width = 85; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.HeaderText = "浓度"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn4.Width = 45; + // + // dataGridViewComboBoxColumn2 + // + this.dataGridViewComboBoxColumn2.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewComboBoxColumn2.HeaderText = "浓度单位"; + this.dataGridViewComboBoxColumn2.Name = "dataGridViewComboBoxColumn2"; + this.dataGridViewComboBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewComboBoxColumn2.Width = 75; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.HeaderText = "速度"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.Width = 45; + // + // dataGridViewComboBoxColumn3 + // + this.dataGridViewComboBoxColumn3.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewComboBoxColumn3.HeaderText = "速度单位"; + this.dataGridViewComboBoxColumn3.Name = "dataGridViewComboBoxColumn3"; + this.dataGridViewComboBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewComboBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewComboBoxColumn3.Width = 85; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.HeaderText = "用量"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewTextBoxColumn6.Width = 60; + // + // dataGridViewComboBoxColumn4 + // + this.dataGridViewComboBoxColumn4.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewComboBoxColumn4.HeaderText = "单位"; + this.dataGridViewComboBoxColumn4.Name = "dataGridViewComboBoxColumn4"; + this.dataGridViewComboBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewComboBoxColumn4.Width = 60; + // + // dataGridViewComboBoxColumn23 + // + this.dataGridViewComboBoxColumn23.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewComboBoxColumn23.HeaderText = "血型"; + this.dataGridViewComboBoxColumn23.Name = "dataGridViewComboBoxColumn23"; + this.dataGridViewComboBoxColumn23.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewComboBoxColumn23.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewComboBoxColumn23.Width = 45; + // + // dataGridViewComboBoxColumn24 + // + this.dataGridViewComboBoxColumn24.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewComboBoxColumn24.HeaderText = "加药方式"; + this.dataGridViewComboBoxColumn24.Name = "dataGridViewComboBoxColumn24"; + this.dataGridViewComboBoxColumn24.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewComboBoxColumn24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewComboBoxColumn24.Visible = false; + this.dataGridViewComboBoxColumn24.Width = 80; + // + // dataGridViewDateTimeInputColumn3 + // + this.dataGridViewDateTimeInputColumn3.AutoAdvance = true; + // + // + // + this.dataGridViewDateTimeInputColumn3.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; + this.dataGridViewDateTimeInputColumn3.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; + this.dataGridViewDateTimeInputColumn3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn3.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; + this.dataGridViewDateTimeInputColumn3.ButtonDropDown.Visible = true; + this.dataGridViewDateTimeInputColumn3.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; + this.dataGridViewDateTimeInputColumn3.HeaderText = "开始时间"; + this.dataGridViewDateTimeInputColumn3.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Center; + // + // + // + // + // + // + this.dataGridViewDateTimeInputColumn3.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn3.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + // + // + // + this.dataGridViewDateTimeInputColumn3.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn3.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); + this.dataGridViewDateTimeInputColumn3.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + // + // + // + this.dataGridViewDateTimeInputColumn3.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn3.MonthCalendar.Visible = false; + this.dataGridViewDateTimeInputColumn3.Name = "dataGridViewDateTimeInputColumn3"; + this.dataGridViewDateTimeInputColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewDateTimeInputColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewDateTimeInputColumn3.Width = 80; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.HeaderText = "持续"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.Width = 45; + // + // dataGridViewDateTimeInputColumn4 + // + this.dataGridViewDateTimeInputColumn4.AutoAdvance = true; + // + // + // + this.dataGridViewDateTimeInputColumn4.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; + this.dataGridViewDateTimeInputColumn4.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; + this.dataGridViewDateTimeInputColumn4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn4.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; + this.dataGridViewDateTimeInputColumn4.ButtonDropDown.Visible = true; + this.dataGridViewDateTimeInputColumn4.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; + this.dataGridViewDateTimeInputColumn4.HeaderText = "结束时间"; + this.dataGridViewDateTimeInputColumn4.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; + // + // + // + // + // + // + this.dataGridViewDateTimeInputColumn4.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn4.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + // + // + // + this.dataGridViewDateTimeInputColumn4.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn4.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); + this.dataGridViewDateTimeInputColumn4.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + // + // + // + this.dataGridViewDateTimeInputColumn4.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewDateTimeInputColumn4.MonthCalendar.Visible = false; + this.dataGridViewDateTimeInputColumn4.Name = "dataGridViewDateTimeInputColumn4"; + this.dataGridViewDateTimeInputColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewDateTimeInputColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewDateTimeInputColumn4.Width = 80; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing; + this.dataGridViewTextBoxColumn8.HeaderText = "通路"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewTextBoxColumn8.Width = 50; + // // frmFactDrugNew // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1853,24 +1847,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15; private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn dataGridViewDateTimeInputColumn6; private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewTextBoxColumn16; - private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewComboEditBoxColumn2; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn4; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn23; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn24; - private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn dataGridViewDateTimeInputColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn dataGridViewDateTimeInputColumn4; - private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewTextBoxColumn8; private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn37; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn38; @@ -1910,5 +1886,23 @@ private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn dataGridViewDateTimeInputColumn8; private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn15; private DevComponents.DotNetBar.SuperTabItem P0; + private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewComboEditBoxColumn2; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn4; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn23; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn24; + private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn dataGridViewDateTimeInputColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; + private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn dataGridViewDateTimeInputColumn4; + private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewTextBoxColumn8; } } \ No newline at end of file diff --git a/AIMS/OperationAanesthesia/frmFactDrugNew.cs b/AIMS/OperationAanesthesia/frmFactDrugNew.cs index 5b7e4c2..af840ba 100644 --- a/AIMS/OperationAanesthesia/frmFactDrugNew.cs +++ b/AIMS/OperationAanesthesia/frmFactDrugNew.cs @@ -51,6 +51,24 @@ namespace AIMS.PublicUI.UI public frmFactDrugNew() { InitializeComponent(); + if (PublicMethod.HospitalName.Contains("漳浦天福")) + { + this.dataGridViewTextBoxColumn8.HeaderText = "位置"; + this.dataGridViewTextBoxColumn8.Items.AddRange(new object[] { + "", + "上", + "下"}); + } + else + { + this.dataGridViewTextBoxColumn8.HeaderText = "通路"; + this.dataGridViewTextBoxColumn8.Items.AddRange(new object[] { + "", + "1", + "2", + "3", + "4"}); + } } private void frmFactDrugNew_Load(object sender, EventArgs e) @@ -1357,7 +1375,7 @@ namespace AIMS.PublicUI.UI TabSelDrugs.Controls.Add(superTabControlPanel); TabSelDrugs.Tabs.Add(spt); } - TabSelDrugs.FixedTabSize=new Size (30,65); + TabSelDrugs.FixedTabSize = new Size(30, 65); this.TabSelDrugs.SelectedTabChanged += new System.EventHandler(this.superTabControl1_SelectedTabChanged); TabSelDrugs.SelectedTab = TabSelDrugs.Tabs[0] as SuperTabItem; superTabControl1_SelectedTabChanged(null, null); diff --git a/AIMS/OperationAanesthesia/frmFactDrugNew.resx b/AIMS/OperationAanesthesia/frmFactDrugNew.resx index 9477963..92db3e3 100644 --- a/AIMS/OperationAanesthesia/frmFactDrugNew.resx +++ b/AIMS/OperationAanesthesia/frmFactDrugNew.resx @@ -137,7 +137,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi - CAAAAk1TRnQBSQFMAgEBAgEAAZgBBgGYAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ + CAAAAk1TRnQBSQFMAgEBAgEAAaABBgGgAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ AwABFAMAAQEBAAEgBgABGS4AA1UBrwOAAf4DKwH8AysB/AGZAYsBQAH9AaEBkgEAAf8BkwGCAQAB/wGW AYcBQAH9AaMBlAEAAf8BowGUAQAB/wGjAZQBAAH/AysB/ANgAej/AA0AAZMBggEAAf8DYgH2A20B9wNt AfcDXAH4A4AB/gGXAYYBAAH/A20B9wHsAecB5AH/AewB5wHkAf8B7AHnAeQB/wNtAfcBkwGCAQAB//8A @@ -164,9 +164,9 @@ AfwB/gH6AfsB/wH+AfoB+wH/Af4B+gH7Av8C/QH/AZMBggEAAf//AA0AAZMBggEAAf8DYAHzAf4B+wH8 Af8B/gH7AfwB/wH+AfsB/AH/AfsB+AH5Af8BmwGLAQAB/wMrAfwB/gH7AfwB/wH+AfsB/AH/Af4B+wH8 Av8C/QH/AZMBggEAAf//AA0AAm0BbAH3A1wB+AOAAf4DgAH+A4AB/gOAAf4BmAGHAQAB/wMrAfwB1AHN - AcIB/wHUAc0BwgH/AdQBzQHCAf8DgAH+AZMBggEAAf//AAkAAwMBBANQAZoBkgGCAQAB/wKAAX4B/gKA - AX4B/gKAAX4B/gGTAYIBAAH/AZMBggEAAf8BjgGBAQAB/wGTAYIBAAH/AZMBggEAAf8BkwGCAQAB/wKA - AX4B/gNaAb3/AAkAAwMBBAMSARcDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEz + AcIB/wHUAc0BwgH/AdQBzQHCAf8DgAH+AZMBggEAAf//AAkAAwMBBANQAZoBkgGCAQAB/wKAAX8B/gKA + AX8B/gKAAX8B/gGTAYIBAAH/AZMBggEAAf8BjgGBAQAB/wGTAYIBAAH/AZMBggEAAf8BkwGCAQAB/wKA + AX8B/gNaAb3/AAkAAwMBBAMSARcDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEz AyMBMwMWAR7/AA0AAwUBBgMEAQUDBAEFAwQBBQMEBAUBBgMFAQYDBQEGAwUBBgMFAQYDBQEGAwUBBgMD AQTwAAFCAU0BPgcAAT4DAAEoAwABUAMAARQDAAEBAQABAQUAAfAXAAP/AQAB/gEAAQ8C/wcAAf4BAAEP Av8HAAH+AQABDwL/BwAB/gEAAQ8C/wcAAf4BAAEPAv8HAAH+AQABDwL/BwAB/gEAAQ8C/wcAAYABAAEP diff --git a/AIMS/OperationAfter/frmExportConfig.cs b/AIMS/OperationAfter/frmExportConfig.cs index e835432..b1cf3a0 100644 --- a/AIMS/OperationAfter/frmExportConfig.cs +++ b/AIMS/OperationAfter/frmExportConfig.cs @@ -38,7 +38,7 @@ namespace AIMS.OperationAfter.UI { if (_dgv == null) return; LoadSettingSource(_dgv); - if (exportConfig != null) + if (exportConfig != null && exportConfig.Value != null) { ExportConfig dataGridViewSetting = JsonConvert.DeserializeObject(exportConfig.Value); txtName.Text = dataGridViewSetting.Title; @@ -83,11 +83,11 @@ namespace AIMS.OperationAfter.UI DataGridViewRow drc = new DataGridViewRow(); drc.CreateCells(dataGridView2); drc.Cells[0].Value = dataGridViewColumn.Name; - drc.Cells[1].Value =dataGridViewColumn.HeaderText; + drc.Cells[1].Value = dataGridViewColumn.HeaderText; drc.Cells[2].Value = dataGridViewColumn.MinimumWidth; drc.Cells[3].Value = dataGridViewColumn.ReadOnly; drc.Cells[4].Value = dataGridViewColumn.Visible; - drc.Cells[5].Value = dataGridViewColumn.Width; + drc.Cells[5].Value = dataGridViewColumn.Width; dataGridView2.Rows.Insert(_lineNumber, drc); _lineNumber++; } @@ -110,6 +110,7 @@ namespace AIMS.OperationAfter.UI exportConfig.OperatorNo = PublicMethod.OperatorNo; exportConfig.OperatorName = PublicMethod.OperatorName; exportConfig.OperateDate = DateTime.Now; + exportConfig.Extend1 = PublicMethod.RoleId.ToString(); if (exportConfig.Id != null && exportConfig.Id.Value > 0) { diff --git a/AIMS/OperationAfter/frmOperationManage.cs b/AIMS/OperationAfter/frmOperationManage.cs index 5035605..50116fd 100644 --- a/AIMS/OperationAfter/frmOperationManage.cs +++ b/AIMS/OperationAfter/frmOperationManage.cs @@ -35,7 +35,7 @@ namespace AIMS.OperationAfter.UI dgv.BackgroundColor = System.Drawing.Color.Snow; ControlExtension.SetDgvAttribute(dgv); DataGridViewPath = GetControlPath(dgv); - exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "'", 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(); @@ -166,7 +166,7 @@ namespace AIMS.OperationAfter.UI System.Data.DataTable dt = BOperationApply.GetOperationDoingDataTable(dtpBegInDate.Value.ToString("yyyy-MM-dd"), dtpEndDate.Value.AddDays(1).ToString("yyyy-MM-dd")); string Where = " (RecoverId is null or RecoverId=1 ) "; - if (state != "") + if (state != "") Where += " and StateId IN (" + state + ") "; if (Department != "") Where += " and PatientDept LIKE '%" + Department + "%' "; @@ -198,7 +198,7 @@ namespace AIMS.OperationAfter.UI Where += " and (ApplyOperationInfoName LIKE '%" + txtOperation.Text + "%' or OperationInfoName LIKE '%" + txtOperation.Text + "%' ) "; if (CboOperationSite.Visible == true && CboOperationSite.SelectedIndex > 0) - Where += " and OperationSite='" + CboOperationSite.SelectedValue + "' "; + Where += " and OperationSite='" + CboOperationSite.SelectedValue + "' "; System.Data.DataTable dataTable = AIMSExtension.PublicMethod.GetNewDataTable(dt, Where, ""); foreach (DataRow item in dataTable.Rows) @@ -533,13 +533,13 @@ namespace AIMS.OperationAfter.UI } private void toolStripButton1_Click(object sender, EventArgs e) - { + { int SelApplyId = int.Parse(dgv.CurrentRow.Cells["ApplyId"].Value.ToString()); if (SelApplyId != 0) { frmPatientStateTree frmas = new frmPatientStateTree(); frmas.ApplyId = SelApplyId; - frmas.ShowDialog(); + frmas.ShowDialog(); } } } diff --git a/AIMS/OremrUserControl/ExportConfig.cs b/AIMS/OremrUserControl/ExportConfig.cs index 877821c..9c4b8b5 100644 --- a/AIMS/OremrUserControl/ExportConfig.cs +++ b/AIMS/OremrUserControl/ExportConfig.cs @@ -10,7 +10,7 @@ namespace AIMS public string Title { get; set; } public string Path { get; set; } public int FontSize { get; set; } - public bool Landscape { get; set; } + public bool Landscape { get; set; } public List exports { get; set; } diff --git a/AIMSEntity/BLL/Extension/BOperationRecord.cs b/AIMSEntity/BLL/Extension/BOperationRecord.cs index d01dcac..a940cbe 100644 --- a/AIMSEntity/BLL/Extension/BOperationRecord.cs +++ b/AIMSEntity/BLL/Extension/BOperationRecord.cs @@ -21,9 +21,9 @@ namespace AIMSBLL { return DOperationRecord.AddTitleTime(PatientId, ApplyId, RecoverId, State, Time, RoomId); } - public static int AddTitleTime2(int PatientId, int ApplyId, int RecoverId, int State, DateTime Time, int RoomId) + public static int AddTitleTime2(int PatientId, int ApplyId, int RecoverId, int State, int RoomId) { - return DOperationRecord.AddTitleTime2(PatientId, ApplyId, RecoverId, State, Time, RoomId); + return DOperationRecord.AddTitleTime2(PatientId, ApplyId, RecoverId, State, RoomId); } public static OperationRecord getRecord(OperationRecord _record, int PatientId, int RecoverId) { @@ -141,7 +141,7 @@ namespace AIMSBLL _record.OpeRecordInfo.OperatorTime = DateTime.Now; _record.OpeRecordInfo.Id = BOperationRecordInfo.Insert(_record.OpeRecordInfo); //是否启用默认项 - if (PublicMethod.HospitalName.Contains("漳浦")) + if (PublicMethod.HospitalName.Contains("漳浦") && RecoverId==1) { if (_record.OpeSpecialCondition == null || _record.OpeSpecialCondition == "") _record.OpeSpecialCondition = "无特殊情况"; @@ -652,9 +652,9 @@ namespace AIMSBLL { foreach (DataRow item1 in dt.Rows) { - if (item1[0].ToString() == "5" && item1[1].ToString() == item[1].ToString()) + if (item1[0].ToString() == "5" && item1[2].ToString() == item[2].ToString()) { - item1[2] = "-1"; + item1[1] = "-1"; } } } @@ -662,9 +662,9 @@ namespace AIMSBLL { foreach (DataRow item1 in dt.Rows) { - if (item1[0].ToString() == "6" && item1[1].ToString() == item[1].ToString()) + if (item1[0].ToString() == "6" && item1[2].ToString() == item[2].ToString()) { - item1[2] = "-1"; + item1[1] = "-1"; } } } diff --git a/AIMSEntity/DAL/AutoGenerate/DSysConfig.cs b/AIMSEntity/DAL/AutoGenerate/DSysConfig.cs index c47ffa0..9c61395 100644 --- a/AIMSEntity/DAL/AutoGenerate/DSysConfig.cs +++ b/AIMSEntity/DAL/AutoGenerate/DSysConfig.cs @@ -9,74 +9,79 @@ using System.Collections.Generic; namespace AIMSDAL { internal partial class DSysConfig - { - #region 插入实体操作部份 - /// + { + #region 插入实体操作部份 + /// /// 插入 /// - /// Command对象 + /// Command对象 /// 实体类对象 /// 标识列值或影响的记录行数 - internal static int Insert(SqlCommand cmd, SysConfig sysConfig) - { - cmd.Parameters.Clear(); - cmd.CommandText = "insert into SysConfig (Name,Value,Note,IsValid,OperatorNo,OperatorName,OperateDate) values (@Name,@Value,@Note,@IsValid,@OperatorNo,@OperatorName,@OperateDate);select @@identity"; - //从实体中取出值放入Command的参数列表 - cmd.Parameters.Add(new SqlParameter("@Name",sysConfig.Name==null?(object)DBNull.Value:(object)sysConfig.Name)); - cmd.Parameters.Add(new SqlParameter("@Value",sysConfig.Value==null?(object)DBNull.Value:(object)sysConfig.Value)); - cmd.Parameters.Add(new SqlParameter("@Note",sysConfig.Note==null?(object)DBNull.Value:(object)sysConfig.Note)); - cmd.Parameters.Add(new SqlParameter("@IsValid",sysConfig.IsValid.HasValue?(object)sysConfig.IsValid.Value:(object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@OperatorNo",sysConfig.OperatorNo==null?(object)DBNull.Value:(object)sysConfig.OperatorNo)); - cmd.Parameters.Add(new SqlParameter("@OperatorName",sysConfig.OperatorName==null?(object)DBNull.Value:(object)sysConfig.OperatorName)); - cmd.Parameters.Add(new SqlParameter("@OperateDate",sysConfig.OperateDate.HasValue?(object)sysConfig.OperateDate.Value:(object)DBNull.Value)); - return Convert.ToInt32(cmd.ExecuteScalar()); - } - /// + internal static int Insert(SqlCommand cmd, SysConfig sysConfig) + { + cmd.Parameters.Clear(); + cmd.CommandText = "insert into SysConfig (Name,Value,Note,IsValid,OperatorNo,OperatorName,OperateDate,Extend1,Extend2,Extend3,Extend4,Extend5) values (@Name,@Value,@Note,@IsValid,@OperatorNo,@OperatorName,@OperateDate,@Extend1,@Extend2,@Extend3,@Extend4,@Extend5);select @@identity"; + //从实体中取出值放入Command的参数列表 + cmd.Parameters.Add(new SqlParameter("@Name", sysConfig.Name == null ? (object)DBNull.Value : (object)sysConfig.Name)); + cmd.Parameters.Add(new SqlParameter("@Value", sysConfig.Value == null ? (object)DBNull.Value : (object)sysConfig.Value)); + cmd.Parameters.Add(new SqlParameter("@Note", sysConfig.Note == null ? (object)DBNull.Value : (object)sysConfig.Note)); + cmd.Parameters.Add(new SqlParameter("@IsValid", sysConfig.IsValid.HasValue ? (object)sysConfig.IsValid.Value : (object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@OperatorNo", sysConfig.OperatorNo == null ? (object)DBNull.Value : (object)sysConfig.OperatorNo)); + cmd.Parameters.Add(new SqlParameter("@OperatorName", sysConfig.OperatorName == null ? (object)DBNull.Value : (object)sysConfig.OperatorName)); + cmd.Parameters.Add(new SqlParameter("@OperateDate", sysConfig.OperateDate.HasValue ? (object)sysConfig.OperateDate.Value : (object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@Extend1", sysConfig.Extend1 == null ? (object)DBNull.Value : (object)sysConfig.Extend1)); + cmd.Parameters.Add(new SqlParameter("@Extend2", sysConfig.Extend2 == null ? (object)DBNull.Value : (object)sysConfig.Extend2)); + cmd.Parameters.Add(new SqlParameter("@Extend3", sysConfig.Extend3 == null ? (object)DBNull.Value : (object)sysConfig.Extend3)); + cmd.Parameters.Add(new SqlParameter("@Extend4", sysConfig.Extend4 == null ? (object)DBNull.Value : (object)sysConfig.Extend4)); + cmd.Parameters.Add(new SqlParameter("@Extend5", sysConfig.Extend5 == null ? (object)DBNull.Value : (object)sysConfig.Extend5)); + return Convert.ToInt32(cmd.ExecuteScalar()); + } + /// /// 不使用事务的插入方法 /// /// 实体类对象 /// 标识列值或影响的记录行数 - internal static int Insert(SysConfig sysConfig) - { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) - { - conn.Open(); + internal static int Insert(SysConfig sysConfig) + { + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + { + conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { return Insert(cmd, sysConfig); } - } - } - - /// + } + } + + /// /// 使用事务的插入方法 /// /// 实现共享Connection的对象 /// 实体类对象 /// 标识列值或影响的记录行数 - internal static int Insert(Connection connection,SysConfig sysConfig) + internal static int Insert(Connection connection, SysConfig sysConfig) { return Insert(connection.Command, sysConfig); } - #endregion - - #region 删除实体操作 - - /// + #endregion + + #region 删除实体操作 + + /// /// 删除 /// - /// Command对象 + /// Command对象 /// 实体类对象 /// 影响的记录行数 - internal static int ExcuteDeleteCommand(SqlCommand cmd, SysConfig sysConfig) + internal static int ExcuteDeleteCommand(SqlCommand cmd, SysConfig sysConfig) { - cmd.Parameters.Clear(); + cmd.Parameters.Clear(); cmd.CommandText = "delete from SysConfig where Id=@Id"; //从实体中取出值放入Command的参数列表 - cmd.Parameters.Add(new SqlParameter("@Id", sysConfig.Id)); + cmd.Parameters.Add(new SqlParameter("@Id", sysConfig.Id)); return cmd.ExecuteNonQuery(); } - /// + /// /// 不使用事务的删除方法 /// /// 实体类对象 @@ -92,18 +97,18 @@ namespace AIMSDAL } } } - /// + /// /// 使用事务的删除方法 /// /// 实现共享Connection的对象 /// 实体类对象 /// 影响的记录行数 - internal static int Delete(Connection connection,SysConfig sysConfig) + internal static int Delete(Connection connection, SysConfig sysConfig) { - return ExcuteDeleteCommand(connection.Command, sysConfig); - } - - /// + return ExcuteDeleteCommand(connection.Command, sysConfig); + } + + /// /// 执行删除命令 /// /// Command对象 @@ -130,8 +135,8 @@ namespace AIMSDAL } return cmd.ExecuteNonQuery(); } - - /// + + /// /// 不使用事务的删除方法 /// /// 对象查询语句 @@ -148,8 +153,8 @@ namespace AIMSDAL } } } - - /// + + /// /// 使用事务的删除方法 /// /// 实现共享Connection的对象 @@ -160,59 +165,64 @@ namespace AIMSDAL { return ExcuteDeleteCommand(connection.Command, oql, parameters); } - - #endregion - - #region 更新实体操作 - - /// + + #endregion + + #region 更新实体操作 + + /// /// 更新 /// - /// Command对象 + /// Command对象 /// 实体类对象 /// 影响的记录行数 - internal static int ExcuteUpdateCommand(SqlCommand cmd, SysConfig sysConfig) - { - cmd.CommandText = "update SysConfig set Name=@Name,Value=@Value,Note=@Note,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate where Id=@Id"; - //从实体中取出值放入Command的参数列表 - cmd.Parameters.Add(new SqlParameter("@Name",sysConfig.Name==null?(object)DBNull.Value:(object)sysConfig.Name)); - cmd.Parameters.Add(new SqlParameter("@Value",sysConfig.Value==null?(object)DBNull.Value:(object)sysConfig.Value)); - cmd.Parameters.Add(new SqlParameter("@Note",sysConfig.Note==null?(object)DBNull.Value:(object)sysConfig.Note)); - cmd.Parameters.Add(new SqlParameter("@IsValid",sysConfig.IsValid.HasValue?(object)sysConfig.IsValid.Value:(object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@OperatorNo",sysConfig.OperatorNo==null?(object)DBNull.Value:(object)sysConfig.OperatorNo)); - cmd.Parameters.Add(new SqlParameter("@OperatorName",sysConfig.OperatorName==null?(object)DBNull.Value:(object)sysConfig.OperatorName)); - cmd.Parameters.Add(new SqlParameter("@OperateDate",sysConfig.OperateDate.HasValue?(object)sysConfig.OperateDate.Value:(object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@Id", sysConfig.Id)); + internal static int ExcuteUpdateCommand(SqlCommand cmd, SysConfig sysConfig) + { + cmd.CommandText = "update SysConfig set Name=@Name,Value=@Value,Note=@Note,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,Extend1=@Extend1,Extend2=@Extend2,Extend3=@Extend3,Extend4=@Extend4,Extend5=@Extend5 where Id=@Id"; + //从实体中取出值放入Command的参数列表 + cmd.Parameters.Add(new SqlParameter("@Name", sysConfig.Name == null ? (object)DBNull.Value : (object)sysConfig.Name)); + cmd.Parameters.Add(new SqlParameter("@Value", sysConfig.Value == null ? (object)DBNull.Value : (object)sysConfig.Value)); + cmd.Parameters.Add(new SqlParameter("@Note", sysConfig.Note == null ? (object)DBNull.Value : (object)sysConfig.Note)); + cmd.Parameters.Add(new SqlParameter("@IsValid", sysConfig.IsValid.HasValue ? (object)sysConfig.IsValid.Value : (object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@OperatorNo", sysConfig.OperatorNo == null ? (object)DBNull.Value : (object)sysConfig.OperatorNo)); + cmd.Parameters.Add(new SqlParameter("@OperatorName", sysConfig.OperatorName == null ? (object)DBNull.Value : (object)sysConfig.OperatorName)); + cmd.Parameters.Add(new SqlParameter("@OperateDate", sysConfig.OperateDate.HasValue ? (object)sysConfig.OperateDate.Value : (object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@Extend1", sysConfig.Extend1 == null ? (object)DBNull.Value : (object)sysConfig.Extend1)); + cmd.Parameters.Add(new SqlParameter("@Extend2", sysConfig.Extend2 == null ? (object)DBNull.Value : (object)sysConfig.Extend2)); + cmd.Parameters.Add(new SqlParameter("@Extend3", sysConfig.Extend3 == null ? (object)DBNull.Value : (object)sysConfig.Extend3)); + cmd.Parameters.Add(new SqlParameter("@Extend4", sysConfig.Extend4 == null ? (object)DBNull.Value : (object)sysConfig.Extend4)); + cmd.Parameters.Add(new SqlParameter("@Extend5", sysConfig.Extend5 == null ? (object)DBNull.Value : (object)sysConfig.Extend5)); + cmd.Parameters.Add(new SqlParameter("@Id", sysConfig.Id)); return cmd.ExecuteNonQuery(); - } - - /// + } + + /// /// 不使用事务的更新方法 /// /// 实体类对象 /// 影响的记录行数 - internal static int Update(SysConfig sysConfig) - { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) - { - conn.Open(); + internal static int Update(SysConfig sysConfig) + { + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + { + conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { return ExcuteUpdateCommand(cmd, sysConfig); } - } - } - /// + } + } + /// /// 使用事务的更新方法 /// /// 实现共享Connection的对象 /// 实体类对象 /// 影响的记录行数 - internal static int Update(Connection connection,SysConfig sysConfig) + internal static int Update(Connection connection, SysConfig sysConfig) { return ExcuteUpdateCommand(connection.Command, sysConfig); - } - /// + } + /// /// 执行更新命令 /// /// Command对象 @@ -224,7 +234,7 @@ namespace AIMSDAL //解析过滤部份Sql语句 string updateString = SyntaxAnalyzer.ParseSql(oql, new SysConfigMap()); cmd.CommandText = "update SysConfig set " + updateString; - cmd.Parameters.Clear(); + cmd.Parameters.Clear(); //添加参数 if (parameters != null) { @@ -235,8 +245,8 @@ namespace AIMSDAL } return cmd.ExecuteNonQuery(); } - - /// + + /// /// 不使用事务的更新方法 /// /// 对象查询语句 @@ -253,8 +263,8 @@ namespace AIMSDAL } } } - - /// + + /// /// 使用事务的更新方法 /// /// 实现共享Connection的对象 @@ -265,17 +275,17 @@ namespace AIMSDAL { return ExcuteUpdateCommand(connection.Command, oql, parameters); } - #endregion - - #region 查询实体集合 - /// + #endregion + + #region 查询实体集合 + /// /// 执行Command获取对象列表 /// /// Command对象 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象列表 - internal static List ExcuteSelectCommand(SqlCommand cmd,RecursiveType recursiveType,int recursiveDepth) + internal static List ExcuteSelectCommand(SqlCommand cmd, RecursiveType recursiveType, int recursiveDepth) { List sysConfigList = new List(); using (SqlDataReader dr = cmd.ExecuteReader()) @@ -286,25 +296,25 @@ namespace AIMSDAL sysConfigList.Add(sysConfig); } } - return sysConfigList; + return sysConfigList; } - /// + /// /// 执行查询命令 /// /// Command对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 - internal static List ExcuteSelectCommand(SqlCommand cmd, string oql, ParameterList parameters,RecursiveType recursiveType,int recursiveDepth) + internal static List ExcuteSelectCommand(SqlCommand cmd, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { //解析过滤部份Sql语句 string filterString = SyntaxAnalyzer.ParseSql(oql, new SysConfigMap()); if (filterString != string.Empty) { - if(filterString.Trim().ToLower().IndexOf("order ")!=0) - filterString = " where " + filterString; + if (filterString.Trim().ToLower().IndexOf("order ") != 0) + filterString = " where " + filterString; } cmd.Parameters.Clear(); cmd.CommandText = "select * from SysConfig " + filterString; @@ -318,14 +328,14 @@ namespace AIMSDAL } return ExcuteSelectCommand(cmd, recursiveType, recursiveDepth); } - - /// + + /// /// 根据对象查询语句查询实体集合 /// /// 实体类对象集合 internal static List Select() { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -335,15 +345,15 @@ namespace AIMSDAL } } } - /// + /// /// 根据对象查询语句查询实体集合 /// - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 internal static List Select(RecursiveType recursiveType, int recursiveDepth) { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -353,8 +363,8 @@ namespace AIMSDAL } } } - - /// + + /// /// 根据对象查询语句查询实体集合 /// /// 对象查询语句 @@ -362,7 +372,7 @@ namespace AIMSDAL /// 实体类对象集合 internal static List Select(string oql, ParameterList parameters) { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -371,18 +381,18 @@ namespace AIMSDAL } } } - - /// + + /// /// 根据对象查询语句查询实体集合 /// /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 - internal static List Select(string oql, ParameterList parameters,RecursiveType recursiveType, int recursiveDepth) + internal static List Select(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -391,62 +401,62 @@ namespace AIMSDAL } } } - - /// + + /// /// 根据对象查询语句查询实体集合（启用事务） /// /// 连接对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 internal static List Select(Connection connection, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { - return ExcuteSelectCommand(connection.Command, oql, parameters,recursiveType, recursiveDepth); + return ExcuteSelectCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth); } - #endregion - - #region 查询单个实体 - - /// + #endregion + + #region 查询单个实体 + + /// /// 递归查询单个实体 /// /// Command对象 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 - internal static SysConfig ExcuteSelectSingleCommand(SqlCommand cmd,RecursiveType recursiveType,int recursiveDepth) - { - SysConfig sysConfig=null; - using (SqlDataReader dr = cmd.ExecuteReader()) + internal static SysConfig ExcuteSelectSingleCommand(SqlCommand cmd, RecursiveType recursiveType, int recursiveDepth) + { + SysConfig sysConfig = null; + using (SqlDataReader dr = cmd.ExecuteReader()) { - if(dr.Read()) - sysConfig = DataReaderToEntity(dr); - } - if(sysConfig==null) - return sysConfig; + if (dr.Read()) + sysConfig = DataReaderToEntity(dr); + } + if (sysConfig == null) + return sysConfig; return sysConfig; - } - /// + } + /// /// 更据对象查询语句递归查询单个实体 /// /// Command对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 - internal static SysConfig ExcuteSelectSingleCommand(SqlCommand cmd, string oql, ParameterList parameters,RecursiveType recursiveType,int recursiveDepth) + internal static SysConfig ExcuteSelectSingleCommand(SqlCommand cmd, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { //解析过滤部份Sql语句 string filterString = SyntaxAnalyzer.ParseSql(oql, new SysConfigMap()); - if(filterString!=string.Empty) - { - filterString=" where "+filterString; - } + if (filterString != string.Empty) + { + filterString = " where " + filterString; + } cmd.CommandText = "select * from SysConfig " + filterString; - cmd.Parameters.Clear(); + cmd.Parameters.Clear(); //添加参数 if (parameters != null) { @@ -457,29 +467,29 @@ namespace AIMSDAL } return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth); } - - /// + + /// /// 更据对象查询语句递归查询单个实体 /// /// Command对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 internal static SysConfig SelectSingle(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { return ExcuteSelectSingleCommand(cmd, oql, parameters, recursiveType, recursiveDepth); - } - } + } + } } - - /// + + /// /// 更据对象查询语句查询单个实体 /// /// Command对象 @@ -488,10 +498,10 @@ namespace AIMSDAL /// 实体对象 internal static SysConfig SelectSingle(string oql, ParameterList parameters) { - return SelectSingle(oql,parameters,RecursiveType.Parent,1); + return SelectSingle(oql, parameters, RecursiveType.Parent, 1); } - - /// + + /// /// 更据对象查询语句并启用事务查询单个实体 /// /// 连接对象 @@ -502,120 +512,140 @@ namespace AIMSDAL { return ExcuteSelectSingleCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth); } - - /// + + /// /// 更据主键值递归查询单个实体 /// /// Command对象 /// 主键值 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 - internal static SysConfig SelectSingle(SqlCommand cmd, int? id,RecursiveType recursiveType,int recursiveDepth) - { - cmd.Parameters.Clear(); - if(id.HasValue) - { - cmd.CommandText = "select * from SysConfig where Id=@pk"; - cmd.Parameters.Add(new SqlParameter("@pk",id.Value)); - } - else - { - cmd.CommandText = "select * from SysConfig where Id is null"; - } - return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth); - } - - /// + internal static SysConfig SelectSingle(SqlCommand cmd, int? id, RecursiveType recursiveType, int recursiveDepth) + { + cmd.Parameters.Clear(); + if (id.HasValue) + { + cmd.CommandText = "select * from SysConfig where Id=@pk"; + cmd.Parameters.Add(new SqlParameter("@pk", id.Value)); + } + else + { + cmd.CommandText = "select * from SysConfig where Id is null"; + } + return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth); + } + + /// /// 按主键字段查询特定实体 /// /// 主键值 /// 实体类对象 internal static SysConfig SelectSingle(int? id) { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { - return SelectSingle(cmd,id,RecursiveType.Parent,1); - } - } + return SelectSingle(cmd, id, RecursiveType.Parent, 1); + } + } } - /// + /// /// 按主键字段查询特定实体 /// /// 主键值 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象 internal static SysConfig SelectSingle(int? id, RecursiveType recursiveType, int recursiveDepth) { - using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { - return SelectSingle(cmd,id, recursiveType, recursiveDepth); - } - } + return SelectSingle(cmd, id, recursiveType, recursiveDepth); + } + } } - - /// + + /// /// 使用事务并按主键字段查询特定实体 /// - /// 连接对象 + /// 连接对象 /// 主键值 /// 实体类对象 - internal static SysConfig SelectSingle(Connection connection,int? id, RecursiveType recursiveType, int recursiveDepth) + internal static SysConfig SelectSingle(Connection connection, int? id, RecursiveType recursiveType, int recursiveDepth) { - return SelectSingle(connection.Command, id, recursiveType, recursiveDepth); + return SelectSingle(connection.Command, id, recursiveType, recursiveDepth); } - #endregion - - - /// + #endregion + + + /// /// 从DataReader中取出值生成实体对象 /// /// 查询对象 /// 过滤条件字符串 - private static SysConfig DataReaderToEntity(SqlDataReader dr) - { - SysConfig entity = new SysConfig (); - if(dr["Id"]!=System.DBNull.Value) - { - entity.Id=Convert.ToInt32(dr["Id"]); - } - if(dr["Name"]!=System.DBNull.Value) - { - entity.Name=dr["Name"].ToString(); - } - if(dr["Value"]!=System.DBNull.Value) - { - entity.Value=dr["Value"].ToString(); - } - if(dr["Note"]!=System.DBNull.Value) - { - entity.Note=dr["Note"].ToString(); - } - if(dr["IsValid"]!=System.DBNull.Value) - { - entity.IsValid=Convert.ToInt32(dr["IsValid"]); - } - if(dr["OperatorNo"]!=System.DBNull.Value) - { - entity.OperatorNo=dr["OperatorNo"].ToString(); - } - if(dr["OperatorName"]!=System.DBNull.Value) - { - entity.OperatorName=dr["OperatorName"].ToString(); - } - if(dr["OperateDate"]!=System.DBNull.Value) - { - entity.OperateDate=Convert.ToDateTime(dr["OperateDate"]); - } - return entity; - } - } + private static SysConfig DataReaderToEntity(SqlDataReader dr) + { + SysConfig entity = new SysConfig(); + if (dr["Id"] != System.DBNull.Value) + { + entity.Id = Convert.ToInt32(dr["Id"]); + } + if (dr["Name"] != System.DBNull.Value) + { + entity.Name = dr["Name"].ToString(); + } + if (dr["Value"] != System.DBNull.Value) + { + entity.Value = dr["Value"].ToString(); + } + if (dr["Note"] != System.DBNull.Value) + { + entity.Note = dr["Note"].ToString(); + } + if (dr["IsValid"] != System.DBNull.Value) + { + entity.IsValid = Convert.ToInt32(dr["IsValid"]); + } + if (dr["OperatorNo"] != System.DBNull.Value) + { + entity.OperatorNo = dr["OperatorNo"].ToString(); + } + if (dr["OperatorName"] != System.DBNull.Value) + { + entity.OperatorName = dr["OperatorName"].ToString(); + } + if (dr["OperateDate"] != System.DBNull.Value) + { + entity.OperateDate = Convert.ToDateTime(dr["OperateDate"]); + } + if (dr["Extend1"] != System.DBNull.Value) + { + entity.Extend1 = dr["Extend1"].ToString(); + } + if (dr["Extend2"] != System.DBNull.Value) + { + entity.Extend2 = dr["Extend2"].ToString(); + } + if (dr["Extend3"] != System.DBNull.Value) + { + entity.Extend3 = dr["Extend3"].ToString(); + } + if (dr["Extend4"] != System.DBNull.Value) + { + entity.Extend4 = dr["Extend4"].ToString(); + } + if (dr["Extend5"] != System.DBNull.Value) + { + entity.Extend5 = dr["Extend5"].ToString(); + } + return entity; + } + } } diff --git a/AIMSEntity/DAL/Extension/DOperationRecord.cs b/AIMSEntity/DAL/Extension/DOperationRecord.cs index e606148..8e7d043 100644 --- a/AIMSEntity/DAL/Extension/DOperationRecord.cs +++ b/AIMSEntity/DAL/Extension/DOperationRecord.cs @@ -21,12 +21,15 @@ namespace AIMSDAL return Convert.ToInt32(HelperDB.DbHelperSQL.ExecNonQuery(strSql)); } - public static int AddTitleTime2(int PatientId, int ApplyId, int RecoverId, int State, DateTime Time, int RoomId) + public static int AddTitleTime2(int PatientId, int ApplyId, int RecoverId, int State, int RoomId) { + DateTime Time = DateTime.Now; OperationRecord _record = new OperationRecord(); BOperationRecord.SelectSingle(PatientId, 1, ref _record); + if (_record != null && _record.OutRoomTime != null) + Time = _record.OutRoomTime.Value.AddMinutes(1); string strSql = "INSERT INTO OperationRecord(PatientId,OperationApplyId,RecoverId,[State],InRoomTime,OperatorNo,OperatorName,OperateDate,RoomId,AnaesthesiaMethodName,ASALevel)" + - "VALUES (" + PatientId + "," + ApplyId + "," + RecoverId + ",'" + State + "','" + Time + "','" + AIMSExtension.PublicMethod.OperatorNo + "','" + "VALUES (" + PatientId + "," + ApplyId + "," + RecoverId + ",'" + State + "','" + Time.ToString("yyyy-MM-dd HH:mm:00") + "','" + AIMSExtension.PublicMethod.OperatorNo + "','" + AIMSExtension.PublicMethod.OperatorName + "','" + AIMSExtension.PublicMethod.SystemDate() + "','" + RoomId + "','" + _record.AnaesthesiaMethodName + "','" + _record.ASALevel + "');select @@identity "; return Convert.ToInt32(HelperDB.DbHelperSQL.ExecNonQuery(strSql)); diff --git a/AIMSEntity/Model/AutoGenerate/SysConfig.cs b/AIMSEntity/Model/AutoGenerate/SysConfig.cs index 294ac0b..df9f70f 100644 --- a/AIMSEntity/Model/AutoGenerate/SysConfig.cs +++ b/AIMSEntity/Model/AutoGenerate/SysConfig.cs @@ -5,82 +5,127 @@ using AIMSDAL; namespace AIMSModel { - [Serializable] + [Serializable] public partial class SysConfig - { - private int? id; + { + private int? id; private string name; private string value; - private string note; - private int? isValid; - private string operatorNo; - private string operatorName; - private DateTime? operateDate; - - - /// + private string note; + private int? isValid; + private string operatorNo; + private string operatorName; + private DateTime? operateDate; + private string extend1; + private string extend2; + private string extend3; + private string extend4; + private string extend5; + + + /// /// /// - public int? Id - { - get{ return id; } - set{ id=value; } - } - /// + public int? Id + { + get { return id; } + set { id = value; } + } + /// /// /// - public string Name - { - get{ return name; } - set{ name=value; } - } - /// + public string Name + { + get { return name; } + set { name = value; } + } + /// /// /// - public string Value - { - get{ return this.value; } - set{ this.value=value; } - } - /// + public string Value + { + get { return value; } + set { value = value; } + } + /// /// /// - public string Note - { - get{ return note; } - set{ note=value; } - } - /// + public string Note + { + get { return note; } + set { note = value; } + } + /// /// /// - public int? IsValid - { - get{ return isValid; } - set{ isValid=value; } - } - /// + public int? IsValid + { + get { return isValid; } + set { isValid = value; } + } + /// /// /// - public string OperatorNo - { - get{ return operatorNo; } - set{ operatorNo=value; } - } - /// + public string OperatorNo + { + get { return operatorNo; } + set { operatorNo = value; } + } + /// /// /// - public string OperatorName - { - get{ return operatorName; } - set{ operatorName=value; } - } - /// + public string OperatorName + { + get { return operatorName; } + set { operatorName = value; } + } + /// /// /// - public DateTime? OperateDate - { - get{ return operateDate; } - set{ operateDate=value; } - } - } + public DateTime? OperateDate + { + get { return operateDate; } + set { operateDate = value; } + } + /// + /// + /// + public string Extend1 + { + get { return extend1; } + set { extend1 = value; } + } + /// + /// + /// + public string Extend2 + { + get { return extend2; } + set { extend2 = value; } + } + /// + /// + /// + public string Extend3 + { + get { return extend3; } + set { extend3 = value; } + } + /// + /// + /// + public string Extend4 + { + get { return extend4; } + set { extend4 = value; } + } + /// + /// + /// + public string Extend5 + { + get { return extend5; } + set { extend5 = value; } + } + } } diff --git a/AIMSEntity/ObjectQuery/SysConfigMap.cs b/AIMSEntity/ObjectQuery/SysConfigMap.cs index 561812d..fbea918 100644 --- a/AIMSEntity/ObjectQuery/SysConfigMap.cs +++ b/AIMSEntity/ObjectQuery/SysConfigMap.cs @@ -17,6 +17,11 @@ namespace AIMSObjectQuery dictionary.Add("operatorno", "OperatorNo"); dictionary.Add("operatorname", "OperatorName"); dictionary.Add("operatedate", "OperateDate"); + dictionary.Add("extend1", "Extend1"); + dictionary.Add("extend2", "Extend2"); + dictionary.Add("extend3", "Extend3"); + dictionary.Add("extend4", "Extend4"); + dictionary.Add("extend5", "Extend5"); } #region IMap 成员 diff --git a/DrawGraph/AreaManage/BaseInfoBottomManage.cs b/DrawGraph/AreaManage/BaseInfoBottomManage.cs index 9571553..f374901 100644 --- a/DrawGraph/AreaManage/BaseInfoBottomManage.cs +++ b/DrawGraph/AreaManage/BaseInfoBottomManage.cs @@ -539,6 +539,8 @@ namespace DrawGraph { tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.DoubleClick -= EditTextBox2_DoubleClick; + tokenEditor.DoubleClick += EditTextBox2_DoubleClick; } if (ableEdit.ClassDataSourceName == "OperationRecord.OperationDoctor" || ableEdit.ClassDataSourceName == "OperationRecord.AnesthesiaDoctor") { @@ -551,7 +553,7 @@ namespace DrawGraph if (ableEdit.ControlTitleText == "人员" && tokenEditor.SelectedTokens.Count > 0) { - for (int i = tokenEditor.SelectedTokens.Count-1; i >= 0; i--) + for (int i = tokenEditor.SelectedTokens.Count - 1; i >= 0; i--) { if (tokenEditor.SelectedTokens[i].Text == "无") { @@ -623,6 +625,19 @@ namespace DrawGraph AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; TokenEditorManage.SaveDictItem2(template, OpeRecord as OperationRecord, tokenEditor, aEdit, true); } + private void EditTextBox2_DoubleClick(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ((DevComponents.DotNetBar.Controls.TokenEditor)sender); + string text = tokenEditor.Text; + if (text.Trim() != "") + { + tokenEditor.SelectedTokens.Clear(); + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.Text = text; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } } } diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index b2c98ba..0a285c3 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -123,10 +123,15 @@ namespace DrawGraph } else { - myOpeRecord.BMI = ""; + myOpeRecord.BMI = "-"; template.SetObjValue(myOpeRecord, "OperationRecord.BMI", myOpeRecord.BMI.ToString(), myOpeRecord.BMI.ToString(), IsUpdate); } } + else + { + myOpeRecord.BMI = "-"; + template.SetObjValue(myOpeRecord, "OperationRecord.BMI", myOpeRecord.BMI.ToString(), myOpeRecord.BMI.ToString(), IsUpdate); + } } /// /// 设置可编辑组件的显示样式 @@ -605,6 +610,8 @@ namespace DrawGraph { tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.DoubleClick -= EditTextBox2_DoubleClick; + tokenEditor.DoubleClick += EditTextBox2_DoubleClick; } EditTextBox_DoubleClick(tokenEditor.EditTextBox, null); @@ -790,6 +797,19 @@ namespace DrawGraph } } } + private void EditTextBox2_DoubleClick(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ((DevComponents.DotNetBar.Controls.TokenEditor)sender); + string text = tokenEditor.Text; + if (text.Trim() != "") + { + tokenEditor.SelectedTokens.Clear(); + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.Text = text; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } private void EditTextBox_DoubleClick(object sender, EventArgs e) { diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index bb82ec2..d126233 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/DrawGraph/AreaManage/DrugsManage.cs @@ -167,6 +167,7 @@ namespace DrawGraph int rowDrugsIndex = 0; //y的高度//主要高度 double drugsy = 0; + int drugsi = 0; //加药最后位置 double maxDrugsy = lines.RealY + getYPositionByListIndex(RowsCount - 1, lines.RealY, lines.RealEndY, RowsCount); @@ -200,13 +201,13 @@ namespace DrawGraph { myOpeRecord.BeforeDrugs += string.Format("{0}{1} ", item.DrugName.Trim(), dose); } - else if (item.DrugChannel == "备用" && item.ParentId==0) + else if (item.DrugChannel == "备用" && item.ParentId == 0) { - myOpeRecord.StandbyListstr.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, "","")); + myOpeRecord.StandbyListstr.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.DrugChannel == "配药" && item.ParentId==0) + else if (item.DrugChannel == "配药" && item.ParentId == 0) { - 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, "","")); + 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 == "麻醉诱导用药") { @@ -219,6 +220,12 @@ namespace DrawGraph myOpeRecord.AnalgesiaDrug += string.Format("{0}{1} ", item.DrugName.Trim(), dose); x++; } + else if (item.Access == "下" && item.ParentId == 0) + { + ListAddDrugs(DrugListstr, drugsi, item); + drugsi++; + continue; + } } //当前时间段加药集合 myOpeRecord.FactDrugList.ForEach(drug => @@ -228,7 +235,7 @@ namespace DrawGraph }); 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; + if (_FactDrugList.Where(s => s.DrugName == "氧气" && s.GiveDrugType != "麻醉前用药" && s.GiveDrugType != "术后镇痛药" && s.GiveDrugType != "麻醉诱导用药").ToList().Count > 0) rowDrugsIndex = 1; //加药按加药时间排序 _FactDrugList.Sort(new FactDrugComparer()); @@ -236,9 +243,10 @@ 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 == "配药") continue; + if (temp.GiveDrugType == "麻醉前用药" || temp.GiveDrugType == "术后镇痛药" || temp.DrugChannel == "备用" || temp.GiveDrugType == "麻醉诱导用药" || temp.DrugChannel == "配药" || temp.Access == "下") continue; //子药不画 if (temp.ParentId > 0) continue; + bool isEqual = false; bool isChildEqual = false; diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index 5c8680c..893d8cc 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -227,7 +227,7 @@ namespace DrawGraph for (int i = 0; i < _FactDrugList.Count; i++) { FactDrug temp = _FactDrugList[i]; - if (temp.GiveDrugType == "麻醉前用药" || temp.GiveDrugType == "术后镇痛药" || temp.DrugChannel == "备用" ||temp.DrugChannel == "配药" || temp.GiveDrugType == "麻醉诱导用药") continue; + if (temp.GiveDrugType == "麻醉前用药" || temp.GiveDrugType == "术后镇痛药" || temp.DrugChannel == "备用" ||temp.DrugChannel == "配药" || temp.GiveDrugType == "麻醉诱导用药" || temp.Access == "下") continue; //子药不画 if (temp.ParentId > 0) continue; bool isEqual = false;