diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index 16aad9b..dfc5151 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -4,6 +4,7 @@ using AIMS.PublicUI.UI; using AIMSBLL; using AIMSExtension; using AIMSModel; +using DevComponents.DotNetBar; using DevComponents.Editors.DateTimeAdv; using DocumentManagement; using DrawGraph; @@ -782,28 +783,28 @@ namespace AIMS.OperationAanesthesia this.picInRoom.BackgroundImage = global::AIMS.Properties.Resources.入手术室_select; BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); - try - { - if (State != AIMSExtension.EditState.BROWSE && _record.StateName == "手术中" && NowRoom != null && isReadOnly == false) - { - //没有IP判断 - DataTable dtPhysioData = BOperationRecord.getPhysioDataByIp(NowRoom.Ip, _record.Id.Value, _record.InRoomTime.Value, getOpeMaxTime(_record), 5); - if (dtPhysioData.Rows.Count > 0) - { - foreach (var addPP in _record.PhysioConfigList) - { - addPP.clearAddObj(zgcAnaesRecord); - } - BOperationRecord.DeletePhysioDataByOpeID(_record.Id.Value); - //同步未画点数据 - DrawFillPhysioData(dtPhysioData); - } - } - } - catch (Exception ex) - { - PublicMethod.WriteLog(ex); - } + //try + //{ + // if (State != AIMSExtension.EditState.BROWSE && _record.StateName == "手术中" && NowRoom != null && isReadOnly == false) + // { + // //没有IP判断 + // DataTable dtPhysioData = BOperationRecord.getPhysioDataByIp(NowRoom.Ip, _record.Id.Value, _record.InRoomTime.Value, getOpeMaxTime(_record), 5); + // if (dtPhysioData.Rows.Count > 0) + // { + // foreach (var addPP in _record.PhysioConfigList) + // { + // addPP.clearAddObj(zgcAnaesRecord); + // } + // BOperationRecord.DeletePhysioDataByOpeID(_record.Id.Value); + // //同步未画点数据 + // DrawFillPhysioData(dtPhysioData); + // } + // } + //} + //catch (Exception ex) + //{ + // PublicMethod.WriteLog(ex); + //} } if (Inevent != null && Inevent.EventName == "麻醉开始" && _record.AnesthesiaBeginTime != Inevent.EventBeginTime) { @@ -931,11 +932,20 @@ namespace AIMS.OperationAanesthesia } public void SetUpPageTime() { - if (_record.pageBegin < _record.sharpBegin) return; - _record.lastPageBegin = _record.pageBegin; - _record.pageBegin = _record.pageBegin.AddMinutes(-240); + if (_record.PageBegin < _record.sharpBegin) return; + _record.lastPageBegin = _record.PageBegin; + _record.PageBegin = _record.PageBegin.AddMinutes(-240); _record.pageCount--; if (_record.pageCount < 1) _record.pageCount = 1; + + if (_record.phListPack != null) + { + Panel pan3 = _record.phListPack.CControl as Panel; + if (pan3 != null) + { + pan3.Controls.Clear(); + } + } } public void SetNextPageTime() { @@ -943,10 +953,19 @@ namespace AIMS.OperationAanesthesia DateTime curTimeTemp = getOpeMaxTime(_record); if (_record.lastPageBegin > curTimeTemp) return; //先设置新页的开始时间 - _record.pageBegin = _record.lastPageBegin; - _record.lastPageBegin = _record.pageBegin.AddMinutes(240); + _record.PageBegin = _record.lastPageBegin; + _record.lastPageBegin = _record.PageBegin.AddMinutes(240); _record.pageCount++; if (_record.pageCount > _record.currentPage) _record.pageCount = _record.currentPage; + + if (_record.phListPack != null) + { + Panel pan3 = _record.phListPack.CControl as Panel; + if (pan3 != null) + { + pan3.Controls.Clear(); + } + } } public DateTime getOpeMaxTime(OperationRecord myOpeRecord) { @@ -959,9 +978,9 @@ namespace AIMS.OperationAanesthesia { dts = nowDate; } - if (dts.ToString("yyyy-MM-dd HH:mm") == myOpeRecord.pageBegin.AddMinutes(240).ToString("yyyy-MM-dd HH:mm")) + if (dts.ToString("yyyy-MM-dd HH:mm") == myOpeRecord.PageBegin.AddMinutes(240).ToString("yyyy-MM-dd HH:mm")) { - dts = myOpeRecord.pageBegin.AddMinutes(240); + dts = myOpeRecord.PageBegin.AddMinutes(240); } if (myOpeRecord.OutRoomTime != null) { @@ -1306,6 +1325,12 @@ namespace AIMS.OperationAanesthesia frmPhysiosSetting frm = new frmPhysiosSetting(); frm.ConfigParam += new frmPhysiosSetting.ConfigParamHandler(templateManage.frmInstance_ConfigParam); frm._record = _record; + frm.FormClosed += ((s, er) => + { + if (PatientId == 0) return; + //刷新到当前页 + ReviewEvent(); + }); frm.ShowDialog(); } private void btnBloodGasAnalysis_Click(object sender, EventArgs e) @@ -1336,9 +1361,9 @@ namespace AIMS.OperationAanesthesia foreach (FactBloodGasAnalysis analysis in _record.FactBloodGasAnalysisList) { analysis.clearAddObj(zgcAnaesRecord); - if (analysis.RecordTime.Value >= _record.pageBegin && analysis.RecordTime.Value < _record.lastPageBegin) + if (analysis.RecordTime.Value >= _record.PageBegin && analysis.RecordTime.Value < _record.lastPageBegin) { - analysis.setAnasArr(zgcAnaesRecord, H5pack.RealX, H5pack.RealEndX, _record.pageBegin, _record.pageBegin.AddMinutes(240)); + analysis.setAnasArr(zgcAnaesRecord, H5pack.RealX, H5pack.RealEndX, _record.PageBegin, _record.PageBegin.AddMinutes(240)); analysis.drawText(janCePack.RealEndX, janCePack.RealY); } } @@ -1360,8 +1385,8 @@ namespace AIMS.OperationAanesthesia if (State == AIMSExtension.EditState.BROWSE || _record.StateName != "手术中" || NowRoom == null || isReadOnly == true) return; if (_record.OutRoomTime != null && DateTime.Now >= _record.OutRoomTime) return; DateTime dtTime = DateTime.Now; - - double span = ((TimeSpan)(dtTime - _record.InRoomTime.Value)).TotalSeconds % 300; + //InRoomTime.Value + double span = ((TimeSpan)(dtTime - _record.PageBegin)).TotalSeconds % 300; if (span < 10 || span > 12) return; if (LastMonitorDataTime != null && LastMonitorDataTime.Value.ToString("yyyy-MM-dd HH:mm") == dtTime.ToString("yyyy-MM-dd HH:mm")) return; @@ -1659,14 +1684,14 @@ namespace AIMS.OperationAanesthesia { //添加自定义的新菜单 ToolStripMenuItem clearSelectCouve = new ToolStripMenuItem(); - clearSelectCouve.Text = "清空选中曲线"; + clearSelectCouve.Text = "删除选择数据"; clearSelectCouve.Click += new EventHandler(clearSelectCouve_Click); menuStrip.Items.Add(clearSelectCouve); if (NowRoom != null) { ToolStripMenuItem getPhysioData = new ToolStripMenuItem(); - getPhysioData.Text = "添加监护仪数据"; + getPhysioData.Text = "重新获取数据"; getPhysioData.Click += getPhysioData_Click; menuStrip.Items.Add(getPhysioData); } @@ -1679,7 +1704,7 @@ namespace AIMS.OperationAanesthesia ToolStripMenuItem mnuAddDrug = new ToolStripMenuItem(); mnuAddDrug.Name = "add_medicine"; mnuAddDrug.Tag = "add_medicine"; - mnuAddDrug.Text = "编辑生命体征"; + mnuAddDrug.Text = "手动添加数据"; mnuAddDrug.Click += ((s, er) => { frmPhysioDataEdit frm = new frmPhysioDataEdit(_record); @@ -1695,7 +1720,7 @@ namespace AIMS.OperationAanesthesia if (NowRoom != null) { ToolStripMenuItem ModifyRoom = new ToolStripMenuItem(); - ModifyRoom.Text = "切换手术间"; + ModifyRoom.Text = "更换患者术间"; ModifyRoom.Click += ModifyRoom_Click; menuStrip.Items.Add(ModifyRoom); } @@ -1705,7 +1730,7 @@ namespace AIMS.OperationAanesthesia ToolStripMenuItem btnSyatemPhysion = new ToolStripMenuItem(); btnSyatemPhysion.Name = "btnSyatemPhysion"; btnSyatemPhysion.Tag = "btnSyatemPhysion"; - btnSyatemPhysion.Text = "历史痕迹"; + btnSyatemPhysion.Text = "查询修改痕迹"; btnSyatemPhysion.Click += new EventHandler(btnSyatemPhysion_Click); menuStrip.Items.Add(btnSyatemPhysion); } @@ -1741,8 +1766,9 @@ namespace AIMS.OperationAanesthesia { if (State != AIMSExtension.EditState.BROWSE && _record.StateName == "手术中" && NowRoom != null && isReadOnly == false) { + //InRoomTime //没有IP判断 - DataTable dtPhysioData = BOperationRecord.getPhysioDataByIp(NowRoom.Ip, _record.Id.Value, _record.InRoomTime.Value, getOpeMaxTime(_record), 5); + DataTable dtPhysioData = BOperationRecord.getPhysioDataByIp(NowRoom.Ip, _record.Id.Value, _record.PageBegin, getOpeMaxTime(_record), 5); //同步未画点数据 DrawFillPhysioData(dtPhysioData); diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs index 159de36..6d546b7 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs @@ -618,9 +618,9 @@ namespace AIMS.OperationAanesthesia } public void SetUpPageTime() { - if (_record.pageBegin < _record.sharpBegin) return; - _record.lastPageBegin = _record.pageBegin; - _record.pageBegin = _record.pageBegin.AddMinutes(-240); + if (_record.PageBegin < _record.sharpBegin) return; + _record.lastPageBegin = _record.PageBegin; + _record.PageBegin = _record.PageBegin.AddMinutes(-240); _record.pageCount--; if (_record.pageCount < 1) _record.pageCount = 1; } @@ -630,8 +630,8 @@ namespace AIMS.OperationAanesthesia DateTime curTimeTemp = getOpeMaxTime(_record); if (_record.lastPageBegin > curTimeTemp) return; //先设置新页的开始时间 - _record.pageBegin = _record.lastPageBegin; - _record.lastPageBegin = _record.pageBegin.AddMinutes(240); + _record.PageBegin = _record.lastPageBegin; + _record.lastPageBegin = _record.PageBegin.AddMinutes(240); _record.pageCount++; if (_record.pageCount > _record.currentPage) _record.pageCount = _record.currentPage; } @@ -925,9 +925,9 @@ namespace AIMS.OperationAanesthesia foreach (FactBloodGasAnalysis analysis in _record.FactBloodGasAnalysisList) { analysis.clearAddObj(zgcAnaesRecord); - if (analysis.RecordTime.Value >= _record.pageBegin && analysis.RecordTime.Value < _record.lastPageBegin) + if (analysis.RecordTime.Value >= _record.PageBegin && analysis.RecordTime.Value < _record.lastPageBegin) { - analysis.setAnasArr(zgcAnaesRecord, H5pack.RealX, IconPpack.RealY, _record.pageBegin, _record.pageBegin.AddMinutes(240)); + analysis.setAnasArr(zgcAnaesRecord, H5pack.RealX, IconPpack.RealY, _record.PageBegin, _record.PageBegin.AddMinutes(240)); analysis.drawText(janCePack.RealEndX, janCePack.RealY); } } @@ -1481,9 +1481,9 @@ namespace AIMS.OperationAanesthesia { dts = nowDate; } - if (dts.ToString("yyyy-MM-dd HH:mm") == myOpeRecord.pageBegin.AddMinutes(240).ToString("yyyy-MM-dd HH:mm")) + if (dts.ToString("yyyy-MM-dd HH:mm") == myOpeRecord.PageBegin.AddMinutes(240).ToString("yyyy-MM-dd HH:mm")) { - dts = myOpeRecord.pageBegin.AddMinutes(240); + dts = myOpeRecord.PageBegin.AddMinutes(240); } if (myOpeRecord.OutRoomTime != null) { diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs index 86c052c..6830bb6 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs @@ -5,6 +5,7 @@ using AIMS.PublicUI.UI; using AIMSBLL; using AIMSExtension; using AIMSModel; +using DevComponents.DotNetBar; using DevComponents.Editors.DateTimeAdv; using DocumentManagement; using DrawGraph; @@ -1912,6 +1913,9 @@ namespace AIMS.OperationAanesthesia { if (this.Visible == false) { + panel8.VerticalScroll.Value = 0; + if (templateManage != null) + templateManage.SetPYL(); if (_record != null && _record.StateName == "手术中" && State != AIMSExtension.EditState.BROWSE) { DisposeTimer(); diff --git a/AIMS/OperationAanesthesia/frmPhysioDataEdit.cs b/AIMS/OperationAanesthesia/frmPhysioDataEdit.cs index 20dd0ab..b01f0b1 100644 --- a/AIMS/OperationAanesthesia/frmPhysioDataEdit.cs +++ b/AIMS/OperationAanesthesia/frmPhysioDataEdit.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Data; using System.Drawing; using System.Linq; +using System.Runtime.Remoting.Metadata.W3cXsd2001; using System.Windows.Forms; namespace AIMS.OperationAanesthesia @@ -290,7 +291,7 @@ namespace AIMS.OperationAanesthesia private void LoadPhysioData(List Lists) { System.Data.DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value); - + int Width = panel2.Width - (panel2.Width / (240 / 5) * 3); foreach (Control pan in panel2.Controls) { @@ -311,64 +312,43 @@ namespace AIMS.OperationAanesthesia list.Add(pdTemp); } } - panel.Controls.Clear(); - panel.Tag = ade; - for (int i = (240 / ade.YAisx) - 1; i >= 0; i--) + foreach (Control txt in panel.Controls) { - DateTime SpanTime = _record.InRoomTime.Value.AddMinutes(i * ade.YAisx); - PhysioData pdNew = null; - foreach (var item in list) - { - if (item.RecordTime == SpanTime) - { - pdNew = item; - pdNew.config = ade; - break; - } - } - if (pdNew == null) - { - pdNew = PhysioDataConfig.newPhysioData(ade, _record.Id.Value, SpanTime, -1); - } if (ade.ImgPath != null && ade.ImgPath != "") { - System.Windows.Forms.ComboBox textNum = new System.Windows.Forms.ComboBox(); - textNum.Items.AddRange(ade.ImgPath.Split('|')); - textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); - textNum.Tag = pdNew; - if (pdNew.ValueString != "-1") - textNum.Text = pdNew.ValueString.ToString(); - textNum.Width = Width / (240 / ade.YAisx); - textNum.Dock = System.Windows.Forms.DockStyle.Left; - textNum.DropDownStyle = ComboBoxStyle.DropDownList; - textNum.Font = new System.Drawing.Font("微软雅黑", 7f); - textNum.Click += TextNum_Click; - textNum.Leave += ComeBoxNum_Leave; - panel.Controls.Add(textNum); + System.Windows.Forms.ComboBox textNum = txt as ComboBox; + PhysioData pdNew = textNum.Tag as PhysioData; + DateTime SpanTime = pdNew.RecordTime; + foreach (var item in list) + { + if (item.RecordTime == SpanTime) + { + pdNew = item; + pdNew.config = ade; + if (pdNew.ValueString != "-1") + textNum.Text = pdNew.ValueString.ToString(); + break; + } + } } else { - System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); - textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); - textNum.Tag = pdNew; - if (pdNew.ValueString != "-1") - textNum.Text = pdNew.ValueString.ToString(); - textNum.Width = Width / (240 / ade.YAisx); - textNum.Dock = System.Windows.Forms.DockStyle.Left; - textNum.Font = new System.Drawing.Font("微软雅黑", 7f); - textNum.Click += TextNum_Click; - textNum.Leave += TextNum_Leave; - textNum.DoubleClick += TextNum_DoubleClick; - panel.Controls.Add(textNum); - } - } - System.Windows.Forms.Label textName = new System.Windows.Forms.Label(); - textName.Name = "txt" + ade.Name; - textName.Text = ade.Name; - textName.Font = new System.Drawing.Font("微软雅黑", 8f); - textName.Width = panel2.Width / (240 / 5) * 3; - textName.Dock = System.Windows.Forms.DockStyle.Left; - panel.Controls.Add(textName); + System.Windows.Forms.TextBox textNum = txt as TextBox; + PhysioData pdNew = textNum.Tag as PhysioData; + DateTime SpanTime = pdNew.RecordTime; + foreach (var item in list) + { + if (item.RecordTime == SpanTime) + { + pdNew = item; + pdNew.config = ade; + if (pdNew.ValueString != "-1") + textNum.Text = pdNew.ValueString.ToString(); + break; + } + } + } + } } else { @@ -381,45 +361,25 @@ namespace AIMS.OperationAanesthesia list.Add(pdTemp); } } - panel.Controls.Clear(); - panel.Tag = ade; - for (int i = (240 / 5) - 1; i >= 0; i--) + foreach (Control txt in panel.Controls) { - DateTime SpanTime = _record.InRoomTime.Value.AddMinutes(i * 5); - System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); - PhysioData pdNew = null; - foreach (var item in list) + if (txt is TextBox) { - if (item.RecordTime == SpanTime) + System.Windows.Forms.TextBox textNum = txt as TextBox; + PhysioData pdNew = textNum.Tag as PhysioData; + DateTime SpanTime = pdNew.RecordTime; + foreach (var item in list) { - pdNew = item; - pdNew.config = ade; - textNum.Text = pdNew.ValueString.ToString(); - break; - } + if (item.RecordTime == SpanTime) + { + pdNew = item; + pdNew.config = ade; + textNum.Text = pdNew.ValueString.ToString(); + break; + } + } } - if (pdNew == null) - { - pdNew = PhysioDataConfig.newPhysioData(ade, _record.Id.Value, SpanTime, -1); - } - - textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); - textNum.Tag = pdNew; - textNum.Width = Width / (240 / 5); - textNum.Font = new System.Drawing.Font("微软雅黑", 7f); - textNum.Dock = System.Windows.Forms.DockStyle.Left; - textNum.Click += TextNum_Click; - textNum.Leave += TextNum_Leave; - textNum.DoubleClick += TextNum_DoubleClick; - panel.Controls.Add(textNum); - } - System.Windows.Forms.Label textName = new System.Windows.Forms.Label(); - textName.Name = "txt" + ade.Name; - textName.Text = ade.Name; - textName.Font = new System.Drawing.Font("微软雅黑", 8f); - textName.Width = panel2.Width / (240 / 5) * 3; - textName.Dock = System.Windows.Forms.DockStyle.Left; - panel.Controls.Add(textName); + } } } @@ -600,29 +560,14 @@ namespace AIMS.OperationAanesthesia { if (selectConfig != null) selectConfig.Focus(); - } - public DateTime getInRoomSpanTime(DateTime time) - { - DateTime resultTime = time; - for (int i = (240 / 5); i >= 0; i--) - { - DateTime spanTime = _record.InRoomTime.Value.AddMinutes(i * 5); - if (spanTime >= resultTime && spanTime < resultTime.AddMinutes(5)) - { - resultTime = spanTime; - break; - } - - } - return resultTime; - } + } private void btnAdd_Click(object sender, EventArgs e) { try { if (dtpInsertEnd.Value < dtpInsertBegin.Value) return; - if (dtpInsertBegin.Value < _record.pageBegin) return; + if (dtpInsertBegin.Value < _record.PageBegin) return; bool RESULT = true; foreach (var item in groupBox3.Controls) { diff --git a/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs b/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs index d46d925..4d0f4e6 100644 --- a/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs +++ b/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs @@ -30,14 +30,17 @@ namespace AIMS.OperationAanesthesia private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPhysiosSetting)); this.btnSave = new DevComponents.DotNetBar.ButtonX(); this.btnDelete = new DevComponents.DotNetBar.ButtonX(); this.panel1 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); + this.superTabControlPanel3 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dgvMZTZ = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.spMZSMTZ = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); this.dgvSetting = new DevComponents.DotNetBar.Controls.DataGridViewX(); @@ -58,9 +61,6 @@ namespace AIMS.OperationAanesthesia this.YAisx = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); this.PhysioOrder = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); this.spJHYCS = new DevComponents.DotNetBar.SuperTabItem(); - this.superTabControlPanel3 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dgvMZTZ = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.spMZSMTZ = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelJHYSJXS = new DevComponents.DotNetBar.PanelEx(); this.spJHYSJXS = new DevComponents.DotNetBar.SuperTabItem(); @@ -85,18 +85,18 @@ namespace AIMS.OperationAanesthesia this.dataGridViewIntegerInputColumn3 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); this.dataGridViewIntegerInputColumn4 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); this.dataGridViewCheckBoxXColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ShowText2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShowText2 = new DevComponents.DotNetBar.Controls.DataGridViewCheckBoxXColumn(); this.dataGridViewCheckBoxXColumn4 = new DevComponents.DotNetBar.Controls.DataGridViewCheckBoxXColumn(); this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewIntegerInputColumn6 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); + this.superTabControlPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvMZTZ)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); this.panelExZKZB.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvSetting)).BeginInit(); - this.superTabControlPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvMZTZ)).BeginInit(); this.superTabControlPanel2.SuspendLayout(); this.SuspendLayout(); // @@ -177,6 +177,59 @@ namespace AIMS.OperationAanesthesia this.spMZSMTZ, this.spJHYSJXS}); // + // superTabControlPanel3 + // + this.superTabControlPanel3.Controls.Add(this.dgvMZTZ); + this.superTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel3.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel3.Name = "superTabControlPanel3"; + this.superTabControlPanel3.Size = new System.Drawing.Size(1152, 436); + this.superTabControlPanel3.TabIndex = 0; + this.superTabControlPanel3.TabItem = this.spMZSMTZ; + // + // dgvMZTZ + // + this.dgvMZTZ.AllowUserToAddRows = false; + this.dgvMZTZ.AllowUserToDeleteRows = false; + this.dgvMZTZ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvMZTZ.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn10, + this.dataGridViewTextBoxColumn11, + this.dataGridViewTextBoxColumn12, + this.dataGridViewImageColumn1, + this.dataGridViewLabelXColumn1, + this.dataGridViewIntegerInputColumn1, + this.dataGridViewIntegerInputColumn2, + this.dataGridViewIntegerInputColumn3, + this.dataGridViewIntegerInputColumn4, + this.dataGridViewCheckBoxXColumn2, + this.ShowText2, + this.dataGridViewCheckBoxXColumn4, + this.dataGridViewTextBoxColumn13, + this.dataGridViewIntegerInputColumn6}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvMZTZ.DefaultCellStyle = dataGridViewCellStyle1; + this.dgvMZTZ.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvMZTZ.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dgvMZTZ.Location = new System.Drawing.Point(0, 0); + this.dgvMZTZ.Name = "dgvMZTZ"; + this.dgvMZTZ.RowTemplate.Height = 23; + this.dgvMZTZ.Size = new System.Drawing.Size(1152, 436); + this.dgvMZTZ.TabIndex = 1; + // + // spMZSMTZ + // + this.spMZSMTZ.AttachedControl = this.superTabControlPanel3; + this.spMZSMTZ.GlobalItem = false; + this.spMZSMTZ.Name = "spMZSMTZ"; + this.spMZSMTZ.Text = "麻醉数据参数"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.panelExZKZB); @@ -423,59 +476,6 @@ namespace AIMS.OperationAanesthesia this.spJHYCS.Name = "spJHYCS"; this.spJHYCS.Text = "监护数据参数"; // - // superTabControlPanel3 - // - this.superTabControlPanel3.Controls.Add(this.dgvMZTZ); - this.superTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel3.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel3.Name = "superTabControlPanel3"; - this.superTabControlPanel3.Size = new System.Drawing.Size(1152, 436); - this.superTabControlPanel3.TabIndex = 0; - this.superTabControlPanel3.TabItem = this.spMZSMTZ; - // - // dgvMZTZ - // - this.dgvMZTZ.AllowUserToAddRows = false; - this.dgvMZTZ.AllowUserToDeleteRows = false; - this.dgvMZTZ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvMZTZ.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn10, - this.dataGridViewTextBoxColumn11, - this.dataGridViewTextBoxColumn12, - this.dataGridViewImageColumn1, - this.dataGridViewLabelXColumn1, - this.dataGridViewIntegerInputColumn1, - this.dataGridViewIntegerInputColumn2, - this.dataGridViewIntegerInputColumn3, - this.dataGridViewIntegerInputColumn4, - this.dataGridViewCheckBoxXColumn2, - this.ShowText2, - this.dataGridViewCheckBoxXColumn4, - this.dataGridViewTextBoxColumn13, - this.dataGridViewIntegerInputColumn6}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvMZTZ.DefaultCellStyle = dataGridViewCellStyle1; - this.dgvMZTZ.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvMZTZ.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dgvMZTZ.Location = new System.Drawing.Point(0, 0); - this.dgvMZTZ.Name = "dgvMZTZ"; - this.dgvMZTZ.RowTemplate.Height = 23; - this.dgvMZTZ.Size = new System.Drawing.Size(1152, 436); - this.dgvMZTZ.TabIndex = 1; - // - // spMZSMTZ - // - this.spMZSMTZ.AttachedControl = this.superTabControlPanel3; - this.spMZSMTZ.GlobalItem = false; - this.spMZSMTZ.Name = "spMZSMTZ"; - this.spMZSMTZ.Text = "麻醉数据参数"; - // // superTabControlPanel2 // this.superTabControlPanel2.Controls.Add(this.panelJHYSJXS); @@ -734,9 +734,14 @@ namespace AIMS.OperationAanesthesia // // ShowText2 // + this.ShowText2.Checked = true; + this.ShowText2.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.ShowText2.CheckValue = "N"; this.ShowText2.DataPropertyName = "ShowText"; this.ShowText2.HeaderText = "是否数字验证"; this.ShowText2.Name = "ShowText2"; + this.ShowText2.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShowText2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // // dataGridViewCheckBoxXColumn4 // @@ -785,11 +790,11 @@ namespace AIMS.OperationAanesthesia this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); + this.superTabControlPanel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvMZTZ)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); this.panelExZKZB.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvSetting)).EndInit(); - this.superTabControlPanel3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dgvMZTZ)).EndInit(); this.superTabControlPanel2.ResumeLayout(false); this.ResumeLayout(false); @@ -849,7 +854,7 @@ namespace AIMS.OperationAanesthesia private DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn dataGridViewIntegerInputColumn3; private DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn dataGridViewIntegerInputColumn4; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewCheckBoxXColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn ShowText2; + private DevComponents.DotNetBar.Controls.DataGridViewCheckBoxXColumn ShowText2; private DevComponents.DotNetBar.Controls.DataGridViewCheckBoxXColumn dataGridViewCheckBoxXColumn4; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; private DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn dataGridViewIntegerInputColumn6; diff --git a/AIMS/OperationAanesthesia/frmPhysiosSetting.resx b/AIMS/OperationAanesthesia/frmPhysiosSetting.resx index 3a61bc9..197549e 100644 --- a/AIMS/OperationAanesthesia/frmPhysiosSetting.resx +++ b/AIMS/OperationAanesthesia/frmPhysiosSetting.resx @@ -218,7 +218,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - LgAAAk1TRnQBSQFMAgEBLwEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + LgAAAk1TRnQBSQFMAgEBLwEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAcADAAEBAQABCAYAATAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/AIMS/OperationAfter/frmOperationManage.Designer.cs b/AIMS/OperationAfter/frmOperationManage.Designer.cs index aa3b236..ce8b47f 100644 --- a/AIMS/OperationAfter/frmOperationManage.Designer.cs +++ b/AIMS/OperationAfter/frmOperationManage.Designer.cs @@ -40,6 +40,41 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.dgv = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.panel2 = new System.Windows.Forms.Panel(); + this.AgeEnd = new System.Windows.Forms.NumericUpDown(); + this.AgeBegin = new System.Windows.Forms.NumericUpDown(); + this.label14 = new System.Windows.Forms.Label(); + this.cboIsNotPlanReturnOperation = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.txtName = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.txtOperation = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.txtArchivesNo = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.tokenEditor3 = new DevComponents.DotNetBar.Controls.TokenEditor(); + this.tokenEditor2 = new DevComponents.DotNetBar.Controls.TokenEditor(); + this.tokenEditor1 = new DevComponents.DotNetBar.Controls.TokenEditor(); + this.label10 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.dtpBegInDate = new System.Windows.Forms.DateTimePicker(); + this.label4 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.dtpEndDate = new System.Windows.Forms.DateTimePicker(); + this.cmbPatType = new System.Windows.Forms.ComboBox(); + this.txtASALevel = new System.Windows.Forms.ComboBox(); + this.txtOperationCut = new System.Windows.Forms.ComboBox(); + this.cboOperationLevel = new System.Windows.Forms.ComboBox(); + this.cmbOpeType = new System.Windows.Forms.ComboBox(); + this.cboDepartment = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btnFind = new System.Windows.Forms.Button(); this.CheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.ApplyId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.StateColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -82,41 +117,6 @@ this.IsNotPlanReturnOperation = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.RemarkColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OperatorName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.panel2 = new System.Windows.Forms.Panel(); - this.btnFind = new System.Windows.Forms.Button(); - this.AgeEnd = new System.Windows.Forms.NumericUpDown(); - this.AgeBegin = new System.Windows.Forms.NumericUpDown(); - this.label14 = new System.Windows.Forms.Label(); - this.cboIsNotPlanReturnOperation = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.txtName = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.txtOperation = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.txtArchivesNo = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.tokenEditor3 = new DevComponents.DotNetBar.Controls.TokenEditor(); - this.tokenEditor2 = new DevComponents.DotNetBar.Controls.TokenEditor(); - this.tokenEditor1 = new DevComponents.DotNetBar.Controls.TokenEditor(); - this.label10 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.dtpBegInDate = new System.Windows.Forms.DateTimePicker(); - this.label4 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.dtpEndDate = new System.Windows.Forms.DateTimePicker(); - this.cmbPatType = new System.Windows.Forms.ComboBox(); - this.txtASALevel = new System.Windows.Forms.ComboBox(); - this.txtOperationCut = new System.Windows.Forms.ComboBox(); - this.cboOperationLevel = new System.Windows.Forms.ComboBox(); - this.cmbOpeType = new System.Windows.Forms.ComboBox(); - this.cboDepartment = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); this.toolStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); @@ -294,340 +294,6 @@ this.dgv.TabIndex = 4; this.dgv.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_RowPostPaint); // - // CheckBoxColumn - // - this.CheckBoxColumn.HeaderText = "选择"; - this.CheckBoxColumn.Name = "CheckBoxColumn"; - this.CheckBoxColumn.ReadOnly = true; - this.CheckBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.CheckBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.CheckBoxColumn.Visible = false; - this.CheckBoxColumn.Width = 35; - // - // ApplyId - // - this.ApplyId.DataPropertyName = "ApplyId"; - this.ApplyId.HeaderText = "ApplyId"; - this.ApplyId.Name = "ApplyId"; - this.ApplyId.ReadOnly = true; - this.ApplyId.Visible = false; - // - // StateColumn - // - this.StateColumn.DataPropertyName = "State"; - this.StateColumn.HeaderText = "状态"; - this.StateColumn.Name = "StateColumn"; - this.StateColumn.ReadOnly = true; - this.StateColumn.Width = 60; - // - // PatientNameColumn - // - this.PatientNameColumn.DataPropertyName = "PatientName"; - this.PatientNameColumn.HeaderText = "姓名"; - this.PatientNameColumn.Name = "PatientNameColumn"; - this.PatientNameColumn.ReadOnly = true; - this.PatientNameColumn.Width = 60; - // - // SexColumn - // - this.SexColumn.DataPropertyName = "Sex"; - this.SexColumn.HeaderText = "性别"; - this.SexColumn.Name = "SexColumn"; - this.SexColumn.ReadOnly = true; - this.SexColumn.Width = 40; - // - // Age - // - this.Age.DataPropertyName = "Age"; - this.Age.HeaderText = "年龄"; - this.Age.Name = "Age"; - this.Age.ReadOnly = true; - this.Age.Width = 40; - // - // ApplyDepNameColumn - // - this.ApplyDepNameColumn.DataPropertyName = "ApplyDeptName"; - this.ApplyDepNameColumn.HeaderText = "科室"; - this.ApplyDepNameColumn.Name = "ApplyDepNameColumn"; - this.ApplyDepNameColumn.ReadOnly = true; - this.ApplyDepNameColumn.Width = 80; - // - // SickBedColumn - // - this.SickBedColumn.DataPropertyName = "SickBed"; - this.SickBedColumn.HeaderText = "床位"; - this.SickBedColumn.Name = "SickBedColumn"; - this.SickBedColumn.ReadOnly = true; - this.SickBedColumn.Width = 40; - // - // PatientType - // - this.PatientType.DataPropertyName = "PatientType"; - this.PatientType.HeaderText = "患者类别"; - this.PatientType.Name = "PatientType"; - this.PatientType.ReadOnly = true; - this.PatientType.Width = 80; - // - // MdrecNoColumn - // - this.MdrecNoColumn.DataPropertyName = "MdrecNo"; - this.MdrecNoColumn.HeaderText = "住院号"; - this.MdrecNoColumn.Name = "MdrecNoColumn"; - this.MdrecNoColumn.ReadOnly = true; - this.MdrecNoColumn.Width = 70; - // - // OperationTypeColumn - // - this.OperationTypeColumn.DataPropertyName = "OperationType"; - this.OperationTypeColumn.HeaderText = "手术类型"; - this.OperationTypeColumn.Name = "OperationTypeColumn"; - this.OperationTypeColumn.ReadOnly = true; - this.OperationTypeColumn.Width = 80; - // - // ApplyOperatorNameColumn - // - this.ApplyOperatorNameColumn.DataPropertyName = "ApplyOperatorNo"; - this.ApplyOperatorNameColumn.HeaderText = "申请人"; - this.ApplyOperatorNameColumn.Name = "ApplyOperatorNameColumn"; - this.ApplyOperatorNameColumn.ReadOnly = true; - this.ApplyOperatorNameColumn.Width = 70; - // - // ApplyTimeColumn - // - this.ApplyTimeColumn.DataPropertyName = "ApplyTime"; - this.ApplyTimeColumn.HeaderText = "申请时间"; - this.ApplyTimeColumn.Name = "ApplyTimeColumn"; - this.ApplyTimeColumn.ReadOnly = true; - this.ApplyTimeColumn.Width = 110; - // - // OrderOperationTimeColumn - // - this.OrderOperationTimeColumn.DataPropertyName = "OrderOperationTime"; - this.OrderOperationTimeColumn.HeaderText = "预约时间"; - this.OrderOperationTimeColumn.Name = "OrderOperationTimeColumn"; - this.OrderOperationTimeColumn.ReadOnly = true; - this.OrderOperationTimeColumn.Width = 110; - // - // ApplyDiagnoseInfoNameColumn - // - this.ApplyDiagnoseInfoNameColumn.DataPropertyName = "ApplyDiagnoseInfoName"; - this.ApplyDiagnoseInfoNameColumn.HeaderText = "术前诊断"; - this.ApplyDiagnoseInfoNameColumn.Name = "ApplyDiagnoseInfoNameColumn"; - this.ApplyDiagnoseInfoNameColumn.ReadOnly = true; - this.ApplyDiagnoseInfoNameColumn.Width = 150; - // - // ApplyOperationInfoNameColumn - // - this.ApplyOperationInfoNameColumn.DataPropertyName = "ApplyOperationInfoName"; - this.ApplyOperationInfoNameColumn.HeaderText = "拟施手术"; - this.ApplyOperationInfoNameColumn.Name = "ApplyOperationInfoNameColumn"; - this.ApplyOperationInfoNameColumn.ReadOnly = true; - this.ApplyOperationInfoNameColumn.Width = 150; - // - // InRoomTime - // - this.InRoomTime.DataPropertyName = "InRoomTime"; - this.InRoomTime.HeaderText = "入室时间"; - this.InRoomTime.Name = "InRoomTime"; - this.InRoomTime.ReadOnly = true; - this.InRoomTime.Width = 110; - // - // OutRoomTime - // - this.OutRoomTime.DataPropertyName = "OutRoomTime"; - this.OutRoomTime.HeaderText = "出室时间"; - this.OutRoomTime.Name = "OutRoomTime"; - this.OutRoomTime.ReadOnly = true; - this.OutRoomTime.Width = 110; - // - // RoomHourTimeSpan - // - this.RoomHourTimeSpan.DataPropertyName = "RoomHourTimeSpan"; - this.RoomHourTimeSpan.HeaderText = "总时长"; - this.RoomHourTimeSpan.Name = "RoomHourTimeSpan"; - this.RoomHourTimeSpan.ReadOnly = true; - this.RoomHourTimeSpan.Width = 80; - // - // AnesthesiaBeginTime - // - this.AnesthesiaBeginTime.DataPropertyName = "AnesthesiaBeginTime"; - this.AnesthesiaBeginTime.HeaderText = "麻醉开始时间"; - this.AnesthesiaBeginTime.Name = "AnesthesiaBeginTime"; - this.AnesthesiaBeginTime.ReadOnly = true; - this.AnesthesiaBeginTime.Width = 110; - // - // AnesthesiaEndTime - // - this.AnesthesiaEndTime.DataPropertyName = "AnesthesiaEndTime"; - this.AnesthesiaEndTime.HeaderText = "麻醉结束时间"; - this.AnesthesiaEndTime.Name = "AnesthesiaEndTime"; - this.AnesthesiaEndTime.ReadOnly = true; - this.AnesthesiaEndTime.Width = 110; - // - // AnaesthesiaHourTimeSpan - // - this.AnaesthesiaHourTimeSpan.DataPropertyName = "AnaesthesiaHourTimeSpan"; - this.AnaesthesiaHourTimeSpan.HeaderText = "麻醉时长"; - this.AnaesthesiaHourTimeSpan.Name = "AnaesthesiaHourTimeSpan"; - this.AnaesthesiaHourTimeSpan.ReadOnly = true; - this.AnaesthesiaHourTimeSpan.Width = 80; - // - // OperationBeginTime - // - this.OperationBeginTime.DataPropertyName = "OperationBeginTime"; - this.OperationBeginTime.HeaderText = "手术开始时间"; - this.OperationBeginTime.Name = "OperationBeginTime"; - this.OperationBeginTime.ReadOnly = true; - this.OperationBeginTime.Width = 110; - // - // OperationEndTime - // - this.OperationEndTime.DataPropertyName = "OperationEndTime"; - this.OperationEndTime.HeaderText = "手术结束时间"; - this.OperationEndTime.Name = "OperationEndTime"; - this.OperationEndTime.ReadOnly = true; - this.OperationEndTime.Width = 110; - // - // OperationHourTimeSpan - // - this.OperationHourTimeSpan.DataPropertyName = "OperationHourTimeSpan"; - this.OperationHourTimeSpan.HeaderText = "手术时长"; - this.OperationHourTimeSpan.Name = "OperationHourTimeSpan"; - this.OperationHourTimeSpan.ReadOnly = true; - this.OperationHourTimeSpan.Width = 80; - // - // AnaesthesiaMethodNameColumn - // - this.AnaesthesiaMethodNameColumn.DataPropertyName = "AnaesthesiaMethodName"; - this.AnaesthesiaMethodNameColumn.HeaderText = "麻醉方式"; - this.AnaesthesiaMethodNameColumn.Name = "AnaesthesiaMethodNameColumn"; - this.AnaesthesiaMethodNameColumn.ReadOnly = true; - // - // OperationInfoName - // - this.OperationInfoName.DataPropertyName = "OperationInfoName"; - this.OperationInfoName.HeaderText = "实施手术"; - this.OperationInfoName.Name = "OperationInfoName"; - this.OperationInfoName.ReadOnly = true; - // - // OperationCut - // - this.OperationCut.DataPropertyName = "OperationCut"; - this.OperationCut.HeaderText = "切口类型"; - this.OperationCut.Name = "OperationCut"; - this.OperationCut.ReadOnly = true; - this.OperationCut.Width = 80; - // - // OperationPositionName - // - this.OperationPositionName.DataPropertyName = "OperationPositionName"; - this.OperationPositionName.HeaderText = "手术部位"; - this.OperationPositionName.Name = "OperationPositionName"; - this.OperationPositionName.ReadOnly = true; - this.OperationPositionName.Width = 80; - // - // OperationBodyPositionName - // - this.OperationBodyPositionName.DataPropertyName = "OperationBodyPositionName"; - this.OperationBodyPositionName.HeaderText = "手术体位"; - this.OperationBodyPositionName.Name = "OperationBodyPositionName"; - this.OperationBodyPositionName.ReadOnly = true; - this.OperationBodyPositionName.Width = 80; - // - // OperationLevelNameColumn - // - this.OperationLevelNameColumn.DataPropertyName = "OperationLevel"; - this.OperationLevelNameColumn.HeaderText = "手术分级"; - this.OperationLevelNameColumn.Name = "OperationLevelNameColumn"; - this.OperationLevelNameColumn.ReadOnly = true; - this.OperationLevelNameColumn.Width = 80; - // - // ASALevelName - // - this.ASALevelName.DataPropertyName = "ASALevelName"; - this.ASALevelName.HeaderText = "ASA等级"; - this.ASALevelName.Name = "ASALevelName"; - this.ASALevelName.ReadOnly = true; - this.ASALevelName.Width = 80; - // - // OperationDoctorColumn - // - this.OperationDoctorColumn.DataPropertyName = "OperationDoctor"; - this.OperationDoctorColumn.HeaderText = "术者"; - this.OperationDoctorColumn.Name = "OperationDoctorColumn"; - this.OperationDoctorColumn.ReadOnly = true; - this.OperationDoctorColumn.Width = 60; - // - // Assistant1Column - // - this.Assistant1Column.DataPropertyName = "Assistant"; - this.Assistant1Column.HeaderText = "助手"; - this.Assistant1Column.Name = "Assistant1Column"; - this.Assistant1Column.ReadOnly = true; - this.Assistant1Column.Width = 90; - // - // AnesthesiaDoctorColumn - // - this.AnesthesiaDoctorColumn.DataPropertyName = "AnesthesiaDoctor"; - this.AnesthesiaDoctorColumn.HeaderText = "麻醉"; - this.AnesthesiaDoctorColumn.Name = "AnesthesiaDoctorColumn"; - this.AnesthesiaDoctorColumn.ReadOnly = true; - this.AnesthesiaDoctorColumn.Width = 60; - // - // TourNurseColumn - // - this.TourNurseColumn.DataPropertyName = "TourNurse"; - this.TourNurseColumn.HeaderText = "巡回"; - this.TourNurseColumn.Name = "TourNurseColumn"; - this.TourNurseColumn.ReadOnly = true; - this.TourNurseColumn.Width = 60; - // - // InstrumentNurseColumn - // - this.InstrumentNurseColumn.DataPropertyName = "InstrumentNurse"; - this.InstrumentNurseColumn.HeaderText = "器械"; - this.InstrumentNurseColumn.Name = "InstrumentNurseColumn"; - this.InstrumentNurseColumn.ReadOnly = true; - this.InstrumentNurseColumn.Width = 60; - // - // OperationRoomColumn - // - this.OperationRoomColumn.DataPropertyName = "OperationRoom"; - this.OperationRoomColumn.HeaderText = "术间"; - this.OperationRoomColumn.Name = "OperationRoomColumn"; - this.OperationRoomColumn.ReadOnly = true; - this.OperationRoomColumn.Width = 40; - // - // PlanOrder - // - this.PlanOrder.DataPropertyName = "PlanOrder"; - this.PlanOrder.HeaderText = "台次"; - this.PlanOrder.Name = "PlanOrder"; - this.PlanOrder.ReadOnly = true; - this.PlanOrder.Width = 40; - // - // IsNotPlanReturnOperation - // - this.IsNotPlanReturnOperation.DataPropertyName = "IsNotPlanReturnOperation"; - this.IsNotPlanReturnOperation.HeaderText = "非计划二次手术"; - this.IsNotPlanReturnOperation.Name = "IsNotPlanReturnOperation"; - this.IsNotPlanReturnOperation.ReadOnly = true; - // - // RemarkColumn - // - this.RemarkColumn.DataPropertyName = "Remark"; - this.RemarkColumn.HeaderText = "停止原因"; - this.RemarkColumn.Name = "RemarkColumn"; - this.RemarkColumn.ReadOnly = true; - // - // OperatorName - // - this.OperatorName.DataPropertyName = "OperatorName"; - this.OperatorName.HeaderText = "停止人"; - this.OperatorName.Name = "OperatorName"; - this.OperatorName.ReadOnly = true; - this.OperatorName.Width = 80; - // // panel2 // this.panel2.Controls.Add(this.AgeEnd); @@ -671,17 +337,6 @@ this.panel2.Size = new System.Drawing.Size(1187, 112); this.panel2.TabIndex = 0; // - // btnFind - // - this.btnFind.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnFind.Location = new System.Drawing.Point(1070, 33); - this.btnFind.Name = "btnFind"; - this.btnFind.Size = new System.Drawing.Size(105, 63); - this.btnFind.TabIndex = 18; - this.btnFind.Text = "查询"; - this.btnFind.UseVisualStyleBackColor = true; - this.btnFind.Click += new System.EventHandler(this.btnFind_Click); - // // AgeEnd // this.AgeEnd.Location = new System.Drawing.Point(990, 42); @@ -1034,6 +689,351 @@ this.label1.TabIndex = 72; this.label1.Text = "科室"; // + // btnFind + // + this.btnFind.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnFind.Location = new System.Drawing.Point(1070, 33); + this.btnFind.Name = "btnFind"; + this.btnFind.Size = new System.Drawing.Size(105, 63); + this.btnFind.TabIndex = 18; + this.btnFind.Text = "查询"; + this.btnFind.UseVisualStyleBackColor = true; + this.btnFind.Click += new System.EventHandler(this.btnFind_Click); + // + // CheckBoxColumn + // + this.CheckBoxColumn.HeaderText = "选择"; + this.CheckBoxColumn.Name = "CheckBoxColumn"; + this.CheckBoxColumn.ReadOnly = true; + this.CheckBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.CheckBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.CheckBoxColumn.Visible = false; + this.CheckBoxColumn.Width = 35; + // + // ApplyId + // + this.ApplyId.DataPropertyName = "ApplyId"; + this.ApplyId.HeaderText = "ApplyId"; + this.ApplyId.Name = "ApplyId"; + this.ApplyId.ReadOnly = true; + this.ApplyId.Visible = false; + // + // StateColumn + // + this.StateColumn.DataPropertyName = "State"; + this.StateColumn.HeaderText = "状态"; + this.StateColumn.Name = "StateColumn"; + this.StateColumn.ReadOnly = true; + this.StateColumn.Width = 60; + // + // PatientNameColumn + // + this.PatientNameColumn.DataPropertyName = "PatientName"; + this.PatientNameColumn.HeaderText = "姓名"; + this.PatientNameColumn.Name = "PatientNameColumn"; + this.PatientNameColumn.ReadOnly = true; + this.PatientNameColumn.Width = 60; + // + // SexColumn + // + this.SexColumn.DataPropertyName = "Sex"; + this.SexColumn.HeaderText = "性别"; + this.SexColumn.Name = "SexColumn"; + this.SexColumn.ReadOnly = true; + this.SexColumn.Width = 40; + // + // Age + // + this.Age.DataPropertyName = "Age"; + this.Age.HeaderText = "年龄"; + this.Age.Name = "Age"; + this.Age.ReadOnly = true; + this.Age.Width = 40; + // + // ApplyDepNameColumn + // + this.ApplyDepNameColumn.DataPropertyName = "PatientDept"; + this.ApplyDepNameColumn.HeaderText = "科室"; + this.ApplyDepNameColumn.Name = "ApplyDepNameColumn"; + this.ApplyDepNameColumn.ReadOnly = true; + this.ApplyDepNameColumn.Width = 80; + // + // SickBedColumn + // + this.SickBedColumn.DataPropertyName = "SickBed"; + this.SickBedColumn.HeaderText = "床位"; + this.SickBedColumn.Name = "SickBedColumn"; + this.SickBedColumn.ReadOnly = true; + this.SickBedColumn.Width = 40; + // + // PatientType + // + this.PatientType.DataPropertyName = "PatientType"; + this.PatientType.HeaderText = "患者类别"; + this.PatientType.Name = "PatientType"; + this.PatientType.ReadOnly = true; + this.PatientType.Width = 80; + // + // MdrecNoColumn + // + this.MdrecNoColumn.DataPropertyName = "MdrecNo"; + this.MdrecNoColumn.HeaderText = "住院号"; + this.MdrecNoColumn.Name = "MdrecNoColumn"; + this.MdrecNoColumn.ReadOnly = true; + this.MdrecNoColumn.Width = 70; + // + // OperationTypeColumn + // + this.OperationTypeColumn.DataPropertyName = "OperationType"; + this.OperationTypeColumn.HeaderText = "手术类型"; + this.OperationTypeColumn.Name = "OperationTypeColumn"; + this.OperationTypeColumn.ReadOnly = true; + this.OperationTypeColumn.Width = 80; + // + // ApplyOperatorNameColumn + // + this.ApplyOperatorNameColumn.DataPropertyName = "ApplyOperatorNo"; + this.ApplyOperatorNameColumn.HeaderText = "申请人"; + this.ApplyOperatorNameColumn.Name = "ApplyOperatorNameColumn"; + this.ApplyOperatorNameColumn.ReadOnly = true; + this.ApplyOperatorNameColumn.Width = 70; + // + // ApplyTimeColumn + // + this.ApplyTimeColumn.DataPropertyName = "ApplyTime"; + this.ApplyTimeColumn.HeaderText = "申请时间"; + this.ApplyTimeColumn.Name = "ApplyTimeColumn"; + this.ApplyTimeColumn.ReadOnly = true; + this.ApplyTimeColumn.Width = 110; + // + // OrderOperationTimeColumn + // + this.OrderOperationTimeColumn.DataPropertyName = "OrderOperationTime"; + this.OrderOperationTimeColumn.HeaderText = "预约时间"; + this.OrderOperationTimeColumn.Name = "OrderOperationTimeColumn"; + this.OrderOperationTimeColumn.ReadOnly = true; + this.OrderOperationTimeColumn.Width = 110; + // + // ApplyDiagnoseInfoNameColumn + // + this.ApplyDiagnoseInfoNameColumn.DataPropertyName = "ApplyDiagnoseInfoName"; + this.ApplyDiagnoseInfoNameColumn.HeaderText = "术前诊断"; + this.ApplyDiagnoseInfoNameColumn.Name = "ApplyDiagnoseInfoNameColumn"; + this.ApplyDiagnoseInfoNameColumn.ReadOnly = true; + this.ApplyDiagnoseInfoNameColumn.Width = 150; + // + // ApplyOperationInfoNameColumn + // + this.ApplyOperationInfoNameColumn.DataPropertyName = "ApplyOperationInfoName"; + this.ApplyOperationInfoNameColumn.HeaderText = "拟施手术"; + this.ApplyOperationInfoNameColumn.Name = "ApplyOperationInfoNameColumn"; + this.ApplyOperationInfoNameColumn.ReadOnly = true; + this.ApplyOperationInfoNameColumn.Width = 150; + // + // InRoomTime + // + this.InRoomTime.DataPropertyName = "InRoomTime"; + this.InRoomTime.HeaderText = "入室时间"; + this.InRoomTime.Name = "InRoomTime"; + this.InRoomTime.ReadOnly = true; + this.InRoomTime.Width = 110; + // + // OutRoomTime + // + this.OutRoomTime.DataPropertyName = "OutRoomTime"; + this.OutRoomTime.HeaderText = "出室时间"; + this.OutRoomTime.Name = "OutRoomTime"; + this.OutRoomTime.ReadOnly = true; + this.OutRoomTime.Width = 110; + // + // RoomHourTimeSpan + // + this.RoomHourTimeSpan.DataPropertyName = "RoomHourTimeSpan"; + this.RoomHourTimeSpan.HeaderText = "总时长"; + this.RoomHourTimeSpan.Name = "RoomHourTimeSpan"; + this.RoomHourTimeSpan.ReadOnly = true; + this.RoomHourTimeSpan.Width = 80; + // + // AnesthesiaBeginTime + // + this.AnesthesiaBeginTime.DataPropertyName = "AnesthesiaBeginTime"; + this.AnesthesiaBeginTime.HeaderText = "麻醉开始时间"; + this.AnesthesiaBeginTime.Name = "AnesthesiaBeginTime"; + this.AnesthesiaBeginTime.ReadOnly = true; + this.AnesthesiaBeginTime.Width = 110; + // + // AnesthesiaEndTime + // + this.AnesthesiaEndTime.DataPropertyName = "AnesthesiaEndTime"; + this.AnesthesiaEndTime.HeaderText = "麻醉结束时间"; + this.AnesthesiaEndTime.Name = "AnesthesiaEndTime"; + this.AnesthesiaEndTime.ReadOnly = true; + this.AnesthesiaEndTime.Width = 110; + // + // AnaesthesiaHourTimeSpan + // + this.AnaesthesiaHourTimeSpan.DataPropertyName = "AnaesthesiaHourTimeSpan"; + this.AnaesthesiaHourTimeSpan.HeaderText = "麻醉时长"; + this.AnaesthesiaHourTimeSpan.Name = "AnaesthesiaHourTimeSpan"; + this.AnaesthesiaHourTimeSpan.ReadOnly = true; + this.AnaesthesiaHourTimeSpan.Width = 80; + // + // OperationBeginTime + // + this.OperationBeginTime.DataPropertyName = "OperationBeginTime"; + this.OperationBeginTime.HeaderText = "手术开始时间"; + this.OperationBeginTime.Name = "OperationBeginTime"; + this.OperationBeginTime.ReadOnly = true; + this.OperationBeginTime.Width = 110; + // + // OperationEndTime + // + this.OperationEndTime.DataPropertyName = "OperationEndTime"; + this.OperationEndTime.HeaderText = "手术结束时间"; + this.OperationEndTime.Name = "OperationEndTime"; + this.OperationEndTime.ReadOnly = true; + this.OperationEndTime.Width = 110; + // + // OperationHourTimeSpan + // + this.OperationHourTimeSpan.DataPropertyName = "OperationHourTimeSpan"; + this.OperationHourTimeSpan.HeaderText = "手术时长"; + this.OperationHourTimeSpan.Name = "OperationHourTimeSpan"; + this.OperationHourTimeSpan.ReadOnly = true; + this.OperationHourTimeSpan.Width = 80; + // + // AnaesthesiaMethodNameColumn + // + this.AnaesthesiaMethodNameColumn.DataPropertyName = "AnaesthesiaMethodName"; + this.AnaesthesiaMethodNameColumn.HeaderText = "麻醉方式"; + this.AnaesthesiaMethodNameColumn.Name = "AnaesthesiaMethodNameColumn"; + this.AnaesthesiaMethodNameColumn.ReadOnly = true; + // + // OperationInfoName + // + this.OperationInfoName.DataPropertyName = "OperationInfoName"; + this.OperationInfoName.HeaderText = "实施手术"; + this.OperationInfoName.Name = "OperationInfoName"; + this.OperationInfoName.ReadOnly = true; + // + // OperationCut + // + this.OperationCut.DataPropertyName = "OperationCut"; + this.OperationCut.HeaderText = "切口类型"; + this.OperationCut.Name = "OperationCut"; + this.OperationCut.ReadOnly = true; + this.OperationCut.Width = 80; + // + // OperationPositionName + // + this.OperationPositionName.DataPropertyName = "OperationPositionName"; + this.OperationPositionName.HeaderText = "手术部位"; + this.OperationPositionName.Name = "OperationPositionName"; + this.OperationPositionName.ReadOnly = true; + this.OperationPositionName.Width = 80; + // + // OperationBodyPositionName + // + this.OperationBodyPositionName.DataPropertyName = "OperationBodyPositionName"; + this.OperationBodyPositionName.HeaderText = "手术体位"; + this.OperationBodyPositionName.Name = "OperationBodyPositionName"; + this.OperationBodyPositionName.ReadOnly = true; + this.OperationBodyPositionName.Width = 80; + // + // OperationLevelNameColumn + // + this.OperationLevelNameColumn.DataPropertyName = "OperationLevel"; + this.OperationLevelNameColumn.HeaderText = "手术分级"; + this.OperationLevelNameColumn.Name = "OperationLevelNameColumn"; + this.OperationLevelNameColumn.ReadOnly = true; + this.OperationLevelNameColumn.Width = 80; + // + // ASALevelName + // + this.ASALevelName.DataPropertyName = "ASALevelName"; + this.ASALevelName.HeaderText = "ASA等级"; + this.ASALevelName.Name = "ASALevelName"; + this.ASALevelName.ReadOnly = true; + this.ASALevelName.Width = 80; + // + // OperationDoctorColumn + // + this.OperationDoctorColumn.DataPropertyName = "OperationDoctor"; + this.OperationDoctorColumn.HeaderText = "术者"; + this.OperationDoctorColumn.Name = "OperationDoctorColumn"; + this.OperationDoctorColumn.ReadOnly = true; + this.OperationDoctorColumn.Width = 60; + // + // Assistant1Column + // + this.Assistant1Column.DataPropertyName = "Assistant"; + this.Assistant1Column.HeaderText = "助手"; + this.Assistant1Column.Name = "Assistant1Column"; + this.Assistant1Column.ReadOnly = true; + this.Assistant1Column.Width = 90; + // + // AnesthesiaDoctorColumn + // + this.AnesthesiaDoctorColumn.DataPropertyName = "AnesthesiaDoctor"; + this.AnesthesiaDoctorColumn.HeaderText = "麻醉"; + this.AnesthesiaDoctorColumn.Name = "AnesthesiaDoctorColumn"; + this.AnesthesiaDoctorColumn.ReadOnly = true; + this.AnesthesiaDoctorColumn.Width = 60; + // + // TourNurseColumn + // + this.TourNurseColumn.DataPropertyName = "TourNurse"; + this.TourNurseColumn.HeaderText = "巡回"; + this.TourNurseColumn.Name = "TourNurseColumn"; + this.TourNurseColumn.ReadOnly = true; + this.TourNurseColumn.Width = 60; + // + // InstrumentNurseColumn + // + this.InstrumentNurseColumn.DataPropertyName = "InstrumentNurse"; + this.InstrumentNurseColumn.HeaderText = "器械"; + this.InstrumentNurseColumn.Name = "InstrumentNurseColumn"; + this.InstrumentNurseColumn.ReadOnly = true; + this.InstrumentNurseColumn.Width = 60; + // + // OperationRoomColumn + // + this.OperationRoomColumn.DataPropertyName = "OperationRoom"; + this.OperationRoomColumn.HeaderText = "术间"; + this.OperationRoomColumn.Name = "OperationRoomColumn"; + this.OperationRoomColumn.ReadOnly = true; + this.OperationRoomColumn.Width = 40; + // + // PlanOrder + // + this.PlanOrder.DataPropertyName = "PlanOrder"; + this.PlanOrder.HeaderText = "台次"; + this.PlanOrder.Name = "PlanOrder"; + this.PlanOrder.ReadOnly = true; + this.PlanOrder.Width = 40; + // + // IsNotPlanReturnOperation + // + this.IsNotPlanReturnOperation.DataPropertyName = "IsNotPlanReturnOperation"; + this.IsNotPlanReturnOperation.HeaderText = "非计划二次手术"; + this.IsNotPlanReturnOperation.Name = "IsNotPlanReturnOperation"; + this.IsNotPlanReturnOperation.ReadOnly = true; + // + // RemarkColumn + // + this.RemarkColumn.DataPropertyName = "Remark"; + this.RemarkColumn.HeaderText = "停止原因"; + this.RemarkColumn.Name = "RemarkColumn"; + this.RemarkColumn.ReadOnly = true; + // + // OperatorName + // + this.OperatorName.DataPropertyName = "OperatorName"; + this.OperatorName.HeaderText = "停止人"; + this.OperatorName.Name = "OperatorName"; + this.OperatorName.ReadOnly = true; + this.OperatorName.Width = 80; + // // frmOperationManage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1075,6 +1075,39 @@ private System.Windows.Forms.ToolStripButton tsbExportExcel; private System.Windows.Forms.Button btnFind; private DevComponents.DotNetBar.Controls.DataGridViewX dgv; + private System.Windows.Forms.NumericUpDown AgeEnd; + private System.Windows.Forms.NumericUpDown AgeBegin; + private System.Windows.Forms.Label label14; + private DevComponents.DotNetBar.Controls.CheckBoxX cboIsNotPlanReturnOperation; + private System.Windows.Forms.TextBox txtName; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtOperation; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox txtArchivesNo; + private System.Windows.Forms.Label label6; + private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor3; + private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor2; + private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor1; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.DateTimePicker dtpBegInDate; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker dtpEndDate; + private System.Windows.Forms.ComboBox cmbPatType; + private System.Windows.Forms.ComboBox txtASALevel; + private System.Windows.Forms.ComboBox txtOperationCut; + private System.Windows.Forms.ComboBox cboOperationLevel; + private System.Windows.Forms.ComboBox cmbOpeType; + private System.Windows.Forms.ComboBox cboDepartment; + private System.Windows.Forms.Label label1; private System.Windows.Forms.DataGridViewCheckBoxColumn CheckBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn ApplyId; private System.Windows.Forms.DataGridViewTextBoxColumn StateColumn; @@ -1117,38 +1150,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn IsNotPlanReturnOperation; private System.Windows.Forms.DataGridViewTextBoxColumn RemarkColumn; private System.Windows.Forms.DataGridViewTextBoxColumn OperatorName; - private System.Windows.Forms.NumericUpDown AgeEnd; - private System.Windows.Forms.NumericUpDown AgeBegin; - private System.Windows.Forms.Label label14; - private DevComponents.DotNetBar.Controls.CheckBoxX cboIsNotPlanReturnOperation; - private System.Windows.Forms.TextBox txtName; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox txtOperation; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.TextBox txtArchivesNo; - private System.Windows.Forms.Label label6; - private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor3; - private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor2; - private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor1; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.DateTimePicker dtpBegInDate; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.DateTimePicker dtpEndDate; - private System.Windows.Forms.ComboBox cmbPatType; - private System.Windows.Forms.ComboBox txtASALevel; - private System.Windows.Forms.ComboBox txtOperationCut; - private System.Windows.Forms.ComboBox cboOperationLevel; - private System.Windows.Forms.ComboBox cmbOpeType; - private System.Windows.Forms.ComboBox cboDepartment; - private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/AIMS/OperationAfter/frmOperationManage.cs b/AIMS/OperationAfter/frmOperationManage.cs index 10ca76f..dc2aaa1 100644 --- a/AIMS/OperationAfter/frmOperationManage.cs +++ b/AIMS/OperationAfter/frmOperationManage.cs @@ -162,7 +162,7 @@ namespace AIMS.OperationAfter.UI else Where += " StateId IN (" + state + ") "; if (Department != "") - Where += " and ApplyDeptName LIKE '%" + Department + "%' "; + Where += " and PatientDept LIKE '%" + Department + "%' "; if (Room != "") Where += " and OperationRoomId IN (" + Room + ") "; if (Anaes != "") diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index 791b67e..e8ea45a 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -58,7 +58,7 @@ namespace DrawGraph aSyncSelectDict = SelectDictValue.CreateInstance(); myOpeRecord.clearAddObj(ZedControl); setPageTime(myOpeRecord.InRoomTime.Value); - setXAxisTime(ZedControl.GraphPane, myOpeRecord.pageBegin, EVERY_PAGE_TIME_SPAN); + setXAxisTime(ZedControl.GraphPane, myOpeRecord.PageBegin, EVERY_PAGE_TIME_SPAN); GetcurrentPage(); #region 单独赋值绑定 @@ -99,7 +99,7 @@ namespace DrawGraph } } } - } + } SetAbleEditView(ableEdit); } } @@ -207,8 +207,17 @@ namespace DrawGraph { myOpeRecord.pageCount = 1; myOpeRecord.sharpBegin = getSharpTime(begin); - myOpeRecord.pageBegin = getPageBegin(begin, collectInterval, ref EVERY_PAGE_TIME_SPAN); - myOpeRecord.lastPageBegin = myOpeRecord.pageBegin.AddHours(EVERY_PAGE_TIME_SPAN / 60); + myOpeRecord.PageBegin = getPageBegin(begin, collectInterval, ref EVERY_PAGE_TIME_SPAN); + myOpeRecord.lastPageBegin = myOpeRecord.PageBegin.AddHours(EVERY_PAGE_TIME_SPAN / 60); + + if (myOpeRecord.phListPack != null) + { + Panel pan3 = myOpeRecord.phListPack.CControl as Panel; + if (pan3 != null) + { + pan3.Controls.Clear(); + } + } } } /// diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index 3c440d4..0122fb1 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/DrawGraph/AreaManage/DrugsManage.cs @@ -306,7 +306,7 @@ namespace DrawGraph { if (temp.IsContinue == 1 && temp.DrugBeginTime == temp.DrugEndTime) temp.End = curTimeTemp; temp.EqualDose = null; - temp.setAnasArr(ZedControl, H5pack.RealX, lines.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + temp.setAnasArr(ZedControl, H5pack.RealX, lines.RealEndX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); temp.nowY = y; } private static void ListAddDrugs(List DrugListstr, int i, FactDrug temp) @@ -426,22 +426,22 @@ namespace DrawGraph bool b = false; if (End == null) { - if (Begin > myOpeRecord.pageBegin && Begin < lastime) + if (Begin > myOpeRecord.PageBegin && Begin < lastime) { b = true; } } else { - if (Begin >= myOpeRecord.pageBegin && Begin <= lastime) + if (Begin >= myOpeRecord.PageBegin && Begin <= lastime) { b = true; } - else if (End >= myOpeRecord.pageBegin && End <= lastime) + else if (End >= myOpeRecord.PageBegin && End <= lastime) { b = true; } - else if (Begin < myOpeRecord.pageBegin && End > lastime) + else if (Begin < myOpeRecord.PageBegin && End > lastime) { b = true; } diff --git a/DrawGraph/AreaManage/IconManage.cs b/DrawGraph/AreaManage/IconManage.cs index 7932ce0..276163a 100644 --- a/DrawGraph/AreaManage/IconManage.cs +++ b/DrawGraph/AreaManage/IconManage.cs @@ -144,7 +144,7 @@ namespace DrawGraph eventListstr.Add(string.Format("{0}{1}->{2} {3} {4}{5}", getNumber(i), temp.EventBeginTime.Value.ToShortTimeString(), temp.EventEndTime.Value.ToShortTimeString(), temp.EventName, "", temp.Remark == null ? "" : temp.Remark.ToString())); } - temp.setAnasArr(ZedControl, eventstartX, eventendX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + temp.setAnasArr(ZedControl, eventstartX, eventendX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); try { string EventName = temp.EventName; @@ -256,22 +256,22 @@ namespace DrawGraph bool b = false; if (End == null) { - if (Begin > myOpeRecord.pageBegin && Begin < lastime) + if (Begin > myOpeRecord.PageBegin && Begin < lastime) { b = true; } } else { - if (Begin >= myOpeRecord.pageBegin && Begin <= lastime) + if (Begin >= myOpeRecord.PageBegin && Begin <= lastime) { b = true; } - else if (End >= myOpeRecord.pageBegin && End <= lastime) + else if (End >= myOpeRecord.PageBegin && End <= lastime) { b = true; } - else if (Begin < myOpeRecord.pageBegin && End > lastime) + else if (Begin < myOpeRecord.PageBegin && End > lastime) { b = true; } diff --git a/DrawGraph/AreaManage/MonitorManage.cs b/DrawGraph/AreaManage/MonitorManage.cs index 65761b9..16934b2 100644 --- a/DrawGraph/AreaManage/MonitorManage.cs +++ b/DrawGraph/AreaManage/MonitorManage.cs @@ -73,108 +73,141 @@ namespace DrawGraph } public override void Bind() { - init(); - - List ables = PackManage.ListPob.Where(s => s is AbleEditPackObj).ToList(); - foreach (PackObjBase pack in ables) + try { - AbleEditPackObj ableEdit = pack as AbleEditPackObj; + init(); - if (ableEdit != null) + List ables = PackManage.ListPob.Where(s => s is AbleEditPackObj).ToList(); + foreach (PackObjBase pack in ables) { - if (ableEdit.ControlType == EControlType.Panel) - { - ableEdit.IsVisible = true; - Panel pan = ableEdit.CControl as Panel; - if (pan != null) - { - pan.Controls.Clear(); - int Width = pan.Width; - int Height = pan.Height / 4; - List panPanels = new List(); - //循环加载数值生命体征 - for (int x = 0; x < myOpeRecord.PhysioConfigList.Count; x++) - { - PhysioDataConfig ade = myOpeRecord.PhysioConfigList[x]; - if (ade.IsDefalultShow == false) continue; - if (!ade.ShowText) continue; - System.Windows.Forms.Panel panel = new System.Windows.Forms.Panel(); - panel.Tag = ade; - panel.Dock = System.Windows.Forms.DockStyle.Top; - panel.Size = new System.Drawing.Size(Width, Height); - for (int i = (240 / 5); i >= 0; i--) - { - DateTime SpanTime = getInRoomSpanTime(myOpeRecord.pageBegin.AddMinutes(i * 5)); - PhysioData pdNew = PhysioDataConfig.newPhysioData(ade, myOpeRecord.Id.Value, SpanTime, -1); + AbleEditPackObj ableEdit = pack as AbleEditPackObj; - System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); - textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); - textNum.Tag = pdNew; - textNum.Font = new System.Drawing.Font("微软雅黑", 7f); - textNum.Multiline = true; - textNum.Width = Width / (240 / 5) + 1; - textNum.Height = panel.Height; - textNum.Dock = System.Windows.Forms.DockStyle.Left; - textNum.Leave += TextNum_Leave; - textNum.DoubleClick += TextNum_DoubleClick; - panel.Controls.Add(textNum); - } - panPanels.Add(panel); - } - for (int x = 0; x < myOpeRecord.PhysioAnesConfigList.Count; x++) + if (ableEdit != null) + { + if (ableEdit.ControlType == EControlType.Panel) + { + ableEdit.IsVisible = true; + Panel pan = ableEdit.CControl as Panel; + if (pan != null) { - PhysioDataConfig ade = myOpeRecord.PhysioAnesConfigList[x]; - if (ade.IsDefalultShow == false) continue; - System.Windows.Forms.Panel panel = new System.Windows.Forms.Panel(); - panel.Tag = ade; - panel.Dock = System.Windows.Forms.DockStyle.Top; - panel.Size = new System.Drawing.Size(Width, Height); - for (int i = (240 / ade.YAisx); i >= 0; i--) + if (pan.Controls.Count == 0) { - DateTime SpanTime = getInRoomSpanTime(myOpeRecord.pageBegin.AddMinutes(i * ade.YAisx)); - PhysioData pdNew = PhysioDataConfig.newPhysioData(ade, myOpeRecord.Id.Value, SpanTime, -1); - if (ade.ImgPath != null && ade.ImgPath != "") + pan.Controls.Clear(); + ToolTip toolTip1 = new System.Windows.Forms.ToolTip(); + int Width = pan.Width; + int Height = pan.Height / 4; + List panPanels = new List(); + //循环加载数值生命体征 + for (int x = 0; x < myOpeRecord.PhysioConfigList.Count; x++) { - System.Windows.Forms.ComboBox textNum = new System.Windows.Forms.ComboBox(); - textNum.Items.AddRange(ade.ImgPath.Split('|')); - textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); - textNum.Tag = pdNew; - textNum.Font = new System.Drawing.Font("微软雅黑", 7f); - textNum.Width = Width / (240 / ade.YAisx) + 1; - textNum.Height = panel.Height; - textNum.Dock = System.Windows.Forms.DockStyle.Left; - textNum.DropDownStyle = ComboBoxStyle.DropDownList; - textNum.Leave += ComeBoxNum_Leave; - panel.Controls.Add(textNum); + PhysioDataConfig ade = myOpeRecord.PhysioConfigList[x]; + if (ade.IsDefalultShow == false) continue; + if (!ade.ShowText) continue; + System.Windows.Forms.Panel panel = new System.Windows.Forms.Panel(); + panel.Tag = ade; + panel.Dock = System.Windows.Forms.DockStyle.Top; + panel.Size = new System.Drawing.Size(Width, Height); + for (int i = (240 / 5); i >= 0; i--) + { + DateTime SpanTime = getInRoomSpanTime(myOpeRecord.PageBegin.AddMinutes(i * 5)); + PhysioData pdNew = PhysioDataConfig.newPhysioData(ade, myOpeRecord.Id.Value, SpanTime, -1); + + System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); + textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); + textNum.Tag = pdNew; + textNum.Font = new System.Drawing.Font("微软雅黑", 6.5f); + textNum.Multiline = true; + textNum.Width = Width / (240 / 5);// + 1; + textNum.Height = panel.Height; + textNum.Dock = System.Windows.Forms.DockStyle.Left; + textNum.Leave += TextNum_Leave; + textNum.DoubleClick += TextNum_DoubleClick; + toolTip1.SetToolTip(textNum, SpanTime.ToString("HH:mm")); + panel.Controls.Add(textNum); + } + panPanels.Add(panel); } - else + for (int x = 0; x < myOpeRecord.PhysioAnesConfigList.Count; x++) { - System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); - textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); - textNum.Tag = pdNew; - textNum.Font = new System.Drawing.Font("微软雅黑", 7f); - textNum.Multiline = true; - textNum.Width = Width / (240 / ade.YAisx) + 1; - textNum.Height = panel.Height; - textNum.Dock = System.Windows.Forms.DockStyle.Left; - textNum.Leave += TextNum_Leave; - textNum.DoubleClick += TextNum_DoubleClick; - panel.Controls.Add(textNum); + PhysioDataConfig ade = myOpeRecord.PhysioAnesConfigList[x]; + if (ade.IsDefalultShow == false) continue; + System.Windows.Forms.Panel panel = new System.Windows.Forms.Panel(); + panel.Tag = ade; + panel.Dock = System.Windows.Forms.DockStyle.Top; + panel.Size = new System.Drawing.Size(Width, Height); + for (int i = (240 / ade.YAisx); i >= 0; i--) + { + DateTime SpanTime = getInRoomSpanTime(myOpeRecord.PageBegin.AddMinutes(i * ade.YAisx)); + PhysioData pdNew = PhysioDataConfig.newPhysioData(ade, myOpeRecord.Id.Value, SpanTime, -1); + //if (ade.ImgPath != null && ade.ImgPath != "") + //{ + // System.Windows.Forms.ComboBox textNum = new System.Windows.Forms.ComboBox(); + // textNum.Items.AddRange(ade.ImgPath.Split('|')); + // textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); + // textNum.Tag = pdNew; + // textNum.Font = new System.Drawing.Font("微软雅黑", 6.5f); + // textNum.Width = Width / (240 / ade.YAisx) + 1; + // textNum.Height = panel.Height; + // textNum.Dock = System.Windows.Forms.DockStyle.Left; + // textNum.DropDownStyle = ComboBoxStyle.DropDownList; + // textNum.Leave += ComeBoxNum_Leave; + // toolTip1.SetToolTip(textNum, SpanTime.ToString("HH:mm")); + // panel.Controls.Add(textNum); + //} + System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); + textNum.Name = pdNew.config.Id + "" + SpanTime.ToString("HHmm"); + textNum.Tag = pdNew; + textNum.Font = new System.Drawing.Font("微软雅黑", 6.5f); + textNum.Multiline = true; + textNum.Width = Width / (240 / ade.YAisx);// + 1; + textNum.Height = panel.Height; + textNum.Dock = System.Windows.Forms.DockStyle.Left; + textNum.Leave += TextNum_Leave; + textNum.DoubleClick += TextNum_DoubleClick; + toolTip1.SetToolTip(textNum, SpanTime.ToString("HH:mm")); + panel.Controls.Add(textNum); + } + panPanels.Add(panel); + } + for (int i = 3; i >= 0; i--) + { + if (i > panPanels.Count - 1) + { + System.Windows.Forms.Panel panel = new System.Windows.Forms.Panel(); + panel.Tag = null; + panel.Dock = System.Windows.Forms.DockStyle.Top; + panel.Size = new System.Drawing.Size(Width, Height); + for (int j = (240 / 5); j >= 0; j--) + { + DateTime SpanTime = getInRoomSpanTime(myOpeRecord.PageBegin.AddMinutes(j * 5)); + System.Windows.Forms.TextBox textNum = new System.Windows.Forms.TextBox(); + textNum.Font = new System.Drawing.Font("微软雅黑", 6.5f); + textNum.Multiline = true; + textNum.Width = Width / (240 / 5) ;//+ 1 + textNum.ReadOnly = true; + textNum.Height = panel.Height; + textNum.Dock = System.Windows.Forms.DockStyle.Left; + toolTip1.SetToolTip(textNum, SpanTime.ToString("HH:mm")); + panel.Controls.Add(textNum); + } + panPanels.Add(panel); + }; + + pan.Controls.Add(panPanels[i]); } } - panPanels.Add(panel); - } - for (int i = 3; i >= 0; i--) - { - pan.Controls.Add(panPanels[i]); } } } } + + DrawPhysioData(); + + } + catch (Exception ex) + { + throw ex; } - - DrawPhysioData(); - } /// @@ -230,16 +263,15 @@ namespace DrawGraph public DateTime getInRoomSpanTime(DateTime time) { DateTime resultTime = time; - for (int i = (240 / 5); i >= 0; i--) - { - DateTime spanTime = myOpeRecord.InRoomTime.Value.AddMinutes(i * 5); - if (spanTime >= resultTime && spanTime < resultTime.AddMinutes(5)) - { - resultTime = spanTime; - break; - } - - } + //for (int i = (240 / 5); i >= 0; i--) + //{ + // DateTime spanTime = myOpeRecord.InRoomTime.Value.AddMinutes(i * 5); + // if (spanTime >= resultTime && spanTime < resultTime.AddMinutes(5)) + // { + // resultTime = spanTime; + // break; + // } + //} return resultTime; } diff --git a/DrawGraph/AreaManage/OperationRecord.cs b/DrawGraph/AreaManage/OperationRecord.cs index fab702c..ebbe7fa 100644 --- a/DrawGraph/AreaManage/OperationRecord.cs +++ b/DrawGraph/AreaManage/OperationRecord.cs @@ -1193,7 +1193,7 @@ namespace DrawGraph [ClassAttributs(Description = "绘图开始时间")] public DateTime sharpBegin; [ClassAttributs(Description = "页开始时间")] - public DateTime pageBegin; + public DateTime PageBegin; [ClassAttributs(Description = "页结束时间")] public DateTime lastPageBegin; [NoCreatControlAttributs] @@ -1204,6 +1204,8 @@ namespace DrawGraph public string StateName; [NoCreatControlAttributs] public DataTable PhysioParamList; + [NoCreatControlAttributs] + public AbleEditPackObj phListPack = null; /// /// 当前选中的,手术生理曲线 /// diff --git a/DrawGraph/AreaManage/OutputManage.cs b/DrawGraph/AreaManage/OutputManage.cs index f182733..db3d642 100644 --- a/DrawGraph/AreaManage/OutputManage.cs +++ b/DrawGraph/AreaManage/OutputManage.cs @@ -211,7 +211,7 @@ namespace DrawGraph { if (temp.IsContinue == 1 && temp.BeginTime == temp.EndTime) temp.End = curTimeTemp; temp.EqualDose = null; - temp.setAnasArr(ZedControl, H5pack.RealX, sapPpack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + temp.setAnasArr(ZedControl, H5pack.RealX, sapPpack.RealEndX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); temp.nowY = y; } private static void ListAddDrugs(List DrugListstr, int i, FactOutputLiquids temp) @@ -235,22 +235,22 @@ namespace DrawGraph bool b = false; if (End == null) { - if (Begin > myOpeRecord.pageBegin && Begin < lastime) + if (Begin > myOpeRecord.PageBegin && Begin < lastime) { b = true; } } else { - if (Begin >= myOpeRecord.pageBegin && Begin <= lastime) + if (Begin >= myOpeRecord.PageBegin && Begin <= lastime) { b = true; } - else if (End >= myOpeRecord.pageBegin && End <= lastime) + else if (End >= myOpeRecord.PageBegin && End <= lastime) { b = true; } - else if (Begin < myOpeRecord.pageBegin && End > lastime) + else if (Begin < myOpeRecord.PageBegin && End > lastime) { b = true; } diff --git a/DrawGraph/AreaManage/PhysioDataConfig.cs b/DrawGraph/AreaManage/PhysioDataConfig.cs index 7a1492b..a9b0474 100644 --- a/DrawGraph/AreaManage/PhysioDataConfig.cs +++ b/DrawGraph/AreaManage/PhysioDataConfig.cs @@ -662,11 +662,31 @@ namespace DrawGraph } if (viewValue != "") { - ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), YLocation, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); - SetPositionText(pd, viewValue); + //取这个时间点的偏移量 + DateTime pylTime = GetpylTime(pd.RecordTime); + if (pylTime > pageBegin && pylTime < pageEnd) + { + ZUtil.DrawText(viewValue, getXPositinByXDate(pylTime), YLocation, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); + SetPositionText(pd, viewValue); + } } } } + public DateTime GetpylTime(DateTime RecordTime, int YAisx = 5) + { + DateTime resultTime = RecordTime; + for (int i = (240 / 5); i >= 0; i--) + { + DateTime spanTime = pageBegin.AddMinutes(i * 5); + if (spanTime >= resultTime && spanTime < resultTime.AddMinutes(5)) + { + resultTime = spanTime.AddMinutes(2).AddSeconds(30); + break; + } + + } + return resultTime; + } #endregion #region 通用方法 @@ -908,7 +928,7 @@ namespace DrawGraph Panel pan3 = phListPack.CControl as Panel; if (pan3 != null) { - Control[] cs = pan3.Controls.Find(pdTemp.PhysioDataConfigId + "" + pdTemp.RecordTime.ToString("HHmm"), true); + Control[] cs = pan3.Controls.Find(pdTemp.PhysioDataConfigId + "" + GetRecordTime(pdTemp.RecordTime).ToString("HHmm"), true); if (cs != null && cs.Length > 0) { Control c = cs[0]; @@ -937,6 +957,25 @@ namespace DrawGraph if (pd.ValueString == null || pd.ValueString == "") return; DrawTextPhysioData(pd); } + public DateTime GetRecordTime(DateTime pdTemp, int collectInterval = 5) + { + DateTime result = Convert.ToDateTime(pdTemp.ToString("yyyy-MM-dd HH:mm:00.000")); + //小于入室时间默认不画 + for (int i = 0; i < (480 / 5); i++) + {//InRoomTime.Value + DateTime tempTime = pageBegin.AddMinutes(i * 5); + if (tempTime >= result && result < tempTime.AddMinutes(5)) + { + result = tempTime; + break; + } + } + //if (result < myOpeRecord.InRoomTime.Value) + //{ + // result = myOpeRecord.InRoomTime.Value; + //} + return result; + } #endregion } diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index 3e50c2f..7992625 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -10,7 +10,7 @@ using System.Text; using System.Windows.Forms; using DevComponents.DotNetBar; using System.Xml.Linq; - +using System.Runtime.InteropServices; namespace DrawGraph { @@ -121,7 +121,7 @@ namespace DrawGraph myOpeRecord.SelPhysioConfig.delAddObj(pd); } - myOpeRecord.SelPhysioConfig.DelItems(myOpeRecord.pageBegin, myOpeRecord.lastPageBegin); + myOpeRecord.SelPhysioConfig.DelItems(myOpeRecord.PageBegin, myOpeRecord.lastPageBegin); myOpeRecord.SelPhysioConfig.clearAddObj(ZedControl); @@ -143,8 +143,8 @@ namespace DrawGraph { if (e.Button != System.Windows.Forms.MouseButtons.Left) return; //清空选中框 - myOpeRecord.SAreaObj.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, - myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + myOpeRecord.SAreaObj.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, + myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); myOpeRecord.SAreaObj.Clear(); //触发可编辑区域的事件 @@ -242,7 +242,7 @@ namespace DrawGraph } } } - ZedControl.AxisChange(); + //ZedControl.AxisChange(); ZedControl.Refresh(); } public override void MouseMove(ZedGraphControl sender, MouseEventArgs e) @@ -279,6 +279,8 @@ namespace DrawGraph } aSyncTip.ViewStr = viewStr; aSyncTip.Show(x, (y + yP)); + //ZedControl.AxisChange(); + ZedControl.Refresh(); } //考虑客户端拖拽数据库处理不及时 可以采用批量缓存新增修改的数据点集中处理 if (AnesOpeStatue == DoAnesOpeStatus.MOVEPD || AnesOpeStatue == DoAnesOpeStatus.ADDPD) @@ -301,7 +303,7 @@ namespace DrawGraph DateTime insTime = GetRecordTime(pdTemp.RecordTime); pdTemp.RecordTime = insTime; myOpeRecord.SelPhysioConfig.AddPointItem(pdTemp); - ZedControl.AxisChange(); + //ZedControl.AxisChange(); ZedControl.Refresh(); } else @@ -311,7 +313,7 @@ namespace DrawGraph { CurPhysioData = newPd; myOpeRecord.SelPhysioConfig.ModifyItem(CurPhysioData, CurPhysioData); - ZedControl.AxisChange(); + //ZedControl.AxisChange(); ZedControl.Refresh(); } @@ -336,7 +338,7 @@ namespace DrawGraph catch { return; } finally { - ZedControl.AxisChange(); + //ZedControl.AxisChange(); ZedControl.Refresh(); } } @@ -360,7 +362,7 @@ namespace DrawGraph } AnesOpeStatue = DoAnesOpeStatus.VIEW; - ZedControl.AxisChange(); + //ZedControl.AxisChange(); ZedControl.Refresh(); } else @@ -480,19 +482,26 @@ namespace DrawGraph } public override void Bind() { - init(); - InitPhysioDataConfigList(myOpeRecord.PhysioConfigList); - //悬浮tip初始化 - aSyncTip = TipBox.CreateInstance("async"); - aSyncTip.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + try + { + init(); + InitPhysioDataConfigList(myOpeRecord.PhysioConfigList); + //悬浮tip初始化 + aSyncTip = TipBox.CreateInstance("async"); + aSyncTip.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); - myOpeRecord.SAreaObj.maxnumber = ZedControl.GraphPane.YAxis.Scale.Max; - myOpeRecord.SAreaObj.minnumber = ZedControl.GraphPane.YAxis.Scale.Min; + myOpeRecord.SAreaObj.maxnumber = ZedControl.GraphPane.YAxis.Scale.Max; + myOpeRecord.SAreaObj.minnumber = ZedControl.GraphPane.YAxis.Scale.Min; - //DrawPhysioData(); + //DrawPhysioData(); - myOpeRecord.SelPhysioConfig = null; - CurPhysioData = null; + myOpeRecord.SelPhysioConfig = null; + CurPhysioData = null; + } + catch (Exception ex) + { + throw ex; + } } #endregion @@ -527,6 +536,7 @@ namespace DrawGraph if (janCePack == null) return; int YRows = 0; addPhysioList.Clear(); + myOpeRecord.phListPack = phListPack; ZedControl.GraphPane.CurveList.Clear(); //监测区域里的第1根竖线，显示数值时用 LinesPackObj pack = template.GetPackObjectOTag("MonitorManage_LinesPackObj_9"); @@ -555,6 +565,7 @@ namespace DrawGraph pp.IsValid = false; } pp.ClearTagstr(ZedControl); + pp.phListPack = phListPack; //如果模板管理不为空 if (pack != null && rowNum < 5 && pp.ShowText == true) { @@ -564,9 +575,8 @@ namespace DrawGraph YRows++; rowNum++; } - pp.phListPack = phListPack; - pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, - myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, + myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); bool isHave = false; foreach (PhysioDataConfig appTemp in addPhysioList) { @@ -590,19 +600,14 @@ namespace DrawGraph { PhysioDataConfig pp = dt2[i]; pp.ConfigType = "麻醉体征"; - if (pp.IsDefalultShow == false) - { - pp.IsValid = false; - } - else - { - pp.IsValid = true; - } - pp.phListPack = phListPack; - pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, - myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); pp.ClearTagstr(ZedControl); - if (rowNum < 5) + pp.phListPack = phListPack; + pp.IsValid = true; + if (pp.IsDefalultShow == false) pp.IsValid = false; + pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, + myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + pp.ClearTagstr(ZedControl); + if (rowNum < 5 && pp.IsDefalultShow == true) { double y = pack.RealY + getYPositionByListIndex(YRows, pack.RealY, pack.RealEndY, RowsCount); ZUtil.DrawText(pp.Name, pack.RealX, y, ZedControl, "PP" + pp.Enname + pp.Id, 5.5f); @@ -665,8 +670,8 @@ namespace DrawGraph pp.IsValid = false; } - pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, - myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, + myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); pp.ClearTagstr(ZedControl); //如果模板管理不为空 if (pack != null && rowNum < 5 && pp.ShowText == true) @@ -688,14 +693,11 @@ namespace DrawGraph { pp.ConfigType = "麻醉体征"; pp.IsValid = true; - if (pp.IsDefalultShow == false) - { - pp.IsValid = false; - } - pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, - myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + if (pp.IsDefalultShow == false) pp.IsValid = false; + pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, + myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); pp.ClearTagstr(ZedControl); - if (pp.ShowText == true && rowNum < 5) + if (pp.ShowText == true && rowNum < 5 && pp.IsDefalultShow == true) { double y = pack.RealY + getYPositionByListIndex(YRows, pack.RealY, pack.RealEndY, RowsCount); ZUtil.DrawText(pp.Name, pack.RealX, y, ZedControl, "PP" + pp.Enname + pp.Id, 5.5f); @@ -705,6 +707,15 @@ namespace DrawGraph } } } + + if (phListPack != null) + { + Panel pan3 = phListPack.CControl as Panel; + if (pan3 != null) + { + pan3.Controls.Clear(); + } + } } #endregion @@ -953,14 +964,18 @@ namespace DrawGraph DateTime result = Convert.ToDateTime(pdTemp.ToString("yyyy-MM-dd HH:mm:00.000")); //小于入室时间默认不画 for (int i = 0; i < (480 / 5); i++) - { - DateTime tempTime = myOpeRecord.InRoomTime.Value.AddMinutes(i * 5); - if (tempTime >= result) + {//InRoomTime.Value + DateTime tempTime = myOpeRecord.PageBegin.AddMinutes(i * 5); + if (tempTime >= result && result < tempTime.AddMinutes(5)) { result = tempTime; break; } } + //if (result < myOpeRecord.InRoomTime.Value) + //{ + // result = myOpeRecord.InRoomTime.Value; + //} return result; } } diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index 638c2d0..2f5c407 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -284,7 +284,7 @@ namespace DrawGraph { if (temp.IsContinue == 1 && temp.DrugBeginTime == temp.DrugEndTime) temp.End = curTimeTemp; temp.EqualDose = null; - temp.setAnasArr(ZedControl, H5pack.RealX, sapPpack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + temp.setAnasArr(ZedControl, H5pack.RealX, sapPpack.RealEndX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); temp.nowY = y; } private static void ListAddDrugs(List DrugListstr, int i, FactDrug temp) @@ -327,22 +327,22 @@ namespace DrawGraph bool b = false; if (End == null) { - if (Begin > myOpeRecord.pageBegin && Begin < lastime) + if (Begin > myOpeRecord.PageBegin && Begin < lastime) { b = true; } } else { - if (Begin >= myOpeRecord.pageBegin && Begin <= lastime) + if (Begin >= myOpeRecord.PageBegin && Begin <= lastime) { b = true; } - else if (End >= myOpeRecord.pageBegin && End <= lastime) + else if (End >= myOpeRecord.PageBegin && End <= lastime) { b = true; } - else if (Begin < myOpeRecord.pageBegin && End > lastime) + else if (Begin < myOpeRecord.PageBegin && End > lastime) { b = true; } diff --git a/DrawGraph/AreaManage/TipBox.cs b/DrawGraph/AreaManage/TipBox.cs index 55fdf24..3bac6aa 100644 --- a/DrawGraph/AreaManage/TipBox.cs +++ b/DrawGraph/AreaManage/TipBox.cs @@ -29,7 +29,7 @@ namespace DrawGraph text.Tag = "ZgcTip" + type; text.FontSpec = new FontSpec("宋体", 5f, System.Drawing.Color.Black, false, false, false); timer = new Timer(); - timer.Interval = 800; + timer.Interval = 500; timer.Tick += new EventHandler(timer_Tick); type = _type; }