diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs index 01a03a6..acb5b9c 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs @@ -178,7 +178,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2082, 10); + this.panel2.Size = new System.Drawing.Size(1711, 10); this.panel2.TabIndex = 1; this.panel2.Visible = false; // @@ -190,7 +190,7 @@ this.panel3.Font = new System.Drawing.Font("宋体", 12F); this.panel3.Location = new System.Drawing.Point(0, 10); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(160, 1032); + this.panel3.Size = new System.Drawing.Size(160, 931); this.panel3.TabIndex = 2; // // panel14 @@ -211,7 +211,7 @@ this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; this.panel14.Location = new System.Drawing.Point(0, 0); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(160, 1032); + this.panel14.Size = new System.Drawing.Size(160, 931); this.panel14.TabIndex = 5; // // button8 @@ -482,9 +482,9 @@ this.panel4.Controls.Add(this.label1); this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); - this.panel4.Location = new System.Drawing.Point(1922, 10); + this.panel4.Location = new System.Drawing.Point(1551, 10); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(160, 1032); + this.panel4.Size = new System.Drawing.Size(160, 931); this.panel4.TabIndex = 3; // // btnChage @@ -499,7 +499,7 @@ this.btnChage.ForeColor = System.Drawing.Color.DimGray; this.btnChage.Image = global::AIMS.Properties.Resources.麻醉医嘱; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnChage.Location = new System.Drawing.Point(0, 682); + this.btnChage.Location = new System.Drawing.Point(0, 581); this.btnChage.Name = "btnChage"; this.btnChage.Size = new System.Drawing.Size(160, 50); this.btnChage.TabIndex = 32; @@ -520,7 +520,7 @@ this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; this.btnsjzx.Image = global::AIMS.Properties.Resources.工作列表; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnsjzx.Location = new System.Drawing.Point(0, 732); + this.btnsjzx.Location = new System.Drawing.Point(0, 631); this.btnsjzx.Name = "btnsjzx"; this.btnsjzx.Size = new System.Drawing.Size(160, 50); this.btnsjzx.TabIndex = 30; @@ -540,7 +540,7 @@ this.btnyldj.ForeColor = System.Drawing.Color.DimGray; this.btnyldj.Image = global::AIMS.Properties.Resources.麻醉记录; this.btnyldj.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnyldj.Location = new System.Drawing.Point(0, 782); + this.btnyldj.Location = new System.Drawing.Point(0, 681); this.btnyldj.Name = "btnyldj"; this.btnyldj.Size = new System.Drawing.Size(160, 50); this.btnyldj.TabIndex = 29; @@ -560,7 +560,7 @@ this.btnzsk.ForeColor = System.Drawing.Color.DimGray; this.btnzsk.Image = global::AIMS.Properties.Resources.知识库; this.btnzsk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnzsk.Location = new System.Drawing.Point(0, 832); + this.btnzsk.Location = new System.Drawing.Point(0, 731); this.btnzsk.Name = "btnzsk"; this.btnzsk.Size = new System.Drawing.Size(160, 50); this.btnzsk.TabIndex = 28; @@ -580,7 +580,7 @@ this.btndptz.ForeColor = System.Drawing.Color.DimGray; this.btndptz.Image = global::AIMS.Properties.Resources.文书状态; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btndptz.Location = new System.Drawing.Point(0, 882); + this.btndptz.Location = new System.Drawing.Point(0, 781); this.btndptz.Name = "btndptz"; this.btndptz.Size = new System.Drawing.Size(160, 50); this.btndptz.TabIndex = 27; @@ -600,7 +600,7 @@ this.btnxldlx.ForeColor = System.Drawing.Color.DimGray; this.btnxldlx.Image = global::AIMS.Properties.Resources.心脏复跳_select; this.btnxldlx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnxldlx.Location = new System.Drawing.Point(0, 932); + this.btnxldlx.Location = new System.Drawing.Point(0, 831); this.btnxldlx.Name = "btnxldlx"; this.btnxldlx.Size = new System.Drawing.Size(160, 50); this.btnxldlx.TabIndex = 26; @@ -621,7 +621,7 @@ this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; this.btnsbwh.Image = global::AIMS.Properties.Resources.耗材管理; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnsbwh.Location = new System.Drawing.Point(0, 982); + this.btnsbwh.Location = new System.Drawing.Point(0, 881); this.btnsbwh.Name = "btnsbwh"; this.btnsbwh.Size = new System.Drawing.Size(160, 50); this.btnsbwh.TabIndex = 25; @@ -814,7 +814,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2082, 1042); + this.panel1.Size = new System.Drawing.Size(1711, 941); this.panel1.TabIndex = 0; // // panel5 @@ -827,7 +827,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1762, 1032); + this.panel5.Size = new System.Drawing.Size(1391, 931); this.panel5.TabIndex = 4; // // superTabMain @@ -855,7 +855,7 @@ this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabIndex = 0; - this.superTabMain.Size = new System.Drawing.Size(1760, 932); + this.superTabMain.Size = new System.Drawing.Size(1389, 831); this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.superTabMain.TabIndex = 14; this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -869,7 +869,7 @@ this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1760, 904); + this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803); this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.spTabQXQDD; // @@ -882,7 +882,7 @@ this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Name = "panelExZKZB"; - this.panelExZKZB.Size = new System.Drawing.Size(1760, 904); + this.panelExZKZB.Size = new System.Drawing.Size(1389, 803); this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -901,7 +901,7 @@ this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1760, 904); + this.panel8.Size = new System.Drawing.Size(1389, 803); this.panel8.TabIndex = 2; this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); // @@ -1052,9 +1052,9 @@ this.panel7.Controls.Add(this.labOperatorName); this.panel7.Controls.Add(this.label19); this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel7.Location = new System.Drawing.Point(0, 990); + this.panel7.Location = new System.Drawing.Point(0, 889); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1760, 40); + this.panel7.Size = new System.Drawing.Size(1389, 40); this.panel7.TabIndex = 1; // // panel21 @@ -1067,7 +1067,7 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1406, 0); + this.panel21.Location = new System.Drawing.Point(1035, 0); this.panel21.Name = "panel21"; this.panel21.Size = new System.Drawing.Size(354, 40); this.panel21.TabIndex = 10; @@ -1207,7 +1207,7 @@ this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Name = "plTitleEventTime"; - this.plTitleEventTime.Size = new System.Drawing.Size(1760, 58); + this.plTitleEventTime.Size = new System.Drawing.Size(1389, 58); this.plTitleEventTime.TabIndex = 0; // // panel13 @@ -1961,7 +1961,7 @@ // frmAnasRecordBill2 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(2082, 1042); + this.ClientSize = new System.Drawing.Size(1711, 941); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmAnasRecordBill2"; diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs index 4faba53..a40b0da 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs @@ -252,13 +252,12 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI } private void PrintDocPane(PrintPageEventArgs e, ZedGraphControl zedGraph, TemplateManage template, bool InitChart) - { - if (InitChart == false) + { foreach (AreaManageBase area in template.ManageList) { area.setPrint(false); area.BindTempData(); - } + } int zedGraphMainWidth = zedGraph.Size.Width; int zedGraphMainHeight = zedGraph.Size.Height; @@ -324,6 +323,10 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI int LocationY = Convert.ToInt32(templateManage.ZedControl.Height * 0.04); templateManage.LocationY = LocationY; templateManage.SetPYL(); + foreach (AreaManageBase area in template.ManageList) + { + area.setPrint(true); + } } } @@ -1223,7 +1226,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI try { //图表的对象 - TextPackObj janCePack = templateManage.GetPackObjectOTag("PhysioDataManage_TextPackObj_17"); + TextPackObj janCePack = templateManage.GetPackObjectOTag("PhysioDataManage_TextPackObj_12"); LinePackObj H5pack = templateManage.GetPackObjectOTag("IconManage_LinePackObj_6"); foreach (FactBloodGasAnalysis analysis in _record.FactBloodGasAnalysisList) { diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs index db4ccdc..d82526f 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs @@ -160,7 +160,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2082, 10); + this.panel2.Size = new System.Drawing.Size(1924, 10); this.panel2.TabIndex = 1; this.panel2.Visible = false; // @@ -488,7 +488,7 @@ this.panel4.Controls.Add(this.label1); this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); - this.panel4.Location = new System.Drawing.Point(1922, 10); + this.panel4.Location = new System.Drawing.Point(1764, 10); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.TabIndex = 3; @@ -758,7 +758,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2082, 1042); + this.panel1.Size = new System.Drawing.Size(1924, 1042); this.panel1.TabIndex = 0; // // panel5 @@ -771,7 +771,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1762, 1032); + this.panel5.Size = new System.Drawing.Size(1604, 1032); this.panel5.TabIndex = 4; // // superTabMain @@ -798,7 +798,7 @@ this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabIndex = 0; - this.superTabMain.Size = new System.Drawing.Size(1760, 932); + this.superTabMain.Size = new System.Drawing.Size(1602, 932); this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.superTabMain.TabIndex = 14; this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -811,7 +811,7 @@ this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1760, 904); + this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904); this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.spTabQXQDD; // @@ -824,7 +824,7 @@ this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Name = "panelExZKZB"; - this.panelExZKZB.Size = new System.Drawing.Size(1760, 904); + this.panelExZKZB.Size = new System.Drawing.Size(1602, 904); this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -844,7 +844,7 @@ this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1760, 904); + this.panel8.Size = new System.Drawing.Size(1602, 904); this.panel8.TabIndex = 2; this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); // @@ -1125,7 +1125,7 @@ this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel7.Location = new System.Drawing.Point(0, 990); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1760, 40); + this.panel7.Size = new System.Drawing.Size(1602, 40); this.panel7.TabIndex = 1; // // panel21 @@ -1135,7 +1135,7 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1419, 0); + this.panel21.Location = new System.Drawing.Point(1261, 0); this.panel21.Name = "panel21"; this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.TabIndex = 10; @@ -1234,7 +1234,7 @@ this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Name = "plTitleEventTime"; - this.plTitleEventTime.Size = new System.Drawing.Size(1760, 58); + this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58); this.plTitleEventTime.TabIndex = 0; // // panel13 @@ -1619,7 +1619,7 @@ // frmAnasRecordInstrument // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(2082, 1042); + this.ClientSize = new System.Drawing.Size(1924, 1042); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmAnasRecordInstrument"; diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs index 33391c0..41888d0 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs @@ -1424,6 +1424,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI SendKeys.Send("{TAB}"); SendKeys.Send("{TAB}"); SendKeys.Send("{TAB}"); + SendKeys.Send("{TAB}"); } } #endregion diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs index 28098e4..f57a834 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs @@ -251,7 +251,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2082, 10); + this.panel2.Size = new System.Drawing.Size(1924, 10); this.panel2.TabIndex = 1; this.panel2.Visible = false; // @@ -576,7 +576,7 @@ this.panel4.Controls.Add(this.label1); this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); - this.panel4.Location = new System.Drawing.Point(1922, 10); + this.panel4.Location = new System.Drawing.Point(1764, 10); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.TabIndex = 3; @@ -846,7 +846,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2082, 1042); + this.panel1.Size = new System.Drawing.Size(1924, 1042); this.panel1.TabIndex = 0; // // panel5 @@ -859,7 +859,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1762, 1032); + this.panel5.Size = new System.Drawing.Size(1604, 1032); this.panel5.TabIndex = 4; // // superTabMain @@ -879,15 +879,15 @@ this.superTabMain.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.ControlBox.MenuBox, this.superTabMain.ControlBox.CloseBox}); - this.superTabMain.Controls.Add(this.superTabControlPanel2); this.superTabMain.Controls.Add(this.superTabControlPanel1); + this.superTabMain.Controls.Add(this.superTabControlPanel2); this.superTabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabMain.Location = new System.Drawing.Point(0, 58); this.superTabMain.Name = "superTabMain"; this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabIndex = 0; - this.superTabMain.Size = new System.Drawing.Size(1760, 932); + this.superTabMain.Size = new System.Drawing.Size(1602, 932); this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.superTabMain.TabIndex = 14; this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -1768,7 +1768,7 @@ this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1760, 904); + this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904); this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.spTabQXQDD; // @@ -1781,7 +1781,7 @@ this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Name = "panelExZKZB"; - this.panelExZKZB.Size = new System.Drawing.Size(1760, 904); + this.panelExZKZB.Size = new System.Drawing.Size(1602, 904); this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1801,7 +1801,7 @@ this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1760, 904); + this.panel8.Size = new System.Drawing.Size(1602, 904); this.panel8.TabIndex = 2; this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); // @@ -2137,7 +2137,7 @@ this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel7.Location = new System.Drawing.Point(0, 990); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1760, 40); + this.panel7.Size = new System.Drawing.Size(1602, 40); this.panel7.TabIndex = 1; // // panel21 @@ -2147,7 +2147,7 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1419, 0); + this.panel21.Location = new System.Drawing.Point(1261, 0); this.panel21.Name = "panel21"; this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.TabIndex = 10; @@ -2246,7 +2246,7 @@ this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Name = "plTitleEventTime"; - this.plTitleEventTime.Size = new System.Drawing.Size(1760, 58); + this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58); this.plTitleEventTime.TabIndex = 0; // // panel13 @@ -2628,13 +2628,13 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // frmAnasRecordInstrument + // frmAnasRecordInstrument2 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(2082, 1042); + this.ClientSize = new System.Drawing.Size(1924, 1042); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "frmAnasRecordInstrument"; + this.Name = "frmAnasRecordInstrument2"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "器械清点单"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; diff --git a/AIMS/OremrUserControl/UCOperationGoodsBill5.cs b/AIMS/OremrUserControl/UCOperationGoodsBill5.cs index 380ad4a..c0f80ae 100644 --- a/AIMS/OremrUserControl/UCOperationGoodsBill5.cs +++ b/AIMS/OremrUserControl/UCOperationGoodsBill5.cs @@ -96,15 +96,15 @@ namespace AIMS.OremrUserControl set { goodsNumber = value; - this.txtDoing.Text = "0"; + //this.txtDoing.Text = "0"; - if (goodsNumber != "") - { - this.txtFront.Text = goodsNumber; - this.txtCloseFront.Text = goodsNumber; - this.txtCloseLast.Text = goodsNumber; - this.txtSkinCloseLast.Text = goodsNumber; - } + //if (goodsNumber != "") + //{ + // this.txtFront.Text = goodsNumber; + // this.txtCloseFront.Text = goodsNumber; + // this.txtCloseLast.Text = goodsNumber; + // this.txtSkinCloseLast.Text = goodsNumber; + //} } } public string OpeFront diff --git a/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs b/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs index 6776ffd..3296ec7 100644 --- a/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs +++ b/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs @@ -41,11 +41,12 @@ this.lblGoodsName.BackColor = System.Drawing.Color.Azure; this.lblGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblGoodsName.Dock = System.Windows.Forms.DockStyle.Left; + this.lblGoodsName.Font = new System.Drawing.Font("微软雅黑", 15F); this.lblGoodsName.Location = new System.Drawing.Point(0, 0); this.lblGoodsName.Multiline = true; this.lblGoodsName.Name = "lblGoodsName"; this.lblGoodsName.ReadOnly = true; - this.lblGoodsName.Size = new System.Drawing.Size(140, 28); + this.lblGoodsName.Size = new System.Drawing.Size(140, 43); this.lblGoodsName.TabIndex = 1; this.lblGoodsName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.lblGoodsName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); @@ -54,13 +55,13 @@ // this.txtCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseLast.Dock = System.Windows.Forms.DockStyle.Left; - this.txtCloseLast.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtCloseLast.Font = new System.Drawing.Font("微软雅黑", 20F); this.txtCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtCloseLast.Location = new System.Drawing.Point(431, 0); this.txtCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseLast.Name = "txtCloseLast"; this.txtCloseLast.ShortcutsEnabled = false; - this.txtCloseLast.Size = new System.Drawing.Size(93, 26); + this.txtCloseLast.Size = new System.Drawing.Size(93, 43); this.txtCloseLast.TabIndex = 5; this.txtCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -68,13 +69,13 @@ // this.txtCloseFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseFront.Dock = System.Windows.Forms.DockStyle.Left; - this.txtCloseFront.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtCloseFront.Font = new System.Drawing.Font("微软雅黑", 20F); this.txtCloseFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtCloseFront.Location = new System.Drawing.Point(334, 0); this.txtCloseFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseFront.Name = "txtCloseFront"; this.txtCloseFront.ShortcutsEnabled = false; - this.txtCloseFront.Size = new System.Drawing.Size(97, 26); + this.txtCloseFront.Size = new System.Drawing.Size(97, 43); this.txtCloseFront.TabIndex = 4; this.txtCloseFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -82,13 +83,13 @@ // this.txtDoing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtDoing.Dock = System.Windows.Forms.DockStyle.Left; - this.txtDoing.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtDoing.Font = new System.Drawing.Font("微软雅黑", 20F); this.txtDoing.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtDoing.Location = new System.Drawing.Point(237, 0); this.txtDoing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtDoing.Name = "txtDoing"; this.txtDoing.ShortcutsEnabled = false; - this.txtDoing.Size = new System.Drawing.Size(97, 26); + this.txtDoing.Size = new System.Drawing.Size(97, 43); this.txtDoing.TabIndex = 3; this.txtDoing.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -96,12 +97,12 @@ // this.txtFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtFront.Dock = System.Windows.Forms.DockStyle.Left; - this.txtFront.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtFront.Font = new System.Drawing.Font("微软雅黑", 20F); this.txtFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtFront.Location = new System.Drawing.Point(140, 0); this.txtFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtFront.Name = "txtFront"; - this.txtFront.Size = new System.Drawing.Size(97, 26); + this.txtFront.Size = new System.Drawing.Size(97, 43); this.txtFront.TabIndex = 2; this.txtFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -109,13 +110,13 @@ // this.txtSkinCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSkinCloseLast.Dock = System.Windows.Forms.DockStyle.Left; - this.txtSkinCloseLast.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtSkinCloseLast.Font = new System.Drawing.Font("微软雅黑", 20F); this.txtSkinCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtSkinCloseLast.Location = new System.Drawing.Point(524, 0); this.txtSkinCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtSkinCloseLast.Name = "txtSkinCloseLast"; this.txtSkinCloseLast.ShortcutsEnabled = false; - this.txtSkinCloseLast.Size = new System.Drawing.Size(93, 26); + this.txtSkinCloseLast.Size = new System.Drawing.Size(94, 43); this.txtSkinCloseLast.TabIndex = 6; // // UCOperationGoodsBill5 @@ -132,7 +133,7 @@ this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "UCOperationGoodsBill5"; - this.Size = new System.Drawing.Size(618, 28); + this.Size = new System.Drawing.Size(618, 43); this.Load += new System.EventHandler(this.UCOperationGoodsBill5_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index 2a6f0a5..481bad6 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -83,9 +83,9 @@ namespace DrawGraph if (ableEdit != null) { - //ableEdit.IsVisible = true; if (ableEdit.ControlType == EControlType.RadioButtonList) { + ableEdit.IsVisible = true; Panel pan = ableEdit.CControl as Panel; if (pan != null) { @@ -139,6 +139,7 @@ namespace DrawGraph switch (ableEdit.ControlType) { case EControlType.RadioButtonList: + ableEdit.IsVisible = true; foreach (Control conl in ableEdit.CControl.Controls) { string spanT = span.Clone().ToString(); @@ -313,7 +314,10 @@ namespace DrawGraph AbleEditPackObj aEdit = pack as AbleEditPackObj; if (aEdit != null) { - aEdit.IsVisible = false; + if (aEdit.ControlType == EControlType.RadioButtonList) + aEdit.IsVisible = true; + else + aEdit.IsVisible = false; } } SelectDictValue.Hidden(); @@ -557,6 +561,7 @@ namespace DrawGraph //拿到数据源（格式：OperationRecord.PatientRef.Bed） if (ableEdit.ControlType == EControlType.RadioButtonList) { + ableEdit.IsVisible = true; //SetAbleEditView(ableEdit,true); if (sender is CheckBox) if ((sender as CheckBox).Checked == true) @@ -578,14 +583,17 @@ namespace DrawGraph string value = ""; if (!updateOk) { - ableEdit.IsVisible = !ableEdit.IsVisible; + if (ableEdit.ControlType == EControlType.RadioButtonList) + ableEdit.IsVisible = true; + else + ableEdit.IsVisible = !ableEdit.IsVisible; } else { if (ableEdit.ControlType == EControlType.RadioButtonList) { //设置属性的值 - ableEdit.IsVisible = !ableEdit.IsVisible; + ableEdit.IsVisible = true; foreach (Control conl in ableEdit.CControl.Controls) { string spanT = ""; @@ -656,5 +664,31 @@ namespace DrawGraph myOpeRecord.currentPage = (int)db + 1; if (myOpeRecord.currentPage == 0) myOpeRecord.currentPage = 1; } + //设置打印模式，组件不显示 + public override void setPrint(bool isVisible) + { + //预览状态时所可编辑组件的组件隐藏 + List ables = PackManage.ListPob.Where(s => s is AbleEditPackObj).ToList(); + foreach (PackObjBase pack1 in ables) + { + AbleEditPackObj ableEdit = pack1 as AbleEditPackObj; + + if (ableEdit.ControlType == EControlType.RadioButtonList) + if (ableEdit != null) + { + ableEdit.IsVisible = isVisible; + if (isVisible == true) + { + ableEdit.IsViewBoard = EIsBool.True; + + } + else + { + ableEdit.IsViewBoard = EIsBool.False; + ableEdit.Draw(); + } + } + } + } } } diff --git a/DrawGraph/AreaManage/DBManage.cs b/DrawGraph/AreaManage/DBManage.cs index 1b16e41..1da5578 100644 --- a/DrawGraph/AreaManage/DBManage.cs +++ b/DrawGraph/AreaManage/DBManage.cs @@ -1,4 +1,5 @@ -using HelperDB; +using AIMSExtension; +using HelperDB; using System; using System.Collections.Generic; using System.Data; @@ -44,7 +45,7 @@ namespace DrawGraph strSql = "SELECT top 10 p.Id,p.Name,p.No Code FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%' OR p.No LIKE '%" + HelpCode + "%')"; if (SelPerson != "") strSql += " AND p.Id not in (" + SelPerson + ") "; strSql += " order by PersonOrder asc"; - } + } break; case "手术": strSql = "SELECT top 20 p.Id,p.Name,p.IcdCode Code FROM Operation p WHERE p.IsValid=1 AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%' OR p.IcdCode LIKE '%" + HelpCode + "%')"; @@ -156,7 +157,7 @@ namespace DrawGraph } else if (items[1] == "OperationType") { - i += UpdateApply (items[1] + "='" + value + "' where Id= " + _operationRecord.PatientId); + i += UpdateApply(items[1] + "='" + value + "' where Id= " + _operationRecord.PatientId); } else { @@ -442,41 +443,49 @@ namespace DrawGraph { if (Ids == null || Ids.Trim() == "") return ""; string Explain = ""; - string sql = ""; - switch (DictionaryName) + try { - case "手术": - sql = "select dbo.GetOperation('" + Ids + "') value"; - break; - case "CA人员": - sql = "select dbo.GetPersons('" + Ids + "') value"; - break; - case "人员": - sql = "select dbo.GetPersons('" + Ids + "') value"; - break; - case "诊断": - sql = "select dbo.GetDisease('" + Ids + "') value"; - break; - case "麻醉方式": - sql = "select dbo.GetAnaesthesiaMethod('" + Ids + "') value"; - break; - case "手术体位": - sql = "select dbo.GetOperationBodyPosition('" + Ids + "') value"; - break; - case "手术部位": - sql = "select dbo.GetOperationPosition('" + Ids + "') value"; - break; - default: - sql = "select dbo.funBasicDictionary('" + Ids + "') value"; - break; - } - if (sql != "") - { - object dt = DBHelper.ExecuteScalar(sql); - if (dt != null) + string sql = ""; + switch (DictionaryName) { - Explain = dt.ToString(); + case "手术": + sql = "select dbo.GetOperation('" + Ids + "') value"; + break; + case "CA人员": + sql = "select dbo.GetPersons('" + Ids + "') value"; + break; + case "人员": + sql = "select dbo.GetPersons('" + Ids + "') value"; + break; + case "诊断": + sql = "select dbo.GetDisease('" + Ids + "') value"; + break; + case "麻醉方式": + sql = "select dbo.GetAnaesthesiaMethod('" + Ids + "') value"; + break; + case "手术体位": + sql = "select dbo.GetOperationBodyPosition('" + Ids + "') value"; + break; + case "手术部位": + sql = "select dbo.GetOperationPosition('" + Ids + "') value"; + break; + default: + sql = "select dbo.funBasicDictionary('" + Ids + "') value"; + break; } + if (sql != "") + { + object dt = DBHelper.ExecuteScalar(sql); + if (dt != null) + { + Explain = dt.ToString(); + } + } + } + catch (Exception ex) + { + PublicMethod.WriteLog(ex); + Explain = ""; } return Explain; } diff --git a/DrawGraph/AreaManage/FactEvents.cs b/DrawGraph/AreaManage/FactEvents.cs index 5391305..bdba3d8 100644 --- a/DrawGraph/AreaManage/FactEvents.cs +++ b/DrawGraph/AreaManage/FactEvents.cs @@ -130,6 +130,13 @@ namespace DrawGraph delAddImg(TextPrefix.IM + this.EventName + this.EventId.ToString()); } + public override void clearDNAndDT(ZedGraphControl zgc) + { + if (zgcAnas == null || zgcAnas != zgc) zgcAnas = zgc; + delAddObj(TextPrefix.DN + this.EventName + this.EventId.ToString()); + delAddObj(TextPrefix.DT + this.EventName + this.EventId.ToString()); + //delAddObj(TextPrefix.IM + this.EventRef.Name + this.EventId.ToString()); + } /// /// 根据事件对象重画图片 /// diff --git a/DrawGraph/AreaManage/OperationRecord.cs b/DrawGraph/AreaManage/OperationRecord.cs index c5ad0e9..947e41e 100644 --- a/DrawGraph/AreaManage/OperationRecord.cs +++ b/DrawGraph/AreaManage/OperationRecord.cs @@ -1166,6 +1166,7 @@ namespace DrawGraph public List EventListstr = new List(); public List DrugsListstr = new List(); + public List SapsListstr = new List(); public List AfterDrugsListstr = new List(); public List FluidListstr = new List(); public List PunctureAndIntubatio; @@ -1346,6 +1347,7 @@ namespace DrawGraph { EventListstr = new List(); DrugsListstr = new List(); + SapsListstr = new List(); FluidListstr = new List(); PunctureAndIntubatio = new List(); BeforeDrugs = ""; diff --git a/DrawGraph/AreaManage/PhysioDataConfig.cs b/DrawGraph/AreaManage/PhysioDataConfig.cs index 0d97e4f..6def7b8 100644 --- a/DrawGraph/AreaManage/PhysioDataConfig.cs +++ b/DrawGraph/AreaManage/PhysioDataConfig.cs @@ -608,45 +608,19 @@ namespace DrawGraph viewValue = Math.Round(pd.Y, 1).ToString(); //如果值有效，则写文本 if (pd.Value != Double.MaxValue) - { - //if ((this.YAisx == 0 && Enname == "SPO2")) - //{ - // ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), (zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height) + 0.003, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); - //} - //else - //{ - if (showValue != -1) + { + if (Enname == "MAC") { - //double y = 0.0135 + (5 - showValue) * 0.0103; - if (Enname == "MAC") - ZUtil.DrawText((Math.Floor(pd.Value * 10) / 10).ToString(), getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); - else if (Enname == "Temp") - { - ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 4.2f, true); - } - else - { - ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); - } + ZUtil.DrawText((Math.Floor(pd.Value * 10) / 10).ToString(), getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); + } + else if (Enname == "Temp") + { + ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 4.2f, true); } else { - if (YAisx == 0) - { - //ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 240, 200, 20), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true); - ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 240, 0), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true); - } - else if (YAisx == 1) - { - ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 105, 45), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true); - } - else if (YAisx == 2) - { - ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 42, 18), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true); - } + ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); } - - //} } } } @@ -685,7 +659,7 @@ namespace DrawGraph private void onlyMoveText(PhysioData newPd, PhysioData oldPd = null) { TextObj text = (TextObj)zgcAnas.MasterPane.GraphObjList[this.Enname + ((oldPd == null) ? newPd.RecordTime.ToString() : oldPd.RecordTime.ToString())]; - text.Location.Y = getYPositinByValue(newPd.Y, 240, 200, 20); + text.Location.Y = showValue; text.Text = ((int)newPd.Value).ToString(); } public void ModItem(PhysioData oldPd, PhysioData newPd) @@ -802,12 +776,7 @@ namespace DrawGraph pd.RecordTime = maxPhysioData.RecordTime.AddMinutes(this.X_MINOR_GRID_STEP); return pd; } - } - //maxPhysioData = PointPairToPhysioData(APhysioParams[0]); - //if (!pd.isEquert(maxPhysioData)) - //{ - // pd.RecordTime = maxPhysioData.RecordTime.AddMinutes(-this.X_MINOR_GRID_STEP); - //} + } return pd; } @@ -857,7 +826,7 @@ namespace DrawGraph { throw new Exception("删除生理数据结点时出错"); } - } + } public void DelItems(DateTime RecordTime, DateTime EndTime) { try @@ -883,8 +852,7 @@ namespace DrawGraph public void draw(bool isValidLine = true) { if (zgcAnas == null) - { - //MessageBox.Show("未传递窗体或传递的不是麻醉单窗体"); + { return; } @@ -895,20 +863,11 @@ namespace DrawGraph curve.YAxisIndex = this.YAisx; curve.Label.IsVisible = this.isValid; curve.Symbol.IsVisible = this.isValid; - curve.Line.IsVisible = isValidLine; - //if (this.isValid && showStyle == "显示数值") - //{ - // curve.Symbol.IsVisible = false; - //} + curve.Line.IsVisible = isValidLine; curve.Label.FontSpec = new FontSpec("微软雅黑", 5.9f, System.Drawing.Color.Black, false, false, false); curve.Label.FontSpec.Border.IsVisible = false; - curve.Label.FontSpec.Fill.IsVisible = false; - //if (!canClick) - //{ - // curve.Label.FontSpec = new FontSpec("微软雅黑", 5.1f, Color.Gray, false, false, false); - // curve.Label.FontSpec.Border.IsVisible = false; - //} + curve.Label.FontSpec.Fill.IsVisible = false; } public PhysioData PointPairToPhysioData(PointPair pp) @@ -938,17 +897,11 @@ namespace DrawGraph if (pd != null) delAddObj(pd); } - } - //foreach (PointPair pp in APhysioParams) - //{ - // PhysioData pd = PointPairToPhysioData(pp); - // if (pd != null && pd.Value == HighLimit) delAddObj(pd); - //} + } if (APhysioParams == null || curve == null) return; - APhysioParams.Clear(); - //APhysioParams = new PointPairList(); + APhysioParams.Clear(); curve.Points = APhysioParams; - } + } /// /// 重新设置曲线属性 /// @@ -994,7 +947,7 @@ namespace DrawGraph curve.Line.IsVisible = this.isValid; curve.Symbol.IsVisible = this.isValid; } - + /// /// 清除各种对象数据 diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index 4647560..6a7e795 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -75,6 +75,8 @@ namespace DrawGraph chartPack = GetPackObjectOTag("PhysioDataManage_ChartPackObj_6") as ChartPackObj; //自己要用的手术对象 myOpeRecord = OpeRecord as OperationRecord; + //myOpeRecord.SAreaObj.maxnumber = ZedControl.GraphPane.YAxis.Scale.Max; + //myOpeRecord.SAreaObj.minnumber = ZedControl.GraphPane.YAxis.Scale.Min; } /// @@ -152,7 +154,7 @@ namespace DrawGraph if (myOpeRecord != null) { if (e.Button != System.Windows.Forms.MouseButtons.Left) return; - //清空选中框 + //清空选中框 myOpeRecord.SAreaObj.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); myOpeRecord.SAreaObj.Clear(); @@ -544,6 +546,8 @@ namespace DrawGraph aSyncTip = TipBox.CreateInstance("async"); aSyncTip.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); + myOpeRecord.SAreaObj.maxnumber = ZedControl.GraphPane.YAxis.Scale.Max; + myOpeRecord.SAreaObj.minnumber = ZedControl.GraphPane.YAxis.Scale.Min; DrawPhysioData(); } @@ -637,7 +641,7 @@ namespace DrawGraph int B = int.Parse(str[3].ToString()); pp.ConveColor = System.Drawing.Color.FromArgb(A, R, G, B); - if (pp.IsDefalultShow == false) + if (pp.IsDefalultShow == false || (pp.ShowImg == false && pp.ShowText == false)) { pp.showStyle = "不显示"; pp.IsValid = false; @@ -654,6 +658,7 @@ namespace DrawGraph pp.showStyle = "显示数值"; pp.IsValid = true; } + } pp.ClearTagstr(ZedControl); //如果模板管理不为空 @@ -734,7 +739,7 @@ namespace DrawGraph int B = int.Parse(str[3].ToString()); pp.ConveColor = System.Drawing.Color.FromArgb(A, R, G, B); - if (pp.IsDefalultShow == false) + if (pp.IsDefalultShow == false || (pp.ShowImg == false && pp.ShowText == false)) { pp.showStyle = "不显示"; pp.IsValid = false; diff --git a/DrawGraph/AreaManage/RemarkManage.cs b/DrawGraph/AreaManage/RemarkManage.cs index 3723e6f..cadc193 100644 --- a/DrawGraph/AreaManage/RemarkManage.cs +++ b/DrawGraph/AreaManage/RemarkManage.cs @@ -180,6 +180,8 @@ namespace DrawGraph //用药备注 SetRemarkInfo(myOpeRecord.DrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); + //液体备注 + SetRemarkInfo(myOpeRecord.SapsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); //术后镇痛药备注 SetRemarkInfo(myOpeRecord.AfterDrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index e539352..e9c192d 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -132,8 +132,8 @@ namespace DrawGraph DateTime serverTime = DateTime.Now; if (curTimeTemp > serverTime) curTimeTemp = serverTime; //超出的药画备注 镇痛药备注 - List DrugListstr = new List(); - DrugListstr.Add("【手术用药】"); + List SapListstr = new List(); + SapListstr.Add("【手术用液】"); myOpeRecord.BeforeDrugs = ""; myOpeRecord.AnalgesiaDrug = ""; //当前时间段加药集合 @@ -186,7 +186,7 @@ namespace DrawGraph if (drugsy <= maxDrugsy) temp.drawText(H3pack.RealX + 0.006f, drugsy); else - ListAddDrugs(DrugListstr, i, temp); + ListAddDrugs(SapListstr, i, temp); foreach (FactDrug item in temp.ChildFactDrugList) { foreach (FactDrug addDrug1item in addDrug1.ChildFactDrugList) @@ -202,7 +202,7 @@ namespace DrawGraph if (drugsy <= maxDrugsy) item.drawText(H3pack.RealX + 0.006f, drugsy); else - ListAddDrugs(DrugListstr, i, item); + ListAddDrugs(SapListstr, i, item); continue; } } @@ -218,7 +218,7 @@ namespace DrawGraph rowDrugsIndex++; } else - ListAddDrugs(DrugListstr, i, temp); + ListAddDrugs(SapListstr, i, temp); if (temp.ChildFactDrugList.Count > 0) { foreach (FactDrug sItem in temp.ChildFactDrugList) @@ -230,7 +230,7 @@ namespace DrawGraph sItem.drawText(H3pack.RealX + 0.006f, drugsy); rowDrugsIndex++; } - else { ListAddDrugs(DrugListstr, i, sItem); } + else { ListAddDrugs(SapListstr, i, sItem); } } if (drugsy <= maxDrugsy) DrawZuDragsLine(H3pack.RealX + 0.003f, drugsy, temp.nowY, temp); @@ -238,7 +238,7 @@ namespace DrawGraph } } - myOpeRecord.DrugsListstr = DrugListstr; + myOpeRecord.SapsListstr = SapListstr; } catch (Exception ex) diff --git a/DrawGraph/AreaManage/SelectWorkerValue.cs b/DrawGraph/AreaManage/SelectWorkerValue.cs index aa383b1..b8205fd 100644 --- a/DrawGraph/AreaManage/SelectWorkerValue.cs +++ b/DrawGraph/AreaManage/SelectWorkerValue.cs @@ -125,18 +125,10 @@ namespace DrawGraph dgvZd.Columns[1].HeaderText = aEdit.ControlTitleText; System.Drawing.Point point = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y + aEdit.CControl.Height); - dgvZd.Size = new System.Drawing.Size(aEdit.CControl.Width < 150 ? 149 : aEdit.CControl.Width, dgvZd.Height); + dgvZd.Size = new System.Drawing.Size(aEdit.CControl.Width < 200 ? 199 : aEdit.CControl.Width, dgvZd.Height); if (_aEdit.RealEndY > 0.8) point = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y - 300); dgvZd.Location = point; - if (dgvZd.Size.Width < 150) - { - dgvZd.Columns[2].Visible = false; - } - else - { - dgvZd.Columns[2].Visible = true; - } if (dgvZd.Parent == null) aEdit.CControl.Parent.Controls.Add(dgvZd); diff --git a/DrawGraph/AreaManage/SelectedAreaObj.cs b/DrawGraph/AreaManage/SelectedAreaObj.cs index 66daf32..20f1550 100644 --- a/DrawGraph/AreaManage/SelectedAreaObj.cs +++ b/DrawGraph/AreaManage/SelectedAreaObj.cs @@ -20,6 +20,10 @@ namespace DrawGraph private float width = 0; private float height = 0; + + public double maxnumber = 300; + public double minnumber = 0; + private string tagName = TextPrefix.BT.ToString(); private bool selected = false; @@ -42,7 +46,7 @@ namespace DrawGraph { startPD = value; startPoint.X = (float)(getXPositinByXDate(startPD.RecordTime)); - startPoint.Y = (float)(getYPositinByValue(startPD.Y, 240, 200, 20)); + startPoint.Y = (float)(getYPositinByValue(startPD.Y, maxnumber, minnumber)); } } /// @@ -55,7 +59,7 @@ namespace DrawGraph { endPd = value; endPoint.X = (float)(getXPositinByXDate(endPd.RecordTime)); - endPoint.Y = (float)(getYPositinByValue(endPd.Y, 240, 200, 20)); + endPoint.Y = (float)(getYPositinByValue(endPd.Y, maxnumber, minnumber)); width = endPoint.X - startPoint.X; height = endPoint.Y - startPoint.Y; } diff --git a/DrawGraph/GUtil/EventObj.cs b/DrawGraph/GUtil/EventObj.cs index 968f585..7fdab37 100644 --- a/DrawGraph/GUtil/EventObj.cs +++ b/DrawGraph/GUtil/EventObj.cs @@ -211,37 +211,33 @@ namespace DrawGraph //xMaxDate - xMinDate 0.16666666651144624 ;xMinPF = 0.15 ??? } - /// - /// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标 - /// - /// 日期时间 - /// x - public double getYPositinByValue(double value, int ymax, int maxnumber, int minnumber) - { - //zgcAnas.GraphPane.Rect.Height = 1606; - //zgcAnas.GraphPane.Chart.Rect.Top=687.368 - //zgcAnas.GraphPane.Chart.Rect.Height=472.164 - //height 50 - double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976 - double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674 - double Minvalue = (yMaxPF - yMinPF) / ymax * ((ymax - maxnumber) / 2);// *(value - 50); - yMinPF = yMinPF + Minvalue; - yMaxPF = yMaxPF - Minvalue; - double endvalue = (yMaxPF - yMinPF) / maxnumber * (value - minnumber); - return yMaxPF - endvalue - 0.004; - } + ///// + ///// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标 + ///// + ///// 日期时间 + ///// x + //public double getYPositinByValue(double value, int ymax, double maxnumber, double minnumber) + //{ + // double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976 + // double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674 + // double Minvalue = (yMaxPF - yMinPF) / ymax * ((ymax - maxnumber) / 2);// *(value - 50); + // yMinPF = yMinPF + Minvalue; + // yMaxPF = yMaxPF - Minvalue; + // double endvalue = (yMaxPF - yMinPF) / maxnumber * (value - minnumber); + // return yMaxPF - endvalue - 0.004; + //} /// /// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标 /// /// 日期时间 /// x - public double getYPositinByValue(double value, int ymax, int minnumber) + public double getYPositinByValue(double value, double ymax, double minnumber) { double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976 double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674 double endvalue = (yMaxPF - yMinPF) / (ymax - minnumber) * (value - minnumber); - return yMaxPF - endvalue - 0.004; + return yMaxPF - endvalue - 0.001; } ///