From 0c561dc3457338a50fb4a69af73c611c250ea8e1 Mon Sep 17 00:00:00 2001 From: leomon Date: Thu, 5 Jan 2023 00:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E7=82=B9bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmAanesthesiaRecord.cs | 13 +- .../frmInstrumentRecord.cs | 2 +- .../frmPhysiosSetting.designer.cs | 358 +++++++++--------- .../frmPhysiosSetting.resx | 2 +- .../frmSelectPatientNew2.cs | 44 ++- .../frmSelectPatientGoodsBill.cs | 40 +- DrawGraph/AreaManage/MonitorManage.cs | 53 ++- DrawGraph/AreaManage/OperationRecord.cs | 8 +- DrawGraph/AreaManage/PhysioDataConfig.cs | 16 +- DrawGraph/AreaManage/PhysioDataManage.cs | 24 +- 10 files changed, 332 insertions(+), 228 deletions(-) diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index dfc5151..2668741 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -1004,7 +1004,7 @@ namespace AIMS.OperationAanesthesia { OperationAanesthesia.frmSelectPatientNew2 frmSelectPatient = new frmSelectPatientNew2(); frmSelectPatient.isMainOpen = true; - frmSelectPatient.frmAnasRecord = this; + frmSelectPatient.tempfrmAnasRecord = this; frmSelectPatient.FormClosed += new FormClosedEventHandler(frmSelectPatient_FormClosed); frmSelectPatient.ShowDialog(); @@ -1050,6 +1050,7 @@ namespace AIMS.OperationAanesthesia btnCancelOperation.Enabled = true; btnCancelIn.Enabled = true; DrawAnasReordBill.IniDrawAnasReordBill5(_record, zgcAnaesRecord, zgcAnaesRecord2, ref templateManage, ref templateManage2); + _record.ComputerRect = Screen.GetWorkingArea(this); StartTimer(); } catch @@ -1073,6 +1074,7 @@ namespace AIMS.OperationAanesthesia templateManage2.ControlClear(); } DrawAnasReordBill.IniDrawAnasReordBill5(_record, zgcAnaesRecord, zgcAnaesRecord2, ref templateManage, ref templateManage2); + _record.ComputerRect = Screen.GetWorkingArea(this); StartTimer(); } else if (PatientId > 0 && State == AIMSExtension.EditState.BROWSE) @@ -1092,6 +1094,7 @@ namespace AIMS.OperationAanesthesia templateManage2.ControlClear(); } DrawAnasReordBill.IniDrawAnasReordBill5(_record, zgcAnaesRecord, zgcAnaesRecord2, ref templateManage, ref templateManage2); + _record.ComputerRect = Screen.GetWorkingArea(this); StartTimer(); } @@ -2214,6 +2217,14 @@ namespace AIMS.OperationAanesthesia { templateManage2.ControlClear(); } + if (_record.phListPack != null) + { + Panel pan3 = _record.phListPack.CControl as Panel; + if (pan3 != null) + { + pan3.Controls.Clear(); + } + } _record = null; } #endregion diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs index 6830bb6..3590050 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs @@ -417,7 +417,7 @@ namespace AIMS.OperationAanesthesia { OperationAanesthesia.frmSelectPatientGoodsBill frmSelectPatient = new frmSelectPatientGoodsBill(); frmSelectPatient.isMainOpen = true; - frmSelectPatient.frmAnasRecord = this; + frmSelectPatient.tempfrmAnasRecord = this; frmSelectPatient.FormClosed += new FormClosedEventHandler(frmSelectPatient_FormClosed); frmSelectPatient.ShowDialog(); diff --git a/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs b/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs index 4d0f4e6..02f9176 100644 --- a/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs +++ b/AIMS/OperationAanesthesia/frmPhysiosSetting.designer.cs @@ -30,8 +30,8 @@ namespace AIMS.OperationAanesthesia 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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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(); @@ -40,6 +40,20 @@ namespace AIMS.OperationAanesthesia this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel3 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dgvMZTZ = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewLabelXColumn1 = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.dataGridViewIntegerInputColumn1 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); + this.dataGridViewIntegerInputColumn2 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); + this.dataGridViewIntegerInputColumn3 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); + this.dataGridViewIntegerInputColumn4 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); + this.dataGridViewCheckBoxXColumn2 = 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.spMZSMTZ = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); @@ -75,20 +89,6 @@ namespace AIMS.OperationAanesthesia this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); - this.dataGridViewLabelXColumn1 = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.dataGridViewIntegerInputColumn1 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); - this.dataGridViewIntegerInputColumn2 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); - this.dataGridViewIntegerInputColumn3 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); - this.dataGridViewIntegerInputColumn4 = new DevComponents.DotNetBar.Controls.DataGridViewIntegerInputColumn(); - this.dataGridViewCheckBoxXColumn2 = 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(); @@ -160,9 +160,9 @@ namespace AIMS.OperationAanesthesia this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel3); this.superTabControl1.Controls.Add(this.superTabControlPanel1); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControl1.Location = new System.Drawing.Point(0, 49); this.superTabControl1.Name = "superTabControl1"; @@ -207,14 +207,14 @@ namespace AIMS.OperationAanesthesia 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; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvMZTZ.DefaultCellStyle = dataGridViewCellStyle5; 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); @@ -223,12 +223,155 @@ namespace AIMS.OperationAanesthesia this.dgvMZTZ.Size = new System.Drawing.Size(1152, 436); this.dgvMZTZ.TabIndex = 1; // + // dataGridViewTextBoxColumn10 + // + this.dataGridViewTextBoxColumn10.DataPropertyName = "Id"; + this.dataGridViewTextBoxColumn10.HeaderText = "Id"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + this.dataGridViewTextBoxColumn10.Visible = false; + // + // dataGridViewTextBoxColumn11 + // + this.dataGridViewTextBoxColumn11.DataPropertyName = "Name"; + this.dataGridViewTextBoxColumn11.HeaderText = "名称"; + this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; + this.dataGridViewTextBoxColumn11.ReadOnly = true; + // + // dataGridViewTextBoxColumn12 + // + this.dataGridViewTextBoxColumn12.DataPropertyName = "Enname"; + this.dataGridViewTextBoxColumn12.HeaderText = "简码"; + this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; + this.dataGridViewTextBoxColumn12.ReadOnly = true; + this.dataGridViewTextBoxColumn12.Width = 80; + // + // dataGridViewImageColumn1 + // + this.dataGridViewImageColumn1.HeaderText = "图片"; + this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; + this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewImageColumn1.Visible = false; + this.dataGridViewImageColumn1.Width = 80; + // + // dataGridViewLabelXColumn1 + // + this.dataGridViewLabelXColumn1.HeaderText = "线条颜色"; + this.dataGridViewLabelXColumn1.Name = "dataGridViewLabelXColumn1"; + this.dataGridViewLabelXColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewLabelXColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewLabelXColumn1.Visible = false; + // + // dataGridViewIntegerInputColumn1 + // + // + // + // + this.dataGridViewIntegerInputColumn1.BackgroundStyle.Class = "DataGridViewNumericBorder"; + this.dataGridViewIntegerInputColumn1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewIntegerInputColumn1.DataPropertyName = "HighLimit"; + this.dataGridViewIntegerInputColumn1.HeaderText = "上限"; + this.dataGridViewIntegerInputColumn1.Name = "dataGridViewIntegerInputColumn1"; + this.dataGridViewIntegerInputColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewIntegerInputColumn1.Width = 70; + // + // dataGridViewIntegerInputColumn2 + // + // + // + // + this.dataGridViewIntegerInputColumn2.BackgroundStyle.Class = "DataGridViewNumericBorder"; + this.dataGridViewIntegerInputColumn2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewIntegerInputColumn2.DataPropertyName = "LowLimit"; + this.dataGridViewIntegerInputColumn2.HeaderText = "下限"; + this.dataGridViewIntegerInputColumn2.Name = "dataGridViewIntegerInputColumn2"; + this.dataGridViewIntegerInputColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewIntegerInputColumn2.Width = 70; + // + // dataGridViewIntegerInputColumn3 + // + // + // + // + this.dataGridViewIntegerInputColumn3.BackgroundStyle.Class = "DataGridViewNumericBorder"; + this.dataGridViewIntegerInputColumn3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewIntegerInputColumn3.DataPropertyName = "WarningHighLimit"; + this.dataGridViewIntegerInputColumn3.HeaderText = "报警上限"; + this.dataGridViewIntegerInputColumn3.Name = "dataGridViewIntegerInputColumn3"; + this.dataGridViewIntegerInputColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewIntegerInputColumn3.Width = 60; + // + // dataGridViewIntegerInputColumn4 + // + // + // + // + this.dataGridViewIntegerInputColumn4.BackgroundStyle.Class = "DataGridViewNumericBorder"; + this.dataGridViewIntegerInputColumn4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewIntegerInputColumn4.DataPropertyName = "WarningLowLimit"; + this.dataGridViewIntegerInputColumn4.HeaderText = "报警下限"; + this.dataGridViewIntegerInputColumn4.Name = "dataGridViewIntegerInputColumn4"; + this.dataGridViewIntegerInputColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewIntegerInputColumn4.Width = 60; + // + // dataGridViewCheckBoxXColumn2 + // + this.dataGridViewCheckBoxXColumn2.DataPropertyName = "YAisx"; + this.dataGridViewCheckBoxXColumn2.HeaderText = "时间间隔"; + this.dataGridViewCheckBoxXColumn2.Name = "dataGridViewCheckBoxXColumn2"; + this.dataGridViewCheckBoxXColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewCheckBoxXColumn2.Width = 60; + // + // 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 + // + this.dataGridViewCheckBoxXColumn4.Checked = true; + this.dataGridViewCheckBoxXColumn4.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.dataGridViewCheckBoxXColumn4.CheckValue = "N"; + this.dataGridViewCheckBoxXColumn4.DataPropertyName = "IsDefalultShow"; + this.dataGridViewCheckBoxXColumn4.HeaderText = "是否默认显示"; + this.dataGridViewCheckBoxXColumn4.Name = "dataGridViewCheckBoxXColumn4"; + this.dataGridViewCheckBoxXColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewCheckBoxXColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewCheckBoxXColumn4.Width = 80; + // + // dataGridViewTextBoxColumn13 + // + this.dataGridViewTextBoxColumn13.DataPropertyName = "Unit"; + this.dataGridViewTextBoxColumn13.HeaderText = "单位"; + this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; + this.dataGridViewTextBoxColumn13.Width = 80; + // + // dataGridViewIntegerInputColumn6 + // + // + // + // + this.dataGridViewIntegerInputColumn6.BackgroundStyle.Class = "DataGridViewNumericBorder"; + this.dataGridViewIntegerInputColumn6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dataGridViewIntegerInputColumn6.DataPropertyName = "PhysioOrder"; + this.dataGridViewIntegerInputColumn6.HeaderText = "排序"; + this.dataGridViewIntegerInputColumn6.Name = "dataGridViewIntegerInputColumn6"; + this.dataGridViewIntegerInputColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewIntegerInputColumn6.Width = 70; + // // spMZSMTZ // this.spMZSMTZ.AttachedControl = this.superTabControlPanel3; this.spMZSMTZ.GlobalItem = false; this.spMZSMTZ.Name = "spMZSMTZ"; - this.spMZSMTZ.Text = "麻醉数据参数"; + this.spMZSMTZ.Text = "麻醉机参数设置"; // // superTabControlPanel1 // @@ -281,14 +424,14 @@ namespace AIMS.OperationAanesthesia this.Unit, this.YAisx, this.PhysioOrder}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSetting.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSetting.DefaultCellStyle = dataGridViewCellStyle6; this.dgvSetting.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSetting.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvSetting.Location = new System.Drawing.Point(0, 0); @@ -474,7 +617,7 @@ namespace AIMS.OperationAanesthesia this.spJHYCS.AttachedControl = this.superTabControlPanel1; this.spJHYCS.GlobalItem = false; this.spJHYCS.Name = "spJHYCS"; - this.spJHYCS.Text = "监护数据参数"; + this.spJHYCS.Text = "监护参数设置"; // // superTabControlPanel2 // @@ -509,7 +652,7 @@ namespace AIMS.OperationAanesthesia this.spJHYSJXS.AttachedControl = this.superTabControlPanel2; this.spJHYSJXS.GlobalItem = false; this.spJHYSJXS.Name = "spJHYSJXS"; - this.spJHYSJXS.Text = "参数数据显示"; + this.spJHYSJXS.Text = "当前术间参数设置"; // // imageList1 // @@ -632,149 +775,6 @@ namespace AIMS.OperationAanesthesia this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; this.dataGridViewTextBoxColumn9.Width = 60; // - // dataGridViewTextBoxColumn10 - // - this.dataGridViewTextBoxColumn10.DataPropertyName = "Id"; - this.dataGridViewTextBoxColumn10.HeaderText = "Id"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; - this.dataGridViewTextBoxColumn10.Visible = false; - // - // dataGridViewTextBoxColumn11 - // - this.dataGridViewTextBoxColumn11.DataPropertyName = "Name"; - this.dataGridViewTextBoxColumn11.HeaderText = "名称"; - this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; - this.dataGridViewTextBoxColumn11.ReadOnly = true; - // - // dataGridViewTextBoxColumn12 - // - this.dataGridViewTextBoxColumn12.DataPropertyName = "Enname"; - this.dataGridViewTextBoxColumn12.HeaderText = "简码"; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.ReadOnly = true; - this.dataGridViewTextBoxColumn12.Width = 80; - // - // dataGridViewImageColumn1 - // - this.dataGridViewImageColumn1.HeaderText = "图片"; - this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; - this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewImageColumn1.Visible = false; - this.dataGridViewImageColumn1.Width = 80; - // - // dataGridViewLabelXColumn1 - // - this.dataGridViewLabelXColumn1.HeaderText = "线条颜色"; - this.dataGridViewLabelXColumn1.Name = "dataGridViewLabelXColumn1"; - this.dataGridViewLabelXColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewLabelXColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewLabelXColumn1.Visible = false; - // - // dataGridViewIntegerInputColumn1 - // - // - // - // - this.dataGridViewIntegerInputColumn1.BackgroundStyle.Class = "DataGridViewNumericBorder"; - this.dataGridViewIntegerInputColumn1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewIntegerInputColumn1.DataPropertyName = "HighLimit"; - this.dataGridViewIntegerInputColumn1.HeaderText = "上限"; - this.dataGridViewIntegerInputColumn1.Name = "dataGridViewIntegerInputColumn1"; - this.dataGridViewIntegerInputColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewIntegerInputColumn1.Width = 70; - // - // dataGridViewIntegerInputColumn2 - // - // - // - // - this.dataGridViewIntegerInputColumn2.BackgroundStyle.Class = "DataGridViewNumericBorder"; - this.dataGridViewIntegerInputColumn2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewIntegerInputColumn2.DataPropertyName = "LowLimit"; - this.dataGridViewIntegerInputColumn2.HeaderText = "下限"; - this.dataGridViewIntegerInputColumn2.Name = "dataGridViewIntegerInputColumn2"; - this.dataGridViewIntegerInputColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewIntegerInputColumn2.Width = 70; - // - // dataGridViewIntegerInputColumn3 - // - // - // - // - this.dataGridViewIntegerInputColumn3.BackgroundStyle.Class = "DataGridViewNumericBorder"; - this.dataGridViewIntegerInputColumn3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewIntegerInputColumn3.DataPropertyName = "WarningHighLimit"; - this.dataGridViewIntegerInputColumn3.HeaderText = "报警上限"; - this.dataGridViewIntegerInputColumn3.Name = "dataGridViewIntegerInputColumn3"; - this.dataGridViewIntegerInputColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewIntegerInputColumn3.Width = 60; - // - // dataGridViewIntegerInputColumn4 - // - // - // - // - this.dataGridViewIntegerInputColumn4.BackgroundStyle.Class = "DataGridViewNumericBorder"; - this.dataGridViewIntegerInputColumn4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewIntegerInputColumn4.DataPropertyName = "WarningLowLimit"; - this.dataGridViewIntegerInputColumn4.HeaderText = "报警下限"; - this.dataGridViewIntegerInputColumn4.Name = "dataGridViewIntegerInputColumn4"; - this.dataGridViewIntegerInputColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewIntegerInputColumn4.Width = 60; - // - // dataGridViewCheckBoxXColumn2 - // - this.dataGridViewCheckBoxXColumn2.DataPropertyName = "YAisx"; - this.dataGridViewCheckBoxXColumn2.HeaderText = "时间间隔"; - this.dataGridViewCheckBoxXColumn2.Name = "dataGridViewCheckBoxXColumn2"; - this.dataGridViewCheckBoxXColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewCheckBoxXColumn2.Width = 60; - // - // 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 - // - this.dataGridViewCheckBoxXColumn4.Checked = true; - this.dataGridViewCheckBoxXColumn4.CheckState = System.Windows.Forms.CheckState.Indeterminate; - this.dataGridViewCheckBoxXColumn4.CheckValue = "N"; - this.dataGridViewCheckBoxXColumn4.DataPropertyName = "IsDefalultShow"; - this.dataGridViewCheckBoxXColumn4.HeaderText = "是否默认显示"; - this.dataGridViewCheckBoxXColumn4.Name = "dataGridViewCheckBoxXColumn4"; - this.dataGridViewCheckBoxXColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewCheckBoxXColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewCheckBoxXColumn4.Width = 80; - // - // dataGridViewTextBoxColumn13 - // - this.dataGridViewTextBoxColumn13.DataPropertyName = "Unit"; - this.dataGridViewTextBoxColumn13.HeaderText = "单位"; - this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; - this.dataGridViewTextBoxColumn13.Width = 80; - // - // dataGridViewIntegerInputColumn6 - // - // - // - // - this.dataGridViewIntegerInputColumn6.BackgroundStyle.Class = "DataGridViewNumericBorder"; - this.dataGridViewIntegerInputColumn6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dataGridViewIntegerInputColumn6.DataPropertyName = "PhysioOrder"; - this.dataGridViewIntegerInputColumn6.HeaderText = "排序"; - this.dataGridViewIntegerInputColumn6.Name = "dataGridViewIntegerInputColumn6"; - this.dataGridViewIntegerInputColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewIntegerInputColumn6.Width = 70; - // // frmPhysiosSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/AIMS/OperationAanesthesia/frmPhysiosSetting.resx b/AIMS/OperationAanesthesia/frmPhysiosSetting.resx index 197549e..9abc63a 100644 --- a/AIMS/OperationAanesthesia/frmPhysiosSetting.resx +++ b/AIMS/OperationAanesthesia/frmPhysiosSetting.resx @@ -218,7 +218,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - LgAAAk1TRnQBSQFMAgEBLwEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + LgAAAk1TRnQBSQFMAgEBLwEAAWgBAAFoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAcADAAEBAQABCAYAATAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs index c32d4d4..89f44b9 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs +++ b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs @@ -22,7 +22,7 @@ namespace AIMS.OperationAanesthesia public int SelPatientId; public int SelApplyId; public bool isMainOpen = false; - public AIMS.OperationAanesthesia.frmAanesthesiaRecord frmAnasRecord; + public AIMS.OperationAanesthesia.frmAanesthesiaRecord tempfrmAnasRecord; List rooms; public frmSelectPatientNew2() @@ -267,8 +267,16 @@ namespace AIMS.OperationAanesthesia } } - if (frmAnasRecord == null) + frmAanesthesiaRecord frmAnasRecord = null; + if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) + { + frmAnasRecord = tempfrmAnasRecord; + frmAnasRecord.ClearRecordDate(); + } + else + { frmAnasRecord = new frmAanesthesiaRecord(); + } frmAnasRecord.PatientId = PatientId; frmAnasRecord.ApplyId = applyId; frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(RoomId); @@ -290,16 +298,24 @@ namespace AIMS.OperationAanesthesia } else { - if (frmAnasRecord._record != null) - frmAnasRecord.ClearRecordDate(); + //if (frmAnasRecord._record != null) + // frmAnasRecord.ClearRecordDate(); this.Close(); } } else { - if (frmAnasRecord == null) + frmAanesthesiaRecord frmAnasRecord = null; + if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) + { + frmAnasRecord = tempfrmAnasRecord; + frmAnasRecord.ClearRecordDate(); + } + else + { frmAnasRecord = new frmAanesthesiaRecord(); + } frmAnasRecord.PatientId = PatientId; frmAnasRecord.ApplyId = applyId; frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(RoomId); @@ -319,8 +335,8 @@ namespace AIMS.OperationAanesthesia } else { - if (frmAnasRecord._record != null) - frmAnasRecord.ClearRecordDate(); + //if (tempfrmAnasRecord._record != null) + // tempfrmAnasRecord.ClearRecordDate(); this.Close(); } } @@ -408,8 +424,16 @@ namespace AIMS.OperationAanesthesia BOperationRecord.DeleteEvent(PatientId, 8); HelperDB.DbHelperSQL.CommitTrans(); - if (frmAnasRecord == null) + frmAanesthesiaRecord frmAnasRecord = null; + if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) + { + frmAnasRecord = tempfrmAnasRecord; + frmAnasRecord.ClearRecordDate(); + } + else + { frmAnasRecord = new frmAanesthesiaRecord(); + } frmAnasRecord.PatientId = PatientId; frmAnasRecord.ApplyId = applyId; frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(int.Parse(uc.Tag.ToString())); @@ -425,8 +449,8 @@ namespace AIMS.OperationAanesthesia } else { - if (frmAnasRecord._record != null) - frmAnasRecord.ClearRecordDate(); + //if (frmAnasRecord._record != null) + // frmAnasRecord.ClearRecordDate(); this.Close(); } } diff --git a/AIMS/OperationAanesthesia/oldSystemCode/frmSelectPatientGoodsBill.cs b/AIMS/OperationAanesthesia/oldSystemCode/frmSelectPatientGoodsBill.cs index a0f82a7..dc870c8 100644 --- a/AIMS/OperationAanesthesia/oldSystemCode/frmSelectPatientGoodsBill.cs +++ b/AIMS/OperationAanesthesia/oldSystemCode/frmSelectPatientGoodsBill.cs @@ -19,7 +19,7 @@ namespace AIMS.OperationAanesthesia public int SelPatientId; public int SelApplyId; public bool isMainOpen = false; - public AIMS.OperationAanesthesia.frmInstrumentRecord frmAnasRecord; + public AIMS.OperationAanesthesia.frmInstrumentRecord tempfrmAnasRecord; List rooms; public frmSelectPatientGoodsBill() @@ -259,8 +259,16 @@ namespace AIMS.OperationAanesthesia } } - if (frmAnasRecord == null) + frmInstrumentRecord frmAnasRecord = null; + if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) + { + frmAnasRecord = tempfrmAnasRecord; + frmAnasRecord.ClearRecordDate(); + } + else + { frmAnasRecord = new frmInstrumentRecord(); + } frmAnasRecord.PatientId = PatientId; frmAnasRecord.ApplyId = applyId; frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(RoomId); @@ -282,16 +290,24 @@ namespace AIMS.OperationAanesthesia } else { - if (frmAnasRecord._record != null) - frmAnasRecord.ClearRecordDate(); + //if (frmAnasRecord._record != null) + // frmAnasRecord.ClearRecordDate(); this.Close(); } } else { - if (frmAnasRecord == null) + frmInstrumentRecord frmAnasRecord = null; + if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) + { + frmAnasRecord = tempfrmAnasRecord; + frmAnasRecord.ClearRecordDate(); + } + else + { frmAnasRecord = new frmInstrumentRecord(); + } frmAnasRecord.PatientId = PatientId; frmAnasRecord.ApplyId = applyId; frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(RoomId); @@ -367,8 +383,16 @@ namespace AIMS.OperationAanesthesia BOperationRecord.DeleteEvent(PatientId, 8); HelperDB.DbHelperSQL.CommitTrans(); - if (frmAnasRecord == null) + frmInstrumentRecord frmAnasRecord = null; + if (tempfrmAnasRecord != null && tempfrmAnasRecord._record != null) + { + frmAnasRecord = tempfrmAnasRecord; + frmAnasRecord.ClearRecordDate(); + } + else + { frmAnasRecord = new frmInstrumentRecord(); + } frmAnasRecord.PatientId = PatientId; frmAnasRecord.ApplyId = applyId; frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(int.Parse(uc.Tag.ToString())); @@ -384,8 +408,8 @@ namespace AIMS.OperationAanesthesia } else { - if (frmAnasRecord._record != null) - frmAnasRecord.ClearRecordDate(); + //if (frmAnasRecord._record != null) + // frmAnasRecord.ClearRecordDate(); this.Close(); } } diff --git a/DrawGraph/AreaManage/MonitorManage.cs b/DrawGraph/AreaManage/MonitorManage.cs index 16934b2..5b44809 100644 --- a/DrawGraph/AreaManage/MonitorManage.cs +++ b/DrawGraph/AreaManage/MonitorManage.cs @@ -92,7 +92,30 @@ namespace DrawGraph { if (pan.Controls.Count == 0) { - pan.Controls.Clear(); + Font font = new System.Drawing.Font("微软雅黑", 7f); + int pyl = 1; + if (myOpeRecord.ComputerRect.Width >= 3840) + { + font = new System.Drawing.Font("微软雅黑", 11f); + } + else if (myOpeRecord.ComputerRect.Width >= 2560) + { + font = new System.Drawing.Font("微软雅黑", 9f); + } + else if (myOpeRecord.ComputerRect.Width >= 1920) + { + font = new System.Drawing.Font("宋体", 9f); + } + else if (myOpeRecord.ComputerRect.Width >= 1600) + { + font = new System.Drawing.Font("宋体", 6f); + } + else if (myOpeRecord.ComputerRect.Width >= 1024) + { + font = new System.Drawing.Font("宋体", 5f); + } + + //pan.Controls.Clear(); ToolTip toolTip1 = new System.Windows.Forms.ToolTip(); int Width = pan.Width; int Height = pan.Height / 4; @@ -115,16 +138,16 @@ namespace DrawGraph 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.Font = font; textNum.Multiline = true; - textNum.Width = Width / (240 / 5);// + 1; + textNum.Width = Width / (240 / 5) + pyl; 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 x = 0; x < myOpeRecord.PhysioAnesConfigList.Count; x++) @@ -145,7 +168,7 @@ namespace DrawGraph // 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.Font = new System.Drawing.Font("微软雅黑", fontSize); // textNum.Width = Width / (240 / ade.YAisx) + 1; // textNum.Height = panel.Height; // textNum.Dock = System.Windows.Forms.DockStyle.Left; @@ -157,18 +180,22 @@ namespace DrawGraph 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.Font = font; textNum.Multiline = true; - textNum.Width = Width / (240 / ade.YAisx);// + 1; + textNum.Width = Width / (240 / ade.YAisx) + pyl; 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); } + + System.Windows.Forms.Panel wmpanel = new System.Windows.Forms.Panel(); + wmpanel.Size = pan.Size; + wmpanel.Dock = DockStyle.Fill; for (int i = 3; i >= 0; i--) { if (i > panPanels.Count - 1) @@ -181,9 +208,9 @@ namespace DrawGraph { 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.Font = font; textNum.Multiline = true; - textNum.Width = Width / (240 / 5) ;//+ 1 + textNum.Width = Width / (240 / 5) + pyl; textNum.ReadOnly = true; textNum.Height = panel.Height; textNum.Dock = System.Windows.Forms.DockStyle.Left; @@ -193,8 +220,12 @@ namespace DrawGraph panPanels.Add(panel); }; - pan.Controls.Add(panPanels[i]); + wmpanel.Controls.Add(panPanels[i]); } + pan.Controls.Clear(); + pan.Controls.Add(wmpanel); + + } } } diff --git a/DrawGraph/AreaManage/OperationRecord.cs b/DrawGraph/AreaManage/OperationRecord.cs index ebbe7fa..4cdfd21 100644 --- a/DrawGraph/AreaManage/OperationRecord.cs +++ b/DrawGraph/AreaManage/OperationRecord.cs @@ -3,6 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Data; +using System.Drawing; using System.Xml.Serialization; namespace DrawGraph @@ -1205,12 +1206,11 @@ namespace DrawGraph [NoCreatControlAttributs] public DataTable PhysioParamList; [NoCreatControlAttributs] - public AbleEditPackObj phListPack = null; - /// - /// 当前选中的,手术生理曲线 - /// + public AbleEditPackObj phListPack = null; [NoCreatControlAttributs] public PhysioDataConfig SelPhysioConfig; + [NoCreatControlAttributs] + public Rectangle ComputerRect; [ClassAttributs(Description = "选中范围的对象")] [NoCreatControlAttributs] diff --git a/DrawGraph/AreaManage/PhysioDataConfig.cs b/DrawGraph/AreaManage/PhysioDataConfig.cs index a9b0474..6e47648 100644 --- a/DrawGraph/AreaManage/PhysioDataConfig.cs +++ b/DrawGraph/AreaManage/PhysioDataConfig.cs @@ -650,11 +650,19 @@ namespace DrawGraph if (pd.RecordTime <= pageEnd && pd.RecordTime >= pageBegin) { string viewValue = ""; - if (pd.Value != Double.MaxValue && pd.Value > 0) + + if (ConfigType == "生命体征" || ShowText == true) { - viewValue = ((int)pd.Value).ToString(); - if (Enname == "Temp") - viewValue = Math.Round(pd.Y, 1).ToString(); + if (pd.Value != Double.MaxValue && pd.Value > 0) + { + viewValue = ((int)pd.Value).ToString(); + if (Enname == "Temp") + viewValue = Math.Round(pd.Y, 1).ToString(); + } + else + { + viewValue = pd.ValueString; + } } else { diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index 7992625..c9cdc26 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -352,12 +352,18 @@ namespace DrawGraph if (myOpeRecord.SelPhysioConfig != null && myOpeRecord.SelPhysioConfig.IsClick == true) { - PhysioData pdNew = rePD(sender, e); - if (pdNew == null) return; + PhysioData pdTemp = rePD(sender, e); + if (pdTemp == null) return; if (AnesOpeStatue == DoAnesOpeStatus.MOVEPD) { - if (CurPhysioData.RecordTime == pdNew.RecordTime) - myOpeRecord.SelPhysioConfig.ModifyItem(CurPhysioData, pdNew); + if (CurPhysioData.isEquert(pdTemp)) + { + PhysioData newPd = myOpeRecord.SelPhysioConfig.MoveItem(pdTemp); + if (newPd != null)//&& CurPhysioData.Value != newPd.Value + { + myOpeRecord.SelPhysioConfig.ModifyItem(CurPhysioData, newPd); + } + } CurPhysioData = null; } @@ -934,11 +940,11 @@ namespace DrawGraph } #endregion - public DataTable getByOpeIDIsPhysioData(int operationId) - { - string sqlStr = "SELECT [PhysioDataConfig].Name , PhysioData.RecordTime, PhysioData.[Value] FROM [dbo].[PhysioDataConfig] INNER JOIN PhysioData ON [PhysioDataConfig].Id = PhysioData.PhysioDataConfigId where PatientId = " + operationId + " order by PhysioDataConfigId,PhysioData.RecordTime ASC"; - return DBHelper.GetDataTable(sqlStr); - } + //public DataTable getByOpeIDIsPhysioData(int operationId) + //{ + // string sqlStr = "SELECT [PhysioDataConfig].Name , PhysioData.RecordTime, PhysioData.[Value] FROM [dbo].[PhysioDataConfig] INNER JOIN PhysioData ON [PhysioDataConfig].Id = PhysioData.PhysioDataConfigId where PatientId = " + operationId + " order by PhysioDataConfigId,PhysioData.RecordTime ASC"; + // return DBHelper.GetDataTable(sqlStr); + //} public List SelectPhysioDataByID(int operationId, DateTime startTime, DateTime endTime, double startValue, double endValue) { List PhysioDatas = new List();