From 7e31547586900174ab60df6587147eb8cabcfbe3 Mon Sep 17 00:00:00 2001 From: leomon Date: Mon, 21 Nov 2022 23:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AF=E5=89=8D=E6=8E=92=E7=A8=8B=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8C=87=E5=AE=9A=E4=BA=BA=E5=91=98=20=E6=9C=AF?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/DocManager/frmDocument.Designer.cs | 23 +- AIMS/DocManager/frmDocument.cs | 24 ++ AIMS/DocManager/frmDocument3.cs | 27 +- AIMS/DocManager/frmDocument3.designer.cs | 21 +- .../AnasRecordBill/frmAnasRecordBill2.cs | 1 + .../AnasRecordBill/frmAnasRecordInstrument.cs | 4 +- .../AnasRecordBill/frmFactDrugNew.cs | 59 +---- .../frmOperationApplyDetail.Designer.cs | 36 +-- .../frmOperationSchedulePlan.cs | 239 +++++++++++------ .../frmOperationSchedulePlan.resx | 2 +- .../OremrUserControl/UCOperationGoodsBill5.cs | 14 +- .../ucPlanOperationRoomCard.Designer.cs | 12 +- .../ucPlanOperationRoomCard.cs | 244 ++++++++++++------ AIMS/PublicUI/frmSelectDisease.Designer.cs | 26 +- AIMS/PublicUI/frmSelectDisease.cs | 2 + AIMS/PublicUI/frmSelectOperation.Designer.cs | 24 +- AIMS/PublicUI/frmSelectOperation.cs | 4 +- AIMS/PublicUI/frmSelectOperation.resx | 24 ++ .../frmSelectOperationOne.Designer.cs | 138 +++++++++- AIMS/PublicUI/frmSelectOperationOne.cs | 1 + AIMS/PublicUI/frmSelectOperationOne.resx | 24 ++ AIMSEntity/BLL/Extension/BApplyPersonDuty.cs | 2 +- AIMSEntity/DAL/Extension/DApplyPersonDuty.cs | 2 +- AIMSEntity/DAL/Extension/DOperationApply.cs | 2 +- AIMSEntity/Extensions/SelectPatient.cs | 46 +++- .../DocumentEntity/PatientRecord.cs | 4 + DrawGraph/AreaManage/BaseInfoBottomManage.cs | 37 ++- DrawGraph/AreaManage/BaseInfoTopManage.cs | 37 ++- DrawGraph/AreaManage/DrugsManage.cs | 20 +- DrawGraph/AreaManage/OperationRecord.cs | 2 + DrawGraph/AreaManage/OutputManage.cs | 23 ++ DrawGraph/AreaManage/PhysioDataManage.cs | 20 +- DrawGraph/AreaManage/RemarkManage.cs | 18 +- DrawGraph/AreaManage/SapManage.cs | 14 +- DrawGraph/AreaManage/SelectDictText.cs | 6 +- DrawGraph/AreaManage/SelectDictValue.cs | 51 +--- DrawGraph/AreaManage/SelectWorkerValue.cs | 47 +--- DrawGraph/AreaManage/TempDataManage.cs | 97 +++---- 38 files changed, 873 insertions(+), 504 deletions(-) diff --git a/AIMS/DocManager/frmDocument.Designer.cs b/AIMS/DocManager/frmDocument.Designer.cs index 4c18a71..2ef98ec 100644 --- a/AIMS/DocManager/frmDocument.Designer.cs +++ b/AIMS/DocManager/frmDocument.Designer.cs @@ -40,6 +40,7 @@ this.expandablePanel1 = new DevComponents.DotNetBar.ExpandablePanel(); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.tabItem1 = new DevComponents.DotNetBar.TabItem(this.components); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tsbDoc)).BeginInit(); @@ -137,6 +138,7 @@ // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.Controls.Add(this.buttonX1); this.panelEx1.Controls.Add(this.lblPatient); this.panelEx1.Controls.Add(this.btnSel); this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; @@ -161,7 +163,7 @@ // // this.lblPatient.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblPatient.Location = new System.Drawing.Point(134, 10); + this.lblPatient.Location = new System.Drawing.Point(161, 10); this.lblPatient.Margin = new System.Windows.Forms.Padding(2); this.lblPatient.Name = "lblPatient"; this.lblPatient.Size = new System.Drawing.Size(740, 26); @@ -174,7 +176,7 @@ this.btnSel.Location = new System.Drawing.Point(12, 10); this.btnSel.Margin = new System.Windows.Forms.Padding(2); this.btnSel.Name = "btnSel"; - this.btnSel.Size = new System.Drawing.Size(99, 23); + this.btnSel.Size = new System.Drawing.Size(70, 23); this.btnSel.TabIndex = 4; this.btnSel.Text = "批量打印"; this.btnSel.Click += new System.EventHandler(this.btnSel_Click); @@ -230,14 +232,26 @@ this.tabItem1.Name = "tabItem1"; this.tabItem1.Text = "tabItem1"; // - // frmDocument2 + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(86, 10); + this.buttonX1.Margin = new System.Windows.Forms.Padding(2); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(70, 23); + this.buttonX1.TabIndex = 4; + this.buttonX1.Text = "数据中心"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); + // + // frmDocument // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1074, 542); this.Controls.Add(this.panel2); this.Margin = new System.Windows.Forms.Padding(2); - this.Name = "frmDocument2"; + this.Name = "frmDocument"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "医疗文书"; @@ -264,5 +278,6 @@ private DevComponents.DotNetBar.TabControl tsbDoc; private DevComponents.DotNetBar.TabControlPanel tabControlPanel1; private DevComponents.DotNetBar.TabItem tabItem1; + private DevComponents.DotNetBar.ButtonX buttonX1; } } \ No newline at end of file diff --git a/AIMS/DocManager/frmDocument.cs b/AIMS/DocManager/frmDocument.cs index 8ae9d61..b12197a 100644 --- a/AIMS/DocManager/frmDocument.cs +++ b/AIMS/DocManager/frmDocument.cs @@ -1,9 +1,11 @@ using AIMS.OremrUserControl; +using AIMSExtension; using AIMSModel; using DevComponents.DotNetBar; using DocumentManagement; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Text; using System.Windows.Forms; @@ -198,5 +200,27 @@ namespace AIMS.DocManager tsbDoc.TabItemClose += new TabStrip.UserActionEventHandler(tsbDoc_TabItemClose); } + + private void buttonX1_Click(object sender, EventArgs e) + { + if (PublicMethod.GetHospitalName().Contains("秦皇岛")) + { + if (Patient.HISPatientId != null && Patient.VisitTimes != null) + try + { + string patientId = "orcl:LDQ:5:1:0:" + Patient.HISPatientId + ":" + Patient.VisitTimes + ""; + Process myprocess = new Process(); + ProcessStartInfo startInfo = new ProcessStartInfo(@"C:\APPSOFT\zlSoftCISInterface.exe", patientId); + PublicMethod.WriteLog(new Exception(@"C:\APPSOFT\zlSoftCISInterface.exe" + patientId)); + myprocess.StartInfo = startInfo; + myprocess.StartInfo.UseShellExecute = false; + myprocess.Start(); + } + catch (Exception ex) + { + MessageBox.Show(@"在C:\APPSOFT\zlSoftCISInterface.exe路径下找不到“zlSoftCISInterface.exe”"); + } + } + } } } diff --git a/AIMS/DocManager/frmDocument3.cs b/AIMS/DocManager/frmDocument3.cs index ac01bcb..7d9fd66 100644 --- a/AIMS/DocManager/frmDocument3.cs +++ b/AIMS/DocManager/frmDocument3.cs @@ -7,6 +7,7 @@ using DocumentManagement; using System; using System.Collections.Generic; using System.Data; +using System.Diagnostics; using System.Drawing; using System.Text; using System.Windows.Forms; @@ -50,7 +51,7 @@ namespace AIMS.OperationAfter.UI sb.Append("性别：" + Patient.Sex + t); sb.Append("手术名称：" + Patient.OperationInfoName + t); sb.Append("状态：" + Patient.State + t); - this.lblPatient.Text = sb.ToString(); + this.lblPatient.Text = sb.ToString(); } /// @@ -408,5 +409,29 @@ namespace AIMS.OperationAfter.UI } } } + + private void buttonX1_Click(object sender, EventArgs e) + { + if (PublicMethod.GetHospitalName().Contains("秦皇岛")) + { + if (Patient.HISPatientId != null && Patient.VisitTimes != null) + { + try + { + string patientId = "orcl:LDQ:5:1:0:" + Patient.HISPatientId + ":" + Patient.VisitTimes + ""; + Process myprocess = new Process(); + ProcessStartInfo startInfo = new ProcessStartInfo(@"C:\APPSOFT\zlSoftCISInterface.exe", patientId); + PublicMethod.WriteLog(new Exception(@"C:\APPSOFT\zlSoftCISInterface.exe" + patientId)); + myprocess.StartInfo = startInfo; + myprocess.StartInfo.UseShellExecute = false; + myprocess.Start(); + } + catch (Exception ex) + { + MessageBox.Show(@"在C:\APPSOFT\zlSoftCISInterface.exe路径下找不到“zlSoftCISInterface.exe”"); + } + } + } + } } } diff --git a/AIMS/DocManager/frmDocument3.designer.cs b/AIMS/DocManager/frmDocument3.designer.cs index 4b17b47..57f7791 100644 --- a/AIMS/DocManager/frmDocument3.designer.cs +++ b/AIMS/DocManager/frmDocument3.designer.cs @@ -45,6 +45,7 @@ this.btnSel = new DevComponents.DotNetBar.ButtonX(); this.lblPatient = new DevComponents.DotNetBar.LabelX(); this.expandablePanel1 = new DevComponents.DotNetBar.ExpandablePanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.panel2.SuspendLayout(); this.groupBox2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -265,6 +266,7 @@ // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.Controls.Add(this.buttonX1); this.panelEx1.Controls.Add(this.btnSel); this.panelEx1.Controls.Add(this.lblPatient); this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; @@ -290,7 +292,7 @@ this.btnSel.Location = new System.Drawing.Point(10, 11); this.btnSel.Margin = new System.Windows.Forms.Padding(2); this.btnSel.Name = "btnSel"; - this.btnSel.Size = new System.Drawing.Size(99, 23); + this.btnSel.Size = new System.Drawing.Size(72, 23); this.btnSel.TabIndex = 6; this.btnSel.Text = "批量打印"; this.btnSel.Click += new System.EventHandler(this.btnSel_Click); @@ -301,10 +303,10 @@ // // this.lblPatient.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblPatient.Location = new System.Drawing.Point(116, 10); + this.lblPatient.Location = new System.Drawing.Point(166, 8); this.lblPatient.Margin = new System.Windows.Forms.Padding(2); this.lblPatient.Name = "lblPatient"; - this.lblPatient.Size = new System.Drawing.Size(870, 26); + this.lblPatient.Size = new System.Drawing.Size(534, 26); this.lblPatient.TabIndex = 5; // // expandablePanel1 @@ -337,6 +339,18 @@ this.expandablePanel1.TitleStyle.GradientAngle = 90; this.expandablePanel1.TitleText = "文档目录"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(86, 11); + this.buttonX1.Margin = new System.Windows.Forms.Padding(2); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(76, 23); + this.buttonX1.TabIndex = 6; + this.buttonX1.Text = "数据中心"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); + // // frmDocument3 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -381,5 +395,6 @@ private DevComponents.DotNetBar.LabelX lblPatient; private DevComponents.DotNetBar.ExpandablePanel expandablePanel1; private DevComponents.DotNetBar.ButtonX btnSel; + private DevComponents.DotNetBar.ButtonX buttonX1; } } \ No newline at end of file diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs index 331eefe..d65ce50 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs @@ -1182,6 +1182,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI private void FrmFactOutputLiquids_OutParam() { templateManage.Bind("OutputManage"); + templateManage.Bind("RemarkManage"); zgcAnaesRecord.Refresh(); } diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs index 54e3c72..838e7b1 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs @@ -1341,9 +1341,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI uc.GoodsName = dr["Name"].ToString(); if (applic == null) { - string ApplianceNumber = dr["ApplianceNumber"].ToString(); - if (_applianceUseType != null && _applianceUseType.Count == 1 && _applianceUseType[0].Id == 1) - ApplianceNumber = ""; + string ApplianceNumber = dr["ApplianceNumber"].ToString(); uc.GoodsNumber = ApplianceNumber; } uc.Location = new Point((uc.Width) * i, (uc.Height - 1) * j); diff --git a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs index b60881e..0c65d0e 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmFactDrugNew.cs @@ -658,18 +658,7 @@ namespace AIMS.PublicUI.UI //点击开始时间时显示时间 if (_dataGridView.CurrentCell != null) { - _dataGridView.BeginEdit(true); - //if (_dataGridView.CurrentCell.ColumnIndex == 14 && _dataGridView.CurrentCell.EditedFormattedValue.ToString() == "") - //{ - // _dataGridView.CurrentCell.Value = PublicMethod.ServerTime(); ; - // //开始注销的 不显示时间 LM解开 不知原因为何 - // SendKeys.Send("{Tab}"); - //} - //if (_dataGridView.CurrentCell.ColumnIndex == 10) - //{ - // GetControlPosition(_dataGridView, _dataGridView.CurrentCell); - // dgvDosage.Visible = true; - //} + _dataGridView.BeginEdit(true); //点击Sign列时显示持续事件标记 if (_dataGridView.CurrentCell.ColumnIndex == 15) { @@ -789,11 +778,7 @@ namespace AIMS.PublicUI.UI { if (_dataGridView.CurrentRow != null) { - string objectName = _dataGridView.CurrentRow.Cells[3].EditedFormattedValue.ToString();//药品名称 - //string messang = string.Format("确定要删除：{0}吗？", objectName); - //DialogResult dr = MessageBox.Show(messang, "删除提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning); - //if (dr == System.Windows.Forms.DialogResult.OK) - //{ + string objectName = _dataGridView.CurrentRow.Cells[3].EditedFormattedValue.ToString(); if (_dataGridView.CurrentRow.Tag != null) { int id = Convert.ToInt32(_dataGridView.CurrentRow.Tag); @@ -816,6 +801,7 @@ namespace AIMS.PublicUI.UI FullALLDGV(); tabDrugs_SelectedTabChanged(null, null); + if (DrugsParam != null) DrugsParam(); } else { @@ -824,8 +810,7 @@ namespace AIMS.PublicUI.UI _dataGridView.Rows.Remove(_dataGridView.CurrentRow); _lineNumber = 0; } - } - //} + } } } catch (Exception ex) @@ -1468,41 +1453,7 @@ namespace AIMS.PublicUI.UI /// void dgvTxt_PreviewKeyDownEvent(object sender, PreviewKeyDownEventArgs e) { - ////常用默认剂量小于2不做操作 - //if (dgvDosage.Rows.Count < 2) - //{ - // if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down || e.KeyCode == Keys.Enter) - // { - // _dataGridView.CurrentCell = _dataGridView.Rows[_dataGridView.CurrentCell.RowIndex + 1].Cells[3]; - // _dataGridView.BeginEdit(true); - // } - // dgvDosage.Visible = false; - // return; - //} - ////显示默认剂量列表 - //if (dgvDosage.Visible == false) - //{ - // dgvDosage.Visible = true; - // GetControlPosition(dgvDosage, _dataGridView.CurrentCell); - //} - ////点击上下键时默认剂量列表显示并定位光标 - //if (e.KeyCode == Keys.Up) - //{ - // dgvDosage.Focus(); - // dgvDosage.Rows[dgvDosage.Rows.Count - 1].Selected = true; - // dgvDosage.CurrentCell = dgvDosage.Rows[dgvDosage.Rows.Count - 1].Cells[0]; - - //} - //if (e.KeyCode == Keys.Down) - //{ - // if (dgvDosage.Rows.Count > 0) - // { - // dgvDosage.Focus(); - // dgvDosage.Rows[0].Selected = true; - // dgvDosage.CurrentCell = dgvDosage.Rows[0].Cells[0]; - // } - //} - + ////常用默认剂量小于2不做操作 } /// ///获取单元格的位置并显示面板 diff --git a/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs b/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs index c660cc0..b6bc57e 100644 --- a/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs +++ b/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs @@ -33,7 +33,6 @@ this.tsbSava = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.tsbCancel = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.tsbSet = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.tsbExit = new System.Windows.Forms.ToolStripButton(); @@ -119,6 +118,7 @@ this.label19 = new System.Windows.Forms.Label(); this.txtOperationDoctor = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cboPatientType = new System.Windows.Forms.ComboBox(); this.txtContactsPhone = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); this.txtContacts = new System.Windows.Forms.TextBox(); @@ -153,7 +153,6 @@ this.btnDR = new System.Windows.Forms.Button(); this.label3 = new System.Windows.Forms.Label(); this.txtMdrecNo = new System.Windows.Forms.TextBox(); - this.cboPatientType = new System.Windows.Forms.ComboBox(); this.toolStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -172,7 +171,6 @@ this.tsbSava, this.toolStripSeparator4, this.tsbCancel, - this.toolStripSeparator1, this.tsbSet, this.toolStripSeparator2, this.tsbExit}); @@ -211,11 +209,6 @@ this.tsbCancel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbCancel.Click += new System.EventHandler(this.tsbCancel_Click); // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49); - // // tsbSet // this.tsbSet.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -1134,6 +1127,19 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "病人基本信息"; // + // cboPatientType + // + this.cboPatientType.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.cboPatientType.FormattingEnabled = true; + this.cboPatientType.Items.AddRange(new object[] { + "住院", + "门诊"}); + this.cboPatientType.Location = new System.Drawing.Point(6, 27); + this.cboPatientType.Name = "cboPatientType"; + this.cboPatientType.Size = new System.Drawing.Size(74, 28); + this.cboPatientType.TabIndex = 37; + this.cboPatientType.Text = "住院"; + // // txtContactsPhone // this.txtContactsPhone.Location = new System.Drawing.Point(918, 100); @@ -1446,19 +1452,6 @@ this.txtMdrecNo.Size = new System.Drawing.Size(109, 23); this.txtMdrecNo.TabIndex = 3; // - // cboPatientType - // - this.cboPatientType.Font = new System.Drawing.Font("微软雅黑", 10.5F); - this.cboPatientType.FormattingEnabled = true; - this.cboPatientType.Items.AddRange(new object[] { - "住院", - "门诊"}); - this.cboPatientType.Location = new System.Drawing.Point(6, 27); - this.cboPatientType.Name = "cboPatientType"; - this.cboPatientType.Size = new System.Drawing.Size(74, 28); - this.cboPatientType.TabIndex = 37; - this.cboPatientType.Text = "住院"; - // // frmOperationApplyDetail // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1497,7 +1490,6 @@ private System.Windows.Forms.ToolStripButton tsbSava; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripButton tsbSet; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.TextBox txtIntern; private System.Windows.Forms.Label label34; diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 833ba0d..2ac53d7 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -1,22 +1,18 @@ -using System; -using System.Drawing; -using System.Collections; -using System.ComponentModel; -using System.Windows.Forms; -using System.Data; -using DevComponents.DotNetBar; -using System.Collections.Generic; -using DevComponents.DotNetBar.Controls; -using System.Threading.Tasks; -using System.Diagnostics; -using System.Linq; -using DevComponents.DotNetBar.SuperGrid; -using DataDictionary; -using AIMSModel; -using AIMSExtension; -using AIMSBLL; using AIMS.OremrUserControl; -using System.Linq.Expressions; +using AIMSBLL; +using AIMSExtension; +using AIMSModel; +using DevComponents.DotNetBar; +using DevComponents.DotNetBar.Controls; +using DevComponents.DotNetBar.SuperGrid; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.Drawing; +using System.Linq; +using System.Windows.Forms; namespace AIMS.OperationFront.UI { @@ -489,10 +485,12 @@ namespace AIMS.OperationFront.UI this.colDel = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.gridColumn2 = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.panel1 = new System.Windows.Forms.Panel(); - this.lblcount = new System.Windows.Forms.Label(); - this.btnWorkPlan = new System.Windows.Forms.Button(); + this.btnDataCente = new System.Windows.Forms.Button(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.ȡųͨToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.label4 = new System.Windows.Forms.Label(); + this.lblcount = new System.Windows.Forms.Label(); + this.btnWorkPlan = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); this.btnPlan = new System.Windows.Forms.Button(); @@ -581,8 +579,6 @@ namespace AIMS.OperationFront.UI this.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn47 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn48 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btnDataCente = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); this.navigationPane1.SuspendLayout(); this.navigationPanePanel1.SuspendLayout(); this.groupBoxsel.SuspendLayout(); @@ -768,7 +764,7 @@ namespace AIMS.OperationFront.UI this.dgvApplyOrDoctor.DefaultCellStyle = dataGridViewCellStyle9; this.dgvApplyOrDoctor.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvApplyOrDoctor.EnableHeadersVisualStyles = false; - this.dgvApplyOrDoctor.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dgvApplyOrDoctor.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvApplyOrDoctor.Location = new System.Drawing.Point(0, 89); this.dgvApplyOrDoctor.Name = "dgvApplyOrDoctor"; this.dgvApplyOrDoctor.ReadOnly = true; @@ -2251,37 +2247,37 @@ namespace AIMS.OperationFront.UI // this.ctsThisRoom.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuChangeOptRoomTo, - this.mnuCancelINurse, this.mnuCancelADoctor, + this.mnuCancelINurse, this.mnuCancelTNurse}); this.ctsThisRoom.Name = "ctsThisRoom"; - this.ctsThisRoom.Size = new System.Drawing.Size(149, 92); + this.ctsThisRoom.Size = new System.Drawing.Size(181, 114); this.ctsThisRoom.Opening += new System.ComponentModel.CancelEventHandler(this.ctsThisRoom_Opening); // // mnuChangeOptRoomTo // this.mnuChangeOptRoomTo.Name = "mnuChangeOptRoomTo"; - this.mnuChangeOptRoomTo.Size = new System.Drawing.Size(148, 22); + this.mnuChangeOptRoomTo.Size = new System.Drawing.Size(180, 22); this.mnuChangeOptRoomTo.Text = ""; // // mnuCancelINurse // this.mnuCancelINurse.Name = "mnuCancelINurse"; - this.mnuCancelINurse.Size = new System.Drawing.Size(148, 22); + this.mnuCancelINurse.Size = new System.Drawing.Size(180, 22); this.mnuCancelINurse.Text = "ȡϴֻʿ"; this.mnuCancelINurse.Click += new System.EventHandler(this.mnuCancelINurse_Click); // // mnuCancelADoctor // this.mnuCancelADoctor.Name = "mnuCancelADoctor"; - this.mnuCancelADoctor.Size = new System.Drawing.Size(148, 22); + this.mnuCancelADoctor.Size = new System.Drawing.Size(180, 22); this.mnuCancelADoctor.Text = "ȡų"; this.mnuCancelADoctor.Click += new System.EventHandler(this.mnuCancelADoctor_Click); // // mnuCancelTNurse // this.mnuCancelTNurse.Name = "mnuCancelTNurse"; - this.mnuCancelTNurse.Size = new System.Drawing.Size(148, 22); + this.mnuCancelTNurse.Size = new System.Drawing.Size(180, 22); this.mnuCancelTNurse.Text = "ȡѲػʿ"; this.mnuCancelTNurse.Click += new System.EventHandler(this.mnuCancelTNurse_Click); // @@ -2434,6 +2430,48 @@ namespace AIMS.OperationFront.UI this.panel1.Size = new System.Drawing.Size(1051, 39); this.panel1.TabIndex = 0; // + // btnDataCente + // + this.btnDataCente.BackColor = System.Drawing.Color.Transparent; + this.btnDataCente.ContextMenuStrip = this.contextMenuStrip1; + this.btnDataCente.Dock = System.Windows.Forms.DockStyle.Left; + this.btnDataCente.FlatAppearance.BorderSize = 0; + this.btnDataCente.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDataCente.Font = new System.Drawing.Font("΢ź", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDataCente.Location = new System.Drawing.Point(552, 0); + this.btnDataCente.Name = "btnDataCente"; + this.btnDataCente.Size = new System.Drawing.Size(78, 39); + this.btnDataCente.TabIndex = 503; + this.btnDataCente.Text = ""; + this.btnDataCente.UseVisualStyleBackColor = false; + this.btnDataCente.Click += new System.EventHandler(this.btnDataCente_Click); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ȡųͨToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(149, 26); + // + // ȡųͨToolStripMenuItem + // + this.ȡųͨToolStripMenuItem.Name = "ȡųͨToolStripMenuItem"; + this.ȡųͨToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.ȡųͨToolStripMenuItem.Text = "ȡųͨ"; + this.ȡųͨToolStripMenuItem.Click += new System.EventHandler(this.ȡųͨToolStripMenuItem_Click); + // + // label4 + // + this.label4.BackColor = System.Drawing.Color.Transparent; + this.label4.Dock = System.Windows.Forms.DockStyle.Left; + this.label4.Font = new System.Drawing.Font("΢ź", 11F); + this.label4.Location = new System.Drawing.Point(542, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(10, 39); + this.label4.TabIndex = 502; + this.label4.Text = "|\r\n"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // lblcount // this.lblcount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -2463,20 +2501,6 @@ namespace AIMS.OperationFront.UI this.btnWorkPlan.Visible = false; this.btnWorkPlan.Click += new System.EventHandler(this.btnWorkPlan_Click); // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ȡųͨToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(149, 26); - // - // ȡųͨToolStripMenuItem - // - this.ȡųͨToolStripMenuItem.Name = "ȡųͨToolStripMenuItem"; - this.ȡųͨToolStripMenuItem.Size = new System.Drawing.Size(148, 22); - this.ȡųͨToolStripMenuItem.Text = "ȡųͨ"; - this.ȡųͨToolStripMenuItem.Click += new System.EventHandler(this.ȡųͨToolStripMenuItem_Click); - // // button3 // this.button3.BackColor = System.Drawing.Color.Transparent; @@ -3418,34 +3442,6 @@ namespace AIMS.OperationFront.UI this.dataGridViewTextBoxColumn48.HeaderText = ""; this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48"; // - // btnDataCente - // - this.btnDataCente.BackColor = System.Drawing.Color.Transparent; - this.btnDataCente.ContextMenuStrip = this.contextMenuStrip1; - this.btnDataCente.Dock = System.Windows.Forms.DockStyle.Left; - this.btnDataCente.FlatAppearance.BorderSize = 0; - this.btnDataCente.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnDataCente.Font = new System.Drawing.Font("΢ź", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDataCente.Location = new System.Drawing.Point(552, 0); - this.btnDataCente.Name = "btnDataCente"; - this.btnDataCente.Size = new System.Drawing.Size(78, 39); - this.btnDataCente.TabIndex = 503; - this.btnDataCente.Text = ""; - this.btnDataCente.UseVisualStyleBackColor = false; - this.btnDataCente.Click += new System.EventHandler(this.btnDataCente_Click); - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Dock = System.Windows.Forms.DockStyle.Left; - this.label4.Font = new System.Drawing.Font("΢ź", 11F); - this.label4.Location = new System.Drawing.Point(542, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(10, 39); - this.label4.TabIndex = 502; - this.label4.Text = "|\r\n"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // frmOperationSchedulePlan // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -4180,8 +4176,8 @@ namespace AIMS.OperationFront.UI outMsg = string.Format("{2} :{0} {1} ɹ", grCurrentSub.Cells["Patient"].Value, opeRoom, RoomCardManage.lastSelectOpeRoom.operationRoom.Name); RoomCardManage.WriteMsg(rtbLog, outMsg); LoadOperationInfo(opeRoom.Id.Value); - LoadOperationInfoDgv(CurrentRoom); - dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); + LoadOperationInfoDgv(RoomCardManage.lastSelectOpeRoom.operationRoom.Id.Value); + //dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); } catch (Exception ex) { @@ -4573,7 +4569,104 @@ namespace AIMS.OperationFront.UI private void ctsThisRoom_Opening(object sender, CancelEventArgs e) { + if (selApply == null || selApply == "") return; + + mnuCancelADoctor.DropDownItems.Clear(); + mnuCancelINurse.DropDownItems.Clear(); + mnuCancelTNurse.DropDownItems.Clear(); + if (selApply == "") + return; + if (RoomCardManage.lastSelectOpeRoom == null) return; + + System.Data.DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(RoomCardManage.lastSelectOpeRoom.pDataTable, " ApplyID=" + selApply, ""); + if (Newdt != null && Newdt.Rows.Count > 0) + { + DataRow item = Newdt.Rows[0]; + #region ҽ + string sAnesthesiaDoctor = item["AnesthesiaDoctor"].ToString(); + if (!string.IsNullOrWhiteSpace(sAnesthesiaDoctor)) + { + List Anesthesia = sAnesthesiaDoctor.Split(',').ToList(); + List AnesthesiaId = item["AnesthesiaDoctorId"].ToString().Split(',').ToList(); + if (Anesthesia.Count > 0 && AnesthesiaId.Count > 0) + { + for (int i = 0; i < AnesthesiaId.Count; i++) + { + ToolStripItem tspAnes = new ToolStripMenuItem(Anesthesia[i]); + tspAnes.Tag = AnesthesiaId[i]; + tspAnes.Click += TspAnes_Click; + mnuCancelADoctor.DropDownItems.Add(tspAnes); + } + } + } + #endregion + + #region ϴֻʿ + string sInstrumentNurse = item["InstrumentNurse"].ToString(); + if (!string.IsNullOrWhiteSpace(sInstrumentNurse)) + { + List Instrument = sInstrumentNurse.Split(',').ToList(); + List InstrumentId = item["InstrumentNurseId"].ToString().Split(',').ToList(); + if (Instrument.Count > 0 && InstrumentId.Count > 0) + { + for (int i = 0; i < InstrumentId.Count; i++) + { + ToolStripItem tspIns = new ToolStripMenuItem( Instrument[i]); + tspIns.Tag = InstrumentId[i]; + tspIns.Click += TspNurse1_Click; + mnuCancelINurse.DropDownItems.Add( tspIns); + } + } + } + #endregion + #region Ѳػʿ + string sTourNurse = item["TourNurse"].ToString(); + if (!string.IsNullOrWhiteSpace(sTourNurse)) + { + List Tour = sTourNurse.Split(',').ToList(); + List TourId = item["TourNurseId"].ToString().Split(',').ToList(); + if (Tour.Count > 0 && TourId.Count > 0) + { + for (int i = 0; i < TourId.Count; i++) + { + ToolStripItem tspNurse2 = new ToolStripMenuItem( Tour[i]); + tspNurse2.Tag = TourId[i] ; + tspNurse2.Click += TspNurse2_Click; + mnuCancelTNurse.DropDownItems.Add(tspNurse2 ); + } + } + } + #endregion + } } + + + private void TspAnes_Click(object sender, EventArgs e) + { + if (selApply == null || selApply == "") return; + int dict = int.Parse((sender as ToolStripItem).Tag.ToString()); + BApplyPersonDuty.Delete(" PersonId='" + dict + "' and PersonDutyId in(5) and OperationApplyId=" + selApply, null); + LoadOperationInfoDgv(RoomCardManage.lastSelectOpeRoom.operationRoom.Id.Value); + MessageBox.Show("ҽɹ"); + } + private void TspNurse1_Click(object sender, EventArgs e) + { + if (selApply == null || selApply == "") return; + int dict = int.Parse((sender as ToolStripItem).Tag.ToString()); + BApplyPersonDuty.Delete(" PersonId='" + dict + "' and PersonDutyId in(6) and OperationApplyId=" + selApply , null); + LoadOperationInfoDgv(RoomCardManage.lastSelectOpeRoom.operationRoom.Id.Value); + MessageBox.Show("ϴֻʿɹ"); + } + + private void TspNurse2_Click(object sender, EventArgs e) + { + if (selApply == null || selApply == "") return; + int dict = int.Parse((sender as ToolStripItem).Tag.ToString()); + BApplyPersonDuty.Delete(" PersonId='" + dict + "' and PersonDutyId in(7) and OperationApplyId=" + selApply , null); + LoadOperationInfoDgv(RoomCardManage.lastSelectOpeRoom.operationRoom.Id.Value); + MessageBox.Show("Ѳػʿɹ"); + } + private void sgcDetail_RowActivated(object sender, GridRowActivatedEventArgs e) { if (e.NewActiveRow != null) diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.resx b/AIMS/OperationFront/frmOperationSchedulePlan.resx index ee35023..da0c0e6 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.resx +++ b/AIMS/OperationFront/frmOperationSchedulePlan.resx @@ -251,7 +251,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+ - CAAAAk1TRnQBSQFMAgEBAgEAAbwBEwG8ARMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAcQBEwHEARMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/AIMS/OremrUserControl/UCOperationGoodsBill5.cs b/AIMS/OremrUserControl/UCOperationGoodsBill5.cs index f77681a..f7ea434 100644 --- a/AIMS/OremrUserControl/UCOperationGoodsBill5.cs +++ b/AIMS/OremrUserControl/UCOperationGoodsBill5.cs @@ -98,13 +98,13 @@ namespace AIMS.OremrUserControl goodsNumber = value; //this.txtDoing.Text = "0"; - //if (goodsNumber != "") - //{ - // this.txtFront.Text = goodsNumber; - // this.txtCloseFront.Text = goodsNumber; - // this.txtCloseLast.Text = goodsNumber; - // this.txtSkinCloseLast.Text = goodsNumber; - //} + if (goodsNumber != "" && goodsNumber != "0") + { + this.txtFront.Text = goodsNumber; + //this.txtCloseFront.Text = goodsNumber; + //this.txtCloseLast.Text = goodsNumber; + //this.txtSkinCloseLast.Text = goodsNumber; + } } } public string OpeFront diff --git a/AIMS/OremrUserControl/ucPlanOperationRoomCard.Designer.cs b/AIMS/OremrUserControl/ucPlanOperationRoomCard.Designer.cs index 8908e33..93ac767 100644 --- a/AIMS/OremrUserControl/ucPlanOperationRoomCard.Designer.cs +++ b/AIMS/OremrUserControl/ucPlanOperationRoomCard.Designer.cs @@ -94,40 +94,40 @@ this.tsDelNs2, this.tsUpdateRoom}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(173, 114); + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 136); // // tsDel // this.tsDel.Name = "tsDel"; - this.tsDel.Size = new System.Drawing.Size(172, 22); + this.tsDel.Size = new System.Drawing.Size(180, 22); this.tsDel.Text = "撤销所有排程"; this.tsDel.Click += new System.EventHandler(this.tsDel_Click); // // tsDelAnes // this.tsDelAnes.Name = "tsDelAnes"; - this.tsDelAnes.Size = new System.Drawing.Size(172, 22); + this.tsDelAnes.Size = new System.Drawing.Size(180, 22); this.tsDelAnes.Text = "取消麻醉医生"; this.tsDelAnes.Click += new System.EventHandler(this.tsDelAnes_Click); // // tsDelNs1 // this.tsDelNs1.Name = "tsDelNs1"; - this.tsDelNs1.Size = new System.Drawing.Size(172, 22); + this.tsDelNs1.Size = new System.Drawing.Size(180, 22); this.tsDelNs1.Text = "取消洗手护士"; this.tsDelNs1.Click += new System.EventHandler(this.tsDelNs1_Click); // // tsDelNs2 // this.tsDelNs2.Name = "tsDelNs2"; - this.tsDelNs2.Size = new System.Drawing.Size(172, 22); + this.tsDelNs2.Size = new System.Drawing.Size(180, 22); this.tsDelNs2.Text = "取消巡回护士"; this.tsDelNs2.Click += new System.EventHandler(this.tsDelNs2_Click); // // tsUpdateRoom // this.tsUpdateRoom.Name = "tsUpdateRoom"; - this.tsUpdateRoom.Size = new System.Drawing.Size(172, 22); + this.tsUpdateRoom.Size = new System.Drawing.Size(180, 22); this.tsUpdateRoom.Text = "全部更换手术间至"; // // lblNurse diff --git a/AIMS/OremrUserControl/ucPlanOperationRoomCard.cs b/AIMS/OremrUserControl/ucPlanOperationRoomCard.cs index a4af161..795b882 100644 --- a/AIMS/OremrUserControl/ucPlanOperationRoomCard.cs +++ b/AIMS/OremrUserControl/ucPlanOperationRoomCard.cs @@ -12,6 +12,7 @@ using AIMSExtension; using AIMSBLL; using System.Drawing.Drawing2D; using DCSoftDotfuscate; +using System.Net; namespace AIMS.OremrUserControl { @@ -273,16 +274,18 @@ namespace AIMS.OremrUserControl return grNew; } + Dictionary lstAnseDoctors; + Dictionary lstNurse; + Dictionary lstNurse2; /// /// 绘制手术间医生信息 /// public void DrawRoomText() { List lstOpeDoctors = new List(); - List lstAnseDoctors = new List(); - List lstNurse = new List(); - List lstNurse2 = new List(); - List lstInfos = new List(); + lstAnseDoctors = new Dictionary(); + lstNurse = new Dictionary(); + lstNurse2 = new Dictionary(); bool isPassed = false; lblNurse2.Text = "巡回护士"; lblNurse2.ForeColor = Color.Gray; @@ -306,29 +309,45 @@ namespace AIMS.OremrUserControl string sAnesthesiaDoctor = item["AnesthesiaDoctor"].ToString(); if (!string.IsNullOrWhiteSpace(sAnesthesiaDoctor)) { - sAnesthesiaDoctor.Split(',').ToList().ForEach(d => + List Anesthesia = sAnesthesiaDoctor.Split(',').ToList(); + List AnesthesiaId = item["AnesthesiaDoctorId"].ToString().Split(',').ToList(); + if (Anesthesia.Count > 0 && AnesthesiaId.Count > 0) { - if (!lstAnseDoctors.Contains(d)) - lstAnseDoctors.Add(d); - }); + for (int i = 0; i < AnesthesiaId.Count; i++) + { + if (!lstAnseDoctors.ContainsKey(int.Parse(AnesthesiaId[i]))) + lstAnseDoctors.Add(int.Parse(AnesthesiaId[i]), Anesthesia[i]); + } + } } + string sInstrumentNurse = item["InstrumentNurse"].ToString(); if (!string.IsNullOrWhiteSpace(sInstrumentNurse)) { - sInstrumentNurse.Split(',').ToList().ForEach(d => + List Instrument = sInstrumentNurse.Split(',').ToList(); + List InstrumentId = item["InstrumentNurseId"].ToString().Split(',').ToList(); + if (Instrument.Count > 0 && InstrumentId.Count > 0) { - if (!lstNurse.Contains(d)) - lstNurse.Add(d); - }); + for (int i = 0; i < InstrumentId.Count; i++) + { + if (!lstNurse.ContainsKey(int.Parse(InstrumentId[i]))) + lstNurse.Add(int.Parse(InstrumentId[i]), Instrument[i]); + } + } } string sTourNurse = item["TourNurse"].ToString(); if (!string.IsNullOrWhiteSpace(sTourNurse)) { - sTourNurse.Split(',').ToList().ForEach(d => + List Tour = sTourNurse.Split(',').ToList(); + List TourId = item["TourNurseId"].ToString().Split(',').ToList(); + if (Tour.Count > 0 && TourId.Count > 0) { - if (!lstNurse2.Contains(d)) - lstNurse2.Add(d); - }); + for (int i = 0; i < TourId.Count; i++) + { + if (!lstNurse2.ContainsKey(int.Parse(TourId[i]))) + lstNurse2.Add(int.Parse(TourId[i]), Tour[i]); + } + } } if (lstOpeDoctors.Count > 0) @@ -351,61 +370,12 @@ namespace AIMS.OremrUserControl lblOpeDoctors.ForeColor = Color.Gray; } - if (lstAnseDoctors.Count > 0) - { - lblAnesDoctors.Text = ""; - lstAnseDoctors.ForEach(s => - { - lblAnesDoctors.Text += s + ","; - }); - lblAnesDoctors.Text = lblAnesDoctors.Text.TrimEnd(','); - if (isPassed == true) - lblAnesDoctors.ForeColor = Color.Red; - else - lblAnesDoctors.ForeColor = Color.Blue; - } - else - { - lblAnesDoctors.Text = "麻醉医生"; - lblAnesDoctors.ForeColor = Color.Gray; - } + SetAnseDoctorsText(isPassed); + + SetNurse1Text(isPassed); + + SetNurse2Text(isPassed); - if (lstNurse.Count > 0) - { - lblNurse.Text = ""; - lstNurse.ForEach(s => - { - lblNurse.Text += s + ","; - }); - lblNurse.Text = lblNurse.Text.TrimEnd(','); - if (isPassed == true) - lblNurse.ForeColor = Color.Red; - else - lblNurse.ForeColor = Color.Blue; - } - else - { - lblNurse.Text = "洗手护士"; - lblNurse.ForeColor = Color.Gray; - } - if (lstNurse2.Count > 0) - { - lblNurse2.Text = ""; - lstNurse2.ForEach(s => - { - lblNurse2.Text += s + ","; - }); - lblNurse2.Text = lblNurse2.Text.TrimEnd(','); - if (isPassed == true) - lblNurse2.ForeColor = Color.Red; - else - lblNurse2.ForeColor = Color.Blue; - } - else - { - lblNurse2.Text = "巡回护士"; - lblNurse2.ForeColor = Color.Gray; - } if (int.Parse(item["StateId"].ToString()) >= 4) { lblAnesDoctors.ForeColor = Color.Red; @@ -425,6 +395,135 @@ namespace AIMS.OremrUserControl labTabindex.ForeColor = Color.Black; } } + + } + + private void SetAnseDoctorsText(bool isPassed) + { + if (lstAnseDoctors.Count > 0) + { + lblAnesDoctors.Text = ""; + tsDelAnes.DropDownItems.Clear(); + foreach (var ans in lstAnseDoctors) + { + ToolStripItem tspAnes = new ToolStripMenuItem(ans.Value); + tspAnes.Tag = ans.Key; + tspAnes.Click += TspAnes_Click; + tsDelAnes.DropDownItems.Add(tspAnes); + lblAnesDoctors.Text += ans.Value + ","; + } + lblAnesDoctors.Text = lblAnesDoctors.Text.TrimEnd(','); + if (isPassed == true) + lblAnesDoctors.ForeColor = Color.Red; + else + lblAnesDoctors.ForeColor = Color.Blue; + } + else + { + lblAnesDoctors.Text = "麻醉医生"; + lblAnesDoctors.ForeColor = Color.Gray; + tsDelAnes.DropDownItems.Clear(); + } + } + + private void SetNurse1Text(bool isPassed) + { + if (lstNurse.Count > 0) + { + lblNurse.Text = ""; + tsDelNs1.DropDownItems.Clear(); + foreach (var ins in lstNurse) + { + ToolStripItem tspIns = new ToolStripMenuItem(ins.Value); + tspIns.Tag = ins.Key; + tspIns.Click += TspNurse1_Click; + tsDelNs1.DropDownItems.Add(tspIns); + lblNurse.Text += ins.Value + ","; + } + lblNurse.Text = lblNurse.Text.TrimEnd(','); + if (isPassed == true) + lblNurse.ForeColor = Color.Red; + else + lblNurse.ForeColor = Color.Blue; + } + else + { + lblNurse.Text = "洗手护士"; + lblNurse.ForeColor = Color.Gray; + tsDelNs1.DropDownItems.Clear(); + } + } + private void SetNurse2Text(bool isPassed) + { + if (lstNurse2.Count > 0) + { + lblNurse2.Text = ""; + tsDelNs2.DropDownItems.Clear(); + foreach (var ins2 in lstNurse2) + { + ToolStripItem tspNurse2 = new ToolStripMenuItem(ins2.Value); + tspNurse2.Tag = ins2.Key; + tspNurse2.Click += TspNurse2_Click; + tsDelNs2.DropDownItems.Add(tspNurse2); + lblNurse2.Text += ins2.Value + ","; + } + lblNurse2.Text = lblNurse2.Text.TrimEnd(','); + if (isPassed == true) + lblNurse2.ForeColor = Color.Red; + else + lblNurse2.ForeColor = Color.Blue; + } + else + { + lblNurse2.Text = "巡回护士"; + lblNurse2.ForeColor = Color.Gray; + tsDelNs2.DropDownItems.Clear(); + } + } + + + private void TspAnes_Click(object sender, EventArgs e) + { + if (pDataTable.Rows.Count <= 0) return; + int dict = int.Parse((sender as ToolStripItem).Tag.ToString()); + foreach (DataRow item in pDataTable.Rows) + { + string OperationApplyId = item["ApplyId"].ToString(); + BApplyPersonDuty.Delete(" PersonId='" + dict + "' and PersonDutyId in(5) and OperationApplyId=" + OperationApplyId, null); + } + lstAnseDoctors.Remove(dict); + SetAnseDoctorsText(false); + RaiseDataSavedEvent(); + MessageBox.Show("撤销麻醉医生成功！"); + } + private void TspNurse1_Click(object sender, EventArgs e) + { + if (pDataTable.Rows.Count <= 0) return; + int dict = int.Parse((sender as ToolStripItem).Tag.ToString()); + foreach (DataRow item in pDataTable.Rows) + { + string OperationApplyId = item["ApplyId"].ToString(); + BApplyPersonDuty.Delete(" PersonId='" + dict + "' and PersonDutyId in(6) and OperationApplyId=" + OperationApplyId, null); + } + lstNurse.Remove(dict); + SetNurse1Text(false); + RaiseDataSavedEvent(); + MessageBox.Show("撤销洗手护士成功！"); + } + + private void TspNurse2_Click(object sender, EventArgs e) + { + if (pDataTable.Rows.Count <= 0) return; + int dict = int.Parse((sender as ToolStripItem).Tag.ToString()); + foreach (DataRow item in pDataTable.Rows) + { + string OperationApplyId = item["ApplyId"].ToString(); + BApplyPersonDuty.Delete(" PersonId='" + dict + "' and PersonDutyId in(7) and OperationApplyId=" + OperationApplyId, null); + } + lstNurse2.Remove(dict); + SetNurse2Text(false); + RaiseDataSavedEvent(); + MessageBox.Show("撤销巡回护士成功！"); } private void ucPlanOperationRoomCard_Load(object sender, EventArgs e) @@ -444,8 +543,8 @@ namespace AIMS.OremrUserControl private void ToolStripItem1_Click(object sender, EventArgs e) { if (pDataTable.Rows.Count <= 0) return; - OperationRoom opeRoom = (sender as ToolStripItem).Tag as OperationRoom; - if (BOperationApply.SaveRoomOrderByTime(opeRoom.Id.Value , PlanOperationTime, operationRoom.Id.Value) > 0) + OperationRoom opeRoom = (sender as ToolStripItem).Tag as OperationRoom; + if (BOperationApply.SaveRoomOrderByTime(opeRoom.Id.Value, PlanOperationTime, operationRoom.Id.Value) > 0) { //刷新当前间台次 BOperationApply.UpdteOperationOrder(PlanOperationTime, operationRoom.Id.Value); @@ -466,5 +565,6 @@ namespace AIMS.OremrUserControl } } + } } \ No newline at end of file diff --git a/AIMS/PublicUI/frmSelectDisease.Designer.cs b/AIMS/PublicUI/frmSelectDisease.Designer.cs index 4f05297..12af72e 100644 --- a/AIMS/PublicUI/frmSelectDisease.Designer.cs +++ b/AIMS/PublicUI/frmSelectDisease.Designer.cs @@ -64,7 +64,7 @@ this.txtHelpCode.ForeColor = System.Drawing.Color.Black; this.txtHelpCode.Location = new System.Drawing.Point(108, 8); this.txtHelpCode.Name = "txtHelpCode"; - this.txtHelpCode.Size = new System.Drawing.Size(192, 23); + this.txtHelpCode.Size = new System.Drawing.Size(302, 23); this.txtHelpCode.TabIndex = 0; this.txtHelpCode.TextChanged += new System.EventHandler(this.txtHelpCode_TextChanged); // @@ -104,7 +104,7 @@ this.labDown.AutoSize = true; this.labDown.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labDown.ForeColor = System.Drawing.Color.Blue; - this.labDown.Location = new System.Drawing.Point(209, 8); + this.labDown.Location = new System.Drawing.Point(235, 8); this.labDown.Name = "labDown"; this.labDown.Size = new System.Drawing.Size(49, 14); this.labDown.TabIndex = 17; @@ -117,7 +117,7 @@ this.labUp.AutoSize = true; this.labUp.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labUp.ForeColor = System.Drawing.Color.Blue; - this.labUp.Location = new System.Drawing.Point(70, 7); + this.labUp.Location = new System.Drawing.Point(96, 7); this.labUp.Name = "labUp"; this.labUp.Size = new System.Drawing.Size(49, 14); this.labUp.TabIndex = 16; @@ -128,7 +128,7 @@ // labPage // this.labPage.AutoSize = true; - this.labPage.Location = new System.Drawing.Point(140, 7); + this.labPage.Location = new System.Drawing.Point(166, 7); this.labPage.Name = "labPage"; this.labPage.Size = new System.Drawing.Size(56, 14); this.labPage.TabIndex = 15; @@ -142,7 +142,7 @@ this.groupBox2.Size = new System.Drawing.Size(366, 394); this.groupBox2.TabIndex = 14; this.groupBox2.TabStop = false; - this.groupBox2.Text = "已选"; + this.groupBox2.Text = "已选诊断"; // // dgvSelectDisease // @@ -203,7 +203,7 @@ this.btnToLeft.Name = "btnToLeft"; this.btnToLeft.Size = new System.Drawing.Size(31, 91); this.btnToLeft.TabIndex = 13; - this.btnToLeft.Text = "<<"; + this.btnToLeft.Text = "删\r\n\r\n除"; this.btnToLeft.UseVisualStyleBackColor = true; this.btnToLeft.Click += new System.EventHandler(this.btnToLeft_Click); // @@ -224,7 +224,7 @@ this.btnToRight.Name = "btnToRight"; this.btnToRight.Size = new System.Drawing.Size(31, 91); this.btnToRight.TabIndex = 12; - this.btnToRight.Text = ">>"; + this.btnToRight.Text = "添\r\n\r\n加"; this.btnToRight.UseVisualStyleBackColor = true; this.btnToRight.Click += new System.EventHandler(this.btnToRight_Click); // @@ -236,7 +236,7 @@ this.groupBox1.Size = new System.Drawing.Size(366, 397); this.groupBox1.TabIndex = 11; this.groupBox1.TabStop = false; - this.groupBox1.Text = "待选"; + this.groupBox1.Text = "待选诊断"; // // dgvDisease // @@ -283,29 +283,29 @@ // // btnAddDisease // - this.btnAddDisease.Location = new System.Drawing.Point(507, 6); + this.btnAddDisease.Location = new System.Drawing.Point(462, 3); this.btnAddDisease.Name = "btnAddDisease"; this.btnAddDisease.Size = new System.Drawing.Size(80, 30); this.btnAddDisease.TabIndex = 3; - this.btnAddDisease.Text = "添加诊断"; + this.btnAddDisease.Text = "新增诊断"; this.btnAddDisease.UseVisualStyleBackColor = true; this.btnAddDisease.Visible = false; this.btnAddDisease.Click += new System.EventHandler(this.btnAddDisease_Click); // // btnOk // - this.btnOk.Location = new System.Drawing.Point(379, 7); + this.btnOk.Location = new System.Drawing.Point(688, 3); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(80, 30); this.btnOk.TabIndex = 2; - this.btnOk.Text = "确定选择"; + this.btnOk.Text = "保存"; this.btnOk.UseVisualStyleBackColor = true; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(39, 17); + this.label1.Location = new System.Drawing.Point(30, 13); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(63, 14); this.label1.TabIndex = 1; diff --git a/AIMS/PublicUI/frmSelectDisease.cs b/AIMS/PublicUI/frmSelectDisease.cs index a84704d..9afa2a8 100644 --- a/AIMS/PublicUI/frmSelectDisease.cs +++ b/AIMS/PublicUI/frmSelectDisease.cs @@ -171,6 +171,7 @@ namespace AIMS.PublicUI.UI DiseaseObj.IcdCode = ""; DiseaseObj.HelpCode = AIMSExtension.PublicMethod.GetFirstLetter(DiseaseObj.Name); DiseaseObj.IsValid = 1; + DiseaseObj.UseRate = 1; DiseaseObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; DiseaseObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; DiseaseObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); @@ -187,6 +188,7 @@ namespace AIMS.PublicUI.UI BDisease.Add(DiseaseObj); txtHelpCode_TextChanged(null, null); + dgvDisease_CellDoubleClick(null, null); } private void dgvSelectDisease_CellDoubleClick(object sender, DataGridViewCellEventArgs e) diff --git a/AIMS/PublicUI/frmSelectOperation.Designer.cs b/AIMS/PublicUI/frmSelectOperation.Designer.cs index fd4d9b8..7d0c36c 100644 --- a/AIMS/PublicUI/frmSelectOperation.Designer.cs +++ b/AIMS/PublicUI/frmSelectOperation.Designer.cs @@ -64,7 +64,7 @@ this.txtHelpCode.ForeColor = System.Drawing.Color.Black; this.txtHelpCode.Location = new System.Drawing.Point(108, 8); this.txtHelpCode.Name = "txtHelpCode"; - this.txtHelpCode.Size = new System.Drawing.Size(192, 23); + this.txtHelpCode.Size = new System.Drawing.Size(403, 23); this.txtHelpCode.TabIndex = 0; this.txtHelpCode.TextChanged += new System.EventHandler(this.txtHelpCode_TextChanged); // @@ -74,7 +74,7 @@ this.btnToRight.Name = "btnToRight"; this.btnToRight.Size = new System.Drawing.Size(31, 91); this.btnToRight.TabIndex = 12; - this.btnToRight.Text = ">>"; + this.btnToRight.Text = "添\r\n\r\n加"; this.btnToRight.UseVisualStyleBackColor = true; this.btnToRight.Click += new System.EventHandler(this.btnToRight_Click); // @@ -136,22 +136,22 @@ this.groupBox1.Size = new System.Drawing.Size(459, 397); this.groupBox1.TabIndex = 11; this.groupBox1.TabStop = false; - this.groupBox1.Text = "待选"; + this.groupBox1.Text = "待选手术"; // // btnAddOperation // - this.btnAddOperation.Location = new System.Drawing.Point(507, 6); + this.btnAddOperation.Location = new System.Drawing.Point(530, 5); this.btnAddOperation.Name = "btnAddOperation"; this.btnAddOperation.Size = new System.Drawing.Size(80, 30); this.btnAddOperation.TabIndex = 3; - this.btnAddOperation.Text = "添加手术"; + this.btnAddOperation.Text = "新增手术"; this.btnAddOperation.UseVisualStyleBackColor = true; this.btnAddOperation.Visible = false; this.btnAddOperation.Click += new System.EventHandler(this.btnAddOperation_Click); // // btnOk // - this.btnOk.Location = new System.Drawing.Point(379, 7); + this.btnOk.Location = new System.Drawing.Point(859, 6); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(80, 30); this.btnOk.TabIndex = 2; @@ -165,7 +165,7 @@ this.btnToLeft.Name = "btnToLeft"; this.btnToLeft.Size = new System.Drawing.Size(31, 91); this.btnToLeft.TabIndex = 13; - this.btnToLeft.Text = "<<"; + this.btnToLeft.Text = "删\r\n\r\n除"; this.btnToLeft.UseVisualStyleBackColor = true; this.btnToLeft.Click += new System.EventHandler(this.btnToLeft_Click); // @@ -174,7 +174,7 @@ this.labDown.AutoSize = true; this.labDown.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labDown.ForeColor = System.Drawing.Color.Blue; - this.labDown.Location = new System.Drawing.Point(209, 8); + this.labDown.Location = new System.Drawing.Point(249, 8); this.labDown.Name = "labDown"; this.labDown.Size = new System.Drawing.Size(49, 14); this.labDown.TabIndex = 17; @@ -201,7 +201,7 @@ this.labUp.AutoSize = true; this.labUp.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labUp.ForeColor = System.Drawing.Color.Blue; - this.labUp.Location = new System.Drawing.Point(70, 7); + this.labUp.Location = new System.Drawing.Point(110, 7); this.labUp.Name = "labUp"; this.labUp.Size = new System.Drawing.Size(49, 14); this.labUp.TabIndex = 16; @@ -212,7 +212,7 @@ // labPage // this.labPage.AutoSize = true; - this.labPage.Location = new System.Drawing.Point(140, 7); + this.labPage.Location = new System.Drawing.Point(180, 7); this.labPage.Name = "labPage"; this.labPage.Size = new System.Drawing.Size(56, 14); this.labPage.TabIndex = 15; @@ -226,7 +226,7 @@ this.groupBox2.Size = new System.Drawing.Size(456, 394); this.groupBox2.TabIndex = 14; this.groupBox2.TabStop = false; - this.groupBox2.Text = "已选"; + this.groupBox2.Text = "已选手术"; // // dgvSelectOperation // @@ -295,7 +295,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(39, 17); + this.label1.Location = new System.Drawing.Point(30, 13); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(63, 14); this.label1.TabIndex = 1; diff --git a/AIMS/PublicUI/frmSelectOperation.cs b/AIMS/PublicUI/frmSelectOperation.cs index bf391f8..82e4585 100644 --- a/AIMS/PublicUI/frmSelectOperation.cs +++ b/AIMS/PublicUI/frmSelectOperation.cs @@ -173,6 +173,7 @@ namespace AIMS.PublicUI.UI OperationObj.IcdCode = ""; OperationObj.HelpCode = AIMSExtension.PublicMethod.GetFirstLetter(OperationObj.Name); OperationObj.IsValid = 1; + OperationObj.UseRate = 1; OperationObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; OperationObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); @@ -189,7 +190,8 @@ namespace AIMS.PublicUI.UI BOperation.Add(OperationObj); txtHelpCode_TextChanged(null, null); - + dgvOperation_CellDoubleClick(null, null); + } private void dgvSelectOperation_CellDoubleClick(object sender, DataGridViewCellEventArgs e) diff --git a/AIMS/PublicUI/frmSelectOperation.resx b/AIMS/PublicUI/frmSelectOperation.resx index db53fc2..16915a7 100644 --- a/AIMS/PublicUI/frmSelectOperation.resx +++ b/AIMS/PublicUI/frmSelectOperation.resx @@ -129,6 +129,30 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True diff --git a/AIMS/PublicUI/frmSelectOperationOne.Designer.cs b/AIMS/PublicUI/frmSelectOperationOne.Designer.cs index ba6ef1b..22c9da8 100644 --- a/AIMS/PublicUI/frmSelectOperationOne.Designer.cs +++ b/AIMS/PublicUI/frmSelectOperationOne.Designer.cs @@ -43,10 +43,21 @@ this.labPage = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label2 = new System.Windows.Forms.Label(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.dgvOperation)).BeginInit(); this.groupBox1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // txtHelpCode @@ -110,27 +121,31 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.linkLabel2); this.groupBox1.Controls.Add(this.dgvOperation); + this.groupBox1.Controls.Add(this.groupBox2); + this.groupBox1.Controls.Add(this.linkLabel1); + this.groupBox1.Controls.Add(this.label2); this.groupBox1.Location = new System.Drawing.Point(25, 17); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(459, 555); this.groupBox1.TabIndex = 11; this.groupBox1.TabStop = false; - this.groupBox1.Text = "待选"; + this.groupBox1.Text = "待选手术"; // // btnAddOperation // - this.btnAddOperation.Location = new System.Drawing.Point(408, 3); + this.btnAddOperation.Location = new System.Drawing.Point(306, 3); this.btnAddOperation.Name = "btnAddOperation"; this.btnAddOperation.Size = new System.Drawing.Size(80, 30); this.btnAddOperation.TabIndex = 3; - this.btnAddOperation.Text = "添加手术"; + this.btnAddOperation.Text = "增加手术"; this.btnAddOperation.UseVisualStyleBackColor = true; this.btnAddOperation.Click += new System.EventHandler(this.btnAddOperation_Click); // // btnOk // - this.btnOk.Location = new System.Drawing.Point(322, 5); + this.btnOk.Location = new System.Drawing.Point(398, 3); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(80, 30); this.btnOk.TabIndex = 2; @@ -143,7 +158,7 @@ this.labDown.AutoSize = true; this.labDown.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labDown.ForeColor = System.Drawing.Color.Blue; - this.labDown.Location = new System.Drawing.Point(209, 8); + this.labDown.Location = new System.Drawing.Point(295, 8); this.labDown.Name = "labDown"; this.labDown.Size = new System.Drawing.Size(49, 14); this.labDown.TabIndex = 17; @@ -167,7 +182,7 @@ this.labUp.AutoSize = true; this.labUp.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labUp.ForeColor = System.Drawing.Color.Blue; - this.labUp.Location = new System.Drawing.Point(70, 7); + this.labUp.Location = new System.Drawing.Point(156, 7); this.labUp.Name = "labUp"; this.labUp.Size = new System.Drawing.Size(49, 14); this.labUp.TabIndex = 16; @@ -178,7 +193,7 @@ // labPage // this.labPage.AutoSize = true; - this.labPage.Location = new System.Drawing.Point(140, 7); + this.labPage.Location = new System.Drawing.Point(226, 7); this.labPage.Name = "labPage"; this.labPage.Size = new System.Drawing.Size(56, 14); this.labPage.TabIndex = 15; @@ -202,12 +217,107 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(39, 17); + this.label1.Location = new System.Drawing.Point(39, 14); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(63, 14); this.label1.TabIndex = 1; this.label1.Text = "手术查询"; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.dataGridView1); + this.groupBox2.Location = new System.Drawing.Point(0, 0); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(459, 555); + this.groupBox2.TabIndex = 11; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "待选手术"; + // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.BackgroundColor = System.Drawing.Color.White; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2, + this.dataGridViewTextBoxColumn3, + this.dataGridViewTextBoxColumn4}); + this.dataGridView1.Location = new System.Drawing.Point(6, 19); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersVisible = false; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView1.Size = new System.Drawing.Size(447, 530); + this.dataGridView1.TabIndex = 9; + this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvOperation_CellDoubleClick); + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "Id"; + this.dataGridViewTextBoxColumn1.Frozen = true; + this.dataGridViewTextBoxColumn1.HeaderText = "Id"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Visible = false; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "IcdCode"; + this.dataGridViewTextBoxColumn2.HeaderText = "编码"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + this.dataGridViewTextBoxColumn2.Width = 120; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.DataPropertyName = "Name"; + this.dataGridViewTextBoxColumn3.HeaderText = "手术名称"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; + this.dataGridViewTextBoxColumn3.Width = 210; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.DataPropertyName = "level"; + this.dataGridViewTextBoxColumn4.HeaderText = "手术分级"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(196, -10); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(56, 14); + this.label2.TabIndex = 15; + this.label2.Text = "labPage"; + // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.linkLabel1.ForeColor = System.Drawing.Color.Blue; + this.linkLabel1.Location = new System.Drawing.Point(126, -10); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(49, 14); + this.linkLabel1.TabIndex = 16; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "上一页"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.labUp_LinkClicked); + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.linkLabel2.ForeColor = System.Drawing.Color.Blue; + this.linkLabel2.Location = new System.Drawing.Point(265, -9); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(49, 14); + this.linkLabel2.TabIndex = 17; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "下一页"; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.labDown_LinkClicked); + // // frmSelectOperationOne // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -222,10 +332,13 @@ this.Load += new System.EventHandler(this.frmSelectOperationOne_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvOperation)).EndInit(); this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } @@ -247,5 +360,14 @@ private System.Windows.Forms.DataGridViewTextBoxColumn IcdCodeColumn; private System.Windows.Forms.DataGridViewTextBoxColumn NameColumn; private System.Windows.Forms.DataGridViewTextBoxColumn level; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/AIMS/PublicUI/frmSelectOperationOne.cs b/AIMS/PublicUI/frmSelectOperationOne.cs index 62029e2..26cc995 100644 --- a/AIMS/PublicUI/frmSelectOperationOne.cs +++ b/AIMS/PublicUI/frmSelectOperationOne.cs @@ -146,6 +146,7 @@ namespace AIMS.PublicUI.UI OperationObj.IcdCode = ""; OperationObj.HelpCode = AIMSExtension.PublicMethod.GetFirstLetter(OperationObj.Name); OperationObj.IsValid = 1; + OperationObj.UseRate = 1; OperationObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; OperationObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); diff --git a/AIMS/PublicUI/frmSelectOperationOne.resx b/AIMS/PublicUI/frmSelectOperationOne.resx index 17208a4..9505ee8 100644 --- a/AIMS/PublicUI/frmSelectOperationOne.resx +++ b/AIMS/PublicUI/frmSelectOperationOne.resx @@ -129,4 +129,28 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/AIMSEntity/BLL/Extension/BApplyPersonDuty.cs b/AIMSEntity/BLL/Extension/BApplyPersonDuty.cs index 183e6df..c85da8a 100644 --- a/AIMSEntity/BLL/Extension/BApplyPersonDuty.cs +++ b/AIMSEntity/BLL/Extension/BApplyPersonDuty.cs @@ -30,6 +30,6 @@ namespace AIMSBLL public static DataTable GetPersonDataTable(int OperationApplyId) { return DApplyPersonDuty.GetPersonDataTable(OperationApplyId); - } + } } } diff --git a/AIMSEntity/DAL/Extension/DApplyPersonDuty.cs b/AIMSEntity/DAL/Extension/DApplyPersonDuty.cs index 07874ab..f7b2c0d 100644 --- a/AIMSEntity/DAL/Extension/DApplyPersonDuty.cs +++ b/AIMSEntity/DAL/Extension/DApplyPersonDuty.cs @@ -57,7 +57,7 @@ namespace AIMSDAL public static DataTable GetPersonDataTable(int OperationApplyId) { List PersonIdList = new List(); - string strSql = "SELECT PersonDutyId,PersonId FROM ApplyPersonDuty WHERE OperationApplyId=" + OperationApplyId + ""; + string strSql = "SELECT PersonDutyId,PersonId FROM ApplyPersonDuty WHERE OperationApplyId=" + OperationApplyId + " and PersonDutyId in(1,2) "; return HelperDB.DbHelperSQL.GetDataTable(strSql); } } diff --git a/AIMSEntity/DAL/Extension/DOperationApply.cs b/AIMSEntity/DAL/Extension/DOperationApply.cs index c6d4275..982b0c2 100644 --- a/AIMSEntity/DAL/Extension/DOperationApply.cs +++ b/AIMSEntity/DAL/Extension/DOperationApply.cs @@ -273,7 +273,7 @@ namespace AIMSDAL "of1.VerifyTime, of1.VerifyOperatorName," + "of1.PlanOperationTime, of1.OperationRoom, of1.OperationRoomId, of1.AnesthesiaDoctor," + "of1.InstrumentNurse, of1.TourNurse, of1.AnesthesiaDoctorSucceed," + - "of1.InstrumentNurseSucceed, of1.TourNurseSucceed,of1.Remark,of1.PlanOrder,of1.PatientType " + + "of1.InstrumentNurseSucceed, of1.TourNurseSucceed,of1.Remark,of1.PlanOrder,of1.PatientType,of1.AnesthesiaDoctorId,of1.InstrumentNurseId,of1.TourNurseId " + "FROM V_OperationFront of1 WHERE of1.OrderOperationTime>='" + BegInData + "' and of1.OrderOperationTime<'" + EndData + "' order by OperationRoomId,PlanOrder asc"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } diff --git a/AIMSEntity/Extensions/SelectPatient.cs b/AIMSEntity/Extensions/SelectPatient.cs index 624d4bf..1bce1a1 100644 --- a/AIMSEntity/Extensions/SelectPatient.cs +++ b/AIMSEntity/Extensions/SelectPatient.cs @@ -28,9 +28,9 @@ namespace AIMSBLL strSql += " order by [StateId] asc"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } - public static DataTable GetTodayDoOpePatientDataTable(DateTime BeginDate, string Room="") + public static DataTable GetTodayDoOpePatientDataTable(DateTime BeginDate, string Room = "") { - string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,[dbo].[funGetAge](of1.BirthDay,getdate()) age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中' ) and of2.InRoomTime >= '" + BeginDate + "' AND of2.InRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 "; + string strSql = "SELECT of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,[dbo].[funGetAge](of1.BirthDay,getdate()) age,of2.InRoomTime PlanOperationTime,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom ,of1.Contagion,of1.OrderOperationTime,of2.AnaesthesiaMethodName,of2.InRoomTime FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of2.State in( '手术中' ) and of2.InRoomTime >= '" + BeginDate + "' AND of2.InRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 "; if (Room != "" && Room != "-1") strSql += " and of1.OperationRoomId='" + Room + "'"; strSql += " order by [StateId] asc"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); @@ -68,9 +68,9 @@ namespace AIMSBLL if (isLoginPerson == true) { strSql += " and (AnesthesiaDoctor like '%" + person + "%' or InstrumentNurse like '%" + person + "%' or TourNurse like '%" + person + "%')"; - } + } strSql += " order by convert(nvarchar(10),InRoomTime,120) desc,OperationRoomId asc,PlanOrder asc"; - return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); + return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } } @@ -82,7 +82,7 @@ namespace AIMSBLL public static DataTable GetSelectPatientChart2(DateTime dateTime) { string strSql = @"SELECT DeptName dat,COUNT(*) con FROM(SELECT dp.Name DeptName FROM OperationRecord red left join OperationApply oa on oa.Id=red.OperationApplyId - left join Department dp on dp.Id=oa.ApplyDepId WHERE CONVERT(nvarchar(7), InRoomTime, 120)='"+dateTime.ToString("yyyy-MM")+"' And red.[State] = 2 ) temp GROUP BY DeptName "; + left join Department dp on dp.Id=oa.ApplyDepId WHERE CONVERT(nvarchar(7), InRoomTime, 120)='" + dateTime.ToString("yyyy-MM") + "' And red.[State] = 2 ) temp GROUP BY DeptName "; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } @@ -176,15 +176,33 @@ namespace AIMSBLL DataTable dt = BApplyPersonDuty.GetPersonDataTable(ApplyId); for (int i = 0; i < dt.Rows.Count; i++) { - FactPersonDuty FactPersonDutyObj = new FactPersonDuty(); - FactPersonDutyObj.PatientId = PatientId; - FactPersonDutyObj.ApplyId = ApplyId; - FactPersonDutyObj.PersonDutyId = int.Parse(dt.Rows[i]["PersonDutyId"].ToString()); - FactPersonDutyObj.PersonId = int.Parse(dt.Rows[i]["PersonId"].ToString()); - FactPersonDutyObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; - FactPersonDutyObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; - FactPersonDutyObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); - BFactPersonDuty.Add(FactPersonDutyObj); + if (int.Parse(dt.Rows[i]["PersonDutyId"].ToString()) == 1) + { + FactPersonDuty FactPersonDutyObj = new FactPersonDuty(); + FactPersonDutyObj.PatientId = PatientId; + FactPersonDutyObj.ApplyId = ApplyId; + FactPersonDutyObj.PersonDutyId = 1; + FactPersonDutyObj.PersonId = int.Parse(dt.Rows[i]["PersonId"].ToString()); + FactPersonDutyObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; + FactPersonDutyObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; + FactPersonDutyObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); + BFactPersonDuty.Add(FactPersonDutyObj); + } + } + for (int i = 0; i < dt.Rows.Count; i++) + { + if (int.Parse(dt.Rows[i]["PersonDutyId"].ToString()) != 1) + { + FactPersonDuty FactPersonDutyObj = new FactPersonDuty(); + FactPersonDutyObj.PatientId = PatientId; + FactPersonDutyObj.ApplyId = ApplyId; + FactPersonDutyObj.PersonDutyId = 1; + FactPersonDutyObj.PersonId = int.Parse(dt.Rows[i]["PersonId"].ToString()); + FactPersonDutyObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; + FactPersonDutyObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; + FactPersonDutyObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); + BFactPersonDuty.Add(FactPersonDutyObj); + } } //增加入室事件 diff --git a/DocumentManagement/DocumentEntity/PatientRecord.cs b/DocumentManagement/DocumentEntity/PatientRecord.cs index 2338bf1..902eca0 100644 --- a/DocumentManagement/DocumentEntity/PatientRecord.cs +++ b/DocumentManagement/DocumentEntity/PatientRecord.cs @@ -14,6 +14,8 @@ namespace DocumentManagement { public int PatientId { get; set; } public int ApplyId { get; set; } + public String HISPatientId { get; set; } + public String VisitTimes { get; set; } public String MdrecNo { get; set; } public String ArchivesNo { get; set; } public String PatientName { get; set; } @@ -117,6 +119,8 @@ namespace DocumentManagement patient.PatientId = int.Parse(dt.Rows[0]["PatientId"].ToString()); //patient.PatientId = int.Parse(dt.Rows[0]["PatientId"].ToString()); patient.ApplyId = int.Parse(dt.Rows[0]["ApplyId"].ToString()); + patient.HISPatientId = dt.Rows[0]["HISPatientId"].ToString(); + patient.VisitTimes = dt.Rows[0]["VisitTimes"].ToString(); patient.MdrecNo = dt.Rows[0]["MdrecNo"].ToString(); patient.ArchivesNo = dt.Rows[0]["ArchivesNo"].ToString(); patient.PatientName = dt.Rows[0]["PatientName"].ToString(); diff --git a/DrawGraph/AreaManage/BaseInfoBottomManage.cs b/DrawGraph/AreaManage/BaseInfoBottomManage.cs index f935d1d..79d89dd 100644 --- a/DrawGraph/AreaManage/BaseInfoBottomManage.cs +++ b/DrawGraph/AreaManage/BaseInfoBottomManage.cs @@ -121,7 +121,8 @@ namespace DrawGraph aEdit1.IsVisible = !aEdit1.IsVisible; aEdit1S.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); aEdit1S.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); - aEdit1S.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + aEdit1S.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + aEdit1S.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); ; //根据数据源名称进行不同的事件处理 switch (aEdit1.ClassDataSourceName) { @@ -181,6 +182,8 @@ namespace DrawGraph ableEdit.CControl.MouseDown += new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); ableEdit.CControl.KeyUp += new KeyEventHandler(CControl_KeyUp); + ableEdit.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); + ableEdit.CControl.KeyPress += new KeyPressEventHandler(CControl_KeyPress); if (myOpeRecord != null) { @@ -217,11 +220,35 @@ namespace DrawGraph if (myOpeRecord != null) { Control conl = sender as Control; - if (conl.Text != SelectWorkerValue.Value) - if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Back) - { + if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Back) + { + if (conl.Text != SelectWorkerValue.Value) aSyncSelectDict.DelSel(conl, OpeRecord); + } + else if (e.KeyCode == Keys.Down) + { + if (SelectWorkerValue.dgvZd.CurrentRow.Index + 1 != SelectWorkerValue.dgvZd.Rows.Count - 1) + { + SelectWorkerValue.dgvZd.CurrentCell = SelectWorkerValue.dgvZd.Rows[SelectWorkerValue.dgvZd.CurrentRow.Index + 1].Cells[1]; } + } + else if (e.KeyCode == Keys.Up) + { + if (SelectWorkerValue.dgvZd.CurrentRow.Index != 0) + { + SelectWorkerValue.dgvZd.CurrentCell = SelectWorkerValue.dgvZd.Rows[SelectWorkerValue.dgvZd.CurrentRow.Index - 1].Cells[1]; + } + } + } + } + private void CControl_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar.ToString() == "\r") + { + if (SelectWorkerValue.dgvZd.SelectedRows.Count > 0) + { + SelectWorkerValue.SetContent(SelectWorkerValue.dgvZd.SelectedRows[0].Index); + } } } private void CControl_MouseDown(object sender, MouseEventArgs e) @@ -318,6 +345,8 @@ namespace DrawGraph ableEdit.CControl.MouseDown += new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); ableEdit.CControl.KeyUp += new KeyEventHandler(CControl_KeyUp); + ableEdit.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); + ableEdit.CControl.KeyPress += new KeyPressEventHandler(CControl_KeyPress); if (myOpeRecord != null) { diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index bb6b71d..e93a279 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -333,6 +333,7 @@ namespace DrawGraph aEdit1S.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); aEdit1S.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); aEdit1S.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + aEdit1S.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); ; //根据数据源名称进行不同的事件处理 switch (aEdit1.ClassDataSourceName) { @@ -430,6 +431,8 @@ namespace DrawGraph ableEdit.CControl.MouseDown += new MouseEventHandler(CControl_MouseDown); ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); ableEdit.CControl.KeyUp += new KeyEventHandler(CControl_KeyUp); + ableEdit.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); + ableEdit.CControl.KeyPress += new KeyPressEventHandler(CControl_KeyPress); if (myOpeRecord != null) { @@ -451,6 +454,8 @@ namespace DrawGraph aSyncSelectDict.Show(template, OpeRecord, sender, _DictType, isRadio); } } + + private void CControl_TextChanged(object sender, EventArgs e) { if (myOpeRecord != null) @@ -465,11 +470,37 @@ namespace DrawGraph if (myOpeRecord != null) { Control conl = sender as Control; - if (conl.Text != SelectDictValue.Value) - if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Back) - { + if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Back) + { + if (conl.Text != SelectDictValue.Value) aSyncSelectDict.DelSel(conl, OpeRecord); + } + else if (e.KeyCode == Keys.Down) + { + if (SelectDictValue.dgvZd.CurrentRow.Index + 1 != SelectDictValue.dgvZd.Rows.Count - 1) + { + SelectDictValue.dgvZd.CurrentCell = SelectDictValue.dgvZd.Rows[SelectDictValue.dgvZd.CurrentRow.Index + 1].Cells[1]; + //SelectDictValue.dgvZd.Rows[SelectDictValue.dgvZd.CurrentRow.Index + 1].Selected = true; } + } + else if (e.KeyCode == Keys.Up) + { + if (SelectDictValue.dgvZd.CurrentRow.Index != 0) + { + SelectDictValue.dgvZd.CurrentCell = SelectDictValue.dgvZd.Rows[SelectDictValue.dgvZd.CurrentRow.Index - 1].Cells[1]; + //SelectDictValue.dgvZd.Rows[SelectDictValue.dgvZd.CurrentRow.Index - 1].Selected = true; + } + } + } + } + private void CControl_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar.ToString() == "\r") + { + if (SelectDictValue.dgvZd.SelectedRows.Count > 0) + { + SelectDictValue.SetContent(SelectDictValue.dgvZd.SelectedRows[0].Index); + } } } private void CControl_MouseDown(object sender, MouseEventArgs e) diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index 22516bf..0fe8884 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/DrawGraph/AreaManage/DrugsManage.cs @@ -389,16 +389,16 @@ namespace DrawGraph }); template.SetObjValue(myOpeRecord, "OperationRecord.InAmount", allDrugDose.ToString(), allDrugDose.ToString(), allDrugDose.ToString() != myOpeRecord.InAmount ? true : false); DrawIndex++; - myOpeRecord.FactOutputLiquidsList.ForEach(item => - { - if (item.DosageUnit.Trim() == "mL" || item.DosageUnit.Trim() == "ml" || item.DosageUnit.Trim() == "ML") - { - Double val = Convert.ToDouble(item.Dosage); - allOutDose += val; - } - }); - template.SetObjValue(myOpeRecord, "OperationRecord.OutAmount", allOutDose.ToString(), allOutDose.ToString(), allOutDose.ToString() != myOpeRecord.OutAmount ? true : false); - DrawIndex++; + //myOpeRecord.FactOutputLiquidsList.ForEach(item => + //{ + // if (item.DosageUnit.Trim() == "mL" || item.DosageUnit.Trim() == "ml" || item.DosageUnit.Trim() == "ML") + // { + // Double val = Convert.ToDouble(item.Dosage); + // allOutDose += val; + // } + //}); + //template.SetObjValue(myOpeRecord, "OperationRecord.OutAmount", allOutDose.ToString(), allOutDose.ToString(), allOutDose.ToString() != myOpeRecord.OutAmount ? true : false); + //DrawIndex++; //myOpeRecord.FactOutputLiquidsList.ForEach(item => //{ diff --git a/DrawGraph/AreaManage/OperationRecord.cs b/DrawGraph/AreaManage/OperationRecord.cs index bd0492c..d160c5e 100644 --- a/DrawGraph/AreaManage/OperationRecord.cs +++ b/DrawGraph/AreaManage/OperationRecord.cs @@ -1175,6 +1175,7 @@ namespace DrawGraph public List EventListstr = new List(); public List DrugsListstr = new List(); public List SapsListstr = new List(); + public List OutsListstr = new List(); public List AfterDrugsListstr = new List(); public List FluidListstr = new List(); public List PunctureAndIntubatio; @@ -1357,6 +1358,7 @@ namespace DrawGraph DrugsListstr = new List(); SapsListstr = new List(); FluidListstr = new List(); + OutsListstr = new List(); PunctureAndIntubatio = new List(); BeforeDrugs = ""; AnalgesiaDrug = ""; diff --git a/DrawGraph/AreaManage/OutputManage.cs b/DrawGraph/AreaManage/OutputManage.cs index e962f2f..f182733 100644 --- a/DrawGraph/AreaManage/OutputManage.cs +++ b/DrawGraph/AreaManage/OutputManage.cs @@ -178,12 +178,35 @@ namespace DrawGraph ListAddDrugs(DrugListstr, i, temp); } + myOpeRecord.OutsListstr = DrugListstr; + DrawOutDose(); } catch (Exception ex) { throw ex; } } + + private void DrawOutDose() + { + try + { + double allOutDose = 0; + myOpeRecord.FactOutputLiquidsList.ForEach(item => + { + if (item.DosageUnit.Trim() == "mL" || item.DosageUnit.Trim() == "ml" || item.DosageUnit.Trim() == "ML") + { + Double val = Convert.ToDouble(item.Dosage); + allOutDose += val; + } + }); + template.SetObjValue(myOpeRecord, "OperationRecord.OutAmount", allOutDose.ToString(), allOutDose.ToString(), allOutDose.ToString() != myOpeRecord.OutAmount ? true : false); + } + catch (Exception ex) + { + PublicMethod.WriteLog(ex); + } + } private void SetDrug(FactOutputLiquids temp, DateTime curTimeTemp, double y) { if (temp.IsContinue == 1 && temp.BeginTime == temp.EndTime) temp.End = curTimeTemp; diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index cfcc3e2..5f56b61 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -252,17 +252,15 @@ namespace DrawGraph } } - ////获得指定Tag和指定类型的组件 - //List packs = PackManage.ListPob.Where(s => s.PackTag == "Operation_AddListEvent" && s is LinesPackObj).ToList(); - //foreach (PackObjBase pack in packs) - //{ - // LinesPackObj linesPack = pack as LinesPackObj; - // if ((x > linesPack.RealX && x < linesPack.RealEndX) && (y > linesPack.RealY && y < linesPack.RealEndY)) - // { - // string viewStr = string.Format("PhysioDataManage的MouseDown事件显示的内容：{0}组件，X={1}、Y={2}", pack.PackTag, linesPack.RealX, linesPack.RealY); - // MessageBox.Show(viewStr); - // } - //} + if (!isLegendArea(sender1, mousePt) && pane == null) + { + if (curPhysioParam != null) + { + curPhysioParam.IsClick = false; + curPhysioParam.onClick(e); + curPhysioParam = null; + } + } } ZedControl.AxisChange(); ZedControl.Refresh(); diff --git a/DrawGraph/AreaManage/RemarkManage.cs b/DrawGraph/AreaManage/RemarkManage.cs index 4b394f3..b73e974 100644 --- a/DrawGraph/AreaManage/RemarkManage.cs +++ b/DrawGraph/AreaManage/RemarkManage.cs @@ -163,25 +163,13 @@ namespace DrawGraph PublicMethod.WriteLog(ex); } //事件备注 - SetRemarkInfo(myOpeRecord.EventListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); - if (OutputManagePpack == null) - { - myOpeRecord.FluidListstr.Clear(); - myOpeRecord.FluidListstr.Add("【出量】"); - for (int i = 0; i < myOpeRecord.FactOutputLiquidsList.Count; i++) - { - FactOutputLiquids temp = myOpeRecord.FactOutputLiquidsList[i]; - myOpeRecord.FluidListstr.Add(string.Format("{0}{1} {2} {3}{4}{5}", getNumber(i), (temp.BeginTime == temp.EndTime) ? temp.BeginTime.ToShortTimeString() : temp.BeginTime.ToShortTimeString() + "->" + temp.EndTime.ToShortTimeString(), temp.OutputLiquidsName.Trim(), temp.Dosage, temp.DosageUnit, "")); - - } - //出量备注 - SetRemarkInfo(myOpeRecord.FluidListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); - } - + SetRemarkInfo(myOpeRecord.EventListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); //用药备注 SetRemarkInfo(myOpeRecord.DrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); //液体备注 SetRemarkInfo(myOpeRecord.SapsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); + //出量备注 + SetRemarkInfo(myOpeRecord.OutsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); //术后镇痛药备注 if (myOpeRecord.currentPage == myOpeRecord.pageCount) diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index 0f0e305..f494f33 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -298,19 +298,7 @@ namespace DrawGraph } DrugListstr.Add(string.Format("({0}){1} {2} {3}{4}{5}", i + 1, (temp.DrugBeginTime == temp.DrugEndTime) ? temp.DrugBeginTime.ToShortTimeString() : temp.DrugBeginTime.ToShortTimeString() + "->" + temp.DrugEndTime.ToShortTimeString(), temp.DrugName.Trim(), dose, "", temp.DrugChannel == null ? "" : " " + temp.DrugChannel.ToString())); //DrugListstr.Append(" "); - } - private static void ListAddDrugs(List DrugListstr, FactDrug temp) - { - string dose = ""; - if (dose.Trim() != "") dose += " "; - dose += ((double)temp.Dosage).ToString(); - if (temp.DosageUnit != null) - { - dose += temp.DosageUnit; - } - DrugListstr.Add(string.Format("{1} {2} {3}{4}{5}", "", (temp.DrugBeginTime == temp.DrugEndTime) ? temp.DrugBeginTime.ToShortTimeString() : temp.DrugBeginTime.ToShortTimeString() + "->" + temp.DrugEndTime.ToShortTimeString(), temp.DrugName.Trim(), dose, "", temp.DrugChannel == null ? "" : "<" + temp.DrugChannel.ToString() + ">")); - //DrugListstr.Append(" "); - } + } private bool isSapDrugs(FactDrug record) { bool isSap = false; diff --git a/DrawGraph/AreaManage/SelectDictText.cs b/DrawGraph/AreaManage/SelectDictText.cs index 5940284..680850f 100644 --- a/DrawGraph/AreaManage/SelectDictText.cs +++ b/DrawGraph/AreaManage/SelectDictText.cs @@ -88,7 +88,7 @@ namespace DrawGraph } return _instance; } - static System.Windows.Forms.DataGridView dgvZd; + public static System.Windows.Forms.DataGridView dgvZd; static AbleEditPackObj aEdit; static string type; public static TemplateManage template; @@ -194,7 +194,7 @@ namespace DrawGraph } } catch (Exception) - { + { } } @@ -207,7 +207,7 @@ namespace DrawGraph } } - static void SetContent(int index) + public static void SetContent(int index) { if (dgvZd.Rows[index].Cells["Name"].EditedFormattedValue.ToString() != "") { diff --git a/DrawGraph/AreaManage/SelectDictValue.cs b/DrawGraph/AreaManage/SelectDictValue.cs index 90b757a..9e762a1 100644 --- a/DrawGraph/AreaManage/SelectDictValue.cs +++ b/DrawGraph/AreaManage/SelectDictValue.cs @@ -87,7 +87,7 @@ namespace DrawGraph } return _instance; } - static System.Windows.Forms.DataGridView dgvZd; + public static System.Windows.Forms.DataGridView dgvZd; static AbleEditPackObj aEdit; static string type; public static TemplateManage template; @@ -110,14 +110,14 @@ namespace DrawGraph dgvZd.DataSource = dt; dgvZd.Columns[1].HeaderText = aEdit.ControlTitleText; dgvZd.Location = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y + aEdit.CControl.Height); - dgvZd.Size = new System.Drawing.Size( aEdit.CControl.Width < 100 ? 99 : aEdit.CControl.Width, dgvZd.Height); + dgvZd.Size = new System.Drawing.Size(aEdit.CControl.Width < 100 ? 99 : aEdit.CControl.Width, dgvZd.Height); if (dgvZd.Size.Width < 100) { dgvZd.Columns[2].Visible = false; } else { - dgvZd.Columns[2].Visible = true; + dgvZd.Columns[2].Visible = true; } if (dgvZd.Parent == null) aEdit.CControl.Parent.Controls.Add(dgvZd); @@ -204,7 +204,7 @@ namespace DrawGraph } } catch (Exception) - { + { } } @@ -215,48 +215,9 @@ namespace DrawGraph { SetContent(e.RowIndex); } - } - //static void dgvZd_KeyDown(object sender, KeyEventArgs e) - //{ - // if (e.KeyCode == Keys.Down) - // { - // if (dgvZd.CurrentRow.Index == dgvZd.Rows.Count - 1) - // { - // e.Handled = true; - // dgvZd.CurrentCell = dgvZd.Rows[0].Cells[3]; - // dgvZd.Rows[0].Selected = true; - // } - // } - // if (e.KeyCode == Keys.Up) - // { - // if (dgvZd.CurrentRow.Index == 0) - // { - // e.Handled = true; - // dgvZd.CurrentCell = dgvZd.Rows[dgvZd.Rows.Count - 1].Cells[3]; - // dgvZd.Rows[dgvZd.Rows.Count - 1].Selected = true; - // } - // } - //} + } - //static void dgvZd_KeyPress(object sender, KeyPressEventArgs e) - //{ - // if (e.KeyChar.ToString() == "\r") - // { - // if (dgvZd.SelectedRows.Count > 0) - // { - // SetContent(dgvZd.SelectedRows[0].Index); - // } - // } - //} - //static void dgvZd_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - //{ - // if (e.KeyCode == Keys.Enter) - // { - // index = dgvZd.CurrentRow.Index; - // } - //} - - static void SetContent(int index) + public static void SetContent(int index) { if (dgvZd.Rows[index].Cells["Name"].EditedFormattedValue.ToString() != "") { diff --git a/DrawGraph/AreaManage/SelectWorkerValue.cs b/DrawGraph/AreaManage/SelectWorkerValue.cs index d476d6f..8d89ff8 100644 --- a/DrawGraph/AreaManage/SelectWorkerValue.cs +++ b/DrawGraph/AreaManage/SelectWorkerValue.cs @@ -88,7 +88,7 @@ namespace DrawGraph } return _instance; } - static System.Windows.Forms.DataGridView dgvZd; + public static System.Windows.Forms.DataGridView dgvZd; static AbleEditPackObj aEdit; static string type; public static TemplateManage template; @@ -215,7 +215,7 @@ namespace DrawGraph } } catch (Exception) - { + { } } @@ -226,47 +226,8 @@ namespace DrawGraph { SetContent(e.RowIndex); } - } - //static void dgvZd_KeyDown(object sender, KeyEventArgs e) - //{ - // if (e.KeyCode == Keys.Down) - // { - // if (dgvZd.CurrentRow.Index == dgvZd.Rows.Count - 1) - // { - // e.Handled = true; - // dgvZd.CurrentCell = dgvZd.Rows[0].Cells[3]; - // dgvZd.Rows[0].Selected = true; - // } - // } - // if (e.KeyCode == Keys.Up) - // { - // if (dgvZd.CurrentRow.Index == 0) - // { - // e.Handled = true; - // dgvZd.CurrentCell = dgvZd.Rows[dgvZd.Rows.Count - 1].Cells[3]; - // dgvZd.Rows[dgvZd.Rows.Count - 1].Selected = true; - // } - // } - //} - - //static void dgvZd_KeyPress(object sender, KeyPressEventArgs e) - //{ - // if (e.KeyChar.ToString() == "\r") - // { - // if (dgvZd.SelectedRows.Count > 0) - // { - // SetContent(dgvZd.SelectedRows[0].Index); - // } - // } - //} - //static void dgvZd_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - //{ - // if (e.KeyCode == Keys.Enter) - // { - // index = dgvZd.CurrentRow.Index; - // } - //} - static void SetContent(int index) + } + public static void SetContent(int index) { if (dgvZd.Rows[index].Cells["Name"].EditedFormattedValue.ToString() != "") { diff --git a/DrawGraph/AreaManage/TempDataManage.cs b/DrawGraph/AreaManage/TempDataManage.cs index 8f2ed58..eac5621 100644 --- a/DrawGraph/AreaManage/TempDataManage.cs +++ b/DrawGraph/AreaManage/TempDataManage.cs @@ -494,13 +494,11 @@ namespace DrawGraph AbleEditPackObj ableEdit = sender; if (ableEdit == null) return; - ableEdit.CControl.Leave -= new EventHandler(txt_Leave); - //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); - //ableEdit.CControl.KeyUp += new KeyEventHandler(CControl_KeyUp); + ableEdit.CControl.Leave -= new EventHandler(txt_Leave); + ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); + ableEdit.CControl.KeyUp += new KeyEventHandler(CControl_KeyUp); + ableEdit.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); + ableEdit.CControl.KeyPress += new KeyPressEventHandler(CControl_KeyPress); if (myOpeRecord != null) { @@ -518,8 +516,7 @@ namespace DrawGraph } aSyncSelectDict.Show(template, OpeRecord, sender, _DictType, isRadio); - ableEdit.CControl.Leave += new EventHandler(txt_Leave); - //SetAbleEditView(ableEdit); + ableEdit.CControl.Leave += new EventHandler(txt_Leave); } } private void ASyncSelectDict_SetValue(string Text, AbleEditPackObj aEdit) @@ -529,57 +526,37 @@ namespace DrawGraph template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Text, Text, true); aEdit.CControl.Leave -= new EventHandler(txt_Leave); aEdit.CControl.Leave += new EventHandler(txt_Leave); + } + private void CControl_KeyUp(object sender, KeyEventArgs e) + { + if (myOpeRecord != null) + { + Control conl = sender as Control; + if (e.KeyCode == Keys.Down) + { + if (SelectDictText.dgvZd.CurrentRow.Index + 1 != SelectDictText.dgvZd.Rows.Count - 1) + { + SelectDictText.dgvZd.CurrentCell = SelectDictText.dgvZd.Rows[SelectDictText.dgvZd.CurrentRow.Index + 1].Cells[1]; + } + } + else if (e.KeyCode == Keys.Up) + { + if (SelectDictText.dgvZd.CurrentRow.Index != 0) + { + SelectDictText.dgvZd.CurrentCell = SelectDictText.dgvZd.Rows[SelectDictText.dgvZd.CurrentRow.Index - 1].Cells[1]; + } + } + } } - //private void CControl_TextChanged(object sender, EventArgs e) - //{ - // if (myOpeRecord != null) - // { - // Control conl = sender as Control; - - // aSyncSelectDict.ShowSel(conl, OpeRecord); - // } - //} - //private void CControl_KeyUp(object sender, KeyEventArgs e) - //{ - // if (myOpeRecord != null) - // { - // Control conl = sender as Control; - // if (conl.Text != SelectDictText.Value) - // if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Back) - // { - // aSyncSelectDict.DelSel(conl, OpeRecord); - // } - // } - //} - //private void CControl_MouseDown(object sender, MouseEventArgs e) - //{ - // if (myOpeRecord != null) - // { - // TextBox conl = sender as TextBox; - // string leftStr = conl.Text.Substring(0, conl.SelectionStart); - // string rightStr = conl.Text.Substring(conl.SelectionStart, conl.Text.Length - conl.SelectionStart); - // int startIndex = 0; - // int endLength = conl.Text.Length; - - // if (leftStr.Contains(",")) - // { - // int beginindex = leftStr.LastIndexOf(','); - // startIndex = beginindex + 1; - // if (rightStr.Contains(",")) - // { - // endLength = rightStr.IndexOf(",") + (leftStr.Length - beginindex); - // } - // } - // else - // { - // if (rightStr.Contains(",")) - // { - // endLength = rightStr.IndexOf(",") + leftStr.Length + 1; - // } - // } - // conl.Select(startIndex, endLength); - - // } - //} + private void CControl_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar.ToString() == "\r") + { + if (SelectDictText.dgvZd.SelectedRows.Count > 0) + { + SelectDictText.SetContent(SelectDictText.dgvZd.SelectedRows[0].Index); + } + } + } } }