From b8834330f9611ceb2cd64a3a1fd6426a1d0136b9 Mon Sep 17 00:00:00 2001 From: leomon Date: Thu, 27 Apr 2023 19:42:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AF=E4=B8=AD=E5=AD=97=E5=85=B8=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E9=80=89=E6=8B=A9=E6=8E=A7=E4=BB=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/AIMS.xml | 2 +- AIMS/DocManager/frmDocument3.designer.cs | 82 ++- AIMS/Extensions/EMRExtension.cs | 3 +- AIMS/FormLogin.cs | 4 +- AIMS/FormLogin.designer.cs | 11 +- AIMS/FormLogin.resx | 2 +- .../frmAanesthesiaPainlessRecord.cs | 5 +- .../frmAanesthesiaRecord.cs | 5 +- .../frmOpeRecoverOutInfo.cs | 5 + .../frmOpeRecoverOutInfo.designer.cs | 182 ++++--- AIMS/OperationAfter/frmReportExport.cs | 140 ++--- .../frmReportExport.designer.cs | 308 +++++++++-- .../frmOperationApplyDetail.Designer.cs | 80 ++- .../OperationFront/frmOperationApplyDetail.cs | 72 +++ .../frmOperationSchedulePlan.cs | 6 +- AIMSEntity/Extensions/BOperationReport.cs | 5 + .../AreaManage/AnalgesiaDataBottonManage.cs | 76 ++- DrawGraph/AreaManage/AnalgesiaDataManage.cs | 69 ++- DrawGraph/AreaManage/BaseInfoBottomManage.cs | 193 +++++-- DrawGraph/AreaManage/BaseInfoTopManage.cs | 102 +++- DrawGraph/AreaManage/PhysioDataManage.cs | 2 +- DrawGraph/AreaManage/TempDataManage.cs | 86 ++- DrawGraph/AreaManage/TokenEditorManage.cs | 145 +++++ DrawGraph/BoardPack/AbleEditPackObj.cs | 44 +- DrawGraph/BoardPack/TextsPackObj.cs | 508 ++++++++++++++++++ DrawGraph/DrawGraph.csproj | 2 + DrawGraph/GUtil/TextPrefix.cs | 3 +- DrawGraphManagement/AIMS.xml | 2 +- 28 files changed, 1795 insertions(+), 349 deletions(-) create mode 100644 DrawGraph/AreaManage/TokenEditorManage.cs create mode 100644 DrawGraph/BoardPack/TextsPackObj.cs diff --git a/AIMS/AIMS.xml b/AIMS/AIMS.xml index 093bb06..8fe8536 100644 --- a/AIMS/AIMS.xml +++ b/AIMS/AIMS.xml @@ -1,6 +1,6 @@  - Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020; + Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020; Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39; diff --git a/AIMS/DocManager/frmDocument3.designer.cs b/AIMS/DocManager/frmDocument3.designer.cs index dc9ca52..c2c32b5 100644 --- a/AIMS/DocManager/frmDocument3.designer.cs +++ b/AIMS/DocManager/frmDocument3.designer.cs @@ -42,13 +42,13 @@ this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter(); this.panel5 = new System.Windows.Forms.Panel(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.CboOperationSite = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.labelSite = new System.Windows.Forms.Label(); this.btnDelete = new DevComponents.DotNetBar.ButtonX(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.btnSel = new DevComponents.DotNetBar.ButtonX(); this.lblPatient = new DevComponents.DotNetBar.LabelX(); this.expandablePanel1 = new DevComponents.DotNetBar.ExpandablePanel(); - this.CboOperationSite = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.labelSite = new System.Windows.Forms.Label(); this.panel2.SuspendLayout(); this.groupBox2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -199,10 +199,10 @@ this.panel4.Controls.Add(this.tsbDoc); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Font = new System.Drawing.Font("宋体", 9.5F); - this.panel4.Location = new System.Drawing.Point(171, 53); + this.panel4.Location = new System.Drawing.Point(210, 53); this.panel4.Margin = new System.Windows.Forms.Padding(2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(700, 558); + this.panel4.Size = new System.Drawing.Size(661, 558); this.panel4.TabIndex = 3; // // tsbDoc @@ -217,7 +217,7 @@ this.tsbDoc.Name = "tsbDoc"; this.tsbDoc.SelectedTabFont = new System.Drawing.Font("宋体", 9.5F, System.Drawing.FontStyle.Bold); this.tsbDoc.SelectedTabIndex = 0; - this.tsbDoc.Size = new System.Drawing.Size(700, 558); + this.tsbDoc.Size = new System.Drawing.Size(661, 558); this.tsbDoc.TabIndex = 0; this.tsbDoc.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.MultilineNoNavigationBox; // @@ -250,9 +250,9 @@ this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(171, 45); + this.expandableSplitter2.Location = new System.Drawing.Point(210, 45); this.expandableSplitter2.Name = "expandableSplitter2"; - this.expandableSplitter2.Size = new System.Drawing.Size(700, 8); + this.expandableSplitter2.Size = new System.Drawing.Size(661, 8); this.expandableSplitter2.TabIndex = 2; this.expandableSplitter2.TabStop = false; // @@ -260,10 +260,10 @@ // this.panel5.Controls.Add(this.panelEx1); this.panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.panel5.Location = new System.Drawing.Point(171, 0); + this.panel5.Location = new System.Drawing.Point(210, 0); this.panel5.Margin = new System.Windows.Forms.Padding(2); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(700, 45); + this.panel5.Size = new System.Drawing.Size(661, 45); this.panel5.TabIndex = 1; // // panelEx1 @@ -281,7 +281,7 @@ this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Margin = new System.Windows.Forms.Padding(2); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(700, 45); + this.panelEx1.Size = new System.Drawing.Size(661, 45); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.AliceBlue; this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); @@ -291,12 +291,40 @@ this.panelEx1.Style.GradientAngle = 90; this.panelEx1.TabIndex = 0; // + // CboOperationSite + // + this.CboOperationSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CboOperationSite.DisplayMember = "Text"; + this.CboOperationSite.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.CboOperationSite.Font = new System.Drawing.Font("微软雅黑", 9.5F); + this.CboOperationSite.ForeColor = System.Drawing.Color.Black; + this.CboOperationSite.FormattingEnabled = true; + this.CboOperationSite.ItemHeight = 18; + this.CboOperationSite.Location = new System.Drawing.Point(572, 10); + this.CboOperationSite.Name = "CboOperationSite"; + this.CboOperationSite.Size = new System.Drawing.Size(89, 24); + this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.CboOperationSite.TabIndex = 508; + // + // labelSite + // + this.labelSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.labelSite.AutoSize = true; + this.labelSite.BackColor = System.Drawing.Color.Transparent; + this.labelSite.Font = new System.Drawing.Font("微软雅黑", 9.5F); + this.labelSite.Location = new System.Drawing.Point(506, 12); + this.labelSite.Name = "labelSite"; + this.labelSite.Size = new System.Drawing.Size(61, 19); + this.labelSite.TabIndex = 509; + this.labelSite.Text = "手术地点"; + this.labelSite.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + // // btnDelete // this.btnDelete.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnDelete.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDelete.Location = new System.Drawing.Point(464, 11); + this.btnDelete.Location = new System.Drawing.Point(425, 11); this.btnDelete.Margin = new System.Windows.Forms.Padding(2); this.btnDelete.Name = "btnDelete"; this.btnDelete.Size = new System.Drawing.Size(76, 23); @@ -352,52 +380,22 @@ this.expandablePanel1.Location = new System.Drawing.Point(0, 0); this.expandablePanel1.Margin = new System.Windows.Forms.Padding(2); this.expandablePanel1.Name = "expandablePanel1"; - this.expandablePanel1.Size = new System.Drawing.Size(171, 611); + this.expandablePanel1.Size = new System.Drawing.Size(210, 611); this.expandablePanel1.Style.Alignment = System.Drawing.StringAlignment.Center; this.expandablePanel1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandablePanel1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.expandablePanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.expandablePanel1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; this.expandablePanel1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.expandablePanel1.Style.GradientAngle = 90; this.expandablePanel1.TabIndex = 0; this.expandablePanel1.TitleHeight = 21; this.expandablePanel1.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.expandablePanel1.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandablePanel1.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.expandablePanel1.TitleStyle.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.expandablePanel1.TitleStyle.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandablePanel1.TitleStyle.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.expandablePanel1.TitleStyle.GradientAngle = 90; this.expandablePanel1.TitleText = "文档目录"; // - // CboOperationSite - // - this.CboOperationSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.CboOperationSite.DisplayMember = "Text"; - this.CboOperationSite.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.CboOperationSite.Font = new System.Drawing.Font("微软雅黑", 9.5F); - this.CboOperationSite.FormattingEnabled = true; - this.CboOperationSite.ItemHeight = 18; - this.CboOperationSite.Location = new System.Drawing.Point(611, 10); - this.CboOperationSite.Name = "CboOperationSite"; - this.CboOperationSite.Size = new System.Drawing.Size(89, 24); - this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.CboOperationSite.TabIndex = 508; - // - // labelSite - // - this.labelSite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.labelSite.AutoSize = true; - this.labelSite.BackColor = System.Drawing.Color.Transparent; - this.labelSite.Font = new System.Drawing.Font("微软雅黑", 9.5F); - this.labelSite.Location = new System.Drawing.Point(545, 12); - this.labelSite.Name = "labelSite"; - this.labelSite.Size = new System.Drawing.Size(61, 19); - this.labelSite.TabIndex = 509; - this.labelSite.Text = "手术地点"; - this.labelSite.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - // // frmDocument3 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/AIMS/Extensions/EMRExtension.cs b/AIMS/Extensions/EMRExtension.cs index 64e4019..f0d0e27 100644 --- a/AIMS/Extensions/EMRExtension.cs +++ b/AIMS/Extensions/EMRExtension.cs @@ -46,8 +46,9 @@ namespace AIMS else if (PublicMethod.HospitalName.Contains("天福")) { string HisPatientId = pat.HisPatientId; + string HisPatientId2 = pat.Extend5; - string Path = string.Format("http://10.129.130.60:5050/osworksweb/operating_hocussFirst.jsp?vae01={0}&jsessionids=43261bf8-e5ce-4686-8da7-3aad50e00ca61681461295076", HisPatientId); + string Path = string.Format("http://10.129.130.60:5050/osworksweb/operating_externalinformation.jsp?vaa07={0}&vaa01={1}&acf01=2&dbstyle=db2", HisPatientId,HisPatientId2); System.Diagnostics.Process.Start(Path); } diff --git a/AIMS/FormLogin.cs b/AIMS/FormLogin.cs index 0d98394..9dc6701 100644 --- a/AIMS/FormLogin.cs +++ b/AIMS/FormLogin.cs @@ -29,8 +29,9 @@ namespace AIMS private void frmLogin_Load(object sender, EventArgs e) { AIMSExtension.PublicMethod.SetLocalDateTime(); + AIMSExtension.PublicMethod.HospitalName = PublicMethod.GetHospital(); //label1.Text = AIMSExtension.PublicMethod.GetSystemName(); - //label2.Text = "@" + PublicMethod.HospitalName + " V" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); + label2.Text = PublicMethod.HospitalName + " V" + PublicMethod.NowVersion; txtNo.Select(); txtNo.Focus(); List list = xmlUse.GetNode("LastLoginNo"); @@ -72,7 +73,6 @@ namespace AIMS AIMSExtension.PublicMethod.PermissionLevel = role.PermissionLevel == null ? 0 : role.PermissionLevel.Value; AIMSExtension.PublicMethod.RoleName = BMenu.GetMenuRootListManageStr(AIMSExtension.PublicMethod.RoleId, "功能权限"); AIMSExtension.PublicMethod.OperationSite = BOperationRoom.GetOperationSite(); - AIMSExtension.PublicMethod.HospitalName = PublicMethod.GetHospital(); if (LastNo != null && PersonObj.No != "admin" && PersonObj.No != LastNo) xmlUse.SetNode("LastLoginNo", PersonObj.No); List list = xmlUse.GetNode("LastOperationSite"); diff --git a/AIMS/FormLogin.designer.cs b/AIMS/FormLogin.designer.cs index 7b55114..fa72717 100644 --- a/AIMS/FormLogin.designer.cs +++ b/AIMS/FormLogin.designer.cs @@ -44,14 +44,13 @@ // this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.White; - this.label2.Font = new System.Drawing.Font("宋体", 9F); + this.label2.Font = new System.Drawing.Font("微软雅黑", 9F); this.label2.ForeColor = System.Drawing.Color.SteelBlue; - this.label2.Location = new System.Drawing.Point(448, 359); + this.label2.Location = new System.Drawing.Point(448, 349); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 12); + this.label2.Size = new System.Drawing.Size(43, 17); this.label2.TabIndex = 5; this.label2.Text = "label2"; - this.label2.Visible = false; // // btnOk // @@ -59,7 +58,7 @@ this.btnOk.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb; this.btnOk.FocusCuesEnabled = false; this.btnOk.Font = new System.Drawing.Font("微软雅黑", 11.5F); - this.btnOk.Location = new System.Drawing.Point(435, 264); + this.btnOk.Location = new System.Drawing.Point(435, 270); this.btnOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(76, 43); @@ -74,7 +73,7 @@ this.btnExit.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb; this.btnExit.FocusCuesEnabled = false; this.btnExit.Font = new System.Drawing.Font("微软雅黑", 11.5F); - this.btnExit.Location = new System.Drawing.Point(530, 264); + this.btnExit.Location = new System.Drawing.Point(530, 270); this.btnExit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnExit.Name = "btnExit"; this.btnExit.Size = new System.Drawing.Size(76, 43); diff --git a/AIMS/FormLogin.resx b/AIMS/FormLogin.resx index 51b2092..6d3f7e6 100644 --- a/AIMS/FormLogin.resx +++ b/AIMS/FormLogin.resx @@ -139,7 +139,7 @@ iVBORw0KGgoAAAANSUhEUgAAAscAAAGQCAIAAADN91qrAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DwAACw8BkvkDpQAA/7JJREFUeF7s/QeMbFt6mIdeT1fOOeecdu1dOeecc+jqnHPuPvGeG0aUniyIlkhB + DgAACw4BQL7hQQAA/7JJREFUeF7s/QeMbFt6mIdeT1fOOeecdu1dOeecc+jqnHPuPvGeG0aUniyIlkhB wnswDD/AsE1SgRYpQbLlJ0uCoGfhydCz8ATbkDkMJjU0JYxAQbZMkBy+f+2q7nPuuXfuJHI4Q9aPD+us 2rWruk/16bO//a9/rfWBwEawtA621sHS2BlaC0tr4WjNAEtjpqoMFKWORP8Whe6R+REDRQGnAcZ3MFFU gJmqtgIUtY2qcdJ0bgqgdQFUnZuq81ANGNWE00wExeSnWgI0W5hii9DtUY49wnXE2a4ky5NmYEU2XmES diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs index 6f2a5ab..8b617fb 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs @@ -873,7 +873,8 @@ namespace AIMS.OperationAanesthesia } private void plRefresh_Click(object sender, EventArgs e) { - if (PatientId == 0) return; + if (PatientId == 0) return; + plRefresh.Select(); //刷新到当前页 ReviewEvent(); } @@ -881,6 +882,7 @@ namespace AIMS.OperationAanesthesia { if (PatientId == 0) return; if (_record.pageCount == 1) return; + btnUpPage.Select(); SetUpPageTime(); ReviewEvent(); } @@ -888,6 +890,7 @@ namespace AIMS.OperationAanesthesia { if (PatientId == 0) return; if (_record.pageCount == _record.currentPage) return; + btnNextPage.Select(); SetNextPageTime(); ReviewEvent(); } diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index 9e0ec9b..ac3b34c 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -903,10 +903,11 @@ namespace AIMS.OperationAanesthesia { if (templateManage2 != null) templateManage2.SetPYL(); - } + } private void plRefresh_Click(object sender, EventArgs e) { if (PatientId == 0) return; + plRefresh.Select(); //刷新到当前页 ReviewEvent(); } @@ -914,6 +915,7 @@ namespace AIMS.OperationAanesthesia { if (PatientId == 0) return; if (_record.pageCount == 1) return; + btnUpPage.Select(); SetUpPageTime(); ReviewEvent(); } @@ -921,6 +923,7 @@ namespace AIMS.OperationAanesthesia { if (PatientId == 0) return; if (_record.pageCount == _record.currentPage) return; + btnNextPage.Select(); SetNextPageTime(); ReviewEvent(); } diff --git a/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.cs b/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.cs index 6d9d558..726421a 100644 --- a/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.cs +++ b/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.cs @@ -59,6 +59,9 @@ namespace AIMS.OperationAanesthesia txtSX.Text = _record.OpeRecoverOutInfo.LeftPupil; txtPHY.Text = _record.OpeRecoverOutInfo.RightPupil; + txtExtend1.Text = _record.OpeRecoverOutInfo.Extend1; + txtExtend2.Text = _record.OpeRecoverOutInfo.Extend2; + if (_record.OpeRecoverOutInfo.PACUAldteteScore != null) txtAndree.Text = _record.OpeRecoverOutInfo.PACUAldteteScore.ToString(); if (_record.OpeRecoverOutInfo.State == "病房") @@ -144,6 +147,8 @@ namespace AIMS.OperationAanesthesia _record.OpeRecoverOutInfo.LeftPupil = txtSX.Text; _record.OpeRecoverOutInfo.RightPupil = txtPHY.Text; + _record.OpeRecoverOutInfo.Extend1 = txtExtend1.Text; + _record.OpeRecoverOutInfo.Extend2 = txtExtend2.Text; if (radioButton1.Checked == true) { _record.OpeRecoverOutInfo.State = "病房"; diff --git a/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs b/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs index 7a8e121..52894d9 100644 --- a/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs +++ b/AIMS/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs @@ -40,7 +40,6 @@ this.label17 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label2 = new System.Windows.Forms.Label(); - this.txtPain = new AIMS.OremrUserControl.NumTextBox(); this.label25 = new System.Windows.Forms.Label(); this.slider1 = new DevComponents.DotNetBar.Controls.Slider(); this.groupBox4 = new System.Windows.Forms.GroupBox(); @@ -63,22 +62,18 @@ this.label35 = new System.Windows.Forms.Label(); this.cboHD = new System.Windows.Forms.ComboBox(); this.label36 = new System.Windows.Forms.Label(); - this.txtAndree = new AIMS.OremrUserControl.NumTextBox(); this.label40 = new System.Windows.Forms.Label(); this.label52 = new System.Windows.Forms.Label(); this.label53 = new System.Windows.Forms.Label(); this.cboHXDTCCD = new System.Windows.Forms.ComboBox(); this.cboZTHDD = new System.Windows.Forms.ComboBox(); this.label23 = new System.Windows.Forms.Label(); - this.txtZPF = new AIMS.OremrUserControl.NumTextBox(); this.label54 = new System.Windows.Forms.Label(); this.label51 = new System.Windows.Forms.Label(); this.cboQXCD = new System.Windows.Forms.ComboBox(); - this.txtTSQK = new AIMS.OremrUserControl.UText(); this.cboHXY = new System.Windows.Forms.ComboBox(); this.cboTT = new System.Windows.Forms.ComboBox(); this.label24 = new System.Windows.Forms.Label(); - this.txtBFZ = new AIMS.OremrUserControl.UText(); this.textBox1 = new System.Windows.Forms.TextBox(); this.txtMAP = new System.Windows.Forms.TextBox(); this.txtBP = new System.Windows.Forms.TextBox(); @@ -109,6 +104,15 @@ this.cboPF = new System.Windows.Forms.ComboBox(); this.label31 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.txtExtend1 = new System.Windows.Forms.TextBox(); + this.txtExtend2 = new System.Windows.Forms.TextBox(); + this.txtPain = new AIMS.OremrUserControl.NumTextBox(); + this.txtAndree = new AIMS.OremrUserControl.NumTextBox(); + this.txtZPF = new AIMS.OremrUserControl.NumTextBox(); + this.txtTSQK = new AIMS.OremrUserControl.UText(); + this.txtBFZ = new AIMS.OremrUserControl.UText(); this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox4.SuspendLayout(); @@ -117,9 +121,13 @@ // groupBox1 // this.groupBox1.Controls.Add(this.TXTXY); + this.groupBox1.Controls.Add(this.txtExtend2); + this.groupBox1.Controls.Add(this.txtExtend1); this.groupBox1.Controls.Add(this.txtPHY); this.groupBox1.Controls.Add(this.txtSX); + this.groupBox1.Controls.Add(this.label18); this.groupBox1.Controls.Add(this.txtCQL); + this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.label26); this.groupBox1.Controls.Add(this.label19); this.groupBox1.Controls.Add(this.label7); @@ -183,28 +191,28 @@ // // TXTXY // - this.TXTXY.Location = new System.Drawing.Point(228, 205); + this.TXTXY.Location = new System.Drawing.Point(206, 205); this.TXTXY.Name = "TXTXY"; this.TXTXY.Size = new System.Drawing.Size(60, 26); this.TXTXY.TabIndex = 1541; // // txtPHY // - this.txtPHY.Location = new System.Drawing.Point(476, 205); + this.txtPHY.Location = new System.Drawing.Point(438, 205); this.txtPHY.Name = "txtPHY"; this.txtPHY.Size = new System.Drawing.Size(60, 26); this.txtPHY.TabIndex = 1542; // // txtSX // - this.txtSX.Location = new System.Drawing.Point(345, 205); + this.txtSX.Location = new System.Drawing.Point(315, 205); this.txtSX.Name = "txtSX"; this.txtSX.Size = new System.Drawing.Size(60, 26); this.txtSX.TabIndex = 1542; // // txtCQL // - this.txtCQL.Location = new System.Drawing.Point(101, 205); + this.txtCQL.Location = new System.Drawing.Point(97, 205); this.txtCQL.Name = "txtCQL"; this.txtCQL.Size = new System.Drawing.Size(60, 26); this.txtCQL.TabIndex = 1542; @@ -212,16 +220,16 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(415, 207); + this.label26.Location = new System.Drawing.Point(381, 208); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(51, 20); this.label26.TabIndex = 1540; - this.label26.Text = "平恒液"; + this.label26.Text = "平衡液"; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(298, 207); + this.label19.Location = new System.Drawing.Point(272, 208); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(37, 20); this.label19.TabIndex = 1540; @@ -230,7 +238,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(181, 207); + this.label7.Location = new System.Drawing.Point(163, 208); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(37, 20); this.label7.TabIndex = 1539; @@ -239,7 +247,7 @@ // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(40, 207); + this.label17.Location = new System.Drawing.Point(40, 208); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(51, 20); this.label17.TabIndex = 1540; @@ -268,14 +276,6 @@ this.label2.TabIndex = 1535; this.label2.Text = "分"; // - // txtPain - // - this.txtPain.Location = new System.Drawing.Point(382, 23); - this.txtPain.Name = "txtPain"; - this.txtPain.ReadOnly = true; - this.txtPain.Size = new System.Drawing.Size(56, 26); - this.txtPain.TabIndex = 1536; - // // label25 // this.label25.AutoSize = true; @@ -564,13 +564,6 @@ this.label36.TabIndex = 559; this.label36.Text = "Aldrete总评分"; // - // txtAndree - // - this.txtAndree.Location = new System.Drawing.Point(825, 99); - this.txtAndree.Name = "txtAndree"; - this.txtAndree.Size = new System.Drawing.Size(77, 26); - this.txtAndree.TabIndex = 560; - // // label40 // this.label40.AutoSize = true; @@ -642,13 +635,6 @@ this.label23.Text = "分"; this.label23.Visible = false; // - // txtZPF - // - this.txtZPF.Location = new System.Drawing.Point(555, 310); - this.txtZPF.Name = "txtZPF"; - this.txtZPF.Size = new System.Drawing.Size(77, 26); - this.txtZPF.TabIndex = 560; - // // label54 // this.label54.AutoSize = true; @@ -683,21 +669,6 @@ this.cboQXCD.TabIndex = 518; this.cboQXCD.SelectedIndexChanged += new System.EventHandler(this.cboQXCD_SelectedIndexChanged); // - // txtTSQK - // - this.txtTSQK.BackColor = System.Drawing.Color.White; - this.txtTSQK.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtTSQK.DictionaryKey = "特殊处理"; - this.txtTSQK.Font = new System.Drawing.Font("宋体", 11F); - this.txtTSQK.IsFindDictionray = true; - this.txtTSQK.IsUpdateDictionary = false; - this.txtTSQK.Location = new System.Drawing.Point(101, 98); - this.txtTSQK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.txtTSQK.Name = "txtTSQK"; - this.txtTSQK.Size = new System.Drawing.Size(388, 17); - this.txtTSQK.TabIndex = 1533; - this.txtTSQK.Tag = ""; - // // cboHXY // this.cboHXY.FormattingEnabled = true; @@ -757,21 +728,6 @@ this.label24.TabIndex = 580; this.label24.Text = "VSA评分"; // - // txtBFZ - // - this.txtBFZ.BackColor = System.Drawing.Color.White; - this.txtBFZ.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtBFZ.DictionaryKey = "并发症"; - this.txtBFZ.Font = new System.Drawing.Font("宋体", 11F); - this.txtBFZ.IsFindDictionray = true; - this.txtBFZ.IsUpdateDictionary = false; - this.txtBFZ.Location = new System.Drawing.Point(102, 69); - this.txtBFZ.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.txtBFZ.Name = "txtBFZ"; - this.txtBFZ.Size = new System.Drawing.Size(388, 17); - this.txtBFZ.TabIndex = 1532; - this.txtBFZ.Tag = ""; - // // textBox1 // this.textBox1.Location = new System.Drawing.Point(755, 208); @@ -930,7 +886,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(497, 68); + this.label3.Location = new System.Drawing.Point(508, 68); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(107, 20); @@ -1010,7 +966,7 @@ // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(498, 97); + this.label32.Location = new System.Drawing.Point(513, 101); this.label32.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(102, 20); @@ -1024,7 +980,7 @@ this.cboSS.Items.AddRange(new object[] { "是", "否"}); - this.cboSS.Location = new System.Drawing.Point(623, 93); + this.cboSS.Location = new System.Drawing.Point(622, 98); this.cboSS.Margin = new System.Windows.Forms.Padding(5, 10, 5, 10); this.cboSS.Name = "cboSS"; this.cboSS.Size = new System.Drawing.Size(77, 28); @@ -1076,6 +1032,90 @@ this.label1.TabIndex = 515; this.label1.Text = "肌力评分"; // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(564, 134); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(51, 20); + this.label4.TabIndex = 1540; + this.label4.Text = "总入量"; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(564, 167); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(51, 20); + this.label18.TabIndex = 1540; + this.label18.Text = "总出量"; + // + // txtExtend1 + // + this.txtExtend1.Location = new System.Drawing.Point(622, 132); + this.txtExtend1.Name = "txtExtend1"; + this.txtExtend1.Size = new System.Drawing.Size(76, 26); + this.txtExtend1.TabIndex = 1542; + // + // txtExtend2 + // + this.txtExtend2.Location = new System.Drawing.Point(622, 164); + this.txtExtend2.Name = "txtExtend2"; + this.txtExtend2.Size = new System.Drawing.Size(76, 26); + this.txtExtend2.TabIndex = 1542; + // + // txtPain + // + this.txtPain.Location = new System.Drawing.Point(382, 23); + this.txtPain.Name = "txtPain"; + this.txtPain.ReadOnly = true; + this.txtPain.Size = new System.Drawing.Size(56, 26); + this.txtPain.TabIndex = 1536; + // + // txtAndree + // + this.txtAndree.Location = new System.Drawing.Point(825, 99); + this.txtAndree.Name = "txtAndree"; + this.txtAndree.Size = new System.Drawing.Size(77, 26); + this.txtAndree.TabIndex = 560; + // + // txtZPF + // + this.txtZPF.Location = new System.Drawing.Point(555, 310); + this.txtZPF.Name = "txtZPF"; + this.txtZPF.Size = new System.Drawing.Size(77, 26); + this.txtZPF.TabIndex = 560; + // + // txtTSQK + // + this.txtTSQK.BackColor = System.Drawing.Color.White; + this.txtTSQK.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.txtTSQK.DictionaryKey = "特殊处理"; + this.txtTSQK.Font = new System.Drawing.Font("宋体", 11F); + this.txtTSQK.IsFindDictionray = true; + this.txtTSQK.IsUpdateDictionary = false; + this.txtTSQK.Location = new System.Drawing.Point(101, 98); + this.txtTSQK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtTSQK.Name = "txtTSQK"; + this.txtTSQK.Size = new System.Drawing.Size(388, 17); + this.txtTSQK.TabIndex = 1533; + this.txtTSQK.Tag = ""; + // + // txtBFZ + // + this.txtBFZ.BackColor = System.Drawing.Color.White; + this.txtBFZ.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.txtBFZ.DictionaryKey = "并发症"; + this.txtBFZ.Font = new System.Drawing.Font("宋体", 11F); + this.txtBFZ.IsFindDictionray = true; + this.txtBFZ.IsUpdateDictionary = false; + this.txtBFZ.Location = new System.Drawing.Point(102, 69); + this.txtBFZ.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtBFZ.Name = "txtBFZ"; + this.txtBFZ.Size = new System.Drawing.Size(388, 17); + this.txtBFZ.TabIndex = 1532; + this.txtBFZ.Tag = ""; + // // frmOpeRecoverOutInfo // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); @@ -1185,5 +1225,9 @@ private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label17; + private System.Windows.Forms.TextBox txtExtend2; + private System.Windows.Forms.TextBox txtExtend1; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/AIMS/OperationAfter/frmReportExport.cs b/AIMS/OperationAfter/frmReportExport.cs index 6dde626..33e5d40 100644 --- a/AIMS/OperationAfter/frmReportExport.cs +++ b/AIMS/OperationAfter/frmReportExport.cs @@ -18,6 +18,9 @@ namespace AIMS { public partial class frmReportExport : Form { + public SysConfig exportConfig; + public string DataGridViewPath = ""; + public DataGridView selectdgv; public frmReportExport() { InitializeComponent(); @@ -29,6 +32,9 @@ namespace AIMS { dtpOpeTime.Value = DateTime.Now; dtpEnd.Value = dtpOpeTime.Value; + + dtpOpeTime2.Value = DateTime.Now; + dtpEnd2.Value = dtpOpeTime.Value; } catch (Exception exp) { @@ -36,67 +42,6 @@ namespace AIMS } } - public SysConfig exportConfig; - public string DataGridViewPath = ""; - public DataGridView selectdgv; - private void btn手术例数按月统计_Click(object sender, EventArgs e) - { - selectdgv = dgvtReport; - ControlExtension.SetDgvAttribute(selectdgv); - DataGridViewPath = GetControlPath(selectdgv); - exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "'", null, RecursiveType.None, 0); - if (exportConfig != null) - ConfigDataGridView(exportConfig, selectdgv); - - string beginTime = Convert.ToDateTime(dtpOpeTime.Value).ToString("yyyy-MM-dd 00:00:00"); - string endTime = Convert.ToDateTime(dtpEnd.Value).ToString("yyyy-MM-dd 23:59:59"); - string sql = string.Format(" ExecTime>='{0}' and ExecTime<'{1}'", beginTime, endTime); - System.Data.DataTable MonthDay = BOperationReport.GetMonthDay(); - MonthDay.Rows.Clear(); - System.Data.DataTable dataResult = BOperationReport.Get手术例数按月统计(beginTime, endTime); - List Months = new List(); - foreach (DataRow row in dataResult.Rows) - { - string month = row["OpeMonth"].ToString(); - if (!Months.Contains(month)) - { - Months.Add(month); - } - } - foreach (string month in Months) - { - DataRow row = MonthDay.NewRow(); - row["月份"] = month; - MonthDay.Rows.Add(row); - } - foreach (DataRow month in MonthDay.Rows) - { - foreach (DataRow row in dataResult.Rows) - { - if (month[0].ToString() == row["OpeMonth"].ToString()) - { - string day = row["OpeDay"].ToString(); - string num = row["num"].ToString(); - month[DateTime.Parse(day).Day] = num; - } - } - } - - foreach (DataRow month in MonthDay.Rows) - { - int SumValue = 0; - foreach (DataColumn item in MonthDay.Columns) - { - if (item.ColumnName != "月份" && month[item].ToString() != "") - { - SumValue += int.Parse(month[item].ToString()); - } - } - month["合计"] = SumValue; - } - dgvtReport.DataSource = MonthDay; - } - private void dgvtReport_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) { //隔行换色 @@ -324,5 +269,78 @@ namespace AIMS return excelProcesses; } + + private void btn手术例数按月统计_Click(object sender, EventArgs e) + { + selectdgv = dgvtReport; + ControlExtension.SetDgvAttribute(selectdgv); + DataGridViewPath = GetControlPath(selectdgv); + exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "'", null, RecursiveType.None, 0); + + string beginTime = Convert.ToDateTime(dtpOpeTime.Value).ToString("yyyy-MM-dd 00:00:00"); + string endTime = Convert.ToDateTime(dtpEnd.Value).ToString("yyyy-MM-dd 23:59:59"); + System.Data.DataTable MonthDay = BOperationReport.GetMonthDay(); + MonthDay.Rows.Clear(); + System.Data.DataTable dataResult = BOperationReport.Get手术例数按月统计(beginTime, endTime); + List Months = new List(); + foreach (DataRow row in dataResult.Rows) + { + string month = row["OpeMonth"].ToString(); + if (!Months.Contains(month)) + { + Months.Add(month); + } + } + foreach (string month in Months) + { + DataRow row = MonthDay.NewRow(); + row["月份"] = month; + MonthDay.Rows.Add(row); + } + foreach (DataRow month in MonthDay.Rows) + { + foreach (DataRow row in dataResult.Rows) + { + if (month[0].ToString() == row["OpeMonth"].ToString()) + { + string day = row["OpeDay"].ToString(); + string num = row["num"].ToString(); + month[DateTime.Parse(day).Day] = num; + } + } + } + + foreach (DataRow month in MonthDay.Rows) + { + int SumValue = 0; + foreach (DataColumn item in MonthDay.Columns) + { + if (item.ColumnName != "月份" && month[item].ToString() != "") + { + SumValue += int.Parse(month[item].ToString()); + } + } + month["合计"] = SumValue; + } + selectdgv.DataSource = MonthDay; + if (exportConfig != null) + ConfigDataGridView(exportConfig, selectdgv); + } + + private void btn麻醉专业医疗质控指标_Click(object sender, EventArgs e) + { + selectdgv = dgvtReport2; + ControlExtension.SetDgvAttribute(selectdgv); + DataGridViewPath = GetControlPath(selectdgv); + exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "'", null, RecursiveType.None, 0); + + string beginTime = Convert.ToDateTime(dtpOpeTime2.Value).ToString("yyyy-MM-dd 00:00:00"); + string endTime = Convert.ToDateTime(dtpEnd2.Value).ToString("yyyy-MM-dd 23:59:59"); + System.Data.DataTable dataResult = BOperationReport.Get麻醉专业医疗质控指标(beginTime, endTime); + selectdgv.DataSource = dataResult; + + if (exportConfig != null) + ConfigDataGridView(exportConfig, selectdgv); + } } } diff --git a/AIMS/OperationAfter/frmReportExport.designer.cs b/AIMS/OperationAfter/frmReportExport.designer.cs index a3d7a2f..6e27f18 100644 --- a/AIMS/OperationAfter/frmReportExport.designer.cs +++ b/AIMS/OperationAfter/frmReportExport.designer.cs @@ -28,10 +28,14 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.tspSetting = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); @@ -43,7 +47,15 @@ this.btn手术例数按月统计 = new DevComponents.DotNetBar.ButtonX(); this.labDate = new System.Windows.Forms.Label(); this.R1 = new DevComponents.DotNetBar.SuperTabItem(); - this.tspSetting = new System.Windows.Forms.ToolStripButton(); + this.R2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dgvtReport2 = new System.Windows.Forms.DataGridView(); + this.panel1 = new System.Windows.Forms.Panel(); + this.dtpEnd2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.dtpOpeTime2 = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); + this.label1 = new System.Windows.Forms.Label(); + this.btn麻醉专业医疗质控指标 = new DevComponents.DotNetBar.ButtonX(); + this.label2 = new System.Windows.Forms.Label(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); @@ -52,6 +64,11 @@ this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dtpEnd)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dtpOpeTime)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvtReport2)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dtpEnd2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dtpOpeTime2)).BeginInit(); this.SuspendLayout(); // // toolStrip1 @@ -68,6 +85,17 @@ this.toolStrip1.TabIndex = 37; this.toolStrip1.Text = "toolStrip1"; // + // tspSetting + // + this.tspSetting.Font = new System.Drawing.Font("微软雅黑", 9F); + this.tspSetting.Image = global::AIMS.Properties.Resources.图标_设置; + this.tspSetting.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tspSetting.Name = "tspSetting"; + this.tspSetting.Size = new System.Drawing.Size(68, 46); + this.tspSetting.Text = " 导出设置"; + this.tspSetting.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.tspSetting.Click += new System.EventHandler(this.tspSetting_Click); + // // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -97,6 +125,7 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); this.superTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControl1.ForeColor = System.Drawing.Color.Black; @@ -109,7 +138,8 @@ this.superTabControl1.TabFont = new System.Drawing.Font("微软雅黑", 10F); this.superTabControl1.TabIndex = 38; this.superTabControl1.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.R1}); + this.R1, + this.R2}); this.superTabControl1.Text = "superTabControl1"; // // superTabControlPanel1 @@ -117,9 +147,9 @@ this.superTabControlPanel1.Controls.Add(this.dgvtReport); this.superTabControlPanel1.Controls.Add(this.panel2); this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel1.Location = new System.Drawing.Point(0, 32); this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1350, 464); + this.superTabControlPanel1.Size = new System.Drawing.Size(1350, 460); this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.R1; // @@ -131,42 +161,42 @@ this.dgvtReport.AllowUserToResizeRows = false; this.dgvtReport.BackgroundColor = System.Drawing.Color.White; this.dgvtReport.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - this.dgvtReport.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + this.dgvtReport.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvtReport.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F); - dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvtReport.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvtReport.DefaultCellStyle = dataGridViewCellStyle5; this.dgvtReport.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvtReport.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.dgvtReport.GridColor = System.Drawing.Color.Black; - this.dgvtReport.Location = new System.Drawing.Point(0, 57); + this.dgvtReport.Location = new System.Drawing.Point(0, 45); this.dgvtReport.MultiSelect = false; this.dgvtReport.Name = "dgvtReport"; this.dgvtReport.ReadOnly = true; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvtReport.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvtReport.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvtReport.RowHeadersVisible = false; this.dgvtReport.RowTemplate.Height = 23; this.dgvtReport.ShowCellErrors = false; this.dgvtReport.ShowCellToolTips = false; - this.dgvtReport.Size = new System.Drawing.Size(1350, 407); + this.dgvtReport.Size = new System.Drawing.Size(1350, 415); this.dgvtReport.TabIndex = 391; this.dgvtReport.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvtReport_RowPostPaint); // @@ -182,7 +212,7 @@ this.panel2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1350, 57); + this.panel2.Size = new System.Drawing.Size(1350, 45); this.panel2.TabIndex = 390; // // dtpEnd @@ -198,7 +228,7 @@ this.dtpEnd.Font = new System.Drawing.Font("微软雅黑", 9F); this.dtpEnd.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.dtpEnd.IsPopupCalendarOpen = false; - this.dtpEnd.Location = new System.Drawing.Point(224, 16); + this.dtpEnd.Location = new System.Drawing.Point(224, 9); // // // @@ -233,7 +263,7 @@ this.dtpOpeTime.Font = new System.Drawing.Font("微软雅黑", 9F); this.dtpOpeTime.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.dtpOpeTime.IsPopupCalendarOpen = false; - this.dtpOpeTime.Location = new System.Drawing.Point(91, 16); + this.dtpOpeTime.Location = new System.Drawing.Point(91, 9); // // // @@ -258,7 +288,7 @@ // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(208, 18); + this.label24.Location = new System.Drawing.Point(208, 11); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(15, 20); this.label24.TabIndex = 470; @@ -269,7 +299,7 @@ this.btn手术例数按月统计.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn手术例数按月统计.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btn手术例数按月统计.Font = new System.Drawing.Font("微软雅黑", 11.5F); - this.btn手术例数按月统计.Location = new System.Drawing.Point(356, 14); + this.btn手术例数按月统计.Location = new System.Drawing.Point(356, 7); this.btn手术例数按月统计.Name = "btn手术例数按月统计"; this.btn手术例数按月统计.Size = new System.Drawing.Size(90, 29); this.btn手术例数按月统计.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -280,7 +310,7 @@ // labDate // this.labDate.AutoSize = true; - this.labDate.Location = new System.Drawing.Point(17, 16); + this.labDate.Location = new System.Drawing.Point(17, 9); this.labDate.Name = "labDate"; this.labDate.Size = new System.Drawing.Size(68, 20); this.labDate.TabIndex = 421; @@ -293,16 +323,185 @@ this.R1.Name = "R1"; this.R1.Text = "手术例数按月统计表"; // - // tspSetting + // R2 // - this.tspSetting.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tspSetting.Image = global::AIMS.Properties.Resources.图标_设置; - this.tspSetting.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tspSetting.Name = "tspSetting"; - this.tspSetting.Size = new System.Drawing.Size(68, 46); - this.tspSetting.Text = " 导出设置"; - this.tspSetting.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.tspSetting.Click += new System.EventHandler(this.tspSetting_Click); + this.R2.AttachedControl = this.superTabControlPanel2; + this.R2.GlobalItem = false; + this.R2.Name = "R2"; + this.R2.Text = "2022麻醉专业医疗质控指标"; + // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dgvtReport2); + this.superTabControlPanel2.Controls.Add(this.panel1); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 32); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(1350, 460); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.R2; + // + // dgvtReport2 + // + this.dgvtReport2.AllowUserToAddRows = false; + this.dgvtReport2.AllowUserToDeleteRows = false; + this.dgvtReport2.AllowUserToResizeColumns = false; + this.dgvtReport2.AllowUserToResizeRows = false; + this.dgvtReport2.BackgroundColor = System.Drawing.Color.White; + this.dgvtReport2.BorderStyle = System.Windows.Forms.BorderStyle.None; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + this.dgvtReport2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dgvtReport2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvtReport2.DefaultCellStyle = dataGridViewCellStyle2; + this.dgvtReport2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvtReport2.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; + this.dgvtReport2.GridColor = System.Drawing.Color.Black; + this.dgvtReport2.Location = new System.Drawing.Point(0, 45); + this.dgvtReport2.MultiSelect = false; + this.dgvtReport2.Name = "dgvtReport2"; + this.dgvtReport2.ReadOnly = true; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvtReport2.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.dgvtReport2.RowHeadersVisible = false; + this.dgvtReport2.RowTemplate.Height = 23; + this.dgvtReport2.ShowCellErrors = false; + this.dgvtReport2.ShowCellToolTips = false; + this.dgvtReport2.Size = new System.Drawing.Size(1350, 415); + this.dgvtReport2.TabIndex = 393; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.WhiteSmoke; + this.panel1.Controls.Add(this.dtpEnd2); + this.panel1.Controls.Add(this.dtpOpeTime2); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.btn麻醉专业医疗质控指标); + this.panel1.Controls.Add(this.label2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1350, 45); + this.panel1.TabIndex = 392; + // + // dtpEnd2 + // + // + // + // + this.dtpEnd2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dtpEnd2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.dtpEnd2.ButtonDropDown.Visible = true; + this.dtpEnd2.CustomFormat = "yyyy-MM-dd"; + this.dtpEnd2.FocusHighlightColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(186)))), ((int)(((byte)(179))))); + this.dtpEnd2.Font = new System.Drawing.Font("微软雅黑", 9F); + this.dtpEnd2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.dtpEnd2.IsPopupCalendarOpen = false; + this.dtpEnd2.Location = new System.Drawing.Point(224, 9); + // + // + // + // + // + // + this.dtpEnd2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.dtpEnd2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dtpEnd2.MonthCalendar.DisplayMonth = new System.DateTime(2017, 11, 1, 0, 0, 0, 0); + // + // + // + this.dtpEnd2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dtpEnd2.Name = "dtpEnd2"; + this.dtpEnd2.Size = new System.Drawing.Size(114, 23); + this.dtpEnd2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.dtpEnd2.TabIndex = 472; + // + // dtpOpeTime2 + // + // + // + // + this.dtpOpeTime2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dtpOpeTime2.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; + this.dtpOpeTime2.ButtonDropDown.Visible = true; + this.dtpOpeTime2.CustomFormat = "yyyy-MM-dd"; + this.dtpOpeTime2.FocusHighlightColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(186)))), ((int)(((byte)(179))))); + this.dtpOpeTime2.Font = new System.Drawing.Font("微软雅黑", 9F); + this.dtpOpeTime2.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; + this.dtpOpeTime2.IsPopupCalendarOpen = false; + this.dtpOpeTime2.Location = new System.Drawing.Point(91, 9); + // + // + // + // + // + // + this.dtpOpeTime2.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.dtpOpeTime2.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dtpOpeTime2.MonthCalendar.DisplayMonth = new System.DateTime(2017, 11, 1, 0, 0, 0, 0); + // + // + // + this.dtpOpeTime2.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.dtpOpeTime2.Name = "dtpOpeTime2"; + this.dtpOpeTime2.Size = new System.Drawing.Size(114, 23); + this.dtpOpeTime2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.dtpOpeTime2.TabIndex = 471; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(208, 11); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(15, 20); + this.label1.TabIndex = 470; + this.label1.Text = "-"; + // + // btn麻醉专业医疗质控指标 + // + this.btn麻醉专业医疗质控指标.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btn麻醉专业医疗质控指标.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btn麻醉专业医疗质控指标.Font = new System.Drawing.Font("微软雅黑", 11.5F); + this.btn麻醉专业医疗质控指标.Location = new System.Drawing.Point(356, 7); + this.btn麻醉专业医疗质控指标.Name = "btn麻醉专业医疗质控指标"; + this.btn麻醉专业医疗质控指标.Size = new System.Drawing.Size(90, 29); + this.btn麻醉专业医疗质控指标.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btn麻醉专业医疗质控指标.TabIndex = 467; + this.btn麻醉专业医疗质控指标.Text = "查询"; + this.btn麻醉专业医疗质控指标.Click += new System.EventHandler(this.btn麻醉专业医疗质控指标_Click); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(17, 9); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(68, 20); + this.label2.TabIndex = 421; + this.label2.Text = "查询时间:"; // // frmReportExport // @@ -323,6 +522,12 @@ this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dtpEnd)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dtpOpeTime)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvtReport2)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dtpEnd2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dtpOpeTime2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -343,5 +548,14 @@ private DevComponents.DotNetBar.ButtonX btn手术例数按月统计; public System.Windows.Forms.Label labDate; private System.Windows.Forms.ToolStripButton tspSetting; + private DevComponents.DotNetBar.SuperTabControlPanel superTabControlPanel2; + private System.Windows.Forms.DataGridView dgvtReport2; + private System.Windows.Forms.Panel panel1; + private DevComponents.Editors.DateTimeAdv.DateTimeInput dtpEnd2; + private DevComponents.Editors.DateTimeAdv.DateTimeInput dtpOpeTime2; + public System.Windows.Forms.Label label1; + private DevComponents.DotNetBar.ButtonX btn麻醉专业医疗质控指标; + public System.Windows.Forms.Label label2; + private DevComponents.DotNetBar.SuperTabItem R2; } } \ No newline at end of file diff --git a/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs b/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs index c4db259..75cb8c8 100644 --- a/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs +++ b/AIMS/OperationFront/frmOperationApplyDetail.Designer.cs @@ -38,6 +38,7 @@ this.tsbExit = new System.Windows.Forms.ToolStripButton(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.tokenEditor1 = new DevComponents.DotNetBar.Controls.TokenEditor(); this.label23 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); this.txtOperationRemark = new System.Windows.Forms.TextBox(); @@ -224,11 +225,12 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 49); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1132, 484); + this.panel1.Size = new System.Drawing.Size(1132, 497); this.panel1.TabIndex = 2; // // groupBox2 // + this.groupBox2.Controls.Add(this.tokenEditor1); this.groupBox2.Controls.Add(this.label23); this.groupBox2.Controls.Add(this.label28); this.groupBox2.Controls.Add(this.txtOperationRemark); @@ -286,16 +288,43 @@ this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F); this.groupBox2.Location = new System.Drawing.Point(0, 140); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(1132, 341); + this.groupBox2.Size = new System.Drawing.Size(1132, 354); this.groupBox2.TabIndex = 14; this.groupBox2.TabStop = false; this.groupBox2.Text = "手术基本信息"; // + // tokenEditor1 + // + // + // + // + this.tokenEditor1.BackgroundStyle.Class = "DateTimeInputBackground"; + this.tokenEditor1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.tokenEditor1.DropDownButtonVisible = true; + this.tokenEditor1.DropDownWidth = 380; + this.tokenEditor1.Location = new System.Drawing.Point(925, 171); + this.tokenEditor1.MaxHeightLines = 3; + this.tokenEditor1.Name = "tokenEditor1"; + this.tokenEditor1.Separators.Add(";"); + this.tokenEditor1.Separators.Add(","); + this.tokenEditor1.Size = new System.Drawing.Size(619, 24); + this.tokenEditor1.TabIndex = 32; + this.tokenEditor1.SelectedTokensChanged += new System.EventHandler(this.tokenEditor1_SelectedTokensChanged); + this.tokenEditor1.TokenMouseEnter += new System.EventHandler(this.tokenEditor1_TokenMouseEnter); + this.tokenEditor1.TokenMouseLeave += new System.EventHandler(this.tokenEditor1_TokenMouseLeave); + this.tokenEditor1.TokenMouseClick += new System.Windows.Forms.MouseEventHandler(this.tokenEditor1_TokenMouseClick); + this.tokenEditor1.TokenMouseHover += new System.EventHandler(this.tokenEditor1_TokenMouseHover); + this.tokenEditor1.RemovingToken += new DevComponents.DotNetBar.Controls.RemovingTokenEventHandler(this.tokenEditor1_RemovingToken); + this.tokenEditor1.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor1_ValidateToken); + this.tokenEditor1.RegionChanged += new System.EventHandler(this.tokenEditor1_RegionChanged); + this.tokenEditor1.SizeChanged += new System.EventHandler(this.tokenEditor1_SizeChanged); + this.tokenEditor1.TextChanged += new System.EventHandler(this.tokenEditor1_TextChanged); + // // label23 // this.label23.AutoSize = true; this.label23.ForeColor = System.Drawing.Color.Black; - this.label23.Location = new System.Drawing.Point(9, 308); + this.label23.Location = new System.Drawing.Point(9, 299); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(63, 14); this.label23.TabIndex = 11; @@ -312,7 +341,7 @@ // // txtOperationRemark // - this.txtOperationRemark.Location = new System.Drawing.Point(85, 303); + this.txtOperationRemark.Location = new System.Drawing.Point(85, 294); this.txtOperationRemark.Name = "txtOperationRemark"; this.txtOperationRemark.Size = new System.Drawing.Size(1014, 23); this.txtOperationRemark.TabIndex = 10; @@ -329,7 +358,7 @@ // this.label47.AutoSize = true; this.label47.ForeColor = System.Drawing.Color.Black; - this.label47.Location = new System.Drawing.Point(10, 277); + this.label47.Location = new System.Drawing.Point(10, 268); this.label47.Name = "label47"; this.label47.Size = new System.Drawing.Size(70, 14); this.label47.TabIndex = 11; @@ -339,7 +368,7 @@ // this.label45.AutoSize = true; this.label45.ForeColor = System.Drawing.Color.Black; - this.label45.Location = new System.Drawing.Point(10, 219); + this.label45.Location = new System.Drawing.Point(10, 210); this.label45.Name = "label45"; this.label45.Size = new System.Drawing.Size(70, 14); this.label45.TabIndex = 11; @@ -349,7 +378,7 @@ // this.label46.AutoSize = true; this.label46.ForeColor = System.Drawing.Color.Black; - this.label46.Location = new System.Drawing.Point(10, 248); + this.label46.Location = new System.Drawing.Point(10, 239); this.label46.Name = "label46"; this.label46.Size = new System.Drawing.Size(70, 14); this.label46.TabIndex = 11; @@ -359,7 +388,7 @@ // this.label44.AutoSize = true; this.label44.ForeColor = System.Drawing.Color.Black; - this.label44.Location = new System.Drawing.Point(10, 190); + this.label44.Location = new System.Drawing.Point(10, 181); this.label44.Name = "label44"; this.label44.Size = new System.Drawing.Size(70, 14); this.label44.TabIndex = 11; @@ -369,7 +398,7 @@ // this.label35.AutoSize = true; this.label35.ForeColor = System.Drawing.Color.Black; - this.label35.Location = new System.Drawing.Point(10, 161); + this.label35.Location = new System.Drawing.Point(10, 152); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(70, 14); this.label35.TabIndex = 11; @@ -505,7 +534,7 @@ // txtRight5 // this.txtRight5.Enabled = false; - this.txtRight5.Location = new System.Drawing.Point(643, 274); + this.txtRight5.Location = new System.Drawing.Point(643, 265); this.txtRight5.Name = "txtRight5"; this.txtRight5.Size = new System.Drawing.Size(264, 23); this.txtRight5.TabIndex = 9; @@ -513,7 +542,7 @@ // txtRight3 // this.txtRight3.Enabled = false; - this.txtRight3.Location = new System.Drawing.Point(643, 216); + this.txtRight3.Location = new System.Drawing.Point(643, 207); this.txtRight3.Name = "txtRight3"; this.txtRight3.Size = new System.Drawing.Size(264, 23); this.txtRight3.TabIndex = 9; @@ -521,7 +550,7 @@ // txtLeft5 // this.txtLeft5.Enabled = false; - this.txtLeft5.Location = new System.Drawing.Point(86, 274); + this.txtLeft5.Location = new System.Drawing.Point(86, 265); this.txtLeft5.Name = "txtLeft5"; this.txtLeft5.Size = new System.Drawing.Size(103, 23); this.txtLeft5.TabIndex = 9; @@ -529,7 +558,7 @@ // txtLeft3 // this.txtLeft3.Enabled = false; - this.txtLeft3.Location = new System.Drawing.Point(86, 216); + this.txtLeft3.Location = new System.Drawing.Point(86, 207); this.txtLeft3.Name = "txtLeft3"; this.txtLeft3.Size = new System.Drawing.Size(103, 23); this.txtLeft3.TabIndex = 9; @@ -537,7 +566,7 @@ // txtRight4 // this.txtRight4.Enabled = false; - this.txtRight4.Location = new System.Drawing.Point(643, 245); + this.txtRight4.Location = new System.Drawing.Point(643, 236); this.txtRight4.Name = "txtRight4"; this.txtRight4.Size = new System.Drawing.Size(264, 23); this.txtRight4.TabIndex = 9; @@ -545,7 +574,7 @@ // txtLeft4 // this.txtLeft4.Enabled = false; - this.txtLeft4.Location = new System.Drawing.Point(86, 245); + this.txtLeft4.Location = new System.Drawing.Point(86, 236); this.txtLeft4.Name = "txtLeft4"; this.txtLeft4.Size = new System.Drawing.Size(103, 23); this.txtLeft4.TabIndex = 9; @@ -553,14 +582,14 @@ // txtRight2 // this.txtRight2.Enabled = false; - this.txtRight2.Location = new System.Drawing.Point(643, 187); + this.txtRight2.Location = new System.Drawing.Point(643, 178); this.txtRight2.Name = "txtRight2"; this.txtRight2.Size = new System.Drawing.Size(264, 23); this.txtRight2.TabIndex = 9; // // txtOperation5 // - this.txtOperation5.Location = new System.Drawing.Point(201, 274); + this.txtOperation5.Location = new System.Drawing.Point(201, 265); this.txtOperation5.Name = "txtOperation5"; this.txtOperation5.Size = new System.Drawing.Size(431, 23); this.txtOperation5.TabIndex = 9; @@ -570,14 +599,14 @@ // txtLeft2 // this.txtLeft2.Enabled = false; - this.txtLeft2.Location = new System.Drawing.Point(86, 187); + this.txtLeft2.Location = new System.Drawing.Point(86, 178); this.txtLeft2.Name = "txtLeft2"; this.txtLeft2.Size = new System.Drawing.Size(103, 23); this.txtLeft2.TabIndex = 9; // // txtOperation3 // - this.txtOperation3.Location = new System.Drawing.Point(201, 216); + this.txtOperation3.Location = new System.Drawing.Point(201, 207); this.txtOperation3.Name = "txtOperation3"; this.txtOperation3.Size = new System.Drawing.Size(431, 23); this.txtOperation3.TabIndex = 9; @@ -586,7 +615,7 @@ // // txtOperation4 // - this.txtOperation4.Location = new System.Drawing.Point(201, 245); + this.txtOperation4.Location = new System.Drawing.Point(201, 236); this.txtOperation4.Name = "txtOperation4"; this.txtOperation4.Size = new System.Drawing.Size(431, 23); this.txtOperation4.TabIndex = 9; @@ -596,14 +625,14 @@ // txtRight // this.txtRight.Enabled = false; - this.txtRight.Location = new System.Drawing.Point(643, 158); + this.txtRight.Location = new System.Drawing.Point(643, 149); this.txtRight.Name = "txtRight"; this.txtRight.Size = new System.Drawing.Size(264, 23); this.txtRight.TabIndex = 9; // // txtOperation2 // - this.txtOperation2.Location = new System.Drawing.Point(201, 187); + this.txtOperation2.Location = new System.Drawing.Point(201, 178); this.txtOperation2.Name = "txtOperation2"; this.txtOperation2.Size = new System.Drawing.Size(431, 23); this.txtOperation2.TabIndex = 9; @@ -613,14 +642,14 @@ // txtLeft // this.txtLeft.Enabled = false; - this.txtLeft.Location = new System.Drawing.Point(86, 158); + this.txtLeft.Location = new System.Drawing.Point(86, 149); this.txtLeft.Name = "txtLeft"; this.txtLeft.Size = new System.Drawing.Size(103, 23); this.txtLeft.TabIndex = 9; // // txtOperation // - this.txtOperation.Location = new System.Drawing.Point(201, 158); + this.txtOperation.Location = new System.Drawing.Point(201, 149); this.txtOperation.Name = "txtOperation"; this.txtOperation.Size = new System.Drawing.Size(431, 23); this.txtOperation.TabIndex = 9; @@ -1219,7 +1248,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1132, 533); + this.ClientSize = new System.Drawing.Size(1132, 546); this.Controls.Add(this.panel1); this.Controls.Add(this.toolStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -1350,5 +1379,6 @@ public System.Windows.Forms.ToolStripButton tsbCancel; private System.Windows.Forms.RadioButton rboRJ; public System.Windows.Forms.ComboBox cboPatientType; + private DevComponents.DotNetBar.Controls.TokenEditor tokenEditor1; } } \ No newline at end of file diff --git a/AIMS/OperationFront/frmOperationApplyDetail.cs b/AIMS/OperationFront/frmOperationApplyDetail.cs index fb1509c..1198857 100644 --- a/AIMS/OperationFront/frmOperationApplyDetail.cs +++ b/AIMS/OperationFront/frmOperationApplyDetail.cs @@ -140,10 +140,16 @@ namespace AIMS.OperationFront.UI //手术 SelectOperationData = BApplyOperationInfo.GetApplyOperationIdList(EditApplyId); + for (int i = 0; i < SelectOperationData.Count; i++) { ApplyOperationInfo info = SelectOperationData[i]; + + Operation operation = BOperation.SelectSingle(info.OperationId); ; + tokenEditor1.SelectedTokens.Add(new DevComponents.DotNetBar.Controls.EditToken(operation.Id.ToString(), operation.Name)); + tokenEditor1.EditTextBox.TextChanged += EditTextBox_TextChanged; + if (i == 0) { txtOperation.Text = BOperation.SelectSingle(info.OperationId).Name; @@ -1395,5 +1401,71 @@ namespace AIMS.OperationFront.UI dtpOrderOperationTime.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd HH:mm"); } } + + private void tokenEditor1_ValidateToken(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea) + { + if (ea.IsNewToken) + { + // Remember the keyword created + tokenEditor1.Tokens.Add(ea.Token); + } + } + + private void tokenEditor1_TextChanged(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_TokenMouseClick(object sender, MouseEventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_SelectedTokensChanged(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_SizeChanged(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_RemovingToken(object sender, DevComponents.DotNetBar.Controls.RemovingTokenEventArgs ea) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_RegionChanged(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_TokenMouseEnter(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_TokenMouseHover(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void tokenEditor1_TokenMouseLeave(object sender, EventArgs e) + { + string text= tokenEditor1.Text; + } + + private void EditTextBox_TextChanged(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + if (txt.Text != "") + { + DevComponents.DotNetBar.Controls.EditToken edit = new DevComponents.DotNetBar.Controls.EditToken("programmingprogrammingprogrammingprogrammingprogrammingprogramming"); + tokenEditor1.Tokens.Add(edit); + tokenEditor1.IsPopupOpen = true; + //tokenEditor1.ClientSize =new Size ( tokenEditor1.Width,100); + } + } } } diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 4cfce50..8fa96de 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -3612,13 +3612,15 @@ namespace AIMS.OperationFront.UI comboBoxExRoom.Visible = false; RoomCardManage.SelectDgv = dgvApplyOrDoctor; RoomCardManage.OnDataSaved = marksManager_OnDataSaved; - LoadSelectDate(""); + + NowPatientDataTable = BOperationApply.GetOperationFrontDataTable(dtpSearchTime.Value.ToString("yyyy-MM-dd 00:00:00"), dtpSearchTime.Value.ToString("yyyy-MM-dd 23:59:59")); + LoadOperationRooms(); tabScheduling_SelectedTabChanged(null, null); + dtpSearchTime.Focus(); navigationPane1.ShowMoreButtons(); dgvApplyOrDoctor.ClearSelection(); - //dtpSearchTime.Focus(); dtpSearchTime.ValueChanged -= new EventHandler(dtpSearchTime_ValueChanged); this.VisibleChanged -= new EventHandler(frmOperationSchedulePlans_VisibleChanged); dtpSearchTime.ValueChanged += new EventHandler(dtpSearchTime_ValueChanged); diff --git a/AIMSEntity/Extensions/BOperationReport.cs b/AIMSEntity/Extensions/BOperationReport.cs index 14b0f5a..962bc57 100644 --- a/AIMSEntity/Extensions/BOperationReport.cs +++ b/AIMSEntity/Extensions/BOperationReport.cs @@ -24,5 +24,10 @@ namespace AIMSBLL string strSql = "SELECT OpeMonth, OpeDAY,COUNT(*) num FROM [dbo].[V_OperationRecordInfo] where State='手术结束' and InRoomTime>'" + beginTime + "' and InRoomTime<'" + endTime + "' group by OpeMonth,OpeDAY"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } + public static DataTable Get麻醉专业医疗质控指标(string beginTime, string endTime) + { + string strSql = "exec [usp_Get2022AnaseQuality]'" + beginTime + "' ,'" + endTime + "' "; + return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); + } } } diff --git a/DrawGraph/AreaManage/AnalgesiaDataBottonManage.cs b/DrawGraph/AreaManage/AnalgesiaDataBottonManage.cs index 576253f..7a87ad9 100644 --- a/DrawGraph/AreaManage/AnalgesiaDataBottonManage.cs +++ b/DrawGraph/AreaManage/AnalgesiaDataBottonManage.cs @@ -1,4 +1,5 @@ using AIMSExtension; +using DevComponents.DotNetBar.Controls; using DevComponents.Editors.DateTimeAdv; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -259,6 +260,22 @@ namespace DrawGraph ableEdit.CControl.Leave += new EventHandler(txt_Leave); } } + else if (ableEdit.ControlType == EControlType.Directorys) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ableEdit.CControl as DevComponents.DotNetBar.Controls.TokenEditor; + tokenEditor.EditTextBox.DoubleClick -= EditTextBox_DoubleClick; + tokenEditor.EditTextBox.DoubleClick += EditTextBox_DoubleClick; + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + tokenEditor.Leave -= TokenEditor_Leave; + tokenEditor.Leave += TokenEditor_Leave; + + if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断") + { + tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + } + } else if (ableEdit.ControlType == EControlType.CheckBox) { Panel pan = ableEdit.CControl as Panel; @@ -495,6 +512,19 @@ namespace DrawGraph //设置属性的值 template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); break; + case EControlType.Directorys: + value = ableEdit.PackValue; + if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断" || ableEdit.ControlTitleText == "人员") + { + text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText); + } + else + { + text = ableEdit.PackValue; + } + //设置属性的值 + template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); + break; default: text = ableEdit.CControl.Text; value = ableEdit.CControl.Text; @@ -850,9 +880,9 @@ namespace DrawGraph if (myOpeRecord != null) { Control conl = sender as Control; - AbleEditPackObj aEdit1S = conl.Tag as AbleEditPackObj; + AbleEditPackObj aEdit1S = conl.Tag as AbleEditPackObj; if (aEdit1S == null) return; - aSyncSelectDict.ShowSel(template, conl, OpeRecord,aEdit1S); + aSyncSelectDict.ShowSel(template, conl, OpeRecord, aEdit1S); //conl.KeyUp -= new KeyEventHandler(CControl_KeyUp2); } } @@ -865,9 +895,9 @@ namespace DrawGraph { if (conl.Text != SelectDictText.Value && SelectDictText.ChageText == "") { - AbleEditPackObj aEdit1S = conl.Tag as AbleEditPackObj; - if (aEdit1S == null) return; - aSyncSelectDict.DelSel(template, conl, OpeRecord,aEdit1S); + AbleEditPackObj aEdit1S = conl.Tag as AbleEditPackObj; + if (aEdit1S == null) return; + aSyncSelectDict.DelSel(template, conl, OpeRecord, aEdit1S); SelectDictText.ChageText = ""; } } @@ -918,5 +948,41 @@ namespace DrawGraph aSyncSelectDict.Show(template, OpeRecord, sender, _DictType, isRadio); } } + + + private void EditTextBox_DoubleClick(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + private void EditTextBox_TextChanged(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + + private void tokenEditor_ValidateToken(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + if (ea.IsNewToken) + { + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + string id = TokenEditorManage.GetOperationItemId(ea.Token.Value, aEdit); + tokenEditor.SelectedTokens.Add(new EditToken(id, ea.Token.Value)); + ea.Token = null; + tokenEditor.EditTextBox.Text = ""; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } + + private void TokenEditor_Leave(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + TokenEditorManage.SaveDictItem(template, OpeRecord as OperationRecord, tokenEditor, aEdit); + } + } } diff --git a/DrawGraph/AreaManage/AnalgesiaDataManage.cs b/DrawGraph/AreaManage/AnalgesiaDataManage.cs index 64ceb14..8edd5d3 100644 --- a/DrawGraph/AreaManage/AnalgesiaDataManage.cs +++ b/DrawGraph/AreaManage/AnalgesiaDataManage.cs @@ -1,11 +1,15 @@ using AIMSExtension; +using DevComponents.DotNetBar.Controls; using DevComponents.Editors.DateTimeAdv; +using HelperDB; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +using System.Data; using System.IO; using System.Linq; +using System.Reflection.Emit; using System.Windows.Forms; using static System.Net.Mime.MediaTypeNames; @@ -258,6 +262,22 @@ namespace DrawGraph ableEdit.CControl.Leave += new EventHandler(txt_Leave); } } + else if (ableEdit.ControlType == EControlType.Directorys) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ableEdit.CControl as DevComponents.DotNetBar.Controls.TokenEditor; + tokenEditor.EditTextBox.DoubleClick -= EditTextBox_DoubleClick; + tokenEditor.EditTextBox.DoubleClick += EditTextBox_DoubleClick; + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + tokenEditor.Leave -= TokenEditor_Leave; + tokenEditor.Leave += TokenEditor_Leave; + + if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断") + { + tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + } + } else if (ableEdit.ControlType == EControlType.CheckBox) { Panel pan = ableEdit.CControl as Panel; @@ -313,7 +333,6 @@ namespace DrawGraph } } - ////取消滚轮事件 //void numericUpDown1_MouseWheel(object sender, MouseEventArgs e) //{ @@ -494,6 +513,19 @@ namespace DrawGraph //设置属性的值 template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); break; + case EControlType.Directorys: + value = ableEdit.PackValue; + if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断" || ableEdit.ControlTitleText == "人员") + { + text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText); + } + else + { + text = ableEdit.PackValue; + } + //设置属性的值 + template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); + break; default: text = ableEdit.CControl.Text; value = ableEdit.CControl.Text; @@ -869,5 +901,40 @@ namespace DrawGraph aSyncSelectDict.Show(template, OpeRecord, sender, _DictType, isRadio); } } + + private void EditTextBox_DoubleClick(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + private void EditTextBox_TextChanged(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + + private void tokenEditor_ValidateToken(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + if (ea.IsNewToken) + { + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + string id = TokenEditorManage.GetOperationItemId(ea.Token.Value, aEdit); + tokenEditor.SelectedTokens.Add(new EditToken(id, ea.Token.Value)); + ea.Token = null; + tokenEditor.EditTextBox.Text = ""; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } + + private void TokenEditor_Leave(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + TokenEditorManage.SaveDictItem(template, OpeRecord as OperationRecord, tokenEditor, aEdit); + } + } } diff --git a/DrawGraph/AreaManage/BaseInfoBottomManage.cs b/DrawGraph/AreaManage/BaseInfoBottomManage.cs index 2f7f11b..a15c2b5 100644 --- a/DrawGraph/AreaManage/BaseInfoBottomManage.cs +++ b/DrawGraph/AreaManage/BaseInfoBottomManage.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; - +using DevComponents.DotNetBar.Controls; namespace DrawGraph { @@ -83,6 +83,12 @@ namespace DrawGraph //设置属性的值 template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); break; + case EControlType.Directorys: + value = ableEdit.PackValue; + text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText); + //设置属性的值 + template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); + break; default: break; } @@ -119,7 +125,7 @@ namespace DrawGraph if (aEdit1 != null) { Control conl = aEdit1.CControl; - conl.Leave -= new EventHandler(txt_Leave); + conl.Leave -= new EventHandler(txt_Leave); aEdit1.IsVisible = !aEdit1.IsVisible; aEdit1S.CControl.MouseDown -= new MouseEventHandler(CControl_MouseDown); aEdit1S.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp); @@ -158,17 +164,17 @@ namespace DrawGraph case "OperationRecord.OrtherDoctorId": Worker_Click(aEdit1, e, 4); break; - case "OperationRecord.OpeRecoverOutInfo.Extend1": + case "OperationRecord.OpeRecoverOutInfo.Extend1": ((TextBox)conl).BorderStyle = BorderStyle.Fixed3D; ((TextBox)conl).Focus(); ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); - conl.Leave += new EventHandler(txt_Leave); + conl.Leave += new EventHandler(txt_Leave); break; - case "OperationRecord.OpeRecoverOutInfo.Extend2": + case "OperationRecord.OpeRecoverOutInfo.Extend2": ((TextBox)conl).BorderStyle = BorderStyle.Fixed3D; ((TextBox)conl).Focus(); ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); - conl.Leave += new EventHandler(txt_Leave); + conl.Leave += new EventHandler(txt_Leave); break; //default: // //在此处写日志 @@ -208,13 +214,13 @@ namespace DrawGraph ableEdit.IsVisible = !ableEdit.IsVisible; } else - { - text = control.Text.Trim(); - value = control.Text.Trim(); - //设置属性的值 - ableEdit.IsVisible = !ableEdit.IsVisible; - template.SetObjValue(OpeRecord, DataSourceName, text, value, true); - ((TextBox)control).BorderStyle = BorderStyle.None; + { + text = control.Text.Trim(); + value = control.Text.Trim(); + //设置属性的值 + ableEdit.IsVisible = !ableEdit.IsVisible; + template.SetObjValue(OpeRecord, DataSourceName, text, value, true); + ((TextBox)control).BorderStyle = BorderStyle.None; } } catch (Exception ex) @@ -231,43 +237,48 @@ namespace DrawGraph private void Worker_Click(AbleEditPackObj sender, EventArgs e, int _workersType) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; - - 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.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); - ableEdit.CControl.KeyPress += new KeyPressEventHandler(CControl_KeyPress); - SelectWorkerValue.ChageText = ""; - if (myOpeRecord != null) + try { - Control conl = sender.CControl; - if (conl is TextBox) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { - ((TextBox)conl).BorderStyle = BorderStyle.Fixed3D; - ((TextBox)conl).Focus(); - if (sender.PackValue != null && sender.PackValue.Trim() != "") + 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.KeyPress -= new KeyPressEventHandler(CControl_KeyPress); + ableEdit.CControl.KeyPress += new KeyPressEventHandler(CControl_KeyPress); + SelectWorkerValue.ChageText = ""; + if (myOpeRecord != null) { - if (ableEdit.ClassDataSourceName == "OperationRecord.AnaesthesiaMethodName") + Control conl = sender.CControl; + if (conl is TextBox) { - if (((TextBox)conl).Text.LastIndexOf('+') != sender.PackText.Length) - ((TextBox)conl).Text = ((TextBox)conl).Text + "+"; - ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); - } - else - { - if (((TextBox)conl).Text.LastIndexOf(',') != sender.PackText.Length) - ((TextBox)conl).Text = ((TextBox)conl).Text + ","; - ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); + ((TextBox)conl).BorderStyle = BorderStyle.Fixed3D; + ((TextBox)conl).Focus(); + if (sender.PackValue != null && sender.PackValue.Trim() != "") + { + if (((TextBox)conl).Text.LastIndexOf(',') != sender.PackText.Length) + ((TextBox)conl).Text = ((TextBox)conl).Text + ","; + ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); + } } + ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); + ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); + + aSyncSelectDict.Show(template, OpeRecord, sender, _workersType.ToString()); } } - ableEdit.CControl.TextChanged -= new EventHandler(CControl_TextChanged); - ableEdit.CControl.TextChanged += new EventHandler(CControl_TextChanged); - - aSyncSelectDict.Show(template, OpeRecord, sender, _workersType.ToString()); + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } + } + catch (Exception ex) + { + AIMSExtension.PublicMethod.WriteLog(ex); } } @@ -336,16 +347,16 @@ namespace DrawGraph if (rightStr.Contains(",")) { endLength = rightStr.IndexOf(",") + (leftStr.Length - beginindex); - } + } } - else if (leftStr.Contains("+")) + else if (leftStr.Contains("+")) { int beginindex = leftStr.LastIndexOf('+'); startIndex = beginindex + 1; if (rightStr.Contains("+")) { endLength = rightStr.IndexOf("+") + (leftStr.Length - beginindex); - } + } } else { @@ -365,14 +376,19 @@ namespace DrawGraph private void ope_Click(AbleEditPackObj sender, EventArgs e) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { SelDict(sender, e, ableEdit.ControlTitleText); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } } catch (Exception ex) { @@ -381,14 +397,19 @@ namespace DrawGraph } private void Anaes_Click(AbleEditPackObj sender, EventArgs e) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { SelDict(sender, e, ableEdit.ControlTitleText); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } } catch (Exception ex) { @@ -398,14 +419,19 @@ namespace DrawGraph //通用字典分组窗体打开 private void TYZD_Click(AbleEditPackObj sender, EventArgs e, bool isRadio = false) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { SelDict(sender, e, ableEdit.ControlTitleText); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } } catch (Exception ex) { @@ -455,6 +481,61 @@ namespace DrawGraph } } - #endregion + #endregion + + + private void SetDirectorysMethod(AbleEditPackObj ableEdit) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ableEdit.CControl as DevComponents.DotNetBar.Controls.TokenEditor; + tokenEditor.EditTextBox.DoubleClick -= EditTextBox_DoubleClick; + tokenEditor.EditTextBox.DoubleClick += EditTextBox_DoubleClick; + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + tokenEditor.Leave -= TokenEditor_Leave; + tokenEditor.Leave += TokenEditor_Leave; + + if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断") + { + tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + } + EditTextBox_DoubleClick(tokenEditor.EditTextBox, null); + tokenEditor.EditTextBox.Select(); + } + + private void EditTextBox_DoubleClick(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + private void EditTextBox_TextChanged(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + + private void tokenEditor_ValidateToken(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + if (ea.IsNewToken) + { + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + string id = TokenEditorManage.GetOperationItemId(ea.Token.Value, aEdit); + tokenEditor.SelectedTokens.Add(new EditToken(id, ea.Token.Value)); + ea.Token = null; + tokenEditor.EditTextBox.Text = ""; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } + + private void TokenEditor_Leave(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + TokenEditorManage.SaveDictItem(template, OpeRecord as OperationRecord, tokenEditor, aEdit, true); + } + } } diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index 210bfb4..ea3ffa9 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -1,6 +1,6 @@ -using HelperDB; +using AIMSExtension; +using DevComponents.DotNetBar.Controls; using Newtonsoft.Json; -using AIMSExtension; using System; using System.Collections.Generic; using System.Data; @@ -176,6 +176,12 @@ namespace DrawGraph //设置属性的值 template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); break; + case EControlType.Directorys: + value = ableEdit.PackValue; + text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText); + //设置属性的值 + template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); + break; default: text = ableEdit.CControl.Text; value = ableEdit.CControl.Text; @@ -429,14 +435,19 @@ namespace DrawGraph #region 可编辑区域响应事件 //通用字典分组窗体打开 private void TYZD_Click(AbleEditPackObj sender, EventArgs e, bool isRadio = false) - { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; + { try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { - SelDict(sender, e, ableEdit.ControlTitleText, isRadio); + SelDict(sender, e, ableEdit.ControlTitleText, isRadio); + } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); } } catch (Exception ex) @@ -557,30 +568,60 @@ namespace DrawGraph private void ope_Click(AbleEditPackObj sender, EventArgs e) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { SelDict(sender, e, ableEdit.ControlTitleText); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } } catch (Exception ex) { AIMSExtension.PublicMethod.WriteLog(ex); } } + + private void SetDirectorysMethod(AbleEditPackObj ableEdit) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ableEdit.CControl as DevComponents.DotNetBar.Controls.TokenEditor; + tokenEditor.EditTextBox.DoubleClick -= EditTextBox_DoubleClick; + tokenEditor.EditTextBox.DoubleClick += EditTextBox_DoubleClick; + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + tokenEditor.Leave -= TokenEditor_Leave; + tokenEditor.Leave += TokenEditor_Leave; + + if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断") + { + tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + } + EditTextBox_DoubleClick(tokenEditor.EditTextBox, null); + tokenEditor.EditTextBox.Select(); + } + private void opeDisease_Click(AbleEditPackObj sender, EventArgs e) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { SelDict(sender, e, ableEdit.ControlTitleText); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } } catch (Exception ex) { @@ -745,5 +786,40 @@ namespace DrawGraph } } } + + private void EditTextBox_DoubleClick(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + private void EditTextBox_TextChanged(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt); + } + + private void tokenEditor_ValidateToken(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + if (ea.IsNewToken) + { + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + string id = TokenEditorManage.GetOperationItemId(ea.Token.Value, aEdit); + tokenEditor.SelectedTokens.Add(new EditToken(id, ea.Token.Value)); + ea.Token = null; + tokenEditor.EditTextBox.Text = ""; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } + + private void TokenEditor_Leave(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + TokenEditorManage.SaveDictItem(template, OpeRecord as OperationRecord, tokenEditor, aEdit, true); + } + } } diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index 79f5f23..7eb68f4 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -145,7 +145,7 @@ namespace DrawGraph //清空选中框 myOpeRecord.SAreaObj.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); - myOpeRecord.SAreaObj.Clear(); + myOpeRecord.SAreaObj.Clear(); //触发可编辑区域的事件 double y = Convert.ToDouble(Convert.ToDouble(e.Y) / Convert.ToDouble(ZedControl.Height)); diff --git a/DrawGraph/AreaManage/TempDataManage.cs b/DrawGraph/AreaManage/TempDataManage.cs index 28fbbb0..1f64802 100644 --- a/DrawGraph/AreaManage/TempDataManage.cs +++ b/DrawGraph/AreaManage/TempDataManage.cs @@ -1,4 +1,5 @@ using AIMSExtension; +using DevComponents.DotNetBar.Controls; using DevComponents.Editors.DateTimeAdv; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -117,6 +118,19 @@ namespace DrawGraph ableEdit.CControl.Leave -= new EventHandler(txt_Leave); ableEdit.CControl.Leave += new EventHandler(txt_Leave); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ableEdit.CControl as DevComponents.DotNetBar.Controls.TokenEditor; + tokenEditor.EditTextBox.DoubleClick -= EditTextBox_DoubleClick; + tokenEditor.EditTextBox.DoubleClick += EditTextBox_DoubleClick; + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + tokenEditor.Leave -= TokenEditor_Leave; + tokenEditor.Leave += TokenEditor_Leave; + + tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + } else if (ableEdit.ControlType == EControlType.CheckBox) { Panel pan = ableEdit.CControl as Panel; @@ -149,10 +163,10 @@ namespace DrawGraph } } } - else if (ableEdit.ControlType == EControlType.TextBox) + else if (ableEdit.ControlType == EControlType.TextBox) { ableEdit.CControl.KeyDown -= new KeyEventHandler(text_keyDown); - ableEdit.CControl.KeyDown += new KeyEventHandler(text_keyDown); + ableEdit.CControl.KeyDown += new KeyEventHandler(text_keyDown); ableEdit.CControl.GotFocus -= new EventHandler(txt_Focus); ableEdit.CControl.GotFocus += new EventHandler(txt_Focus); ((TextBox)ableEdit.CControl).BorderStyle = BorderStyle.Fixed3D; @@ -171,7 +185,7 @@ namespace DrawGraph } } } - + ////取消滚轮事件 //void numericUpDown1_MouseWheel(object sender, MouseEventArgs e) @@ -187,7 +201,7 @@ namespace DrawGraph if (ableEdit == null) return; if (control.Focused == true && (ableEdit.PackValue == ableEdit.DefaultValue || ableEdit.PackValue == "")) control.Clear(); - } + } private void text_keyDown(object sender, KeyEventArgs e) { ((TextBox)sender).Enabled = true; @@ -376,6 +390,10 @@ namespace DrawGraph text = ableEdit.CControl.Text; value = ableEdit.CControl.Text; break; + case EControlType.Directorys: + text = ableEdit.CControl.Text; + value = ableEdit.CControl.Text; + break; default: text = ableEdit.CControl.Text; value = ableEdit.CControl.Text; @@ -494,20 +512,41 @@ namespace DrawGraph //通用字典分组窗体打开 private void TYZD_Click(AbleEditPackObj sender, EventArgs e, bool isRadio = false) { - AbleEditPackObj ableEdit = sender; - if (ableEdit == null) return; try { - if (myOpeRecord != null) + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) { SelDict(sender, e, ableEdit.ControlTitleText, isRadio); } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } } catch (Exception ex) { AIMSExtension.PublicMethod.WriteLog(ex); } } + private void SetDirectorysMethod(AbleEditPackObj ableEdit) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = ableEdit.CControl as DevComponents.DotNetBar.Controls.TokenEditor; + tokenEditor.EditTextBox.DoubleClick -= EditTextBox_DoubleClick; + tokenEditor.EditTextBox.DoubleClick += EditTextBox_DoubleClick; + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + tokenEditor.Leave -= TokenEditor_Leave; + tokenEditor.Leave += TokenEditor_Leave; + + tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken); + EditTextBox_DoubleClick(tokenEditor.EditTextBox, null); + tokenEditor.EditTextBox.Select(); + } + private void SelDict(AbleEditPackObj sender, EventArgs e, string _DictType, bool isRadio = false) { AbleEditPackObj ableEdit = sender; @@ -577,5 +616,38 @@ namespace DrawGraph } } } + + private void EditTextBox_DoubleClick(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt,false); + } + private void EditTextBox_TextChanged(object sender, EventArgs e) + { + TextBox txt = sender as TextBox; + TokenEditorManage.SelectDictList(OpeRecord as OperationRecord, txt,false); + } + + private void tokenEditor_ValidateToken(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + if (ea.IsNewToken) + { + tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged; + tokenEditor.SelectedTokens.Add(new EditToken( ea.Token.Value, ea.Token.Value)); + ea.Token = null; + tokenEditor.EditTextBox.Text = ""; + tokenEditor.IsPopupOpen = false; + tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged; + } + } + + private void TokenEditor_Leave(object sender, EventArgs e) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + TokenEditorManage.SaveDictItemText(template, OpeRecord as OperationRecord, tokenEditor, aEdit); + } } } diff --git a/DrawGraph/AreaManage/TokenEditorManage.cs b/DrawGraph/AreaManage/TokenEditorManage.cs new file mode 100644 index 0000000..ec13999 --- /dev/null +++ b/DrawGraph/AreaManage/TokenEditorManage.cs @@ -0,0 +1,145 @@ +using AIMSExtension; +using DevComponents.DotNetBar.Controls; +using HelperDB; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace DrawGraph +{ + public static class TokenEditorManage + { + + public static void SelectDictList(OperationRecord OpeRecord, TextBox txt, bool IsSearch = true) + { + //检索字典数据 + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = txt.Parent as DevComponents.DotNetBar.Controls.TokenEditor; + AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj; + string PersonType = ""; + switch (aEdit.ClassDataSourceName) + { + case "OperationRecord.AnesthesiaDoctor": //麻醉医生 + PersonType = "2"; + break; + case "OperationRecord.OperationDoctor": + PersonType = "0"; + break; + case "OperationRecord.InstrumentNurse": + PersonType = "3"; + break; + case "OperationRecord.Assistant1": + PersonType = "0"; + break; + case "OperationRecord.TourNurse": + PersonType = "3"; + break; + case "OperationRecord.OrtherDoctorId": + PersonType = "4"; + break; + } + + DataTable dt = DBManage.GetDictDataTable(OpeRecord, txt.Text, aEdit.ControlTitleText, PersonType, (IsSearch == true ? aEdit.PackValue : "")); + + tokenEditor.Tokens.Clear(); + foreach (DataRow item in dt.Rows) + { + DevComponents.DotNetBar.Controls.EditToken edit = new DevComponents.DotNetBar.Controls.EditToken(item["Id"].ToString(), item["Name"].ToString()); + tokenEditor.Tokens.Add(edit); + } + if (tokenEditor.IsPopupOpen == false) + tokenEditor.IsPopupOpen = true; + } + + public static string GetOperationItemId(string name, AbleEditPackObj aEdit) + { + string Id = ""; + if (aEdit.ControlTitleText == "手术") + { + string sql = string.Format("select Id from Operation where Name = '{0}'", name); + object dt = DBHelper.ExecuteScalar(sql); + if (dt != null) { Id = dt.ToString(); } + if (Id == null || Id == "") + { + string sql2 = string.Format("insert into Operation values('{0}','{1}','{2}',0,1,'admin','系統管理員',getdate(),'{3}');select @@identity ", "", name, PublicMethod.GetFirstLetter(name), ""); + Id = DBHelper.ExecuteScalar(sql2).ToString(); + } + } + else if (aEdit.ControlTitleText == "诊断") + { + string sql = string.Format("select Id from Disease where Name = '{0}'", name); + object dt = DBHelper.ExecuteScalar(sql); + if (dt != null) { Id = dt.ToString(); } + if (Id == null || Id == "") + { + string sql2 = string.Format("insert into Disease values('{0}','{1}','{2}',0,1,'admin','系統管理員',getdate());select @@identity ", "", name, PublicMethod.GetFirstLetter(name)); + Id = DBHelper.ExecuteScalar(sql2).ToString(); + } + } + return Id; + } + public static void SaveDictItem(TemplateManage _template, OperationRecord OpeRecord, TokenEditor tokenEditor, AbleEditPackObj aEdit, bool IsVisible = false) + { + string SplitChar = ","; + if (aEdit.ClassDataSourceName == "OperationRecord.AnaesthesiaMethodName") + { + SplitChar = "+"; + } + string Value = ""; + string Key = ""; + List namevalue = new List(); + List idvalue = new List(); + + foreach (var item in tokenEditor.SelectedTokens) + { + namevalue.Add(item.Text); + idvalue.Add(item.Value); + } + if (idvalue.Count > 0) + { + Value = string.Join(SplitChar, namevalue); + Key = string.Join(SplitChar, idvalue); + } + else + { + Value = ""; + Key = ""; + } + if (IsVisible == true) + aEdit.IsVisible = !aEdit.IsVisible; + if (aEdit.PackValue != Value) + //设置属性的值 + _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Key, true); + } + public static void SaveDictItemText(TemplateManage _template, OperationRecord OpeRecord, TokenEditor tokenEditor, AbleEditPackObj aEdit, bool IsVisible = false) + { + string SplitChar = ","; + if (aEdit.ClassDataSourceName == "OperationRecord.AnaesthesiaMethodName") + { + SplitChar = "+"; + } + string Value = ""; + List namevalue = new List(); + + foreach (var item in tokenEditor.SelectedTokens) + { + namevalue.Add(item.Text); + } + if (namevalue.Count > 0) + { + Value = string.Join(SplitChar, namevalue); + } + else + { + Value = ""; + } + if (IsVisible == true) + aEdit.IsVisible = !aEdit.IsVisible; + if (aEdit.PackValue != Value) + //设置属性的值 + _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Value, true); + } + } +} diff --git a/DrawGraph/BoardPack/AbleEditPackObj.cs b/DrawGraph/BoardPack/AbleEditPackObj.cs index 4b0b295..bcd4084 100644 --- a/DrawGraph/BoardPack/AbleEditPackObj.cs +++ b/DrawGraph/BoardPack/AbleEditPackObj.cs @@ -1,4 +1,5 @@ using DevComponents.DotNetBar; +using DevComponents.DotNetBar.Controls; using DevComponents.Editors; using DevComponents.Editors.DateTimeAdv; using DrawGraph; @@ -43,7 +44,7 @@ namespace DrawGraph private int textLength = 0; - private EIsBool isDateNull = EIsBool.False; + private EIsBool isDateNull = EIsBool.False; [method: CompilerGenerated] //[DebuggerBrowsable(DebuggerBrowsableState.Never), CompilerGenerated] @@ -366,8 +367,7 @@ namespace DrawGraph } else { - bool flag14 = this.controlType == (EControlType)5; - if (flag14) + if (this.controlType == (EControlType)5) { ComboBox comboBox = this.control as ComboBox; bool flag15 = comboBox != null; @@ -376,6 +376,33 @@ namespace DrawGraph comboBox.Text = base.PackText; } } + else if (this.controlType == EControlType.Directorys) + { + DevComponents.DotNetBar.Controls.TokenEditor comboBox = this.control as DevComponents.DotNetBar.Controls.TokenEditor; + if (comboBox != null) + { + comboBox.DropDownWidth = comboBox.Width; + comboBox.SelectedTokens.Clear(); + if (this.ControlTitleText == "诊断") + { + comboBox.SelectedTokens.Clear(); + } + if (base.PackText.Contains(",")) + { + string[] strArray1 = base.PackValue.Split(','); + string[] strArray = base.PackText.Split(','); + + for (int i = 0; i < strArray.Length; i++) + { + comboBox.SelectedTokens.Add(new DevComponents.DotNetBar.Controls.EditToken(strArray1[i], strArray[i])); + } + } + else if (base.PackText != "") + { + comboBox.SelectedTokens.Add(new DevComponents.DotNetBar.Controls.EditToken(base.PackValue, base.PackText)); + } + } + } else { TextBox textBox = this.control as TextBox; @@ -670,11 +697,18 @@ namespace DrawGraph } else { - bool flag14 = this.controlType == EControlType.Directory; - if (flag14) + if (this.controlType == EControlType.Directory) { this.control = new TextBox(); } + else if (this.controlType == EControlType.Directorys) + { + DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = new DevComponents.DotNetBar.Controls.TokenEditor(); + tokenEditor.BackgroundStyle.Class = "DateTimeInputBackground"; + tokenEditor.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + tokenEditor.Separators.Add(","); + this.control = tokenEditor; + } else { bool flag15 = this.controlType == (EControlType)6; diff --git a/DrawGraph/BoardPack/TextsPackObj.cs b/DrawGraph/BoardPack/TextsPackObj.cs new file mode 100644 index 0000000..3c62d44 --- /dev/null +++ b/DrawGraph/BoardPack/TextsPackObj.cs @@ -0,0 +1,508 @@ + +using DrawGraph; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Drawing; +using System.Linq; + +namespace DrawGraph +{ + [JsonObject(MemberSerialization.OptOut)] + [Serializable] + public class TextsPackObj : PackObjBase + { + private float fontSize = 8f; + + private Color fontColor = Color.Black; + + private ELineType isHorizontal = ELineType.Horizontal; + + private EIsBool isUnderline = EIsBool.False; + + private bool underline = false; + + private int angle = 0; + + private EIsBool isBool = EIsBool.False; + + private int unit = 1; + + private EIsBool isTop = EIsBool.True; + + private string controlTitleText = ""; + + private float rowSpan = 0f; + + private EIsBool isViewBoard = EIsBool.False; + + private EAlignType alignType = EAlignType.Left; + + private EIsBool isMultiline = EIsBool.False; + + [ClassAttributs(CName = "旋转角度", Description = "旋转角度")] + public int Angle + { + get + { + return this.angle; + } + set + { + this.angle = value; + } + } + + [ClassAttributs(CName = "下划线", Description = "显示下划线")] + public EIsBool IsUnderline + { + get + { + return this.isUnderline; + } + set + { + this.isUnderline = value; + bool flag = this.isUnderline == EIsBool.True; + if (flag) + { + this.underline = true; + } + } + } + + [ClassAttributs(CName = "横向画", Description = "是否横向画")] + public ELineType IsHorizontal + { + get + { + return this.isHorizontal; + } + set + { + this.isHorizontal = value; + } + } + + [ClassAttributs(CName = "文本字体", Description = "字体大小")] + public float FontSize + { + get + { + return this.fontSize; + } + set + { + bool flag = value > 2f && value < 24f; + if (flag) + { + this.fontSize = value; + } + } + } + + [ClassAttributs(CName = "下换行", Description = "多行时，换行向下画，反之向上画")] + public EIsBool IsTop + { + get + { + return this.isTop; + } + set + { + this.isTop = value; + } + } + + [ClassAttributs(CName = "前景色", Description = "前景色")] + public Color FontColor + { + get + { + return this.fontColor; + } + set + { + this.fontColor = value; + } + } + + [ClassAttributs(CName = "格式化文本", Description = "格式化字符串的样式")] + public string ControlTitleText + { + get + { + return this.controlTitleText.Trim(); + } + set + { + this.controlTitleText = value; + } + } + + [ClassAttributs(CName = "加粗")] + public EIsBool IsBool + { + get + { + return this.isBool; + } + set + { + this.isBool = value; + } + } + + [ClassAttributs(CName = "一行几个组件", Description = "最大单元数,文本框时:是有多少行;单选框或复选框：是一行放几个控件")] + public int Unit + { + get + { + return this.unit; + } + set + { + this.unit = value; + } + } + + [ClassAttributs(CName = "行间距", Description = "行间距，值为0-1之间的值")] + public float RowSpan + { + get + { + return this.rowSpan; + } + set + { + this.rowSpan = value; + } + } + + [ClassAttributs(CName = "显示边框", Description = "是否显示边框")] + public EIsBool IsViewBoard + { + get + { + return this.isViewBoard; + } + set + { + this.isViewBoard = value; + } + } + + [ClassAttributs(CName = "文本对齐", Description = "文本对齐方式")] + public EAlignType AlignType + { + get + { + return this.alignType; + } + set + { + this.alignType = value; + } + } + + [ClassAttributs(CName = "多行", Description = "是否是多行，默认为FALSE单选")] + public EIsBool IsMultiline + { + get + { + return this.isMultiline; + } + set + { + this.isMultiline = value; + } + } + + private float GetFontSize() + { + float result; + try + { + string text = null;// ConfigurationManager.AppSettings["FontSize"]; + bool flag = text == null; + if (flag) + { + result = 8f; + } + else + { + result = float.Parse(text); + } + } + catch (Exception) + { + result = 8f; + } + return result; + } + + public TextsPackObj(ZedGraphControl zgc, PackObjManager poManager) : base(zgc, poManager) + { + this.baseZed = zgc; + base.PackText = "文本" + this.index.ToString(); + this.fontSize = this.GetFontSize(); + } + + public override void Draw() + { + bool flag = this.baseZed == null; + if (!flag) + { + this.Clear(); + base.PackText = base.PackText;//.Replace("\r", "\u3000").Replace("\n", "\u3000"); + bool flag2 = this.IsHorizontal == ELineType.Horizontal; + if (flag2) + { + this.hDraw(); + } + else + { + this.vDraw(); + } + bool flag3 = this.isViewBoard == EIsBool.True; + if (flag3) + { + string packTag = base.PackTag + "_board"; + RectangleFramePackObj rectangleFramePackObj = new RectangleFramePackObj(this.baseZed, this.poManager); + rectangleFramePackObj.PackTag = packTag; + float num = base.X; + bool flag4 = this.AlignType == EAlignType.Center; + if (flag4) + { + num -= base.Width / 2f; + } + rectangleFramePackObj.X = num; + rectangleFramePackObj.Y = base.Y; + rectangleFramePackObj.EndX = num + base.Width; + rectangleFramePackObj.EndY = base.Y + base.Height; + rectangleFramePackObj.Draw(); + } + base.Refresh(); + } + } + + private void hDraw() + { + bool flag = base.PackText == ""; + if (!flag) + { + if ( this.IsMultiline == EIsBool.False) + { + base.PackText = base.PackText.Replace("\r", "\u3000").Replace("\n", "\u3000"); + TextObj textObj = this.CreateTextObj(base.PackText, base.PackTag); + ZUtil.DrawText(textObj, this.baseZed); + this.width = ZUtil.GetColWidthFraction(textObj, this.baseZed); + this.height = ZUtil.GetColHeightFraction(textObj, this.baseZed); + base.EndX = base.X + this.width; + base.EndY = base.Y + this.height; + } + else + { + List list = this.breakLinesForCanvas(base.PackText); + for (int i = 0; i < list.Count; i++) + { + string text = list[i]; + double num = (double)base.RealY; + bool flag3 = this.IsTop == EIsBool.True; + if (flag3) + { + num = (double)(base.RealY + (float)i * this.RowSpan); + } + else + { + num = (double)(base.RealY - (float)(list.Count - i - 1) * this.RowSpan); + } + bool flag4 = text == ""; + if (flag4) + { + break; + } + TextObj textObj2 = this.CreateTextObj(text, base.PackTag + "_" + i.ToString()); + try + { + float colHeightFraction = ZUtil.GetColHeightFraction(textObj2, this.baseZed); + bool flag5 = i == 0 && base.X == base.EndX; + if (flag5) + { + this.width = ZUtil.GetColWidthFraction(textObj2, this.baseZed); + this.height = ZUtil.GetColHeightFraction(textObj2, this.baseZed); + } + this.height = (float)num - base.RealY + colHeightFraction; + bool flag6 = base.X == base.EndX; + if (flag6) + { + base.EndX = base.X + this.width; + base.EndY = base.Y + this.height; + } + } + catch (Exception) + { + } + textObj2.Location.X = (double)base.RealX; + textObj2.Location.Y = num; + ZUtil.DrawText(textObj2, this.baseZed); + } + } + } + } + + private int findBreakPoint(string text) + { + double num = 0.0; + double num2 = (double)(text.Length - 1); + int result; + try + { + bool flag = base.RealEndX != base.RealX; + if (flag) + { + while (num <= num2) + { + int num3 = Convert.ToInt32(Math.Floor((num + num2) / 2.0)); + string a = text.Substring(0, num3); + bool flag2 = a != ""; + if (!flag2) + { + result = -1; + return result; + } + TextObj text2 = this.CreateTextObj(text.Substring(0, num3), base.PackTag); + float colWidthFraction = ZUtil.GetColWidthFraction(text2, this.baseZed); + TextObj text3 = this.CreateTextObj(text.Substring(0, num3 + 1), base.PackTag); + float colWidthFraction2 = ZUtil.GetColWidthFraction(text3, this.baseZed); + float num4 = base.RealEndX - base.RealX + 0.0002f; + bool flag3 = colWidthFraction <= num4 && colWidthFraction2 > num4; + if (flag3) + { + result = num3; + return result; + } + bool flag4 = colWidthFraction < num4; + if (flag4) + { + num = (double)(num3 + 1); + } + else + { + num2 = (double)(num3 - 1); + } + } + } + } + catch (Exception) + { + result = -1; + return result; + } + result = -1; + return result; + } + + public List breakLinesForCanvas(string text) + { + List result = text.Replace("\r\n", "^").Split('^').ToList(); + List list = new List(); + for (int i = 0; i < result.Count; i++) + { + string item = result[i].Replace(" ", " ") ; + int num; + while ((num = this.findBreakPoint(item)) != -1) + { + list.Add(item.Substring(0, num)); + item = item.Substring(num); + } + bool flag = item != ""; + if (flag) + { + list.Add(item); + } + } + return list; + } + + private void vDraw() + { + for (int i = 0; i < base.PackText.Length; i++) + { + string text = base.PackText.Substring(i, 1); + bool flag = text.Trim() == ""; + if (!flag) + { + float num = base.RealY + (float)i * this.RowSpan; + TextObj textObj = this.CreateTextObj(text, base.PackTag + "_" + i.ToString()); + textObj.Location = new Location((double)base.RealX, (double)num, CoordType.PaneFraction); + ZUtil.DrawText(textObj, this.baseZed); + } + } + } + + private TextObj CreateTextObj(string packTextTemp, string packTag) + { + Color color = Color.FromArgb(this.fontColor.ToArgb()); + bool isSelect = base.IsSelect; + if (isSelect) + { + color = Color.Red; + } + TextObj textObj = new TextObj(packTextTemp, (double)base.RealX, (double)base.RealY, CoordType.PaneFraction); + textObj.FontSpec = new FontSpec(PackObjBase.fontFamily, this.fontSize, color, this.isBool == EIsBool.True, false, this.underline); + textObj.FontSpec.Border.Width = 0f; + textObj.FontSpec.Border.IsVisible = false; + textObj.FontSpec.StringAlignment = StringAlignment.Near; + textObj.Tag = packTag; + textObj.FontSpec.Fill.IsVisible = false; + AlignH alignH = AlignH.Left; + bool flag = this.AlignType == EAlignType.Center; + if (flag) + { + alignH = AlignH.Center; + } + bool flag2 = this.AlignType == EAlignType.Right; + if (flag2) + { + alignH = AlignH.Right; + } + textObj.Location.AlignH = alignH; + textObj.Location.AlignV = AlignV.Top; + textObj.ZOrder = ZOrder.A_InFront; + textObj.FontSpec.Angle = (float)this.angle; + return textObj; + } + + public override void Clear() + { + base.Clear(); + for (int i = 0; i <= 20; i++) + { + string tag = base.PackTag + "_" + i.ToString(); + bool flag = this.baseZed.MasterPane != null; + if (flag) + { + GraphObj graphObj = this.baseZed.MasterPane.GraphObjList[tag]; + bool flag2 = graphObj != null; + if (flag2) + { + this.baseZed.MasterPane.GraphObjList.Remove(graphObj); + } + } + } + string tag2 = base.PackTag + "_board"; + bool flag3 = this.baseZed.MasterPane != null; + if (flag3) + { + GraphObj graphObj2 = this.baseZed.MasterPane.GraphObjList[tag2]; + bool flag4 = graphObj2 != null; + if (flag4) + { + this.baseZed.MasterPane.GraphObjList.Remove(graphObj2); + } + } + } + } +} diff --git a/DrawGraph/DrawGraph.csproj b/DrawGraph/DrawGraph.csproj index deb0217..05b8fe2 100644 --- a/DrawGraph/DrawGraph.csproj +++ b/DrawGraph/DrawGraph.csproj @@ -100,6 +100,8 @@ + + Form diff --git a/DrawGraph/GUtil/TextPrefix.cs b/DrawGraph/GUtil/TextPrefix.cs index c704d42..4b47410 100644 --- a/DrawGraph/GUtil/TextPrefix.cs +++ b/DrawGraph/GUtil/TextPrefix.cs @@ -77,7 +77,8 @@ namespace DrawGraph DateTimePicker, Directory, ComboBox, - Panel + Panel, + Directorys } public enum EAlignType diff --git a/DrawGraphManagement/AIMS.xml b/DrawGraphManagement/AIMS.xml index 71c6330..7d66bdd 100644 --- a/DrawGraphManagement/AIMS.xml +++ b/DrawGraphManagement/AIMS.xml @@ -1,6 +1,6 @@  - Data Source=.;Initial Catalog=AIMSDB_DLSJZQZYYY;User ID=sa;Password=Test2020; + Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020; Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39;