From fe22b3bc55bb6461f3f681451a4f35f1e6349684 Mon Sep 17 00:00:00 2001 From: leomo Date: Tue, 8 Nov 2022 23:41:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=89=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/DataDictionary/frmDrugs.Designer.cs | 251 ++++++++---- AIMS/DataDictionary/frmDrugs.cs | 53 ++- AIMS/DataDictionary/frmDrugs.resx | 9 + AIMS/DocManager/PatientLisResult.cs | 22 +- .../AnasRecordBill/frmAnasRecordBill.cs | 2 +- .../AnasRecordBill/frmAnasRecordBill2.cs | 43 +- .../frmAnasRecordInstrument.Designer.cs | 379 ++++++++---------- .../AnasRecordBill/frmAnasRecordInstrument.cs | 85 +--- .../AnasRecordBill/frmFactDrugNew.Designer.cs | 24 +- .../AnasRecordBill/frmFactDrugNew.cs | 3 +- .../AnasRecordBill/frmFactDrugNew.resx | 20 +- .../AnasRecordBill/frmFactEventsNew.cs | 140 +++++-- .../AnasRecoverBill/frmAnasRecoverBill.cs | 2 +- .../oldSystemCode/frmLISResult.designer.cs | 153 +++---- .../frmOperationSchedulePlan.cs | 8 +- .../frmSelectiveOperationsPrint.cs | 55 ++- AIMS/Template/手术排程模板.xlt | Bin 29696 -> 30720 bytes AIMSEntity/BLL/Extension/BDrugs.cs | 6 +- AIMSEntity/BLL/Extension/BOperationRecord.cs | 8 +- AIMSEntity/DAL/AutoGenerate/DDrugs.cs | 13 +- AIMSEntity/DAL/Extension/DDrugs.cs | 27 +- AIMSEntity/DAL/Extension/DEvents.cs | 8 +- AIMSEntity/Model/AutoGenerate/Drugs.cs | 14 +- DrawGraph/AreaManage/BaseInfoBottomManage.cs | 12 +- DrawGraph/AreaManage/BaseInfoTopManage.cs | 9 +- DrawGraph/AreaManage/SelectDictText.cs | 1 + DrawGraph/AreaManage/SelectDictValue.cs | 1 + DrawGraph/AreaManage/SelectWorkerValue.cs | 1 + DrawGraph/Graph/ZUtil.cs | 9 +- DrawGraph/Resources/sy2.png | Bin 428 -> 2099 bytes DrawGraph/Resources/sy3.png | Bin 399 -> 1708 bytes 31 files changed, 824 insertions(+), 534 deletions(-) diff --git a/AIMS/DataDictionary/frmDrugs.Designer.cs b/AIMS/DataDictionary/frmDrugs.Designer.cs index 7d94747..06c152f 100644 --- a/AIMS/DataDictionary/frmDrugs.Designer.cs +++ b/AIMS/DataDictionary/frmDrugs.Designer.cs @@ -63,7 +63,16 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel(); this.dgv = new System.Windows.Forms.DataGridView(); + this.panel3 = new System.Windows.Forms.Panel(); + this.treeView1 = new System.Windows.Forms.TreeView(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel6 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); + this.txtRemark = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.txtChannel = new System.Windows.Forms.ComboBox(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HelpCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DrugKindColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -71,11 +80,9 @@ this.DosageUnitColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UnitColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UseRate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.IsValidColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.panel3 = new System.Windows.Forms.Panel(); - this.treeView1 = new System.Windows.Forms.TreeView(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel6 = new System.Windows.Forms.Panel(); this.toolStrip1.SuspendLayout(); this.panel4.SuspendLayout(); this.panel1.SuspendLayout(); @@ -188,6 +195,8 @@ this.panel4.Controls.Add(this.label4); this.panel4.Controls.Add(this.txtUnit); this.panel4.Controls.Add(this.label2); + this.panel4.Controls.Add(this.txtChannel); + this.panel4.Controls.Add(this.label5); this.panel4.Controls.Add(this.cboDosageUnit); this.panel4.Controls.Add(this.label1); this.panel4.Controls.Add(this.txtStand); @@ -196,19 +205,21 @@ this.panel4.Controls.Add(this.label12); this.panel4.Controls.Add(this.cboDrugKind); this.panel4.Controls.Add(this.chkIsValid); + this.panel4.Controls.Add(this.txtRemark); this.panel4.Controls.Add(this.txtName); + this.panel4.Controls.Add(this.label3); this.panel4.Controls.Add(this.label13); this.panel4.Controls.Add(this.label14); this.panel4.Dock = System.Windows.Forms.DockStyle.Top; this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(691, 115); + this.panel4.Size = new System.Drawing.Size(691, 185); this.panel4.TabIndex = 0; // // txtUseRate // - this.txtUseRate.Location = new System.Drawing.Point(482, 71); + this.txtUseRate.Location = new System.Drawing.Point(484, 106); this.txtUseRate.Name = "txtUseRate"; this.txtUseRate.Size = new System.Drawing.Size(45, 23); this.txtUseRate.TabIndex = 563; @@ -216,7 +227,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(433, 75); + this.label6.Location = new System.Drawing.Point(431, 108); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(35, 14); this.label6.TabIndex = 562; @@ -225,14 +236,14 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(487, 76); + this.label4.Location = new System.Drawing.Point(485, 104); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(0, 14); this.label4.TabIndex = 561; // // txtUnit // - this.txtUnit.Location = new System.Drawing.Point(287, 70); + this.txtUnit.Location = new System.Drawing.Point(287, 76); this.txtUnit.Name = "txtUnit"; this.txtUnit.Size = new System.Drawing.Size(123, 23); this.txtUnit.TabIndex = 560; @@ -240,7 +251,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(246, 79); + this.label2.Location = new System.Drawing.Point(246, 80); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(35, 14); this.label2.TabIndex = 559; @@ -249,7 +260,7 @@ // cboDosageUnit // this.cboDosageUnit.FormattingEnabled = true; - this.cboDosageUnit.Location = new System.Drawing.Point(102, 71); + this.cboDosageUnit.Location = new System.Drawing.Point(102, 76); this.cboDosageUnit.Name = "cboDosageUnit"; this.cboDosageUnit.Size = new System.Drawing.Size(121, 22); this.cboDosageUnit.TabIndex = 558; @@ -257,7 +268,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(25, 79); + this.label1.Location = new System.Drawing.Point(31, 80); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(63, 14); this.label1.TabIndex = 557; @@ -265,7 +276,7 @@ // // txtStand // - this.txtStand.Location = new System.Drawing.Point(287, 41); + this.txtStand.Location = new System.Drawing.Point(287, 46); this.txtStand.Name = "txtStand"; this.txtStand.Size = new System.Drawing.Size(123, 23); this.txtStand.TabIndex = 554; @@ -273,7 +284,7 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(246, 50); + this.label11.Location = new System.Drawing.Point(246, 52); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(35, 14); this.label11.TabIndex = 553; @@ -281,7 +292,7 @@ // // txtHelpCode // - this.txtHelpCode.Location = new System.Drawing.Point(479, 15); + this.txtHelpCode.Location = new System.Drawing.Point(484, 15); this.txtHelpCode.Name = "txtHelpCode"; this.txtHelpCode.Size = new System.Drawing.Size(123, 23); this.txtHelpCode.TabIndex = 552; @@ -300,9 +311,11 @@ this.cboDrugKind.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboDrugKind.FormattingEnabled = true; this.cboDrugKind.Items.AddRange(new object[] { - "抗菌药", - "毒麻药品", - "其它"}); + "麻醉药", + "精神I类", + "精神II类", + "普通药", + "血液制品"}); this.cboDrugKind.Location = new System.Drawing.Point(102, 46); this.cboDrugKind.Name = "cboDrugKind"; this.cboDrugKind.Size = new System.Drawing.Size(121, 22); @@ -311,7 +324,7 @@ // chkIsValid // this.chkIsValid.AutoSize = true; - this.chkIsValid.Location = new System.Drawing.Point(551, 73); + this.chkIsValid.Location = new System.Drawing.Point(549, 106); this.chkIsValid.Name = "chkIsValid"; this.chkIsValid.Size = new System.Drawing.Size(68, 18); this.chkIsValid.TabIndex = 549; @@ -329,7 +342,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(31, 50); + this.label13.Location = new System.Drawing.Point(31, 52); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(63, 14); this.label13.TabIndex = 547; @@ -356,9 +369,9 @@ // this.panel5.Controls.Add(this.dgv); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(0, 115); + this.panel5.Location = new System.Drawing.Point(0, 185); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(691, 312); + this.panel5.Size = new System.Drawing.Size(691, 242); this.panel5.TabIndex = 1; // // dgv @@ -368,6 +381,7 @@ this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, + this.Code, this.NameColumn, this.HelpCodeColumn, this.DrugKindColumn, @@ -375,6 +389,8 @@ this.DosageUnitColumn, this.UnitColumn, this.UseRate, + this.Remark, + this.Channel, this.IsValidColumn}); this.dgv.Dock = System.Windows.Forms.DockStyle.Fill; this.dgv.Location = new System.Drawing.Point(0, 0); @@ -382,74 +398,9 @@ this.dgv.RowHeadersVisible = false; this.dgv.RowTemplate.Height = 23; this.dgv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgv.Size = new System.Drawing.Size(691, 312); + this.dgv.Size = new System.Drawing.Size(691, 242); this.dgv.TabIndex = 1; // - // Id - // - this.Id.DataPropertyName = "Id"; - this.Id.Frozen = true; - this.Id.HeaderText = "Id"; - this.Id.Name = "Id"; - this.Id.ReadOnly = true; - this.Id.Visible = false; - // - // NameColumn - // - this.NameColumn.DataPropertyName = "Name"; - this.NameColumn.HeaderText = "名称"; - this.NameColumn.Name = "NameColumn"; - this.NameColumn.ReadOnly = true; - this.NameColumn.Width = 200; - // - // HelpCodeColumn - // - this.HelpCodeColumn.DataPropertyName = "HelpCode"; - this.HelpCodeColumn.HeaderText = "助记码"; - this.HelpCodeColumn.Name = "HelpCodeColumn"; - this.HelpCodeColumn.ReadOnly = true; - this.HelpCodeColumn.Visible = false; - // - // DrugKindColumn - // - this.DrugKindColumn.DataPropertyName = "DrugKind"; - this.DrugKindColumn.HeaderText = "药品类别"; - this.DrugKindColumn.Name = "DrugKindColumn"; - this.DrugKindColumn.ReadOnly = true; - // - // StandColumn - // - this.StandColumn.DataPropertyName = "Stand"; - this.StandColumn.HeaderText = "规格"; - this.StandColumn.Name = "StandColumn"; - // - // DosageUnitColumn - // - this.DosageUnitColumn.DataPropertyName = "DosageUnit"; - this.DosageUnitColumn.HeaderText = "剂量单位"; - this.DosageUnitColumn.Name = "DosageUnitColumn"; - // - // UnitColumn - // - this.UnitColumn.DataPropertyName = "Unit"; - this.UnitColumn.HeaderText = "单位"; - this.UnitColumn.Name = "UnitColumn"; - this.UnitColumn.ReadOnly = true; - // - // UseRate - // - this.UseRate.DataPropertyName = "UseRate"; - this.UseRate.HeaderText = "频次"; - this.UseRate.Name = "UseRate"; - // - // IsValidColumn - // - this.IsValidColumn.DataPropertyName = "IsValid"; - this.IsValidColumn.HeaderText = "有效性"; - this.IsValidColumn.Name = "IsValidColumn"; - this.IsValidColumn.ReadOnly = true; - this.IsValidColumn.Width = 75; - // // panel3 // this.panel3.Controls.Add(this.panel5); @@ -509,6 +460,123 @@ this.panel6.Size = new System.Drawing.Size(872, 47); this.panel6.TabIndex = 9; // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(31, 108); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(63, 14); + this.label3.TabIndex = 546; + this.label3.Text = "药品备注"; + // + // txtRemark + // + this.txtRemark.Location = new System.Drawing.Point(102, 106); + this.txtRemark.Name = "txtRemark"; + this.txtRemark.Size = new System.Drawing.Size(308, 23); + this.txtRemark.TabIndex = 548; + this.txtRemark.TextChanged += new System.EventHandler(this.txtName_TextChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(431, 80); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(35, 14); + this.label5.TabIndex = 557; + this.label5.Text = "途径"; + // + // txtChannel + // + this.txtChannel.FormattingEnabled = true; + this.txtChannel.Location = new System.Drawing.Point(484, 76); + this.txtChannel.Name = "txtChannel"; + this.txtChannel.Size = new System.Drawing.Size(121, 22); + this.txtChannel.TabIndex = 558; + // + // Id + // + this.Id.DataPropertyName = "Id"; + this.Id.Frozen = true; + this.Id.HeaderText = "Id"; + this.Id.Name = "Id"; + this.Id.ReadOnly = true; + this.Id.Visible = false; + // + // Code + // + this.Code.DataPropertyName = "Code"; + this.Code.HeaderText = "编码"; + this.Code.Name = "Code"; + // + // NameColumn + // + this.NameColumn.DataPropertyName = "Name"; + this.NameColumn.HeaderText = "名称"; + this.NameColumn.Name = "NameColumn"; + this.NameColumn.ReadOnly = true; + this.NameColumn.Width = 200; + // + // HelpCodeColumn + // + this.HelpCodeColumn.DataPropertyName = "HelpCode"; + this.HelpCodeColumn.HeaderText = "助记码"; + this.HelpCodeColumn.Name = "HelpCodeColumn"; + this.HelpCodeColumn.ReadOnly = true; + this.HelpCodeColumn.Visible = false; + // + // DrugKindColumn + // + this.DrugKindColumn.DataPropertyName = "DrugKind"; + this.DrugKindColumn.HeaderText = "药品类别"; + this.DrugKindColumn.Name = "DrugKindColumn"; + this.DrugKindColumn.ReadOnly = true; + // + // StandColumn + // + this.StandColumn.DataPropertyName = "Stand"; + this.StandColumn.HeaderText = "规格"; + this.StandColumn.Name = "StandColumn"; + // + // DosageUnitColumn + // + this.DosageUnitColumn.DataPropertyName = "DosageUnit"; + this.DosageUnitColumn.HeaderText = "剂量单位"; + this.DosageUnitColumn.Name = "DosageUnitColumn"; + // + // UnitColumn + // + this.UnitColumn.DataPropertyName = "Unit"; + this.UnitColumn.HeaderText = "单位"; + this.UnitColumn.Name = "UnitColumn"; + this.UnitColumn.ReadOnly = true; + // + // UseRate + // + this.UseRate.DataPropertyName = "UseRate"; + this.UseRate.HeaderText = "频次"; + this.UseRate.Name = "UseRate"; + // + // Remark + // + this.Remark.DataPropertyName = "Remark"; + this.Remark.HeaderText = "备注"; + this.Remark.Name = "Remark"; + // + // Channel + // + this.Channel.DataPropertyName = "Channel"; + this.Channel.HeaderText = "途径"; + this.Channel.Name = "Channel"; + // + // IsValidColumn + // + this.IsValidColumn.DataPropertyName = "IsValid"; + this.IsValidColumn.HeaderText = "有效性"; + this.IsValidColumn.Name = "IsValidColumn"; + this.IsValidColumn.ReadOnly = true; + this.IsValidColumn.Width = 75; + // // frmDrugs // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -572,7 +640,12 @@ private System.Windows.Forms.TextBox txtUseRate; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox txtChannel; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtRemark; + private System.Windows.Forms.Label label3; private System.Windows.Forms.DataGridViewTextBoxColumn Id; + private System.Windows.Forms.DataGridViewTextBoxColumn Code; private System.Windows.Forms.DataGridViewTextBoxColumn NameColumn; private System.Windows.Forms.DataGridViewTextBoxColumn HelpCodeColumn; private System.Windows.Forms.DataGridViewTextBoxColumn DrugKindColumn; @@ -580,6 +653,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn DosageUnitColumn; private System.Windows.Forms.DataGridViewTextBoxColumn UnitColumn; private System.Windows.Forms.DataGridViewTextBoxColumn UseRate; + private System.Windows.Forms.DataGridViewTextBoxColumn Remark; + private System.Windows.Forms.DataGridViewTextBoxColumn Channel; private System.Windows.Forms.DataGridViewTextBoxColumn IsValidColumn; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmDrugs.cs b/AIMS/DataDictionary/frmDrugs.cs index 9124b32..4e40194 100644 --- a/AIMS/DataDictionary/frmDrugs.cs +++ b/AIMS/DataDictionary/frmDrugs.cs @@ -23,10 +23,20 @@ namespace DataDictionary.UI { AIMSExtension.PublicMethod.SetDgvAttribute(dgv); AIMSExtension.PublicMethod.EnabledControl(panel4, false); - cboDosageUnit.DataSource = BDrugs.GetDosageUnitDataTable(1); + txtName.Enabled = true; + List _dUnitList = BBasicDictionary.GetBasicDictionaryByName("给药单位").SubItem; + _dUnitList.Insert(0, new BasicDictionary() { Id = -1, Name = "" }); + cboDosageUnit.DataSource = _dUnitList; cboDosageUnit.DisplayMember = "Name"; - cboDosageUnit.ValueMember = "Id"; + cboDosageUnit.ValueMember = "Name"; cboDosageUnit.SelectedIndex = -1; + List _channelList = BBasicDictionary.GetBasicDictionaryByName("用药途径").SubItem; + _channelList.Insert(0, new BasicDictionary() { Id = -1, Name = "" }); + txtChannel.DataSource = _channelList; + txtChannel.DisplayMember = "Name"; + txtChannel.ValueMember = "Name"; + txtChannel.SelectedIndex = -1; + _state = AIMSExtension.EditState.BROWSE; GetDrugsDataTable(""); } @@ -34,8 +44,7 @@ namespace DataDictionary.UI { _state = AIMSExtension.EditState.ADD; AIMSExtension.PublicMethod.EnabledControl(panel4, true); - AIMSExtension.PublicMethod.ClearControl(panel4); - chkIsValid.Checked = true; + AIMSExtension.PublicMethod.ClearControl(panel4); txtName.Enabled = true; } @@ -43,7 +52,7 @@ namespace DataDictionary.UI { _state = AIMSExtension.EditState.EDIT; AIMSExtension.PublicMethod.EnabledControl(panel4, true); - txtName.Enabled = false; + txtName.Enabled = true; if (dgv.Rows.Count > 0) { SelectDrugsRowId = int.Parse(dgv.CurrentRow.Cells["Id"].Value.ToString()); @@ -54,6 +63,8 @@ namespace DataDictionary.UI txtUnit.Text = dgv.CurrentRow.Cells["UnitColumn"].Value.ToString(); txtHelpCode.Text = dgv.CurrentRow.Cells["HelpCodeColumn"].Value.ToString(); txtUseRate.Text = dgv.CurrentRow.Cells["UseRate"].Value.ToString(); + txtRemark.Text = dgv.CurrentRow.Cells["Remark"].Value.ToString(); + txtChannel.Text = dgv.CurrentRow.Cells["Channel"].Value.ToString(); if (dgv.CurrentRow.Cells["IsValidColumn"].Value.ToString() == "有效") { @@ -68,9 +79,12 @@ namespace DataDictionary.UI private void tsbCancel_Click(object sender, EventArgs e) { - _state = AIMSExtension.EditState.BROWSE; AIMSExtension.PublicMethod.EnabledControl(panel4, false); AIMSExtension.PublicMethod.ClearControl(panel4); + _state = AIMSExtension.EditState.BROWSE; + txtName.Enabled = true; + GetDrugsDataTable(""); + } private void tsbSava_Click(object sender, EventArgs e) @@ -87,6 +101,8 @@ namespace DataDictionary.UI DrugsObj.Stand = txtStand.Text.Trim(); DrugsObj.DosageUnit = cboDosageUnit.Text.Trim(); DrugsObj.Unit = txtUnit.Text.Trim(); + DrugsObj.Remark = txtRemark.Text.Trim(); + DrugsObj.Channel = txtChannel.Text.Trim(); DrugsObj.UseRate = int.Parse(txtUseRate.Text.Trim()); DrugsObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; DrugsObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; @@ -110,10 +126,21 @@ namespace DataDictionary.UI BDrugs.Update(DrugsObj); } - _state = AIMSExtension.EditState.BROWSE; + + dgv.CurrentRow.Cells["NameColumn"].Value = txtName.Text; + dgv.CurrentRow.Cells["DrugKindColumn"].Value = cboDrugKind.Text; + dgv.CurrentRow.Cells["StandColumn"].Value = txtStand.Text; + dgv.CurrentRow.Cells["DosageUnitColumn"].Value = cboDosageUnit.Text; + dgv.CurrentRow.Cells["UnitColumn"].Value = txtUnit.Text; + dgv.CurrentRow.Cells["HelpCodeColumn"].Value = txtHelpCode.Text; + dgv.CurrentRow.Cells["UseRate"].Value = txtUseRate.Text; + dgv.CurrentRow.Cells["Remark"].Value = txtRemark.Text; + dgv.CurrentRow.Cells["Channel"].Value = txtChannel.Text; + dgv.CurrentRow.Cells["IsValidColumn"].Value = chkIsValid.Checked == true ? "有效" : "无效"; AIMSExtension.PublicMethod.EnabledControl(panel4, false); AIMSExtension.PublicMethod.ClearControl(panel4); - GetDrugsDataTable(""); + _state = AIMSExtension.EditState.BROWSE; + txtName.Enabled = true; } private void tsbExit_Click(object sender, EventArgs e) @@ -123,15 +150,19 @@ namespace DataDictionary.UI private void txtName_TextChanged(object sender, EventArgs e) { - txtHelpCode.Text = AIMSExtension.PublicMethod.GetFirstLetter(txtName.Text.Trim()); + if (_state == AIMSExtension.EditState.BROWSE) + GetDrugsDataTable(""); + else + txtHelpCode.Text = AIMSExtension.PublicMethod.GetFirstLetter(txtName.Text.Trim()); } private void GetDrugsDataTable(string DrugKind) { dgv.Rows.Clear(); - DataTable dt = BDrugs.GetDataTable(DrugKind); + DataTable dt = BDrugs.GetDataTable(DrugKind,txtName.Text); for (int i = 0; i < dt.Rows.Count; i++) { dgv.Rows.Add(dt.Rows[i]["Id"].ToString(), + dt.Rows[i]["Code"].ToString(), dt.Rows[i]["Name"].ToString(), dt.Rows[i]["HelpCode"].ToString(), dt.Rows[i]["DrugKind"].ToString(), @@ -139,6 +170,8 @@ namespace DataDictionary.UI dt.Rows[i]["DosageUnit"].ToString(), dt.Rows[i]["Unit"].ToString(), dt.Rows[i]["UseRate"].ToString(), + dt.Rows[i]["Remark"].ToString(), + dt.Rows[i]["Channel"].ToString(), dt.Rows[i]["IsValid"].ToString()); dgv.Rows[i].Cells["Id"].Selected = false; } diff --git a/AIMS/DataDictionary/frmDrugs.resx b/AIMS/DataDictionary/frmDrugs.resx index aca67d3..3f48197 100644 --- a/AIMS/DataDictionary/frmDrugs.resx +++ b/AIMS/DataDictionary/frmDrugs.resx @@ -123,6 +123,9 @@ True + + True + True @@ -144,6 +147,12 @@ True + + True + + + True + True diff --git a/AIMS/DocManager/PatientLisResult.cs b/AIMS/DocManager/PatientLisResult.cs index b9bee79..a2e9a04 100644 --- a/AIMS/DocManager/PatientLisResult.cs +++ b/AIMS/DocManager/PatientLisResult.cs @@ -41,7 +41,17 @@ namespace AIMS.DocManager public string Item27 { get; set; } public string Item28 { get; set; } public string Item29 { get; set; } - public string Item30 { get; set; } + public string Item30 { get; set; } + public string Item31 { get; set; } + public string Item32 { get; set; } + public string Item33 { get; set; } + public string Item34 { get; set; } + public string Item35 { get; set; } + public string Item36 { get; set; } + public string Item37 { get; set; } + public string Item38 { get; set; } + public string Item39 { get; set; } + public string Item40 { get; set; } public static PatientLisResult GetLisResult(string patientNo) { @@ -80,6 +90,16 @@ namespace AIMS.DocManager patient.Item28 = dt.Rows[0]["Item28"].ToString(); patient.Item29 = dt.Rows[0]["Item29"].ToString(); patient.Item30 = dt.Rows[0]["Item30"].ToString(); + patient.Item31 = dt.Rows[0]["Item31"].ToString(); + patient.Item32 = dt.Rows[0]["Item32"].ToString(); + patient.Item33 = dt.Rows[0]["Item33"].ToString(); + patient.Item34 = dt.Rows[0]["Item34"].ToString(); + patient.Item35 = dt.Rows[0]["Item35"].ToString(); + patient.Item36 = dt.Rows[0]["Item36"].ToString(); + patient.Item37 = dt.Rows[0]["Item37"].ToString(); + patient.Item38 = dt.Rows[0]["Item38"].ToString(); + patient.Item39 = dt.Rows[0]["Item39"].ToString(); + patient.Item40 = dt.Rows[0]["Item40"].ToString(); } return patient; } diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill.cs index 402d3e5..f3d56d0 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill.cs @@ -1111,7 +1111,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI string value = addPP.Enname; if (addPP.IsValid == false) continue; //if (addPP.StopCollect == true) continue; - if (key == "机控呼吸") continue; + if (key == "机械通气") continue; if (value == null || value == "") continue; int minMinutes = -5; diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs index dc9590e..a392d5b 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs @@ -259,7 +259,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI PrintDocPane(e, zgcAnaesRecord, templateManage, true); if (i == 1) { - PrintDocPane(e, zgcAnaesRecord2, templateManage2, false); + PrintDocPane(e, zgcAnaesRecord2, templateManage2, false); } btnNextPage_Click(null, null); } @@ -747,6 +747,29 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI _record.InRoomTime = Inevent.EventBeginTime; 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.addPhysioList) + { + 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) { @@ -996,7 +1019,8 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI _record = new OperationRecord(); btnSelectPatient.Enabled = true; btnCancelOperation.Enabled = false; - btnCancelIn.Enabled = false; + btnCancelIn.Enabled = false; + LastMonitorDataTime = null; ClearTimeText(); if (templateManage != null) { @@ -1260,9 +1284,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI public DateTime? LastMonitorDataTime = null; private void timerGetCollectorData_Tick(bool isOpen) { - if (State == AIMSExtension.EditState.BROWSE || _record.StateName != "手术中" || NowRoom == null || isReadOnly == true) return; - //if (!PublicMethod.RoleId.Operator.RoleRef.Name.Contains("麻醉") && PublicMethod.Operator.Id != _record.OperatorId - // && _record.OperatorId != 1 && PublicMethod.Operator.Name != "系统管理员") return; + 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; @@ -1290,7 +1312,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI string value = addPP.Enname; if (addPP.IsValid == false) continue; //if (addPP.StopCollect == true) continue; - if (key == "机控呼吸") continue; + if (key == "机械通气") continue; if (value == null || value == "") continue; int minMinutes = -5; @@ -1817,6 +1839,9 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI { if (PatientId != 0) { + SelectWorkerValue.Hidden(); + SelectDictValue.Hidden(); + SelectDictText.Hidden(); templateManage.OpeRecord = BOperationRecord.getRecord(_record, PatientId, RecoverId); templateManage2.OpeRecord = templateManage.OpeRecord; templateManage.BindOperationRecordValueAll(templateManage.OpeRecord); @@ -1968,11 +1993,11 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI private bool GetOpeState(ref string message) { bool isTrue = true; - string anaesName = DBManage.GetDictionaryValuesById(_record.AnaesthesiaMethodId, "麻醉方式"); + string anaesName = DBManage.GetDictionaryValuesById(_record.AnaesthesiaMethodName, "麻醉方式"); - if (_record.AnaesthesiaMethodId == null || _record.AnaesthesiaMethodId.ToString().Trim() == "") + if (_record.AnaesthesiaMethodName == null || _record.AnaesthesiaMethodName.ToString().Trim() == "") { - message = "请添加麻醉方式！"; + message = "请添加麻醉方法！"; isTrue = false; } diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs index ace38b6..f8a5d55 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs @@ -33,6 +33,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel14 = new System.Windows.Forms.Panel(); + this.button9 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button(); @@ -47,15 +48,11 @@ this.btnTemplate = new System.Windows.Forms.Button(); this.btnSelectPatient = new System.Windows.Forms.Button(); this.panel4 = new System.Windows.Forms.Panel(); - this.btnChage = new System.Windows.Forms.Button(); this.lblSpo2 = new System.Windows.Forms.Label(); this.lblRESP = new System.Windows.Forms.Label(); this.lblDia = new System.Windows.Forms.Label(); this.lblPR = new System.Windows.Forms.Label(); this.lblHR = new System.Windows.Forms.Label(); - this.btnsjzx = new System.Windows.Forms.Button(); - this.btndptz = new System.Windows.Forms.Button(); - this.btnsbwh = new System.Windows.Forms.Button(); this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); @@ -66,6 +63,9 @@ this.label2 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.btnsjzx = new System.Windows.Forms.Button(); + this.btndptz = new System.Windows.Forms.Button(); + this.btnsbwh = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel(); this.superTabMain = new DevComponents.DotNetBar.SuperTabControl(); @@ -129,7 +129,6 @@ this.picInRoom = new System.Windows.Forms.PictureBox(); this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.button9 = new System.Windows.Forms.Button(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -207,6 +206,26 @@ this.panel14.Size = new System.Drawing.Size(160, 1032); this.panel14.TabIndex = 5; // + // button9 + // + this.button9.BackColor = System.Drawing.Color.Transparent; + this.button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.button9.Cursor = System.Windows.Forms.Cursors.Hand; + this.button9.Dock = System.Windows.Forms.DockStyle.Top; + this.button9.FlatAppearance.BorderSize = 0; + this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button9.Font = new System.Drawing.Font("微软雅黑", 11F); + this.button9.ForeColor = System.Drawing.Color.DimGray; + this.button9.Image = global::AIMS.Properties.Resources.手术申请; + this.button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button9.Location = new System.Drawing.Point(0, 650); + this.button9.Name = "button9"; + this.button9.Size = new System.Drawing.Size(160, 50); + this.button9.TabIndex = 18; + this.button9.Text = " 默认"; + this.button9.UseVisualStyleBackColor = false; + this.button9.Click += new System.EventHandler(this.button9_Click); + // // button1 // this.button1.BackColor = System.Drawing.Color.Transparent; @@ -411,6 +430,7 @@ this.btnAddEvents.TabIndex = 6; this.btnAddEvents.Text = " 事件记录"; this.btnAddEvents.UseVisualStyleBackColor = false; + this.btnAddEvents.Visible = false; this.btnAddEvents.Click += new System.EventHandler(this.btnAddEvents_Click); // // btnDrug @@ -477,15 +497,11 @@ // panel4 // this.panel4.BackColor = System.Drawing.Color.White; - this.panel4.Controls.Add(this.btnChage); this.panel4.Controls.Add(this.lblSpo2); this.panel4.Controls.Add(this.lblRESP); this.panel4.Controls.Add(this.lblDia); this.panel4.Controls.Add(this.lblPR); this.panel4.Controls.Add(this.lblHR); - this.panel4.Controls.Add(this.btnsjzx); - this.panel4.Controls.Add(this.btndptz); - this.panel4.Controls.Add(this.btnsbwh); this.panel4.Controls.Add(this.label9); this.panel4.Controls.Add(this.label8); this.panel4.Controls.Add(this.label6); @@ -496,6 +512,9 @@ this.panel4.Controls.Add(this.label2); this.panel4.Controls.Add(this.label4); this.panel4.Controls.Add(this.label1); + this.panel4.Controls.Add(this.btnsjzx); + this.panel4.Controls.Add(this.btndptz); + this.panel4.Controls.Add(this.btnsbwh); this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); this.panel4.Location = new System.Drawing.Point(1764, 10); @@ -503,82 +522,181 @@ this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.TabIndex = 3; // - // btnChage - // - this.btnChage.BackColor = System.Drawing.Color.Transparent; - this.btnChage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.btnChage.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnChage.Dock = System.Windows.Forms.DockStyle.Bottom; - this.btnChage.FlatAppearance.BorderSize = 0; - this.btnChage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnChage.Font = new System.Drawing.Font("微软雅黑", 11F); - this.btnChage.ForeColor = System.Drawing.Color.DimGray; - this.btnChage.Image = global::AIMS.Properties.Resources.麻醉医嘱; - this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnChage.Location = new System.Drawing.Point(0, 832); - this.btnChage.Name = "btnChage"; - this.btnChage.Size = new System.Drawing.Size(160, 50); - this.btnChage.TabIndex = 24; - this.btnChage.Text = " 收费记录"; - this.btnChage.UseVisualStyleBackColor = false; - this.btnChage.Visible = false; - this.btnChage.Click += new System.EventHandler(this.btnChage_Click); - // // lblSpo2 // this.lblSpo2.AutoSize = true; this.lblSpo2.Font = new System.Drawing.Font("微软雅黑", 23F); - this.lblSpo2.ForeColor = System.Drawing.Color.Teal; - this.lblSpo2.Location = new System.Drawing.Point(63, 399); + this.lblSpo2.ForeColor = System.Drawing.Color.Cyan; + this.lblSpo2.Location = new System.Drawing.Point(60, 414); this.lblSpo2.Name = "lblSpo2"; this.lblSpo2.Size = new System.Drawing.Size(43, 40); - this.lblSpo2.TabIndex = 9; + this.lblSpo2.TabIndex = 38; this.lblSpo2.Text = "--"; // // lblRESP // this.lblRESP.AutoSize = true; this.lblRESP.Font = new System.Drawing.Font("微软雅黑", 23F); - this.lblRESP.ForeColor = System.Drawing.Color.Teal; - this.lblRESP.Location = new System.Drawing.Point(63, 308); + this.lblRESP.ForeColor = System.Drawing.Color.Yellow; + this.lblRESP.Location = new System.Drawing.Point(60, 323); this.lblRESP.Name = "lblRESP"; this.lblRESP.Size = new System.Drawing.Size(43, 40); - this.lblRESP.TabIndex = 7; + this.lblRESP.TabIndex = 36; this.lblRESP.Text = "--"; // // lblDia // this.lblDia.AutoSize = true; this.lblDia.Font = new System.Drawing.Font("微软雅黑", 23F); - this.lblDia.ForeColor = System.Drawing.Color.Teal; - this.lblDia.Location = new System.Drawing.Point(43, 217); + this.lblDia.ForeColor = System.Drawing.Color.Red; + this.lblDia.Location = new System.Drawing.Point(40, 232); this.lblDia.Name = "lblDia"; this.lblDia.Size = new System.Drawing.Size(82, 40); - this.lblDia.TabIndex = 5; + this.lblDia.TabIndex = 35; this.lblDia.Text = "--/--"; // // lblPR // this.lblPR.AutoSize = true; this.lblPR.Font = new System.Drawing.Font("微软雅黑", 23F); - this.lblPR.ForeColor = System.Drawing.Color.Teal; - this.lblPR.Location = new System.Drawing.Point(63, 126); + this.lblPR.ForeColor = System.Drawing.Color.Green; + this.lblPR.Location = new System.Drawing.Point(60, 141); this.lblPR.Name = "lblPR"; this.lblPR.Size = new System.Drawing.Size(43, 40); - this.lblPR.TabIndex = 3; + this.lblPR.TabIndex = 33; this.lblPR.Text = "--"; // // lblHR // this.lblHR.AutoSize = true; this.lblHR.Font = new System.Drawing.Font("微软雅黑", 23F); - this.lblHR.ForeColor = System.Drawing.Color.Teal; - this.lblHR.Location = new System.Drawing.Point(63, 35); + this.lblHR.ForeColor = System.Drawing.Color.Green; + this.lblHR.Location = new System.Drawing.Point(60, 50); this.lblHR.Name = "lblHR"; this.lblHR.Size = new System.Drawing.Size(43, 40); - this.lblHR.TabIndex = 1; + this.lblHR.TabIndex = 26; this.lblHR.Text = "--"; // + // label9 + // + this.label9.AutoSize = true; + this.label9.BackColor = System.Drawing.Color.White; + this.label9.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label9.ForeColor = System.Drawing.Color.DimGray; + this.label9.Location = new System.Drawing.Point(34, 391); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(95, 24); + this.label9.TabIndex = 39; + this.label9.Text = "SPO2( % )"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.BackColor = System.Drawing.Color.White; + this.label8.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label8.ForeColor = System.Drawing.Color.DimGray; + this.label8.Location = new System.Drawing.Point(26, 300); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(110, 24); + this.label8.TabIndex = 37; + this.label8.Text = "呼吸( 次/分 )"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.BackColor = System.Drawing.Color.White; + this.label6.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.ForeColor = System.Drawing.Color.DimGray; + this.label6.Location = new System.Drawing.Point(18, 209); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(127, 24); + this.label6.TabIndex = 34; + this.label6.Text = "血压( mmHg )"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.White; + this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.ForeColor = System.Drawing.Color.DimGray; + this.label10.Location = new System.Drawing.Point(46, 456); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(70, 17); + this.label10.TabIndex = 27; + this.label10.Text = "90%-100%"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.White; + this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.ForeColor = System.Drawing.Color.DimGray; + this.label7.Location = new System.Drawing.Point(44, 365); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(74, 17); + this.label7.TabIndex = 28; + this.label7.Text = "16-20 次/分"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.BackColor = System.Drawing.Color.White; + this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.ForeColor = System.Drawing.Color.DimGray; + this.label5.Location = new System.Drawing.Point(36, 274); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(91, 17); + this.label5.TabIndex = 29; + this.label5.Text = "60-140 mmHg"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.White; + this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.ForeColor = System.Drawing.Color.DimGray; + this.label3.Location = new System.Drawing.Point(41, 183); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(81, 17); + this.label3.TabIndex = 30; + this.label3.Text = "60-100 次/分"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.White; + this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.ForeColor = System.Drawing.Color.DimGray; + this.label2.Location = new System.Drawing.Point(41, 92); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(81, 17); + this.label2.TabIndex = 31; + this.label2.Text = "60-100 次/分"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.BackColor = System.Drawing.Color.White; + this.label4.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.ForeColor = System.Drawing.Color.DimGray; + this.label4.Location = new System.Drawing.Point(26, 118); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(110, 24); + this.label4.TabIndex = 32; + this.label4.Text = "脉搏( 次/分 )"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.White; + this.label1.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.ForeColor = System.Drawing.Color.DimGray; + this.label1.Location = new System.Drawing.Point(26, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(110, 24); + this.label1.TabIndex = 25; + this.label1.Text = "心率( 次/分 )"; + // // btnsjzx // this.btnsjzx.BackColor = System.Drawing.Color.Transparent; @@ -639,126 +757,6 @@ this.btnsbwh.UseVisualStyleBackColor = false; this.btnsbwh.Click += new System.EventHandler(this.btnsbwh_Click); // - // label9 - // - this.label9.AutoSize = true; - this.label9.BackColor = System.Drawing.Color.White; - this.label9.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.ForeColor = System.Drawing.Color.DimGray; - this.label9.Location = new System.Drawing.Point(37, 376); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(95, 24); - this.label9.TabIndex = 10; - this.label9.Text = "SPO2( % )"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.BackColor = System.Drawing.Color.White; - this.label8.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.ForeColor = System.Drawing.Color.DimGray; - this.label8.Location = new System.Drawing.Point(29, 285); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(110, 24); - this.label8.TabIndex = 8; - this.label8.Text = "呼吸( 次/分 )"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.BackColor = System.Drawing.Color.White; - this.label6.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.ForeColor = System.Drawing.Color.DimGray; - this.label6.Location = new System.Drawing.Point(21, 194); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(127, 24); - this.label6.TabIndex = 4; - this.label6.Text = "血压( mmHg )"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.BackColor = System.Drawing.Color.White; - this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.ForeColor = System.Drawing.Color.DimGray; - this.label10.Location = new System.Drawing.Point(49, 441); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(70, 17); - this.label10.TabIndex = 2; - this.label10.Text = "90%-100%"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.BackColor = System.Drawing.Color.White; - this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.ForeColor = System.Drawing.Color.DimGray; - this.label7.Location = new System.Drawing.Point(47, 350); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(74, 17); - this.label7.TabIndex = 2; - this.label7.Text = "16-20 次/分"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.BackColor = System.Drawing.Color.White; - this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.ForeColor = System.Drawing.Color.DimGray; - this.label5.Location = new System.Drawing.Point(39, 259); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(91, 17); - this.label5.TabIndex = 2; - this.label5.Text = "60-140 mmHg"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.BackColor = System.Drawing.Color.White; - this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.ForeColor = System.Drawing.Color.DimGray; - this.label3.Location = new System.Drawing.Point(44, 168); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(81, 17); - this.label3.TabIndex = 2; - this.label3.Text = "60-100 次/分"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.BackColor = System.Drawing.Color.White; - this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.ForeColor = System.Drawing.Color.DimGray; - this.label2.Location = new System.Drawing.Point(44, 77); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(81, 17); - this.label2.TabIndex = 2; - this.label2.Text = "60-100 次/分"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.BackColor = System.Drawing.Color.White; - this.label4.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.ForeColor = System.Drawing.Color.DimGray; - this.label4.Location = new System.Drawing.Point(29, 103); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(110, 24); - this.label4.TabIndex = 2; - this.label4.Text = "脉搏( 次/分 )"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.BackColor = System.Drawing.Color.White; - this.label1.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.ForeColor = System.Drawing.Color.DimGray; - this.label1.Location = new System.Drawing.Point(29, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(110, 24); - this.label1.TabIndex = 0; - this.label1.Text = "心率( 次/分 )"; - // // panel1 // this.panel1.Controls.Add(this.panel5); @@ -1750,26 +1748,6 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // button9 - // - this.button9.BackColor = System.Drawing.Color.Transparent; - this.button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.button9.Cursor = System.Windows.Forms.Cursors.Hand; - this.button9.Dock = System.Windows.Forms.DockStyle.Top; - this.button9.FlatAppearance.BorderSize = 0; - this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button9.Font = new System.Drawing.Font("微软雅黑", 11F); - this.button9.ForeColor = System.Drawing.Color.DimGray; - this.button9.Image = global::AIMS.Properties.Resources.手术申请; - this.button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button9.Location = new System.Drawing.Point(0, 650); - this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(160, 50); - this.button9.TabIndex = 18; - this.button9.Text = " 默认"; - this.button9.UseVisualStyleBackColor = false; - this.button9.Click += new System.EventHandler(this.button9_Click); - // // frmAnasRecordInstrument // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1831,14 +1809,6 @@ private System.Windows.Forms.Panel panel7; private System.Windows.Forms.Panel plTitleEventTime; private PublicUI.UI.DrawPanel panel8; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label lblSpo2; - private System.Windows.Forms.Label lblDia; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label lblPR; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label lblHR; - private System.Windows.Forms.Label label1; private System.Windows.Forms.Label lblRoom; private System.Windows.Forms.Label label22; private System.Windows.Forms.Label labOperatorName; @@ -1882,14 +1852,6 @@ private System.Windows.Forms.Button btnsbwh; private System.Windows.Forms.Button btndptz; private System.Windows.Forms.Button btnsjzx; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label lblRESP; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button btnChage; private System.Windows.Forms.Panel panelQX; private System.Windows.Forms.Panel plBottom; private System.Windows.Forms.Panel panelQXList; @@ -1923,5 +1885,20 @@ private DevComponents.DotNetBar.Controls.TextBoxX txtTourNurse; private DevComponents.DotNetBar.Controls.TextBoxX txtInstrumentNurse; private System.Windows.Forms.Button button9; + private System.Windows.Forms.Label lblSpo2; + private System.Windows.Forms.Label lblRESP; + private System.Windows.Forms.Label lblDia; + private System.Windows.Forms.Label lblPR; + private System.Windows.Forms.Label lblHR; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs index 6959e18..b8ca242 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs @@ -8,6 +8,7 @@ using AIMSModel; using AxNsoOfficeLib; using DevComponents.Editors.DateTimeAdv; using DrawGraph; +using KHD_OREMRInterface; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -50,13 +51,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI } private void frmAnasRecordInstrument_Load(object sender, EventArgs e) - { - //系统演示 收费功能 - if (PublicMethod.OperatorNo == "admin") - { - btnChage.Visible = true; - } - + { labOperatorName.Text = "(" + AIMSExtension.PublicMethod.OperatorNo + ")" + " " + AIMSExtension.PublicMethod.OperatorName; if (NowRoom != null) lblRoom.Text = NowRoom.Name; circularProgress1.Location = new Point((panel8.Width - circularProgress1.Width) / 2, (panel8.Height - circularProgress1.Height) / 2); @@ -740,8 +735,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI ShowMonitorDataToRight(); } catch (Exception) - { - //PublicMethod.WriteLog(ex); + { } } @@ -795,12 +789,12 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI if (keyValuePair.Name == "自主呼吸") { lblRESP.Text = value <= 0 ? "- -" : value.ToString(); - if (iswar == true) lblRESP.ForeColor = Color.Red; else lblRESP.ForeColor = Color.Green; + if (iswar == true) lblRESP.ForeColor = Color.Red; else lblRESP.ForeColor = Color.Yellow; } if (keyValuePair.Name == "氧饱和度") { lblSpo2.Text = value <= 0 ? "- -" : value.ToString(); - if (iswar == true) lblSpo2.ForeColor = Color.Red; else lblSpo2.ForeColor = Color.Green; + if (iswar == true) lblSpo2.ForeColor = Color.Red; else lblSpo2.ForeColor = Color.Cyan; } if (keyValuePair.Name == "脉率") { @@ -810,22 +804,22 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI if (keyValuePair.Name == "无创舒张压") { szy = value <= 0 ? "" : value.ToString(); - if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; + //if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; } if (keyValuePair.Name == "无创收缩压") { ssy = value <= 0 ? "" : value.ToString(); - if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; + //if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; } if (keyValuePair.Name == "有创舒张压") { szy = value <= 0 ? "" : value.ToString(); - if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; + //if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; } if (keyValuePair.Name == "有创收缩压") { ssy = value <= 0 ? "" : value.ToString(); - if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; + //if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green; } break; } @@ -848,43 +842,13 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI lblPR.Text = "- -"; lblDia.Text = "--/--"; lblHR.ForeColor = Color.Green; - lblRESP.ForeColor = Color.Green; - lblSpo2.ForeColor = Color.Green; + lblRESP.ForeColor = Color.Yellow; + lblSpo2.ForeColor = Color.Cyan; lblPR.ForeColor = Color.Green; - lblDia.ForeColor = Color.Green; + lblDia.ForeColor = Color.Red; } } - - public bool isCgtime(string key, DateTime time) - { - bool b = false; - try - { - if (key == "自主呼吸") - { - if (_record.SpileInTime != null && _record.SpileOutTime != null) - { - if (time > _record.SpileInTime && time < _record.SpileOutTime) - b = true; - } - if (_record.SpileInTime != null && _record.SpileOutTime == null) - { - if (time > _record.SpileInTime) - b = true; - } - } - else - { - b = false; - } - } - catch (Exception ex) - { - PublicMethod.WriteLog(ex); - } - return b; - } - + private void StartTimer() { if (timerGetTextCollectorData == null) @@ -1177,13 +1141,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI } fnc.ShowDialog(); } - - private void btnxldlx_Click(object sender, EventArgs e) - { - frmHemodynamics frm = new frmHemodynamics(); - frm.Show(); - } - + private void btnsbwh_Click(object sender, EventArgs e) { frmInstrumentRegistration frm = new frmInstrumentRegistration(); @@ -1191,16 +1149,11 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI } private void btnsjzx_Click(object sender, EventArgs e) - { - MessageBox.Show("未连接到服务器 请联系管理员或稍后再试！", "系统提示"); - } - private void btnChage_Click(object sender, EventArgs e) - { - frmChargRecordPrint frmchargRecord = new frmChargRecordPrint(_record); - frmchargRecord.TemplateType = "麻醉"; - frmchargRecord.Show(); - frmchargRecord.BringToFront(); - } + { + frmLISResult lISResult = new frmLISResult(); + lISResult.PatientNo = _record.InHospitalNo; + lISResult.Show(); + } #endregion #region 器械清点 diff --git a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.Designer.cs index a184f19..5dd7504 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.Designer.cs @@ -200,6 +200,8 @@ this.DOSEPER = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DoseUnit = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Factroy = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tabDrugs)).BeginInit(); @@ -1962,7 +1964,9 @@ this.Norm, this.DOSEPER, this.DoseUnit, - this.Factroy}); + this.Factroy, + this.Channel, + this.Remark}); dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -2113,6 +2117,22 @@ this.Factroy.ReadOnly = true; this.Factroy.Width = 200; // + // Channel + // + this.Channel.DataPropertyName = "Channel"; + this.Channel.HeaderText = "途径"; + this.Channel.Name = "Channel"; + this.Channel.ReadOnly = true; + this.Channel.Visible = false; + // + // Remark + // + this.Remark.DataPropertyName = "Remark"; + this.Remark.HeaderText = "备注"; + this.Remark.Name = "Remark"; + this.Remark.ReadOnly = true; + this.Remark.Visible = false; + // // frmFactDrugNew // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2300,5 +2320,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn DOSEPER; private System.Windows.Forms.DataGridViewTextBoxColumn DoseUnit; private System.Windows.Forms.DataGridViewTextBoxColumn Factroy; + private System.Windows.Forms.DataGridViewTextBoxColumn Channel; + private System.Windows.Forms.DataGridViewTextBoxColumn Remark; } } \ No newline at end of file diff --git a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs index 0b252f2..cc1087b 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs @@ -1546,7 +1546,8 @@ namespace AIMS.PublicUI.UI _dataGridView.CurrentRow.Cells[3].Value = dgvYP.Rows[index].Cells["DrugName"].Value.ToString();//药品名称 _dataGridView.CurrentRow.Cells[11].Value = dgvYP.Rows[index].Cells["DoseUnit"].Value.ToString().Trim(); ;//备注名称 - _dataGridView.CurrentRow.Cells[5].Value = "ivgtt";// dgvYP.Rows[index].Cells["DrugChannel"].Value.ToString(); + _dataGridView.CurrentRow.Cells[4].Value = dgvYP.Rows[index].Cells["Remark"].Value.ToString(); + _dataGridView.CurrentRow.Cells[5].Value = dgvYP.Rows[index].Cells["Channel"].Value.ToString(); if (_dataGridView.CurrentRow.Cells[2].Value.ToString() == "血液制品") { _dataGridView.CurrentRow.Cells[12].ReadOnly = false;//血型 diff --git a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.resx b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.resx index f5f759f..9a500dc 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.resx +++ b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.resx @@ -123,6 +123,12 @@ True + + True + + + True + 957, 91 @@ -131,8 +137,8 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA0 - CAAAAk1TRnQBSQFMAgEBAgEAARABBgEQAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ - AwABFAMAAQEBAAEgBgABGS4AA1UBrwKAAXEB/gMrAfwDKwH8AZkBiwFAAf0BoQGSAQAB/wGTAYIBAAH/ + CAAAAk1TRnQBSQFMAgEBAgEAARgBBgEYAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ + AwABFAMAAQEBAAEgBgABGS4AA1UBrwKAAXIB/gMrAfwDKwH8AZkBiwFAAf0BoQGSAQAB/wGTAYIBAAH/ AZYBhwFAAf0BowGUAQAB/wGjAZQBAAH/AaMBlAEAAf8DKwH8A2AB6P8ADQABkwGCAQAB/wNiAfYDbQH3 A20B9wNcAfgDgAH+AZcBhgEAAf8DbQH3AewB5wHkAf8B7AHnAeQB/wHsAecB5AH/A20B9wGTAYIBAAH/ /wANAAGTAYIBAAH/A2cB8gH/Av0C/wL9Av8C/QL/Av0B/wGbAYsBAAH/AysB/AH/Av0C/wL9Av8C/QL/ @@ -143,8 +149,8 @@ Af0C/wH8Af0C/wH8Af0C/wL+Af8BkwGCAQAB//8ADQABkwGCAQAB/wNgAfMB/gH7AfwB/wH+AfsB/AH/ Af4B+wH8Af8B/gH7AfwB/wGbAYsBAAH/AysB/AH+AfsB/AH/Af4B+wH8Af8B/gH7AfwC/wL9Af8BkwGC AQAB//QAA0cBgQNHAYIDRwGCA0cBggNHAYIDRwGCAYkCAAH/A00B+gNfAfsDXwH7A18B+wNfAfsBjQIA - Af8BpwGgAZAB/QNfAfsDXwH7A18B+wKoAZ8B/QGTAYIBAAH/8AADBgEIAmABUwHzAW0BUgFRAfcCWgFJ - AfUCWgFJAfUCWgFJAfUCWgFJAfUBgQIAAf8DAAH/AV8BXgEyAfsBXwFeATIB+wFfAV4BMgH7Al8BMgH7 + Af8BpwGgAZAB/QNfAfsDXwH7A18B+wKoAZ8B/QGTAYIBAAH/8AADBgEIAmABVAHzAW0BUgFRAfcCWgFK + AfUCWgFKAfUCWgFKAfUCWgFKAfUBgQIAAf8DAAH/AV8BXgEyAfsBXwFeATIB+wFfAV4BMgH7Al8BMgH7 AYECAAH/A2AB4wNeAdMDXgHTA14B0wNdAdEDYAHU8AADCQELA00B+gJtAVEB9wHwAaIBAAH/AfABogEA Af8B8AGiAQAB/wHwAaIBAAH/AYcCAAH/A1wB+AHwAaIBAAH/AfABogEAAf8B8AGiAQAB/wHwAaIBAAH/ AwAB/wM4AVwMAAM+AWoDDgES8AADCQELA00B+gNcAfgB6gGeAQAB/wHqAZ4BAAH/AeoBngEAAf8B6gGe @@ -153,14 +159,14 @@ AfkDagH5AwAB/wM4AVwMAAM1AVYDRgF98AADBwEJA00B+gGDAkAB/QFqAWgBRwH5AWoBaAFHAfkBagFo AUcB+QFqAWgBRwH5AYECAAH/A00B+gFqAWgBRwH5AWoBaAFHAfkBagFoAUcB+QFqAWkBRgH5AYECAAH/ A1kBvgNPAZkDTwGZA08BmQNYAbcDUQGf8AAEAgNJAYUDSQGIA0kBiANJAYgDSQGIA0kBiAGLAgAB/wGP - AkAB/QKAAX0B/gKAAX0B/gKAAX0B/gGkAY0BQAH9AYsCAAH/AaYBmQGDAf0BqAGlAZYB/QGoAaUBlgH9 + AkAB/QKAAX4B/gKAAX4B/gKAAX4B/gGkAY0BQAH9AYsCAAH/AaYBmQGDAf0BqAGlAZYB/QGoAaUBlgH9 AagBpQGWAf0DgAH+AZMBggEAAf//AA0AAZMBggEAAf8DYAHzAf4B+gH7Af8B/gH6AfsB/wH+AfoB+wH/ Af4B+gH7Af8BmwGLAQAB/wMrAfwB/gH6AfsB/wH+AfoB+wH/Af4B+gH7Av8C/QH/AZMBggEAAf//AA0A AZMBggEAAf8DYAHzAf4B+wH8Af8B/gH7AfwB/wH+AfsB/AH/AfsB+AH5Af8BmwGLAQAB/wMrAfwB/gH7 AfwB/wH+AfsB/AH/Af4B+wH8Av8C/QH/AZMBggEAAf//AA0AAm0BbAH3A1wB+AOAAf4DgAH+A4AB/gOA Af4BmAGHAQAB/wMrAfwB1AHNAcIB/wHUAc0BwgH/AdQBzQHCAf8DgAH+AZMBggEAAf//AAkAAwMBBANQ - AZoBkgGCAQAB/wKAAW0B/gKAAW0B/gKAAW0B/gGTAYIBAAH/AZMBggEAAf8BjgGBAQAB/wGTAYIBAAH/ - AZMBggEAAf8BkwGCAQAB/wKAAW0B/gNaAb3/AAkAAwMBBAMSARcDIwEzAyMBMwMjATMDIwEzAyMBMwMj + AZoBkgGCAQAB/wKAAW4B/gKAAW4B/gKAAW4B/gGTAYIBAAH/AZMBggEAAf8BjgGBAQAB/wGTAYIBAAH/ + AZMBggEAAf8BkwGCAQAB/wKAAW4B/gNaAb3/AAkAAwMBBAMSARcDIwEzAyMBMwMjATMDIwEzAyMBMwMj ATMDIwEzAyMBMwMjATMDIwEzAyMBMwMWAR7/AA0AAwUBBgMEAQUDBAEFAwQBBQMEBAUBBgMFAQYDBQEG AwUBBgMFAQYDBQEGAwUBBgMDAQTwAAFCAU0BPgcAAT4DAAEoAwABUAMAARQDAAEBAQABAQUAAfAXAAP/ AQAB/gEAAQ8C/wcAAf4BAAEPAv8HAAH+AQABDwL/BwAB/gEAAQ8C/wcAAf4BAAEPAv8HAAH+AQABDwL/ diff --git a/AIMS/OperationDoing/AnasRecordBill/frmFactEventsNew.cs b/AIMS/OperationDoing/AnasRecordBill/frmFactEventsNew.cs index 7c7e890..cb5e498 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmFactEventsNew.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmFactEventsNew.cs @@ -11,6 +11,7 @@ using System.Data; using System.Drawing; using System.Linq; using System.Windows.Forms; +using System.Data.SqlClient; namespace AIMS.PublicUI.UI { @@ -168,7 +169,7 @@ namespace AIMS.PublicUI.UI panelleftsel.Controls.Add(lb); } - } + } void lb_Click(object sender, EventArgs e) { @@ -390,7 +391,7 @@ namespace AIMS.PublicUI.UI { b = true; } - if (IsReview == true && _record.StateName != "手术结束") + if (_record.StateName == "手术结束") { if (objectName == "麻醉开始") { @@ -400,6 +401,18 @@ namespace AIMS.PublicUI.UI { b = true; } + if (objectName == "插管") + { + b = true; + } + if (objectName == "喉罩") + { + b = true; + } + if (objectName == "拔管") + { + b = true; + } if (objectName == "手术结束") { b = true; @@ -408,7 +421,6 @@ namespace AIMS.PublicUI.UI { b = true; } - if (objectName == "出室") { b = true; @@ -416,7 +428,7 @@ namespace AIMS.PublicUI.UI } if (b == true) { - MessageBox.Show("保存失败！\n\r" + "选择的事件不可删除 只可修改！"); + MessageBox.Show("删除失败！\n\r" + "选择的事件不可删除 只可修改！"); return; } //string messang = string.Format("确定要删除：{0}吗？", objectName); @@ -431,7 +443,7 @@ namespace AIMS.PublicUI.UI { //try //{ - // if (er.EventName == "机控呼吸" || er.EventName == "自主呼吸" || er.EventName == "辅助呼吸") + // if (er.EventName == "机械通气" || er.EventName == "自主呼吸" || er.EventName == "辅助呼吸") // { // foreach (PhysioParameter item in _record.addPhysioList) // { @@ -565,8 +577,8 @@ namespace AIMS.PublicUI.UI _record.FactEventsList.Add(_event); //将新增的事件Id保存到Row dr.Tag = _eventId; - if (dr.Tag != null && _eventId > 0) - SetEventTime(_event, ref IsChage); + //if (dr.Tag != null && _eventId > 0) + // SetEventTime(_event, ref IsChage); } else { @@ -597,38 +609,110 @@ namespace AIMS.PublicUI.UI events.UseRate += 1; BEvents.Update(events); } - SaveIschageEvent(IsChage); EventParam(); MessageBox.Show("保存成功！"); //this.Close(); } - private void SaveIschageEvent(bool IsChage) - { - if (IsChage == true) - { - BOperationRecord.Update("InRoomTime=@InRoom,OperationBeginTime=@OperationBegin,OperationEndTime=@OperationEnd,OutRoomTime=@OutRoom where id=@id", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.HasValue ? (object)_record.InRoomTime.Value : (object)DateTime.Now, "@OperationBegin", _record.OperationBeginTime.HasValue ? (object)_record.OperationBeginTime.Value : (object)DBNull.Value, "@OperationEnd", _record.OperationEndTime.HasValue ? (object)_record.OperationEndTime.Value : (object)DBNull.Value, "@OutRoom", _record.OutRoomTime.HasValue ? (object)_record.OutRoomTime.Value : (object)DBNull.Value, "@id", _record.Id)); - } - } - private void SetEventTime(FactEvents _event, ref bool IsChage) { - if (_event != null && _event.EventName == "入室" && _record.InRoomTime != _event.EventBeginTime) { _record.InRoomTime = _event.EventBeginTime; IsChage = true; } - if (_event != null && _event.EventName == "手术开始" && _record.OperationBeginTime != _event.EventBeginTime) { _record.OperationBeginTime = _event.EventBeginTime; IsChage = true; } - if (_event != null && _event.EventName == "手术结束" && _record.OperationEndTime != _event.EventBeginTime) { _record.OperationEndTime = _event.EventBeginTime; IsChage = true; } - if (_event != null && _event.EventName == "出室" && _record.OutRoomTime != _event.EventBeginTime) { _record.OutRoomTime = _event.EventBeginTime; IsChage = true; } + if (_event != null && _event.EventName == "入室" && _record.InRoomTime != _event.EventBeginTime) + { + _record.InRoomTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "手术开始" && _record.OperationBeginTime != _event.EventBeginTime) + { + _record.OperationBeginTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update("OperationBeginTime=@OperationBegin where Id=@id ", new AIMSModel.ParameterList("@OperationBegin", _record.OperationBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "麻醉开始" && _record.AnesthesiaBeginTime != _event.EventBeginTime) + { + _record.AnesthesiaBeginTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update("AnesthesiaBeginTime=@AnesthesiaBeginTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaBeginTime", _record.AnesthesiaBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "麻醉完成" && _record.AnesthesiaEndTime != _event.EventBeginTime) + { + _record.AnesthesiaEndTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update("AnesthesiaEndTime=@AnesthesiaEndTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaEndTime", _record.AnesthesiaEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "插管" && _record.SpileInTime != _event.EventBeginTime) + { + _record.SpileInTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update(" SpileInTime=@SpileIn where Id=@id ", new AIMSModel.ParameterList("@SpileIn", _record.SpileInTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "喉罩" && _record.SpileInTime != _event.EventBeginTime) + { + _record.SpileInTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update(" SpileInTime=@SpileIn where Id=@id ", new AIMSModel.ParameterList("@SpileIn", _record.SpileInTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "拔管" && _record.SpileOutTime != _event.EventBeginTime) + { + _record.SpileOutTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update(" SpileOutTime=@SpileOut where Id=@id ", new AIMSModel.ParameterList("@SpileOut", _record.SpileOutTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "手术结束" && _record.OperationEndTime != _event.EventBeginTime) + { + _record.OperationEndTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update("OperationEndTime=@OperationEnd where Id=@id ", new AIMSModel.ParameterList("@OperationEnd", _record.OperationEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } + if (_event != null && _event.EventName == "出室" && _record.OutRoomTime != _event.EventBeginTime) + { + _record.OutRoomTime = _event.EventBeginTime; IsChage = true; + BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); + } } private void DelEventTime(FactEvents _event) { //if (_event != null && _event.EventName == "入室" ) { _record.InRoomTime = null; } - if (_event != null && _event.EventName == "手术开始") { _record.OperationBeginTime = null; } - if (_event != null && _event.EventName == "手术结束") { _record.OperationEndTime = null; } - if (_event != null && _event.EventName == "麻醉开始") { _record.AnesthesiaBeginTime = null; } - if (_event != null && _event.EventName == "麻醉完成") { _record.AnesthesiaEndTime = null; } - if (_event != null && _event.EventName == "插管") { _record.SpileInTime = null; } - if (_event != null && _event.EventName == "拔管") { _record.SpileOutTime = null; } - if (_event != null && _event.EventName == "出室") { _record.OutRoomTime = null; } - BOperationRecord.Update("OperationBeginTime=@OperationBegin,OperationEndTime=@OperationEnd,OutRoomTime=@OutRoom where id=@id", new AIMSModel.ParameterList("@OperationBegin", _record.OperationBeginTime.HasValue ? (object)_record.OperationBeginTime.Value : (object)DBNull.Value, "@OperationEnd", _record.OperationEndTime.HasValue ? (object)_record.OperationEndTime.Value : (object)DBNull.Value, "@OutRoom", _record.OutRoomTime.HasValue ? (object)_record.OutRoomTime.Value : (object)DBNull.Value, "@id", _record.Id)); + if (_event != null && _event.EventName == "手术开始") + { + _record.OperationBeginTime = null; + BOperationRecord.Update(" OperationBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + if (_event != null && _event.EventName == "手术结束") + { + _record.OperationEndTime = null; + BOperationRecord.Update(" OperationEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + if (_event != null && _event.EventName == "麻醉开始") + { + _record.AnesthesiaBeginTime = null; + BOperationRecord.Update("AnesthesiaBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + if (_event != null && _event.EventName == "麻醉完成") + { + _record.AnesthesiaEndTime = null; + BOperationRecord.Update(" AnesthesiaEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + if (_event != null && _event.EventName == "插管") + { + _record.SpileInTime = null; + BOperationRecord.Update(" SpileInTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + if (_event != null && _event.EventName == "喉罩") + { + _record.SpileInTime = null; + BOperationRecord.Update(" SpileInTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + if (_event != null && _event.EventName == "拔管") + { + _record.SpileOutTime = null; + BOperationRecord.Update(" SpileOutTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); + } + + //AIMSModel.ParameterList keyValuePairs = new AIMSModel.ParameterList(); + // keyValuePairs.Add("@InRoomTime", _record.InRoomTime.HasValue ? (object)_record.InRoomTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@OutRoomTime", _record.OutRoomTime.HasValue ? (object)_record.OutRoomTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@OperationBeginTime", _record.OperationBeginTime.HasValue ? (object)_record.OperationBeginTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@OperationEndTime", _record.OperationEndTime.HasValue ? (object)_record.OperationEndTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@AnesthesiaBeginTime", _record.AnesthesiaBeginTime.HasValue ? (object)_record.AnesthesiaBeginTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@AnesthesiaEndTime", _record.AnesthesiaEndTime.HasValue ? (object)_record.AnesthesiaEndTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@SpileInTime", _record.SpileInTime.HasValue ? (object)_record.SpileInTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@SpileOutTime", _record.SpileOutTime.HasValue ? (object)_record.SpileOutTime.Value : (object)DBNull.Value); + // keyValuePairs.Add("@Id", _record.Id); + + // BOperationRecord.Update("update OperationRecord set InRoomTime=@InRoomTime,OutRoomTime=@OutRoomTime,OperationBeginTime=@OperationBeginTime,OperationEndTime=@OperationEndTime,AnesthesiaBeginTime=@AnesthesiaBeginTime,AnesthesiaEndTime=@AnesthesiaEndTime,SpileInTime=@SpileInTime,SpileOutTime=@SpileOutTime where Id=@Id", keyValuePairs); } private static void GetEvent(DataGridViewRow dr, FactEvents _event) diff --git a/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBill.cs b/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBill.cs index 2b11dc3..a939f83 100644 --- a/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBill.cs +++ b/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBill.cs @@ -975,7 +975,7 @@ namespace AIMS.OperationDoing.AnasRecoverBill.UI string value = addPP.Enname; if (addPP.IsValid == false) continue; //if (addPP.StopCollect == true) continue; - if (key == "机控呼吸") continue; + if (key == "机械通气") continue; if (value == null || value == "") continue; int minMinutes = -5; diff --git a/AIMS/OperationDoing/oldSystemCode/frmLISResult.designer.cs b/AIMS/OperationDoing/oldSystemCode/frmLISResult.designer.cs index 1b1ce37..d5eb93d 100644 --- a/AIMS/OperationDoing/oldSystemCode/frmLISResult.designer.cs +++ b/AIMS/OperationDoing/oldSystemCode/frmLISResult.designer.cs @@ -62,6 +62,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.dgvItems = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dgvType = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.ItemId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ItemName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.UpdateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.lblRemark = new System.Windows.Forms.Label(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -73,13 +76,6 @@ this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.item_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.item_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.result = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.reference = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.value_unit = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.report_time = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.report_person = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -99,9 +95,13 @@ this.dataGridViewTextBoxColumn27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ItemId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ItemName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.UpdateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.item_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.item_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.result = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.reference = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.value_unit = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.report_time = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.report_person = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvItems)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvType)).BeginInit(); @@ -117,7 +117,7 @@ this.panel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(961, 561); + this.panel1.Size = new System.Drawing.Size(1051, 561); this.panel1.TabIndex = 0; // // dgvItems @@ -150,7 +150,7 @@ this.dgvItems.Name = "dgvItems"; this.dgvItems.RowHeadersVisible = false; this.dgvItems.RowTemplate.Height = 23; - this.dgvItems.Size = new System.Drawing.Size(721, 561); + this.dgvItems.Size = new System.Drawing.Size(811, 561); this.dgvItems.TabIndex = 7; // // dgvType @@ -186,6 +186,27 @@ this.dgvType.TabIndex = 6; this.dgvType.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvType_CellClick); // + // ItemId + // + this.ItemId.HeaderText = "项目Id"; + this.ItemId.Name = "ItemId"; + this.ItemId.ReadOnly = true; + this.ItemId.Visible = false; + // + // ItemName + // + this.ItemName.DataPropertyName = "ITEM_NAME"; + this.ItemName.HeaderText = "检验名称"; + this.ItemName.Name = "ItemName"; + this.ItemName.ReadOnly = true; + // + // UpdateTime + // + this.UpdateTime.HeaderText = "检验时间"; + this.UpdateTime.Name = "UpdateTime"; + this.UpdateTime.ReadOnly = true; + this.UpdateTime.Visible = false; + // // lblRemark // this.lblRemark.AutoSize = true; @@ -302,48 +323,6 @@ this.dataGridViewTextBoxColumn10.ReadOnly = true; this.dataGridViewTextBoxColumn10.Width = 119; // - // item_code - // - this.item_code.DataPropertyName = "LIS_ITEM_NO"; - this.item_code.HeaderText = "项目ID"; - this.item_code.Name = "item_code"; - // - // item_name - // - this.item_name.DataPropertyName = "LIS_ITEM_NAME"; - this.item_name.HeaderText = "项目名称"; - this.item_name.Name = "item_name"; - // - // result - // - this.result.DataPropertyName = "LIS_ITEM_VALUE"; - this.result.HeaderText = "项目参考值"; - this.result.Name = "result"; - // - // reference - // - this.reference.DataPropertyName = "LIS_ITEM_BZ"; - this.reference.HeaderText = "参考值"; - this.reference.Name = "reference"; - // - // value_unit - // - this.value_unit.DataPropertyName = "LIS_ITEM_UNIT"; - this.value_unit.HeaderText = "单位"; - this.value_unit.Name = "value_unit"; - // - // report_time - // - this.report_time.DataPropertyName = "UpdateTime"; - this.report_time.HeaderText = "报告时间"; - this.report_time.Name = "report_time"; - // - // report_person - // - this.report_person.DataPropertyName = "LIS_ITEM_OPERATOR"; - this.report_person.HeaderText = "报告人"; - this.report_person.Name = "report_person"; - // // dataGridViewTextBoxColumn11 // this.dataGridViewTextBoxColumn11.DataPropertyName = "reference"; @@ -519,32 +498,60 @@ this.dataGridViewTextBoxColumn29.HeaderText = "备注"; this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29"; // - // ItemId + // item_code // - this.ItemId.HeaderText = "项目Id"; - this.ItemId.Name = "ItemId"; - this.ItemId.ReadOnly = true; - this.ItemId.Visible = false; + this.item_code.DataPropertyName = "LIS_ITEM_NO"; + this.item_code.HeaderText = "ID"; + this.item_code.Name = "item_code"; + this.item_code.Width = 55; // - // ItemName + // item_name // - this.ItemName.DataPropertyName = "ITEM_NAME"; - this.ItemName.HeaderText = "检验名称"; - this.ItemName.Name = "ItemName"; - this.ItemName.ReadOnly = true; + this.item_name.DataPropertyName = "LIS_ITEM_NAME"; + this.item_name.HeaderText = "项目名称"; + this.item_name.Name = "item_name"; + this.item_name.Width = 220; // - // UpdateTime + // result // - this.UpdateTime.HeaderText = "检验时间"; - this.UpdateTime.Name = "UpdateTime"; - this.UpdateTime.ReadOnly = true; - this.UpdateTime.Visible = false; + this.result.DataPropertyName = "LIS_ITEM_VALUE"; + this.result.HeaderText = "项目值"; + this.result.Name = "result"; + this.result.Width = 80; + // + // reference + // + this.reference.DataPropertyName = "LIS_ITEM_BZ"; + this.reference.HeaderText = "参考值"; + this.reference.Name = "reference"; + this.reference.Width = 80; + // + // value_unit + // + this.value_unit.DataPropertyName = "LIS_ITEM_UNIT"; + this.value_unit.HeaderText = "单位"; + this.value_unit.Name = "value_unit"; + this.value_unit.Width = 80; + // + // report_time + // + this.report_time.DataPropertyName = "UpdateTime"; + this.report_time.HeaderText = "报告时间"; + this.report_time.Name = "report_time"; + this.report_time.Width = 160; + // + // report_person + // + this.report_person.DataPropertyName = "LIS_ITEM_OPERATOR"; + this.report_person.HeaderText = "报告人"; + this.report_person.Name = "report_person"; + this.report_person.Width = 90; // // frmLISResult // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(961, 561); + this.ClientSize = new System.Drawing.Size(1051, 561); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -596,6 +603,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn29; private DevComponents.DotNetBar.Controls.DataGridViewX dgvType; private DevComponents.DotNetBar.Controls.DataGridViewX dgvItems; + private System.Windows.Forms.DataGridViewTextBoxColumn ItemId; + private System.Windows.Forms.DataGridViewTextBoxColumn ItemName; + private System.Windows.Forms.DataGridViewTextBoxColumn UpdateTime; private System.Windows.Forms.DataGridViewTextBoxColumn item_code; private System.Windows.Forms.DataGridViewTextBoxColumn item_name; private System.Windows.Forms.DataGridViewTextBoxColumn result; @@ -603,8 +613,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn value_unit; private System.Windows.Forms.DataGridViewTextBoxColumn report_time; private System.Windows.Forms.DataGridViewTextBoxColumn report_person; - private System.Windows.Forms.DataGridViewTextBoxColumn ItemId; - private System.Windows.Forms.DataGridViewTextBoxColumn ItemName; - private System.Windows.Forms.DataGridViewTextBoxColumn UpdateTime; } } \ No newline at end of file diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 15f6671..4cb0354 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -4182,12 +4182,8 @@ namespace AIMS.OperationFront.UI } private void btnPlan_Click(object sender, EventArgs e) - { - NowPatientDataTable = BOperationApply.GetOperationFrontDataTable(dtpSearchTime.Value.ToString("yyyy-MM-dd 00:00:00"), dtpSearchTime.Value.ToString("yyyy-MM-dd 23:59:59")); - DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, " State <> '˻' ", ""); - if (Newdt == null || Newdt.Rows.Count <= 0) return; - frmSelectiveOperationsPrint frm = new frmSelectiveOperationsPrint(); - frm.dt = Newdt; + { + frmSelectiveOperationsPrint frm = new frmSelectiveOperationsPrint(); frm.beginTime = dtpSearchTime.Value.Date; frm.endTime = dtpSearchTime.Value.Date.AddHours(23).AddMinutes(59); frm.Show(); diff --git a/AIMS/OperationFront/frmSelectiveOperationsPrint.cs b/AIMS/OperationFront/frmSelectiveOperationsPrint.cs index c4ae96e..65670a5 100644 --- a/AIMS/OperationFront/frmSelectiveOperationsPrint.cs +++ b/AIMS/OperationFront/frmSelectiveOperationsPrint.cs @@ -188,14 +188,65 @@ namespace AIMS.OperationFront.UI }; } - excel.PrintPreview(); + excel.Print(); this.Focus(); excel.Close(); } private void btnReview_Click(object sender, EventArgs e) - { + { + GoldPrinter.ExcelAccess excel = new GoldPrinter.ExcelAccess(); + string strFileName = "手术排程模板.xlt"; //模板文件名 + string strExcelTemplateFile = AppDomain.CurrentDomain.BaseDirectory; + strExcelTemplateFile += @"\Template\" + strFileName; + excel.Open(strExcelTemplateFile); //用模板文件 + int rowNum = 4; + DateTime dtBegin = reBeginTime(dtpTime.Value, "begin"); + DateTime dtEnd = reBeginTime(dtpTime.Value, "end"); + DataTable dtt = new DataTable(); + List SelectIds = GetSelectIds(); + if (SelectIds.Count > 0) + { + string Ids = string.Join(",", SelectIds); + dtt = BOperationReview.GetOperationPlanDataTable(" of1.[ApplyId] in (" + Ids + ") "); + } + else + { + dtt = BOperationReview.GetOperationPlanDataTable(beginTime, endTime, ""); + } + excel.SetCellText(3, "L", dtpTime.Value.ToShortDateString()); + for (int j = 0; j < dtt.Rows.Count; j++) + { + rowNum++; + DataRow temp = dtt.Rows[j]; + excel.GetRange(rowNum, "A", rowNum, "R").RowHeight = 26; + excel.GetRange(rowNum, "A", rowNum, "R").WrapText = true; + excel.GetRange(rowNum, "A", rowNum, "R").Borders.LineStyle = Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous; + excel.GetRange(rowNum, "A", rowNum, "R").Value = new string[]{ + temp[1].ToString(), + temp[2].ToString(), + temp[3].ToString(), + temp[4].ToString(), + temp[5].ToString(), + temp[6].ToString(), + temp[7].ToString(), + temp[8].ToString(), + temp[9].ToString(), + temp[10].ToString(), + temp[11].ToString(), + temp[12].ToString(), + temp[13].ToString(), + temp[14].ToString(), + temp[15].ToString(), + temp[16].ToString(), + temp[17].ToString(), + temp[18].ToString() + }; + } + excel.PrintPreview(); + this.Focus(); + excel.Close(); } /// diff --git a/AIMS/Template/手术排程模板.xlt b/AIMS/Template/手术排程模板.xlt index 399c7b43a7d2152b0e42d7c9a9850eff7f59d362..6c0fead952581320f58644d278b1e15447227fbe 100644 GIT binary patch delta 1261 zcmah{OH30{6g}^?9ZCyBTZ|R?8^xjsE#E@;6F{mhEv*Yaaly*OkU?XJR&?cxxYvayCK@%Q8WTSe>Yay~eik|}_q;jx+*qm{b5|YVToJCxVl3us&!&TwTXMG zil)30tib?z(YGD_P^ys0z2hl zeF(|bk3I~bAA^X{=;(DhY%_?;pafjB+YvNY01g>sqQi%vqn=`-!-ruu7$;^in2DHT zFf*|{gIS1K4W@pw5Us@Q2FpiG_J1qVhM4%?S<4QJ>aI36tR3yDW`%yb z!b$Ey2YudeF*nqvCA#0+RYhKg5zrl}hcSeLq<0178 girHL>xY_*F555={zow>HtvGjProcxL)MWYm0q%|W@c;k- delta 1040 zcmah{O;1xn6g~6$!RtrfYm25Ti9#e;wAL0%DOP<2K@0t$23D9DHkdAyxWF2T(k|46 z8UoD9#F*#`SB4A=7TRB6*t$R$?pzo{j4{S&>wQo1`mxY=bLPG?XU?6;ohk3K@+Y!wOhiy%#+ND#; zb#Ja&El@Wa)Fm5rQhc|SWqwr+^PGBshZH-%qxkmz9b8jYzN`fKSJh|FV*kVSm%`~8 zYZvdjpL%*mqk3!Xm@3T8Eky1^fjr(Y)2GiYrp1$ikCLw(0o)`O`hahgC;Iv0_&r}L z1{BW#OG&z)QR+&H&*XFB#!#o^)u3P7U9!0dFYFqBp6C#76Pr?L4F3uRzu}}t02hq0 zf&gVk?0?}!1&54nhjGz}5e(xzMv$U#7)G4v7w;OH6zlma影响的记录行数 internal static int ExcuteUpdateCommand(SqlCommand cmd, Drugs drugs) { - cmd.CommandText = "update Drugs set Name=@Name,HelpCode=@HelpCode,DrugKind=@DrugKind,Stand=@Stand,DosageUnit=@DosageUnit,Unit=@Unit,UseRate=@UseRate,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate where Id=@Id"; + cmd.CommandText = "update Drugs set Name=@Name,HelpCode=@HelpCode,DrugKind=@DrugKind,Stand=@Stand,DosageUnit=@DosageUnit,Unit=@Unit,UseRate=@UseRate,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,Remark=@Remark,Channel=@Channel where Id=@Id"; //从实体中取出值放入Command的参数列表 cmd.Parameters.Add(new SqlParameter("@Name",drugs.Name==null?(object)DBNull.Value:(object)drugs.Name)); cmd.Parameters.Add(new SqlParameter("@HelpCode",drugs.HelpCode==null?(object)DBNull.Value:(object)drugs.HelpCode)); @@ -190,11 +191,13 @@ namespace AIMSDAL cmd.Parameters.Add(new SqlParameter("@OperatorNo",drugs.OperatorNo==null?(object)DBNull.Value:(object)drugs.OperatorNo)); cmd.Parameters.Add(new SqlParameter("@OperatorName",drugs.OperatorName==null?(object)DBNull.Value:(object)drugs.OperatorName)); cmd.Parameters.Add(new SqlParameter("@OperateDate",drugs.OperateDate.HasValue?(object)drugs.OperateDate.Value:(object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@Id", drugs.Id)); + cmd.Parameters.Add(new SqlParameter("@Remark", drugs.Remark == null ? (object)DBNull.Value : (object) drugs.Remark)); + cmd.Parameters.Add(new SqlParameter("@Channel", drugs.Channel == null ? (object)DBNull.Value : (object) drugs.Channel)); + cmd.Parameters.Add(new SqlParameter("@Id", drugs.Id)); return cmd.ExecuteNonQuery(); - } - - /// + } + + /// /// 不使用事务的更新方法 /// /// 实体类对象 diff --git a/AIMSEntity/DAL/Extension/DDrugs.cs b/AIMSEntity/DAL/Extension/DDrugs.cs index a522411..598f568 100644 --- a/AIMSEntity/DAL/Extension/DDrugs.cs +++ b/AIMSEntity/DAL/Extension/DDrugs.cs @@ -15,7 +15,7 @@ namespace AIMSDAL { StringBuilder strSql = new StringBuilder(); strSql.Append("insert into [Drugs]("); - strSql.Append("Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate"); + strSql.Append("Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate,Remark,Channel "); strSql.Append(")"); strSql.Append(" values ("); strSql.Append("'" + DrugsObj.Name + "',"); @@ -28,18 +28,20 @@ namespace AIMSDAL strSql.Append("" + DrugsObj.IsValid + ","); strSql.Append("'" + DrugsObj.OperatorNo + "',"); strSql.Append("'" + DrugsObj.OperatorName + "',"); - strSql.Append("'" + DrugsObj.OperateDate + "'"); + strSql.Append("'" + DrugsObj.OperateDate + "',"); + strSql.Append("'" + DrugsObj.Remark + "',"); + strSql.Append("'" + DrugsObj.Channel + "'"); strSql.Append(")"); HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString()); - } + } public static Drugs GetModel(int Id) { Drugs DrugsObj = new Drugs(); StringBuilder strSql = new StringBuilder(); strSql.Append("select "); - strSql.Append("Id,Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate "); + strSql.Append("Id,Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate,Code,Remark,Channel "); strSql.Append(" from Drugs "); strSql.Append(" where Id=" + Id + ""); DataSet ds = HelperDB.DbHelperSQL.GetDataSet(strSql.ToString()); @@ -63,6 +65,9 @@ namespace AIMSDAL { DrugsObj.IsValid = int.Parse(ds.Tables[0].Rows[0]["IsValid"].ToString()); } + DrugsObj.Code = ds.Tables[0].Rows[0]["Code"].ToString(); + DrugsObj.Remark = ds.Tables[0].Rows[0]["Remark"].ToString(); + DrugsObj.Channel = ds.Tables[0].Rows[0]["Channel"].ToString(); DrugsObj.OperatorNo = ds.Tables[0].Rows[0]["OperatorNo"].ToString(); DrugsObj.OperatorName = ds.Tables[0].Rows[0]["OperatorName"].ToString(); if (ds.Tables[0].Rows[0]["OperateDate"].ToString() != "") @@ -76,22 +81,30 @@ namespace AIMSDAL public static DataTable GetDataTable(string DrugKind) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate "); + strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Code,Remark,Channel"); strSql.Append(" FROM Drugs where DrugKind like '%" + DrugKind + "%'"); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); + } + public static DataTable GetDataTable(string DrugKind, string Name) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Code,Remark,Channel"); + strSql.Append(" FROM Drugs where DrugKind like '%" + DrugKind + "%' " + (Name == "" ? "" : "and (NAME LIKE '%" + Name + "%' OR HelpCode LIKE '%" + Name + "%') ")); + return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); + } public static DataTable GetDosageUnitDataTable(int UnitType) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],CASE UnitType WHEN 1 THEN '剂量单位' when 2 then '包装单位' end as UnitType,CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid "); + strSql.Append("select [Id],[Name],[HelpCode],CASE UnitType WHEN 1 THEN '剂量单位' when 2 then '包装单位' end as UnitType,CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid ,Code,Remark,Channel"); strSql.Append(" FROM DosageUnit WHERE UnitType=" + UnitType + " and IsValid=1"); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } public static DataTable GetDataTableByHelpCode(string HelpCode) { - string strSql = "SELECT Id,Name,Stand,DosageUnit FROM dbo.Drugs WHERE (NAME LIKE '" + HelpCode + "%') OR (HelpCode LIKE '" + HelpCode + "%')"; + string strSql = "SELECT Id,Name,Stand,DosageUnit FROM dbo.Drugs WHERE (NAME LIKE '%" + HelpCode + "%' OR HelpCode LIKE '%" + HelpCode + "%')"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } diff --git a/AIMSEntity/DAL/Extension/DEvents.cs b/AIMSEntity/DAL/Extension/DEvents.cs index 9115da7..e2d35d5 100644 --- a/AIMSEntity/DAL/Extension/DEvents.cs +++ b/AIMSEntity/DAL/Extension/DEvents.cs @@ -150,7 +150,7 @@ namespace AIMSDAL } public static DataTable GetDataTable(string HelpCode, bool IsValid) { - string strSql = "SELECT [Id], EventKind,[Name],HelpCode,CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Remark FROM dbo.Events WHERE IsValid=" + (IsValid == true ? "1" : "0") + " " + (HelpCode == "" ? "" : "and (NAME LIKE '" + HelpCode + "%') OR (HelpCode LIKE '" + HelpCode + "%') "); + string strSql = "SELECT [Id], EventKind,[Name],HelpCode,CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Remark FROM dbo.Events WHERE IsValid=" + (IsValid == true ? "1" : "0") + " " + (HelpCode == "" ? "" : "and (NAME LIKE '%" + HelpCode + "%' OR HelpCode LIKE '%" + HelpCode + "%') "); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } @@ -161,7 +161,7 @@ namespace AIMSDAL } public static DataTable GetCommonlyEvents() { - string strSql = "select top 35 e.* from [Events] e where e.IsValid=1 and Name<>'入室' and Name<>'出室' and Name<>'手术开始' and Name<>'手术结束' and Name<>'麻醉开始' and Name<>'麻醉结束' Order By UseRate desc"; + string strSql = "select top 35 e.* from [Events] e where e.IsValid=1 and Name not in('入室' ,'出室' ,'手术开始' ,'手术结束' ,'麻醉开始' ,'麻醉结束','插管','喉罩' ,'拔管') Order By UseRate desc"; return DBHelper.GetDataTable(strSql); } public static DataTable GetEventsByIds(string ids) @@ -182,11 +182,11 @@ namespace AIMSDAL string sql = string.Empty; if (str == "") { - sql = string.Format("select Id,HelpCode,Name,Remark from Events where IsValid=1 and Name<>'入室' and Name<>'出室' and Name<>'手术开始' and Name<>'手术结束' and Name<>'麻醉开始' and Name<>'麻醉结束' Order By UseRate desc"); + sql = string.Format("select Id,HelpCode,Name,Remark from Events where IsValid=1 and Name not in('入室' ,'出室' ,'手术开始' ,'手术结束' ,'麻醉开始' ,'麻醉结束','插管','喉罩' ,'拔管') Order By UseRate desc"); } else { - sql = string.Format("SELECT Top 28 e.Id,e.Name,e.Remark FROM Events e WHERE (Lower(Name) like '%{0}%' OR Lower(HelpCode) like '%{0}%') and (IsValid=1 and Name<>'入室' and Name<>'出室' and Name<>'手术开始' and Name<>'手术结束' and Name<>'麻醉开始' and Name<>'麻醉结束' ) Order By UseRate desc", str); + sql = string.Format("SELECT Top 28 e.Id,e.Name,e.Remark FROM Events e WHERE (Lower(Name) like '%{0}%' OR Lower(HelpCode) like '%{0}%') and (IsValid=1 and Name not in('入室' ,'出室' ,'手术开始' ,'手术结束' ,'麻醉开始' ,'麻醉结束','插管' ,'喉罩' ,'拔管') ) Order By UseRate desc", str); } try { diff --git a/AIMSEntity/Model/AutoGenerate/Drugs.cs b/AIMSEntity/Model/AutoGenerate/Drugs.cs index 78355bf..ca9566e 100644 --- a/AIMSEntity/Model/AutoGenerate/Drugs.cs +++ b/AIMSEntity/Model/AutoGenerate/Drugs.cs @@ -19,12 +19,14 @@ namespace AIMSModel private int? isValid; private string operatorNo; private string operatorName; - private DateTime? operateDate; - - - /// - /// - /// + private DateTime? operateDate; + + public string Code { get; set; } + public string Remark { get; set; } + public string Channel { get; set; } + /// + /// + /// public int? Id { get{ return id; } diff --git a/DrawGraph/AreaManage/BaseInfoBottomManage.cs b/DrawGraph/AreaManage/BaseInfoBottomManage.cs index 95a36f3..f935d1d 100644 --- a/DrawGraph/AreaManage/BaseInfoBottomManage.cs +++ b/DrawGraph/AreaManage/BaseInfoBottomManage.cs @@ -119,7 +119,9 @@ namespace DrawGraph if (aEdit1 != null) { aEdit1.IsVisible = !aEdit1.IsVisible; - //conl.Leave -= new EventHandler(txt_Leave); + aEdit1S.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); + aEdit1S.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); + aEdit1S.CControl.TextChanged -= new EventHandler(CControl_TextChanged); //根据数据源名称进行不同的事件处理 switch (aEdit1.ClassDataSourceName) { @@ -175,8 +177,6 @@ namespace DrawGraph AbleEditPackObj ableEdit = sender; if (ableEdit == null) return; - ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); - ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); ableEdit.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.MouseDown += new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); @@ -196,6 +196,8 @@ namespace DrawGraph ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); } } + ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); aSyncSelectDict.Show(template, OpeRecord, sender, _workersType.ToString()); } @@ -312,8 +314,6 @@ namespace DrawGraph AbleEditPackObj ableEdit = sender; if (ableEdit == null) return; - ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); - ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); ableEdit.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.MouseDown += new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); @@ -333,6 +333,8 @@ namespace DrawGraph ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); } } + ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); aSyncSelectDict.Show(template, OpeRecord, sender, _DictType); } diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index 481bad6..bb6b71d 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -330,6 +330,9 @@ namespace DrawGraph Control conl = aEdit1.CControl; conl.Leave -= new EventHandler(txt_Leave); conl.DoubleClick -= Conl_DoubleClick; + aEdit1S.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); + aEdit1S.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); + aEdit1S.CControl.TextChanged -= new EventHandler(CControl_TextChanged); //根据数据源名称进行不同的事件处理 switch (aEdit1.ClassDataSourceName) { @@ -423,8 +426,6 @@ namespace DrawGraph AbleEditPackObj ableEdit = sender; if (ableEdit == null) return; - ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); - ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); ableEdit.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.MouseDown += new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); @@ -444,6 +445,8 @@ namespace DrawGraph } ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); } + ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); aSyncSelectDict.Show(template, OpeRecord, sender, _DictType, isRadio); } @@ -683,7 +686,7 @@ namespace DrawGraph } else - { + { ableEdit.IsViewBoard = EIsBool.False; ableEdit.Draw(); } diff --git a/DrawGraph/AreaManage/SelectDictText.cs b/DrawGraph/AreaManage/SelectDictText.cs index becbd3c..e5aa212 100644 --- a/DrawGraph/AreaManage/SelectDictText.cs +++ b/DrawGraph/AreaManage/SelectDictText.cs @@ -129,6 +129,7 @@ namespace DrawGraph { OpeRecord = _OpeRecord; if (aEdit == null) return; + if (dgvZd.Visible == false) return; Value = aEdit.PackText; string text = CControl.Text; text = text.Replace(Value + ",", ""); diff --git a/DrawGraph/AreaManage/SelectDictValue.cs b/DrawGraph/AreaManage/SelectDictValue.cs index 3883bcb..bf676ab 100644 --- a/DrawGraph/AreaManage/SelectDictValue.cs +++ b/DrawGraph/AreaManage/SelectDictValue.cs @@ -133,6 +133,7 @@ namespace DrawGraph { OpeRecord = _OpeRecord; if (aEdit == null) return; + if (dgvZd.Visible == false) return; Key = aEdit.PackValue; Value = aEdit.PackText; string text = CControl.Text; diff --git a/DrawGraph/AreaManage/SelectWorkerValue.cs b/DrawGraph/AreaManage/SelectWorkerValue.cs index b8205fd..0a46166 100644 --- a/DrawGraph/AreaManage/SelectWorkerValue.cs +++ b/DrawGraph/AreaManage/SelectWorkerValue.cs @@ -144,6 +144,7 @@ namespace DrawGraph { OpeRecord = _OpeRecord; if (aEdit == null) return; + if (dgvZd.Visible == false) return; Key = aEdit.PackValue; Value = aEdit.PackText; string text = CControl.Text; diff --git a/DrawGraph/Graph/ZUtil.cs b/DrawGraph/Graph/ZUtil.cs index f7fcc7e..ba9e2e7 100644 --- a/DrawGraph/Graph/ZUtil.cs +++ b/DrawGraph/Graph/ZUtil.cs @@ -141,6 +141,7 @@ namespace DrawGraph public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) { LineObj line = new LineObj(LineColor, x1, y1, x2, y2); + line.Line.Width = 2; line.IsVisible = true; line.ZOrder = ZOrder.A_InFront; line.Location.AlignH = AlignH.Left; @@ -164,7 +165,8 @@ namespace DrawGraph /// 标签名 public static void DrawArrow(Color c, float fontSize, double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, bool hasArrowHead, string tag, bool IsArrowHead) { - ArrowObj arrow = new ArrowObj(c, 6f, x1, y1, x2, y2); + ArrowObj arrow = new ArrowObj(c, 7f, x1, y1, x2, y2); + arrow.Line.Width = 2; arrow.ZOrder = ZOrder.A_InFront; arrow.Location.AlignH = AlignH.Left; arrow.Location.AlignV = AlignV.Top; @@ -174,11 +176,6 @@ namespace DrawGraph arrow.Tag = tag; zedGraph.MasterPane.GraphObjList.Add(arrow); - //DrawLine(x1, y1, x1, y1 + 0.007, zedGraph, "A" + tag, c); - //DrawLine(x2, y1, x2, y2 + 0.007, zedGraph, "B" + tag, c); - - //DrawLine(x1, y1, x1, y1 - 0.007, zedGraph, "A" + tag, c); - //DrawLine(x2, y1, x2, y2 - 0.007, zedGraph, "B" + tag, c); if (x1 != x2 && arrow.IsArrowHead == false) { DrawLine(x1, y1 + 0.004, x1, y1 - 0.004, zedGraph, "A" + tag, c); diff --git a/DrawGraph/Resources/sy2.png b/DrawGraph/Resources/sy2.png index a6e608e3ff390882aca305beb0568e6416cf6452..6e9c32e4b99f58b5dee76689668132a0f0423564 100644 GIT binary patch literal 2099 zcmb_de`wrP9M4%-w|2ADIw_r#N6K8a=JM-uxn#Sxx4YWj*mbo#X$R9S_wv#UyGzm} z?OhAHIYc|$Ms*d(6sEW_lv!v+(M{&S`iH346$A&>zlIqViKc+2{5pcF54o`W4koA%8w=VKhN(ZOvN>+>cz4LjAfCCV#u|83}YXO!f*1 zCSgTUTJIdO(XNrMBplffC6#P#0bBDjHjqWG0`l36;mG+gS+FbPwl_?Zpa60AhslWN z5cDOwLDaMn5d1+3vH=c=lAjGS5*K(Ja11Nbj7YOQ#jr9Hlz9mh9};`BRZZ@RJyG<9 zdtox|x|U4Sxm?blk!g$$xmuP`Cd)T;5Tqnt3{e83sj4I*iGy5eeawV|o(f9qRlHt>VhV+V9F-D6EG5B!Kq&$g za95PXATL6d$AK1#F7LE;ybG1gitTuN)02=#5|mMSaAyik(r3ZpNQ3)70xkMQA2lPk|>d3yX; zHOl!c+Is(MKD2kN&P$E{rwR*m3yxr1&cYBr*S%)>LcyK#m4pmTmF-yjbJu6di$@-=JQID(Z62@ObSihcVd(zR*2vSj zjic*lUak4Eeddv-_kCwhMUL0(e)0KK%_qO_xOBFj80q8Qd+7Dquf1zM-rg0P*tYM` E-{!ldUH||9 delta 403 zcmV;E0c`%W5Uc}`BYy#NNklAwW_NLL zaH&B=u*3+WA;^ZL8fp+~5EuV!6@f^QZek5CjyaiA&>ym);W;l}Uf%cK_j;D!d7g8g z?>* z)b3)1YGwkogT2~TZ$EV6kJS6k2$oqleuO`a-HurN#mn%YwprDD=ojgl)GH(P|2_O` zk<`k%qN+~Z!beiSbvwb^HmjQr&|w|a2!n;tQS=qSZin8@Z#Ke?uonK47ND!>k*;K; z2$uiq7zUceSARms8w1T?$9NU~L_=%{gE)}8t0EXY$W@u2)uqq{O{^8{7^}F1JFz#2 z>*0T>0wc{SJPMr+eS_asVc+l>m+@NqA#lIdfg%`Zk9Z0fu`WHIbHSFK4Kv&;N-l%_ x!{hMZN#k>F7(5SsQI?pMCEzD+V81N!Kf*>sBFD`GX$$}W002ovPDHLkV1f;_#P
  • TwPBigf{%jhW#A(-{ri3n2i+CW8ebZV^Y|nO^ zv>-Z)RITD=4+W+PGz}OPziMBGU_z)`S?MYsh7bj*Qnd;y!2{D?P^n<$I!&SujlWs3 zeSPnDzjMxa&pDY&_8hN2&~yO9u=;pctQWl-(f!~)2YRX}9VUA1*SelIFsu$O)HT|$ z^RGXQVS5hCseZFR(ani!-XlnA26~El4WTitt-YuT;t(`J1`fzd2)}jZa~#N02=DVH z$b`njLAh&8hbP8*QsUT<$VzzoG}K{TgdHQu&1NeajpKDF zn5v#q)m-JEk`qp)NMOh;Wrtq&|N#wGso)=Kea$XpKgr*GOpsFOtt2tFi zhLLy7?)f;+Cv`O|=g@-Ddpru_9lW1n{eCy?p-S#15?ov{OhFN0JQl){J|0 z*`SzplL8ZTdwt%Zo27j|cYyUWkPfn}$oeb$W2!i8WkF@X^gs7MsmrJeh1`AfShZ=T z57#9d=wL_7)pG)#Dvxq9C}j*Mh*l+paM4NuDB&*ItXU9r z7#Ton{g>1ukpF~LwmYE^e~q%VwyVS|aMU-fVYOkQk7~<<3hHw@YG^0T;*S_+^T%V6 zRB%~bo%vusjIG);K5*yYLMHsXVQxAB(oN8X*3ZF9`@8+$J?r#A`LvTcqyHu*|eKD&~|r=Feo z+K5xF&L>tbPOU`cr@&?W+N=gP9P91j)t8Qb{Lq=T==U#AQ8~x-FN-&S?r!4OgPl)s4tcO!)a%Uo58UF7Xk2o$EQ|PYb*66?51r56;g?%`=f_+An7X~az3u#_rrVjaV{25v_QH+6 QE$jaz-q92LD4L%56L4`Zng9R* delta 373 zcmV-*0gC>t4UYqmBYy!_NklQ7D?bBjj<5aB8`P6 zrVvs_I7lJbD1sJhAtnex1R;&2@&lMu>BN+RmDp$yQYeHJmV%&#rr0@dJ#Ozd`Zn+E z%>I8nJ3CwW`Lra5rtt&68{O2B1Js3$05((}*m8IoZ4ZGx!heT|+cEkO*ka9f`M$7L z%tZVahZw_?`@rT=#EIlfu1EfJ)`3FCYINXlJZuPikv~H>Uf?KiXJb)2NP*y6_*%U~ zS+L3Qxtjdf@Ym?c1M5XUPO)24JH}4LAM?OA!e{H$sCGMn$Bkgm@CxVno&h_=e#9${ zU|Zpv8K8>F;cin>vrEJJBx?X)n!tXk&hAq^SY;WvB(K>_mD#;VXBze#!x1m#0C9JA zZ_=>U@OAvj34?LmN@k~s65d5|5ZjWUyqRuri2`0?q=*Gv;Ti+~(N#qk0bKY89$+@G Tv)>t900000NkvXXu0mjf?WVHY