diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index 6d784ba..ea9ae48 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -69,6 +69,9 @@ + + Extensions\System.Net.Http.dll + @@ -1549,6 +1552,6 @@ - rd /s /q zh-TW zh-cn en ar + rd /s /q zh-TW zh-cn en \ No newline at end of file diff --git a/AIMS/AIMS.xml b/AIMS/AIMS.xml index 8fe8536..093bb06 100644 --- a/AIMS/AIMS.xml +++ b/AIMS/AIMS.xml @@ -1,6 +1,6 @@  - Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020; + Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;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/Clear.Bat b/AIMS/Clear.Bat index eaaca49..c467b9e 100644 --- a/AIMS/Clear.Bat +++ b/AIMS/Clear.Bat @@ -1,4 +1,4 @@ attrib -h -s -r /s *.* -del /s *.~* *.pdb *.vshost.exe.manifest *.vshost.exe.config *.vshost.exe AutoUpdateTool.exe +del /s *.~* *.pdb *.vshost.exe.manifest *.vshost.exe.config *.vshost.exe AutoUpdateTool.exe DevComponents.Instrumentation.xml del %0 pause diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs index d9d1cae..190aa22 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs @@ -164,14 +164,14 @@ namespace AIMS.PublicUI.UI { foreach (DataGridViewRow yRow in dgvY.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) { MessageBox.Show("已经选过了！"); foreach (DataGridViewRow drow in dgvD.Rows) { - if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { - drow.Cells["Select"].Value = false; + drow.Cells["Selectc"].Value = false; } } return; @@ -181,7 +181,7 @@ namespace AIMS.PublicUI.UI List list = new List(); foreach (DataGridViewRow row in dgvD.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { list.Add(Convert.ToInt32(row.Cells["Id"].Value)); } diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs index d75d5b4..bc5332c 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs @@ -53,7 +53,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -301,7 +301,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Select, + this.Selectc, this.oName}); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; @@ -338,9 +338,9 @@ // // Select // - this.Select.HeaderText = "选择"; - this.Select.Name = "Select"; - this.Select.Width = 65; + this.Selectc.HeaderText = "选择"; + this.Selectc.Name = "Select"; + this.Selectc.Width = 65; // // oName // @@ -394,13 +394,12 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect; private System.Windows.Forms.DataGridViewTextBoxColumn yId; - private System.Windows.Forms.DataGridViewTextBoxColumn yName; - private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol; + private System.Windows.Forms.DataGridViewTextBoxColumn yName; private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.ButtonX buttonX1; private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Index; - private System.Windows.Forms.DataGridViewCheckBoxColumn Select; + private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc; private System.Windows.Forms.DataGridViewTextBoxColumn oName; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.cs b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.cs index ae6e6f1..8948c3a 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.cs @@ -175,14 +175,14 @@ namespace AIMS.PublicUI.UI { foreach (DataGridViewRow yRow in dgvY.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString() && row.Cells["ospec"].Value.ToString() == yRow.Cells["yspec"].Value.ToString()) + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString() && row.Cells["ospec"].Value.ToString() == yRow.Cells["yspec"].Value.ToString()) { MessageBox.Show("已经选过了！"); foreach (DataGridViewRow drow in dgvD.Rows) { - if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { - drow.Cells["Select"].Value = false; + drow.Cells["Selectc"].Value = false; } } return; @@ -192,7 +192,7 @@ namespace AIMS.PublicUI.UI List list = new List(); foreach (DataGridViewRow row in dgvD.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { list.Add(Convert.ToInt32(row.Cells["Id"].Value)); } diff --git a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs index 9d788c3..147f574 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs @@ -57,7 +57,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ospec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dDOSEPER = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -340,7 +340,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Select, + this.Selectc, this.oName, this.ospec, this.dDOSEPER, @@ -381,9 +381,9 @@ // // Select // - this.Select.HeaderText = "选择"; - this.Select.Name = "Select"; - this.Select.Width = 65; + this.Selectc.HeaderText = "选择"; + this.Selectc.Name = "Select"; + this.Selectc.Width = 65; // // oName // @@ -467,8 +467,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn DOSEPER2; private System.Windows.Forms.DataGridViewTextBoxColumn DOSEPER3; private System.Windows.Forms.DataGridViewTextBoxColumn Id; - private System.Windows.Forms.DataGridViewTextBoxColumn Index; - private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol; + private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn ospec; private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER; @@ -476,6 +475,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER3; private DevComponents.DotNetBar.ButtonX buttonX3; private DevComponents.DotNetBar.ButtonX buttonX4; - private System.Windows.Forms.DataGridViewCheckBoxColumn Select; + private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.cs b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.cs index 787bf79..3fc13f6 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.cs @@ -162,14 +162,14 @@ namespace AIMS.PublicUI.UI { foreach (DataGridViewRow yRow in dgvY.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) { MessageBox.Show("已经选过了！"); foreach (DataGridViewRow drow in dgvD.Rows) { - if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { - drow.Cells["Select"].Value = false; + drow.Cells["Selectc"].Value = false; } } return; @@ -179,7 +179,7 @@ namespace AIMS.PublicUI.UI List list = new List(); foreach (DataGridViewRow row in dgvD.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { list.Add(Convert.ToInt32(row.Cells["Id"].Value)); } diff --git a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs index ec38749..aae3d37 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs @@ -53,7 +53,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -301,7 +301,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Select, + this.Selectc, this.oName}); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; @@ -338,9 +338,9 @@ // // Select // - this.Select.HeaderText = "选择"; - this.Select.Name = "Select"; - this.Select.Width = 65; + this.Selectc.HeaderText = "选择"; + this.Selectc.Name = "Select"; + this.Selectc.Width = 65; // // oName // @@ -396,11 +396,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn yId; private System.Windows.Forms.DataGridViewTextBoxColumn yName; private System.Windows.Forms.DataGridViewTextBoxColumn Id; - private System.Windows.Forms.DataGridViewTextBoxColumn Index; - private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol; + private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn oName; private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.ButtonX buttonX1; - private System.Windows.Forms.DataGridViewCheckBoxColumn Select; + private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmApplianceSelect.cs b/AIMS/DataDictionary/frmApplianceSelect.cs index 67b4a4b..3f1c8a5 100644 --- a/AIMS/DataDictionary/frmApplianceSelect.cs +++ b/AIMS/DataDictionary/frmApplianceSelect.cs @@ -198,14 +198,14 @@ namespace AIMS.PublicUI.UI { foreach (DataGridViewRow yRow in dgvY.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) { MessageBox.Show("已经选过了！"); foreach (DataGridViewRow drow in dgvD.Rows) { - if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { - drow.Cells["Select"].Value = false; + drow.Cells["Selectc"].Value = false; } } return; @@ -215,7 +215,7 @@ namespace AIMS.PublicUI.UI List list = new List(); foreach (DataGridViewRow row in dgvD.Rows) { - if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") + if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True") { list.Add(Convert.ToInt32(row.Cells["Id"].Value)); } diff --git a/AIMS/DataDictionary/frmApplianceSelect.designer.cs b/AIMS/DataDictionary/frmApplianceSelect.designer.cs index dfa5ea8..eb2be22 100644 --- a/AIMS/DataDictionary/frmApplianceSelect.designer.cs +++ b/AIMS/DataDictionary/frmApplianceSelect.designer.cs @@ -57,7 +57,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -364,7 +364,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Select, + this.Selectc, this.oName}); dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; @@ -401,9 +401,9 @@ // // Select // - this.Select.HeaderText = "选择"; - this.Select.Name = "Select"; - this.Select.Width = 65; + this.Selectc.HeaderText = "选择"; + this.Selectc.Name = "Select"; + this.Selectc.Width = 65; // // oName // @@ -500,8 +500,7 @@ private DevComponents.DotNetBar.Controls.TextBoxX txtQuery; private System.Windows.Forms.Label label3; private System.Windows.Forms.DataGridViewTextBoxColumn Id; - private System.Windows.Forms.DataGridViewTextBoxColumn Index; - private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol; + private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect; private System.Windows.Forms.DataGridViewTextBoxColumn yId; @@ -516,6 +515,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private DevComponents.DotNetBar.ButtonX buttonX1; - private System.Windows.Forms.DataGridViewCheckBoxColumn Select; + private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmChargSelect.designer.cs b/AIMS/DataDictionary/frmChargSelect.designer.cs index 8e5d577..5311e15 100644 --- a/AIMS/DataDictionary/frmChargSelect.designer.cs +++ b/AIMS/DataDictionary/frmChargSelect.designer.cs @@ -54,7 +54,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oxmbm = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -309,7 +309,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Select, + this.Selectc, this.oName, this.oCode, this.oxmbm, @@ -349,10 +349,10 @@ // // Select // - this.Select.HeaderText = "选择"; - this.Select.Name = "Select"; - this.Select.Visible = false; - this.Select.Width = 65; + this.Selectc.HeaderText = "选择"; + this.Selectc.Name = "Select"; + this.Selectc.Visible = false; + this.Selectc.Width = 65; // // oName // @@ -521,7 +521,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Index; - private System.Windows.Forms.DataGridViewCheckBoxColumn Select; + private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc; private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oCode; private System.Windows.Forms.DataGridViewTextBoxColumn oxmbm; diff --git a/AIMS/DataDictionary/frmChargsTemplateNew.cs b/AIMS/DataDictionary/frmChargsTemplateNew.cs index 14d60f9..73b0d46 100644 --- a/AIMS/DataDictionary/frmChargsTemplateNew.cs +++ b/AIMS/DataDictionary/frmChargsTemplateNew.cs @@ -37,7 +37,7 @@ namespace AIMS.PublicUI.UI toolStripSeparator4.Visible = true; panel1.Visible = true; dgvApplianceUseType.Columns["IsValid"].Visible = true; - dgvApplianceUseType.Columns["Select"].Visible = true; + dgvApplianceUseType.Columns["SelectC"].Visible = true; } ControlExtension.EnabledControl(panel1, false); diff --git a/AIMS/DataDictionary/frmChargsTemplateNew.designer.cs b/AIMS/DataDictionary/frmChargsTemplateNew.designer.cs index 420cbbe..a821c99 100644 --- a/AIMS/DataDictionary/frmChargsTemplateNew.designer.cs +++ b/AIMS/DataDictionary/frmChargsTemplateNew.designer.cs @@ -54,7 +54,7 @@ this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.IsValid = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Select = new System.Windows.Forms.DataGridViewButtonColumn(); + this.Selectc = new System.Windows.Forms.DataGridViewButtonColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -252,7 +252,7 @@ this.oName, this.HCode, this.IsValid, - this.Select}); + this.Selectc}); dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -332,13 +332,13 @@ // // Select // - this.Select.HeaderText = "项目维护"; - this.Select.Name = "Select"; - this.Select.ReadOnly = true; - this.Select.Text = "项目维护"; - this.Select.UseColumnTextForButtonValue = true; - this.Select.Visible = false; - this.Select.Width = 150; + this.Selectc.HeaderText = "项目维护"; + this.Selectc.Name = "Select"; + this.Selectc.ReadOnly = true; + this.Selectc.Text = "项目维护"; + this.Selectc.UseColumnTextForButtonValue = true; + this.Selectc.Visible = false; + this.Selectc.Width = 150; // // dataGridViewTextBoxColumn1 // @@ -433,6 +433,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn HCode; private System.Windows.Forms.DataGridViewTextBoxColumn IsValid; - private System.Windows.Forms.DataGridViewButtonColumn Select; + private System.Windows.Forms.DataGridViewButtonColumn Selectc; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmPerson.Designer.cs b/AIMS/DataDictionary/frmPerson.Designer.cs index 3d1c33a..41a4112 100644 --- a/AIMS/DataDictionary/frmPerson.Designer.cs +++ b/AIMS/DataDictionary/frmPerson.Designer.cs @@ -30,6 +30,22 @@ { this.panel2 = new System.Windows.Forms.Panel(); this.dgvPerson = new System.Windows.Forms.DataGridView(); + this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DepNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.NoColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.HelpCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SexColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DiplomaColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.JobTitleColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BirthDayColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.TimeToWorkColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PersonTypeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RoleNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PassWordColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.IsValidColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PersonOrderColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SignatureStr = new System.Windows.Forms.DataGridViewImageColumn(); this.panel1 = new System.Windows.Forms.Panel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.cboDepartment = new System.Windows.Forms.ComboBox(); @@ -73,22 +89,6 @@ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.tsbExit = new System.Windows.Forms.ToolStripButton(); this.chkAllShow = new System.Windows.Forms.CheckBox(); - this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DepNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.NoColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.HelpCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SexColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DiplomaColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.JobTitleColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.BirthDayColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.TimeToWorkColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PersonTypeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.RoleNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PassWordColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.IsValidColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PersonOrderColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SignatureStr = new System.Windows.Forms.DataGridViewImageColumn(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvPerson)).BeginInit(); this.panel1.SuspendLayout(); @@ -139,6 +139,126 @@ this.dgvPerson.Size = new System.Drawing.Size(1016, 338); this.dgvPerson.TabIndex = 2; // + // Id + // + this.Id.DataPropertyName = "Id"; + this.Id.Frozen = true; + this.Id.HeaderText = "Id"; + this.Id.Name = "Id"; + this.Id.ReadOnly = true; + this.Id.Visible = false; + // + // DepNameColumn + // + this.DepNameColumn.DataPropertyName = "DepName"; + this.DepNameColumn.HeaderText = "所在科室"; + this.DepNameColumn.Name = "DepNameColumn"; + this.DepNameColumn.ReadOnly = true; + // + // NoColumn + // + this.NoColumn.DataPropertyName = "No"; + this.NoColumn.HeaderText = "工号"; + this.NoColumn.Name = "NoColumn"; + this.NoColumn.ReadOnly = true; + this.NoColumn.Width = 80; + // + // NameColumn + // + this.NameColumn.DataPropertyName = "Name"; + this.NameColumn.HeaderText = "名称"; + this.NameColumn.Name = "NameColumn"; + this.NameColumn.ReadOnly = true; + // + // HelpCodeColumn + // + this.HelpCodeColumn.DataPropertyName = "HelpCode"; + this.HelpCodeColumn.HeaderText = "助记码"; + this.HelpCodeColumn.Name = "HelpCodeColumn"; + this.HelpCodeColumn.ReadOnly = true; + this.HelpCodeColumn.Width = 80; + // + // SexColumn + // + this.SexColumn.DataPropertyName = "Sex"; + this.SexColumn.HeaderText = "性别"; + this.SexColumn.Name = "SexColumn"; + this.SexColumn.ReadOnly = true; + this.SexColumn.Width = 60; + // + // DiplomaColumn + // + this.DiplomaColumn.DataPropertyName = "Diploma"; + this.DiplomaColumn.HeaderText = "His编码"; + this.DiplomaColumn.Name = "DiplomaColumn"; + this.DiplomaColumn.ReadOnly = true; + this.DiplomaColumn.Width = 80; + // + // JobTitleColumn + // + this.JobTitleColumn.DataPropertyName = "JobTitle"; + this.JobTitleColumn.HeaderText = "职称"; + this.JobTitleColumn.Name = "JobTitleColumn"; + this.JobTitleColumn.ReadOnly = true; + this.JobTitleColumn.Width = 80; + // + // BirthDayColumn + // + this.BirthDayColumn.DataPropertyName = "BirthDay"; + this.BirthDayColumn.HeaderText = "出生日期"; + this.BirthDayColumn.Name = "BirthDayColumn"; + this.BirthDayColumn.ReadOnly = true; + // + // TimeToWorkColumn + // + this.TimeToWorkColumn.DataPropertyName = "TimeToWork"; + this.TimeToWorkColumn.HeaderText = "参加工作日期"; + this.TimeToWorkColumn.Name = "TimeToWorkColumn"; + this.TimeToWorkColumn.ReadOnly = true; + // + // PersonTypeColumn + // + this.PersonTypeColumn.DataPropertyName = "PersonType"; + this.PersonTypeColumn.HeaderText = "类型"; + this.PersonTypeColumn.Name = "PersonTypeColumn"; + this.PersonTypeColumn.ReadOnly = true; + // + // RoleNameColumn + // + this.RoleNameColumn.DataPropertyName = "RoleName"; + this.RoleNameColumn.HeaderText = "角色"; + this.RoleNameColumn.Name = "RoleNameColumn"; + this.RoleNameColumn.ReadOnly = true; + // + // PassWordColumn + // + this.PassWordColumn.DataPropertyName = "PassWord"; + this.PassWordColumn.HeaderText = "密码"; + this.PassWordColumn.Name = "PassWordColumn"; + this.PassWordColumn.ReadOnly = true; + this.PassWordColumn.Visible = false; + // + // IsValidColumn + // + this.IsValidColumn.DataPropertyName = "IsValid"; + this.IsValidColumn.HeaderText = "有效性"; + this.IsValidColumn.Name = "IsValidColumn"; + this.IsValidColumn.ReadOnly = true; + this.IsValidColumn.Width = 75; + // + // PersonOrderColumn + // + this.PersonOrderColumn.DataPropertyName = "PersonOrder"; + this.PersonOrderColumn.HeaderText = "排序"; + this.PersonOrderColumn.Name = "PersonOrderColumn"; + this.PersonOrderColumn.ReadOnly = true; + this.PersonOrderColumn.Width = 60; + // + // SignatureStr + // + this.SignatureStr.HeaderText = "签名"; + this.SignatureStr.Name = "SignatureStr"; + // // panel1 // this.panel1.Controls.Add(this.pictureBox1); @@ -276,7 +396,7 @@ // this.txtSignatureIndex.Location = new System.Drawing.Point(934, 9); this.txtSignatureIndex.Name = "txtSignatureIndex"; - this.txtSignatureIndex.Size = new System.Drawing.Size(76, 23); + this.txtSignatureIndex.Size = new System.Drawing.Size(118, 23); this.txtSignatureIndex.TabIndex = 568; // // label15 @@ -659,126 +779,6 @@ this.chkAllShow.UseVisualStyleBackColor = true; this.chkAllShow.CheckedChanged += new System.EventHandler(this.chkAllShow_CheckedChanged); // - // Id - // - this.Id.DataPropertyName = "Id"; - this.Id.Frozen = true; - this.Id.HeaderText = "Id"; - this.Id.Name = "Id"; - this.Id.ReadOnly = true; - this.Id.Visible = false; - // - // DepNameColumn - // - this.DepNameColumn.DataPropertyName = "DepName"; - this.DepNameColumn.HeaderText = "所在科室"; - this.DepNameColumn.Name = "DepNameColumn"; - this.DepNameColumn.ReadOnly = true; - // - // NoColumn - // - this.NoColumn.DataPropertyName = "No"; - this.NoColumn.HeaderText = "工号"; - this.NoColumn.Name = "NoColumn"; - this.NoColumn.ReadOnly = true; - this.NoColumn.Width = 80; - // - // NameColumn - // - this.NameColumn.DataPropertyName = "Name"; - this.NameColumn.HeaderText = "名称"; - this.NameColumn.Name = "NameColumn"; - this.NameColumn.ReadOnly = true; - // - // HelpCodeColumn - // - this.HelpCodeColumn.DataPropertyName = "HelpCode"; - this.HelpCodeColumn.HeaderText = "助记码"; - this.HelpCodeColumn.Name = "HelpCodeColumn"; - this.HelpCodeColumn.ReadOnly = true; - this.HelpCodeColumn.Width = 80; - // - // SexColumn - // - this.SexColumn.DataPropertyName = "Sex"; - this.SexColumn.HeaderText = "性别"; - this.SexColumn.Name = "SexColumn"; - this.SexColumn.ReadOnly = true; - this.SexColumn.Width = 60; - // - // DiplomaColumn - // - this.DiplomaColumn.DataPropertyName = "Diploma"; - this.DiplomaColumn.HeaderText = "His编码"; - this.DiplomaColumn.Name = "DiplomaColumn"; - this.DiplomaColumn.ReadOnly = true; - this.DiplomaColumn.Width = 80; - // - // JobTitleColumn - // - this.JobTitleColumn.DataPropertyName = "JobTitle"; - this.JobTitleColumn.HeaderText = "职称"; - this.JobTitleColumn.Name = "JobTitleColumn"; - this.JobTitleColumn.ReadOnly = true; - this.JobTitleColumn.Width = 80; - // - // BirthDayColumn - // - this.BirthDayColumn.DataPropertyName = "BirthDay"; - this.BirthDayColumn.HeaderText = "出生日期"; - this.BirthDayColumn.Name = "BirthDayColumn"; - this.BirthDayColumn.ReadOnly = true; - // - // TimeToWorkColumn - // - this.TimeToWorkColumn.DataPropertyName = "TimeToWork"; - this.TimeToWorkColumn.HeaderText = "参加工作日期"; - this.TimeToWorkColumn.Name = "TimeToWorkColumn"; - this.TimeToWorkColumn.ReadOnly = true; - // - // PersonTypeColumn - // - this.PersonTypeColumn.DataPropertyName = "PersonType"; - this.PersonTypeColumn.HeaderText = "类型"; - this.PersonTypeColumn.Name = "PersonTypeColumn"; - this.PersonTypeColumn.ReadOnly = true; - // - // RoleNameColumn - // - this.RoleNameColumn.DataPropertyName = "RoleName"; - this.RoleNameColumn.HeaderText = "角色"; - this.RoleNameColumn.Name = "RoleNameColumn"; - this.RoleNameColumn.ReadOnly = true; - // - // PassWordColumn - // - this.PassWordColumn.DataPropertyName = "PassWord"; - this.PassWordColumn.HeaderText = "密码"; - this.PassWordColumn.Name = "PassWordColumn"; - this.PassWordColumn.ReadOnly = true; - this.PassWordColumn.Visible = false; - // - // IsValidColumn - // - this.IsValidColumn.DataPropertyName = "IsValid"; - this.IsValidColumn.HeaderText = "有效性"; - this.IsValidColumn.Name = "IsValidColumn"; - this.IsValidColumn.ReadOnly = true; - this.IsValidColumn.Width = 75; - // - // PersonOrderColumn - // - this.PersonOrderColumn.DataPropertyName = "PersonOrder"; - this.PersonOrderColumn.HeaderText = "排序"; - this.PersonOrderColumn.Name = "PersonOrderColumn"; - this.PersonOrderColumn.ReadOnly = true; - this.PersonOrderColumn.Width = 60; - // - // SignatureStr - // - this.SignatureStr.HeaderText = "签名"; - this.SignatureStr.Name = "SignatureStr"; - // // frmPerson // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/AIMS/Extensions/Newtonsoft.Json.dll b/AIMS/Extensions/Newtonsoft.Json.dll index 218ef55..be3857e 100644 Binary files a/AIMS/Extensions/Newtonsoft.Json.dll and b/AIMS/Extensions/Newtonsoft.Json.dll differ diff --git a/AIMS/Extensions/System.Net.Http.dll b/AIMS/Extensions/System.Net.Http.dll new file mode 100644 index 0000000..78a383c Binary files /dev/null and b/AIMS/Extensions/System.Net.Http.dll differ diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index 2163e60..a441e2f 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -74,16 +74,9 @@ this.superTabMain = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); - this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); - this.paneltop = new System.Windows.Forms.Panel(); - this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); - this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExBLSJ = new DevComponents.DotNetBar.PanelEx(); - this.panel82 = new AIMS.PublicUI.UI.DrawPanel(); - this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress(); - this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl(); this.spTabBM = new DevComponents.DotNetBar.SuperTabItem(); this.panel7 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel(); @@ -135,6 +128,13 @@ this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); + this.paneltop = new System.Windows.Forms.Panel(); + this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); + this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); + this.panel82 = new AIMS.PublicUI.UI.DrawPanel(); + this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress(); + this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -144,10 +144,8 @@ this.superTabMain.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); this.panelExZKZB.SuspendLayout(); - this.panel8.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); this.panelExBLSJ.SuspendLayout(); - this.panel82.SuspendLayout(); this.panel7.SuspendLayout(); this.panel21.SuspendLayout(); this.plTitleEventTime.SuspendLayout(); @@ -175,6 +173,8 @@ this.panel6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).BeginInit(); + this.panel8.SuspendLayout(); + this.panel82.SuspendLayout(); this.SuspendLayout(); // // panel2 @@ -200,7 +200,7 @@ // // panel14 // - this.panel14.BackColor = System.Drawing.Color.White; + this.panel14.BackColor = System.Drawing.Color.AliceBlue; this.panel14.Controls.Add(this.button10); this.panel14.Controls.Add(this.button8); this.panel14.Controls.Add(this.button7); @@ -483,7 +483,7 @@ // // panel4 // - this.panel4.BackColor = System.Drawing.Color.White; + this.panel4.BackColor = System.Drawing.Color.AliceBlue; this.panel4.Controls.Add(this.btnChage); this.panel4.Controls.Add(this.btnsjzx); this.panel4.Controls.Add(this.btnyldj); @@ -919,69 +919,6 @@ this.panelExZKZB.Style.GradientAngle = 90; this.panelExZKZB.TabIndex = 0; // - // panel8 - // - this.panel8.AutoScroll = true; - this.panel8.BackColor = System.Drawing.Color.White; - this.panel8.Controls.Add(this.paneltop); - this.panel8.Controls.Add(this.circularProgress1); - this.panel8.Controls.Add(this.zgcAnaesRecord); - 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(1389, 803); - this.panel8.TabIndex = 2; - this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); - // - // paneltop - // - this.paneltop.Location = new System.Drawing.Point(9, 137); - this.paneltop.Name = "paneltop"; - this.paneltop.Size = new System.Drawing.Size(690, 30); - this.paneltop.TabIndex = 7; - this.paneltop.Visible = false; - // - // circularProgress1 - // - this.circularProgress1.AnimationSpeed = 50; - // - // - // - this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); - this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; - this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.circularProgress1.FocusCuesEnabled = false; - this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.circularProgress1.Location = new System.Drawing.Point(602, 274); - this.circularProgress1.Margin = new System.Windows.Forms.Padding(4); - this.circularProgress1.Name = "circularProgress1"; - this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; - this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; - this.circularProgress1.TabIndex = 6; - this.circularProgress1.Value = 100; - // - // zgcAnaesRecord - // - this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41); - this.zgcAnaesRecord.Name = "zgcAnaesRecord"; - this.zgcAnaesRecord.ScrollGrace = 0D; - this.zgcAnaesRecord.ScrollMaxX = 0D; - this.zgcAnaesRecord.ScrollMaxY = 0D; - this.zgcAnaesRecord.ScrollMaxY2 = 0D; - this.zgcAnaesRecord.ScrollMinX = 0D; - this.zgcAnaesRecord.ScrollMinY = 0D; - this.zgcAnaesRecord.ScrollMinY2 = 0D; - this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000); - this.zgcAnaesRecord.TabIndex = 0; - this.zgcAnaesRecord.Visible = false; - this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder); - this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent); - this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent); - this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent); - this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp); - this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick); - // // spTabQXQDD // this.spTabQXQDD.AttachedControl = this.superTabControlPanel1; @@ -1018,60 +955,6 @@ this.panelExBLSJ.Style.GradientAngle = 90; this.panelExBLSJ.TabIndex = 0; // - // panel82 - // - this.panel82.AutoScroll = true; - this.panel82.BackColor = System.Drawing.Color.White; - this.panel82.Controls.Add(this.circularProgress2); - this.panel82.Controls.Add(this.zgcAnaesRecord2); - this.panel82.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel82.Location = new System.Drawing.Point(0, 0); - this.panel82.Name = "panel82"; - this.panel82.Size = new System.Drawing.Size(1389, 803); - this.panel82.TabIndex = 3; - this.panel82.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel82_Scroll); - // - // circularProgress2 - // - this.circularProgress2.AnimationSpeed = 50; - // - // - // - this.circularProgress2.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); - this.circularProgress2.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; - this.circularProgress2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.circularProgress2.FocusCuesEnabled = false; - this.circularProgress2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.circularProgress2.Location = new System.Drawing.Point(678, 354); - this.circularProgress2.Margin = new System.Windows.Forms.Padding(4); - this.circularProgress2.Name = "circularProgress2"; - this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; - this.circularProgress2.Size = new System.Drawing.Size(389, 239); - this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; - this.circularProgress2.TabIndex = 6; - this.circularProgress2.Value = 100; - // - // zgcAnaesRecord2 - // - this.zgcAnaesRecord2.Location = new System.Drawing.Point(416, 41); - this.zgcAnaesRecord2.Name = "zgcAnaesRecord2"; - this.zgcAnaesRecord2.ScrollGrace = 0D; - this.zgcAnaesRecord2.ScrollMaxX = 0D; - this.zgcAnaesRecord2.ScrollMaxY = 0D; - this.zgcAnaesRecord2.ScrollMaxY2 = 0D; - this.zgcAnaesRecord2.ScrollMinX = 0D; - this.zgcAnaesRecord2.ScrollMinY = 0D; - this.zgcAnaesRecord2.ScrollMinY2 = 0D; - this.zgcAnaesRecord2.Size = new System.Drawing.Size(800, 1000); - this.zgcAnaesRecord2.TabIndex = 0; - this.zgcAnaesRecord2.Visible = false; - this.zgcAnaesRecord2.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord2_ContextMenuBuilder); - this.zgcAnaesRecord2.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseDownEvent); - this.zgcAnaesRecord2.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseUpEvent); - this.zgcAnaesRecord2.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseMoveEvent); - this.zgcAnaesRecord2.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord2_KeyUp); - this.zgcAnaesRecord2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord2_MouseDoubleClick); - // // spTabBM // this.spTabBM.AttachedControl = this.superTabControlPanel2; @@ -1263,7 +1146,7 @@ // // plTitleEventTime // - this.plTitleEventTime.BackColor = System.Drawing.Color.White; + this.plTitleEventTime.BackColor = System.Drawing.Color.AliceBlue; this.plTitleEventTime.Controls.Add(this.panel13); this.plTitleEventTime.Controls.Add(this.panel10); this.plTitleEventTime.Controls.Add(this.panel16); @@ -2023,6 +1906,123 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // + // panel8 + // + this.panel8.AutoScroll = true; + this.panel8.BackColor = System.Drawing.Color.White; + this.panel8.Controls.Add(this.paneltop); + this.panel8.Controls.Add(this.circularProgress1); + this.panel8.Controls.Add(this.zgcAnaesRecord); + 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(1389, 803); + this.panel8.TabIndex = 2; + this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); + // + // paneltop + // + this.paneltop.Location = new System.Drawing.Point(9, 137); + this.paneltop.Name = "paneltop"; + this.paneltop.Size = new System.Drawing.Size(690, 30); + this.paneltop.TabIndex = 7; + this.paneltop.Visible = false; + // + // circularProgress1 + // + this.circularProgress1.AnimationSpeed = 50; + // + // + // + this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); + this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; + this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.circularProgress1.FocusCuesEnabled = false; + this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F); + this.circularProgress1.Location = new System.Drawing.Point(602, 274); + this.circularProgress1.Margin = new System.Windows.Forms.Padding(4); + this.circularProgress1.Name = "circularProgress1"; + this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; + this.circularProgress1.Size = new System.Drawing.Size(389, 239); + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.TabIndex = 6; + this.circularProgress1.Value = 100; + // + // zgcAnaesRecord + // + this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41); + this.zgcAnaesRecord.Name = "zgcAnaesRecord"; + this.zgcAnaesRecord.ScrollGrace = 0D; + this.zgcAnaesRecord.ScrollMaxX = 0D; + this.zgcAnaesRecord.ScrollMaxY = 0D; + this.zgcAnaesRecord.ScrollMaxY2 = 0D; + this.zgcAnaesRecord.ScrollMinX = 0D; + this.zgcAnaesRecord.ScrollMinY = 0D; + this.zgcAnaesRecord.ScrollMinY2 = 0D; + this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000); + this.zgcAnaesRecord.TabIndex = 0; + this.zgcAnaesRecord.Visible = false; + this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder); + this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent); + this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent); + this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent); + this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp); + this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick); + // + // panel82 + // + this.panel82.AutoScroll = true; + this.panel82.BackColor = System.Drawing.Color.White; + this.panel82.Controls.Add(this.circularProgress2); + this.panel82.Controls.Add(this.zgcAnaesRecord2); + this.panel82.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel82.Location = new System.Drawing.Point(0, 0); + this.panel82.Name = "panel82"; + this.panel82.Size = new System.Drawing.Size(1389, 803); + this.panel82.TabIndex = 3; + this.panel82.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel82_Scroll); + // + // circularProgress2 + // + this.circularProgress2.AnimationSpeed = 50; + // + // + // + this.circularProgress2.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); + this.circularProgress2.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; + this.circularProgress2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.circularProgress2.FocusCuesEnabled = false; + this.circularProgress2.Font = new System.Drawing.Font("微软雅黑", 9F); + this.circularProgress2.Location = new System.Drawing.Point(678, 354); + this.circularProgress2.Margin = new System.Windows.Forms.Padding(4); + this.circularProgress2.Name = "circularProgress2"; + this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; + this.circularProgress2.Size = new System.Drawing.Size(389, 239); + this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress2.TabIndex = 6; + this.circularProgress2.Value = 100; + // + // zgcAnaesRecord2 + // + this.zgcAnaesRecord2.Location = new System.Drawing.Point(416, 41); + this.zgcAnaesRecord2.Name = "zgcAnaesRecord2"; + this.zgcAnaesRecord2.ScrollGrace = 0D; + this.zgcAnaesRecord2.ScrollMaxX = 0D; + this.zgcAnaesRecord2.ScrollMaxY = 0D; + this.zgcAnaesRecord2.ScrollMaxY2 = 0D; + this.zgcAnaesRecord2.ScrollMinX = 0D; + this.zgcAnaesRecord2.ScrollMinY = 0D; + this.zgcAnaesRecord2.ScrollMinY2 = 0D; + this.zgcAnaesRecord2.Size = new System.Drawing.Size(800, 1000); + this.zgcAnaesRecord2.TabIndex = 0; + this.zgcAnaesRecord2.Visible = false; + this.zgcAnaesRecord2.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord2_ContextMenuBuilder); + this.zgcAnaesRecord2.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseDownEvent); + this.zgcAnaesRecord2.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseUpEvent); + this.zgcAnaesRecord2.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseMoveEvent); + this.zgcAnaesRecord2.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord2_KeyUp); + this.zgcAnaesRecord2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord2_MouseDoubleClick); + // // frmAanesthesiaRecord // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2045,10 +2045,8 @@ this.superTabMain.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); this.panelExZKZB.ResumeLayout(false); - this.panel8.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); this.panelExBLSJ.ResumeLayout(false); - this.panel82.ResumeLayout(false); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); this.panel21.ResumeLayout(false); @@ -2077,6 +2075,8 @@ this.panel6.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).EndInit(); + this.panel8.ResumeLayout(false); + this.panel82.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/AIMS/OperationAanesthesia/frmFeesRecord.cs b/AIMS/OperationAanesthesia/frmFeesRecord.cs index 5de39fb..89f15fd 100644 --- a/AIMS/OperationAanesthesia/frmFeesRecord.cs +++ b/AIMS/OperationAanesthesia/frmFeesRecord.cs @@ -277,7 +277,7 @@ namespace AIMS.PublicUI.UI { Velocity = Convert.ToDecimal(item.Velocity); } - catch (Exception ex) + catch (Exception) { Velocity = 0; } diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs index fb434f3..2311c41 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs @@ -2291,6 +2291,15 @@ namespace AIMS.OperationAanesthesia btnOperationInfo_Click(null, null); return; } + if (_record.StateName == "手术中") + { + if (txtOutRoom.CustomFormat == " ") + { + txtOutRoom.BackColor = Color.Red; + MessageBox.Show("手术还没有结束，请填写出室时间后打印！", "系统提示"); + return; + } + } if (superTabMain.SelectedTab.Name == "spTabQXQDD") { diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs index 4f2f195..0a2ad91 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs @@ -1326,7 +1326,7 @@ namespace AIMS.OperationAanesthesia #region 加载物品控件 int i1 = 0, j1 = 0; - int i2 = 0, j2 = 0; + //int i2 = 0, j2 = 0; int Incount = 0; int IncRowsount = 25; /// diff --git a/AIMS/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.cs b/AIMS/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.cs index 144fe9f..45d7e4f 100644 --- a/AIMS/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.cs +++ b/AIMS/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.cs @@ -16,7 +16,7 @@ namespace AIMS.OperationAanesthesia { public OperatingRoomPutDoorRegister opr; private string patientModel; - private OrisPatient p; + //private OrisPatient p; List execdepartments; public frmOperatingRoomRegister() { @@ -95,8 +95,8 @@ namespace AIMS.OperationAanesthesia //if (p.BirthDay != null) txtAge.Text = PublicMethod.GetAge(p.BirthDay.Value); //hisPatientId = p.HISPatientId; //hisVisitId = p.VisitId.ToString(); - if (p.Height != null) txtHeight.Text = row["PATIENT_HEIGHT"].ToString(); - if (p.Weight != null) txtWeight.Text = row["PATIENT_WEIGHT"].ToString(); + txtHeight.Text = row["PATIENT_HEIGHT"].ToString(); + txtWeight.Text = row["PATIENT_WEIGHT"].ToString(); //if (p.InHospitalTime != null) dtpInHospitalTime.Value = p.InHospitalTime.Value; //if (p.BirthDay != null) dtpBirthDay.Value = p.BirthDay.Value; @@ -551,7 +551,7 @@ namespace AIMS.OperationAanesthesia opr.AnaesthesiaEndTime = txtAnaesthesiaEndTime.Text != "" ? DateTime.Parse(txtAnaesthesiaEndTime.Text) : (DateTime?)null; opr.AnaesthesiaMethod = GetCheckBoxCheckedValues(panel5); opr.ASALevel = cboASALevel.Text; - opr.BirthDay = p != null ? p.BirthDay : (DateTime?)null; + //opr.BirthDay = p != null ? p.BirthDay : (DateTime?)null; opr.Complication = txtComplication.Text; opr.Contacts = txtContacts.Text; opr.ContactsTel = txtContactsTel.Text; @@ -560,7 +560,7 @@ namespace AIMS.OperationAanesthesia opr.ExecDeptName = "手术室"; opr.ExecDeptNo = "手术室"; opr.Height = txtHeight.Text != "" ? decimal.Parse(txtHeight.Text) : (decimal?)null; - opr.HISPatientId = p != null ? p.HisPatientId : ""; + //opr.HISPatientId = p != null ? p.HisPatientId : ""; opr.IdEntityNo = txtIdEntityNo.Text; opr.InHospitalNo = txtInHospitalNo.Text; opr.InstrumentNurseName = txtInstrumentNurse.Text; @@ -588,14 +588,14 @@ namespace AIMS.OperationAanesthesia opr.PatientBedNo = lblBed.Text; opr.PatientDeptName = cboPDepartment.Text; //opr.PatientDeptNo = cboPDepartment.Text != "" ? cboPDepartment.SelectedValue.ToString() : ""; - opr.PatientId = p != null ? p.Id.ToString() : ""; + //opr.PatientId = p != null ? p.Id.ToString() : ""; opr.PatientModel = GetCheckBoxCheckedValue(panel6); opr.Sex = RbMan.Checked == true ? "男" : "女"; opr.State = 0; opr.Tel = txtContactsTel.Text; opr.TourNurseName = txtTourNurse.Text; opr.TourNurseNo = txtTourNurse.Text != "" ? txtTourNurse.Tag.ToString() : ""; - opr.VisitId = p != null ? p.VisitTimes.ToString() : ""; + //opr.VisitId = p != null ? p.VisitTimes.ToString() : ""; opr.Weight = txtWeight.Text != "" ? decimal.Parse(txtWeight.Text) : (decimal?)null; } private string GetDugsIds() diff --git a/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs b/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs index 1dbf4a5..e11a9a9 100644 --- a/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs +++ b/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs @@ -34,8 +34,8 @@ namespace AIMS.OperationAanesthesia //容器tab //public TabItem Tb; //文档事件 - private EventCodeCompilerBill codeCompiler; - private string strClick, strContentChanged; + //private EventCodeCompilerBill codeCompiler; + //private string strClick, strContentChanged; public frmPrescriptionDocument() @@ -324,8 +324,8 @@ namespace AIMS.OperationAanesthesia { XmlDocument doc = new XmlDocument(); doc.LoadXml(xmlStatic); - strClick = doc.GetElementsByTagName("ClickEvent")[0].InnerText; - strContentChanged = doc.GetElementsByTagName("ContentChangedEnvent")[0].InnerText; + //strClick = doc.GetElementsByTagName("ClickEvent")[0].InnerText; + //strContentChanged = doc.GetElementsByTagName("ContentChangedEnvent")[0].InnerText; } //codeCompiler = new EventCodeCompilerBill(ref this.myEditControl, strClick, strContentChanged, QXList); diff --git a/AIMS/OperationAfter/frmExportConfig.cs b/AIMS/OperationAfter/frmExportConfig.cs index 2dd79d1..a452102 100644 --- a/AIMS/OperationAfter/frmExportConfig.cs +++ b/AIMS/OperationAfter/frmExportConfig.cs @@ -124,7 +124,7 @@ namespace AIMS.OperationAfter.UI } catch (Exception ex) { - throw; + throw ex; } DialogResult = DialogResult.OK; Close(); diff --git a/AIMS/OperationAfter/frmOperationManage.cs b/AIMS/OperationAfter/frmOperationManage.cs index d37f93f..157e4e9 100644 --- a/AIMS/OperationAfter/frmOperationManage.cs +++ b/AIMS/OperationAfter/frmOperationManage.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Diagnostics; +using System.Drawing; using System.Linq; using System.Reflection; using System.Text; @@ -100,10 +101,23 @@ namespace AIMS.OperationAfter.UI ControlExtension.GetOperationSite(labelSite, CboOperationSite); - btnFind_Click(null, null); - + LoadDataRescue(); } + private System.Windows.Forms.Timer timerLoadRescue; + public void LoadDataRescue() + { + timerLoadRescue = new System.Windows.Forms.Timer(); + timerLoadRescue.Enabled = true;//调试时设置为FALSE ， + timerLoadRescue.Interval = 300; + timerLoadRescue.Tick -= timerLoadRescue_Tick; + timerLoadRescue.Tick += timerLoadRescue_Tick; + timerLoadRescue.Start(); + } + private void timerLoadRescue_Tick(object sender, EventArgs e) + { + btnFind_Click(null, null); + } /// /// 绑定基础表项目数据 到 ComboBox /// @@ -249,13 +263,25 @@ namespace AIMS.OperationAfter.UI } dgv.DataSource = dataTable; - //for (int i = 0; i < dgv.Rows.Count; i++) - //{ - // if (dgv.Rows[i].Cells["OperationTypeColumn"].Value.ToString() == "急诊") - // { - // dgv.Rows[i].DefaultCellStyle.BackColor = Color.LightSalmon; - // } - //} + List list = new List() { "麻醉复苏中", "手术结束", "麻醉复苏结束" }; + List list2 = new List() { "退回", "作废" }; + + for (int i = 0; i < dgv.Rows.Count; i++) + { + if (dgv.Rows[i].Cells["StateColumn"].Value.ToString() == "手术中") + { + dgv.Rows[i].DefaultCellStyle.BackColor = Color.LemonChiffon; + } + else if (list.Contains(dgv.Rows[i].Cells["StateColumn"].Value.ToString())) + { + dgv.Rows[i].DefaultCellStyle.BackColor = Color.LightGreen; + } + else if (list2.Contains(dgv.Rows[i].Cells["StateColumn"].Value.ToString())) + { + dgv.Rows[i].DefaultCellStyle.BackColor = Color.Red; + } + } + dgv.ClearSelection(); } private void tsbExportExcel_Click(object sender, EventArgs e) diff --git a/AIMS/PublicUI/frmCreateTemplate.cs b/AIMS/PublicUI/frmCreateTemplate.cs index b329334..bfdfa12 100644 --- a/AIMS/PublicUI/frmCreateTemplate.cs +++ b/AIMS/PublicUI/frmCreateTemplate.cs @@ -33,6 +33,7 @@ namespace AIMS.PublicUI.UI private void frmCreateTemplate_Load(object sender, EventArgs e) { + Initial(); if (IsAdd == true) { txtOperatorName.Text = PublicMethod.OperatorName; @@ -47,7 +48,6 @@ namespace AIMS.PublicUI.UI if (_record.FactDrugList.Count > 0) { cboDrug.Checked = true; - Initial(); SetDGVEvent(dgvDrugsSQ); _record.FactDrugList.Sort(new FactDrugComparer()); FullDrugsData(_record.FactDrugList); @@ -166,7 +166,7 @@ namespace AIMS.PublicUI.UI dgvDrugsSQ.Rows[index].Cells[17].Value = item.Access; dgvDrugsSQ.Rows[index].Cells[18].Value = cboDrug.Checked; } - + private void Initial() { if (ControlExtension._channelList == null) @@ -247,7 +247,7 @@ namespace AIMS.PublicUI.UI drugEffectCell.DisplayMember = "Name"; drugEffectCell.ValueMember = "Id"; - DensityUnit.DataSource = ControlExtension._DensityUnit; + DensityUnit.DataSource = ControlExtension._DensityUnit; DensityUnit.DisplayMember = "Name"; DensityUnit.ValueMember = "Id"; @@ -642,7 +642,7 @@ namespace AIMS.PublicUI.UI ControlExtension._dUnitList = BBasicDictionary.GetBasicDictionaryByName("给药单位").SubItem; ControlExtension._dUnitList.Insert(0, new BasicDictionary() { Id = -1, Name = "" }); } - _outputList = BOutputLiquids.Select(" IsValid=1", null); + _outputList = BOutputLiquids.Select(" IsValid=1", null); _outputList.Insert(0, new OutputLiquids() { Id = -1, Name = "" }); if (FactOutputLiquidsList.Count > 0) { @@ -786,7 +786,7 @@ namespace AIMS.PublicUI.UI } if (dr["Spare3"].ToString() != "" && dr["Spare3"].ToString() != "0" && dr["Spare3"].ToString() != "0.00") { - FactDrugObj.Velocity = dr["Spare3"].ToString() ; + FactDrugObj.Velocity = dr["Spare3"].ToString(); FactDrugObj.VelocityUnit = dr["Spare4"].ToString(); } @@ -832,7 +832,7 @@ namespace AIMS.PublicUI.UI } if (child["Spare3"].ToString() != "" && child["Spare3"].ToString() != "0" && child["Spare3"].ToString() != "0.00") { - FactDrugObjChild.Velocity = child["Spare3"].ToString( ); + FactDrugObjChild.Velocity = child["Spare3"].ToString(); FactDrugObjChild.VelocityUnit = child["Spare4"].ToString(); } @@ -1050,7 +1050,7 @@ namespace AIMS.PublicUI.UI drugsR.DensityUnit = dr.Cells[7].EditedFormattedValue.ToString();//浓度单位 if (dr.Cells[8].EditedFormattedValue.ToString() != "") { - drugsR.Velocity = dr.Cells[8].EditedFormattedValue.ToString( );//速度 + drugsR.Velocity = dr.Cells[8].EditedFormattedValue.ToString();//速度 } else { @@ -1122,7 +1122,7 @@ namespace AIMS.PublicUI.UI OperationTemplateDrugObj.Spare8 = drugsR.Id.ToString(); OperationTemplateDrugObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationTemplateDrugObj.OperatorName = OperatorName; - OperationTemplateDrugObj.OperateDate = DateTime.Now; + OperationTemplateDrugObj.OperateDate = DateTime.Now; OperationTemplateDrugObj.IsPublic = IsPublic; OperationTemplates.Add(OperationTemplateDrugObj); } @@ -1180,7 +1180,7 @@ namespace AIMS.PublicUI.UI OperationTemplateEventObj.Spare8 = factEventsObj.Id.ToString(); OperationTemplateEventObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationTemplateEventObj.OperatorName = OperatorName; - OperationTemplateEventObj.OperateDate = DateTime.Now; + OperationTemplateEventObj.OperateDate = DateTime.Now; OperationTemplateEventObj.IsPublic = IsPublic; OperationTemplates.Add(OperationTemplateEventObj); } @@ -1248,7 +1248,7 @@ namespace AIMS.PublicUI.UI OperationTemplateOutputLiquidsObj.Spare8 = factOutput.Id.ToString(); OperationTemplateOutputLiquidsObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationTemplateOutputLiquidsObj.OperatorName = OperatorName; - OperationTemplateOutputLiquidsObj.OperateDate = DateTime.Now; + OperationTemplateOutputLiquidsObj.OperateDate = DateTime.Now; OperationTemplateOutputLiquidsObj.IsPublic = IsPublic; OperationTemplates.Add(OperationTemplateOutputLiquidsObj); } @@ -1273,7 +1273,7 @@ namespace AIMS.PublicUI.UI OperationTemplateOutputLiquidsObj.Spare8 = ""; OperationTemplateOutputLiquidsObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationTemplateOutputLiquidsObj.OperatorName = OperatorName; - OperationTemplateOutputLiquidsObj.OperateDate = DateTime.Now; + OperationTemplateOutputLiquidsObj.OperateDate = DateTime.Now; OperationTemplateOutputLiquidsObj.IsPublic = IsPublic; OperationTemplates.Add(OperationTemplateOutputLiquidsObj); } diff --git a/AIMSEntity/AIMSEntity.csproj b/AIMSEntity/AIMSEntity.csproj index bb62743..9635cf6 100644 --- a/AIMSEntity/AIMSEntity.csproj +++ b/AIMSEntity/AIMSEntity.csproj @@ -37,7 +37,7 @@ False - ..\AIMS\DLL\Newtonsoft.Json.dll + ..\AIMS\Extensions\Newtonsoft.Json.dll diff --git a/AIMSExtension/AIMSExtension.csproj b/AIMSExtension/AIMSExtension.csproj index b99908e..c2b84d9 100644 --- a/AIMSExtension/AIMSExtension.csproj +++ b/AIMSExtension/AIMSExtension.csproj @@ -34,6 +34,10 @@ ..\AIMS\Extensions\Mono.Security.dll + + False + ..\AIMS\Extensions\Newtonsoft.Json.dll + False ..\AIMS\Extensions\Npgsql.dll @@ -44,6 +48,9 @@ + + ..\AIMS\Extensions\System.Net.Http.dll + @@ -56,6 +63,7 @@ + @@ -83,6 +91,9 @@ + + + diff --git a/AIMSExtension/Sign/DataSignClient.cs b/AIMSExtension/Sign/DataSignClient.cs new file mode 100644 index 0000000..a9709eb --- /dev/null +++ b/AIMSExtension/Sign/DataSignClient.cs @@ -0,0 +1,202 @@ +#if STJ +#else +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +#endif +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Security.Cryptography; +using System.Text; +//using System.Text.Json; +using System.Threading.Tasks; + +namespace AIMS.Infrastructure.CA +{ + public class DataSignClient + { + private static HttpClient _httpClient; + + private readonly string _baseUrl; + private readonly string _accessToken; + private readonly string _signature; + private readonly string _timestamp; + private readonly SignConfig signConfig; + + public DataSignClient(SignConfig signConfig) + { + _baseUrl = signConfig.Url.TrimEnd('/'); + this.signConfig = signConfig; + if (_httpClient == null) + { + _httpClient = new HttpClient(); + _httpClient.BaseAddress = new Uri(signConfig.Url.TrimEnd('/')); + } + } + + public DataSignClient(HttpClient httpClient, string accessToken, string signature, string timestamp) + { + _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient)); + _accessToken = accessToken ?? throw new ArgumentNullException(nameof(accessToken)); + _signature = signature ?? throw new ArgumentNullException(nameof(signature)); + _timestamp = timestamp ?? throw new ArgumentNullException(nameof(timestamp)); + } + // 封装业务数据签名的API + public SignatureResponse SignData(SignatureRequest request) + { + var requestUrl = $"/binary/sign/ZPTFYY"; + var httpResponse = BusinessDataSign(requestUrl, request.Data, request.Signatory, request.DataType, request.SigAlgType); + + return httpResponse; + } + private SignatureResponse BusinessDataSign(string signUrl, + byte[] fileStream, Signatory signatory, + string dataType = null, string sigAlgType = null, string fileName = null) + { + if (signUrl == null) throw new ArgumentNullException(nameof(signUrl)); + if (fileStream == null) throw new ArgumentNullException(nameof(fileStream)); + if (signatory == null) throw new ArgumentNullException(nameof(signatory)); + + var request = new HttpRequestMessage(HttpMethod.Post, signUrl); + Sign(request); + + var multiPartContent = new MultipartFormDataContent(); + var fileContent = new ByteArrayContent(fileStream); + fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data"); + multiPartContent.Add(fileContent, "data", fileName ?? "filename"); // replace "filename" with actual filename + var signatoryContent = new StringContent(Serialize(signatory)); + multiPartContent.Add(signatoryContent, "signatory"); + multiPartContent.Add(new StringContent(dataType), "dataType"); + multiPartContent.Add(new StringContent(sigAlgType), "sigAlgType"); + request.Content = multiPartContent; + //File.WriteAllText("log.http", request.()); + var response = _httpClient.SendAsync(request); + //response.EnsureSuccessStatusCode(); + var responseContent = response.Result.Content.ReadAsStringAsync().Result; + Console.Out.WriteLine(responseContent); + request.Dispose(); + response.Dispose(); + return Deserialize(responseContent); + } + + + // 封装获取数据签名详细信息的API + public DetailResponse GetSignDetail(DetailRequest request) + { + var requestUrl = $"{_baseUrl}/binary/detail/ZPTFYY?id={request.Id}&bizId={request.BizId}"; + var httpResponse = GetDetail(requestUrl); + return httpResponse; + } + + // 封装下载数据签名原文的API + public Stream DownloadOriginalData(DownloadRequest request) + { + var requestUrl = $"{_baseUrl}/binary/download?id={request.Id}&bizId={request.BizId}"; + var httpResponse = DownloadFile(requestUrl); + return httpResponse; + } + + // 封装下载存证报告的API + public Stream DownloadEvidence(EvidenceDownloadRequest request) + { + var requestUrl = $"{_baseUrl}/evidence/download?contractId={request.ContractId}&bizId={request.BizId}"; + var httpResponse = DownloadFile(requestUrl); + return httpResponse; + } + private DetailResponse GetDetail(string detailUrl) + { + if (detailUrl == null) throw new ArgumentNullException(nameof(detailUrl)); + + var request = new HttpRequestMessage(HttpMethod.Get, detailUrl); + Sign(request); + + var response = _httpClient.SendAsync(request).Result; + response.EnsureSuccessStatusCode(); + var responseContent = response.Content.ReadAsStringAsync().Result; + + request.Dispose(); + response.Dispose(); + return Deserialize(responseContent); + } + + private Stream DownloadFile(string downloadUrl) + { + if (downloadUrl == null) throw new ArgumentNullException(nameof(downloadUrl)); + + var request = new HttpRequestMessage(HttpMethod.Get, downloadUrl); + Sign(request); + + var response = _httpClient.SendAsync(request).Result; + response.EnsureSuccessStatusCode(); + + request.Dispose(); + response.Dispose(); + return response.Content.ReadAsStreamAsync().Result; + } + + + // Add other API methods like GetDetail, Download, DownloadEvidence here + + public void Sign(HttpRequestMessage request) + { + var timestamp = GenerateTimestamp(); + var nonce = GenerateNonce(); + var signature = GenerateSignature(timestamp, nonce); + + request.Headers.TryAddWithoutValidation("x-qys-accesstoken", signConfig.AppToken); + request.Headers.TryAddWithoutValidation("x-qys-timestamp", timestamp); + request.Headers.TryAddWithoutValidation("x-qys-nonce", nonce); + request.Headers.TryAddWithoutValidation("x-qys-signature", signature); + } + #region sign + private string GenerateNonce() + { + return Guid.NewGuid().ToString("n"); + } + + private string GenerateTimestamp() + { + long currentMilliseconds = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds; + return currentMilliseconds.ToString(); + } + + static MD5 md5 = MD5.Create(); + private string GenerateSignature(string timestamp, string nonce) + { + var raw = signConfig.AppToken + signConfig.AppSecret + timestamp + nonce; + var bytes = md5.ComputeHash(Encoding.UTF8.GetBytes(raw)); + return BitConverter.ToString(bytes).Replace("-", "").ToLower(); + } + #endregion + +#if STJ + private static System.Text.Json.JsonSerializerOptions JsonSerializerOptions = new System.Text.Json.JsonSerializerOptions(JsonSerializerDefaults.Web); + public static string Serialize(T obj) + { + return System.Text.Json.JsonSerializer.Serialize(obj, JsonSerializerOptions); + } + public static T Deserialize(string jsonText) + { + return System.Text.Json.JsonSerializer.Deserialize(jsonText, JsonSerializerOptions); + } +#else + private static JsonSerializerSettings JsonSerializerOptions = new JsonSerializerSettings() + { + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy() + } + }; + public static string Serialize(T obj) + { + return JsonConvert.SerializeObject(obj, JsonSerializerOptions); + } + public static T Deserialize(string jsonText) + { + return JsonConvert.DeserializeObject(jsonText, JsonSerializerOptions); + } +#endif + } +} diff --git a/AIMSExtension/Sign/SignConfig.cs b/AIMSExtension/Sign/SignConfig.cs new file mode 100644 index 0000000..18a7919 --- /dev/null +++ b/AIMSExtension/Sign/SignConfig.cs @@ -0,0 +1,10 @@ +namespace AIMS.Infrastructure.CA +{ + public class SignConfig + { + public string Url { get; set; } + public string AppToken { get; set; } + + public string AppSecret { get; set; } + } +} diff --git a/AIMSExtension/Sign/SignManage.cs b/AIMSExtension/Sign/SignManage.cs new file mode 100644 index 0000000..b5132e9 --- /dev/null +++ b/AIMSExtension/Sign/SignManage.cs @@ -0,0 +1,59 @@ +using System.Text; +using AIMSExtension; +using HelperDB; + +namespace AIMS.Infrastructure.CA +{ + public class SignManage + { + public string GetSignStr(string docstr, string FileName, string Pid, string PName, string PContact) + { + string SignatureStr = ""; + if (PublicMethod.HospitalName == "漳浦天福医院") + { + var sdk = new DataSignClient(new SignConfig + { + Url = @"http://10.129.131.105:9182", + AppSecret = "2Sl8ZoyYlBfQZcdHTXDnAHdGOrj0wt", + AppToken = "p12zxfQvns" + }); + SignatureResponse signature = sdk.SignData(new SignatureRequest + { + SigAlgType = "SM2", + DataType = "txt", + Data = Encoding.UTF8.GetBytes(docstr), + FileName = FileName, + Signatory = new Signatory + { + Company = new Company { Name = "漳浦天福医院" }, + Operator = new Operator { Name = PName, Contact = PContact }, + TenantType = nameof(TenantType.PERSONAL), + + } + }); + if (signature != null && signature.Result != null && signature.Result.SealImgBase64 != null) + { + SignatureStr = signature.Result.SealImgBase64.Replace("data:image/png;base64,", ""); + //更新人员图片 + UpdateSignatureStr(Pid, SignatureStr); + + + } + } + return SignatureStr; + } + + public void UpdateSignatureStr(string Id, string SignatureStr) + { + try + { + string sql = "update Person set SignatureStr='" + SignatureStr + "' where id=" + Id; + DBHelper.ExecNonQuery(sql); + } + catch (System.Exception ex) + { + PublicMethod.WriteLog(ex); + } + } + } +} diff --git a/AIMSExtension/Sign/SignatureRequest.cs b/AIMSExtension/Sign/SignatureRequest.cs new file mode 100644 index 0000000..94d806a --- /dev/null +++ b/AIMSExtension/Sign/SignatureRequest.cs @@ -0,0 +1,120 @@ +using System; +using System.IO; + +namespace AIMS.Infrastructure.CA +{ + + // 封装数据签名请求 + public class SignatureRequest + { + public byte[] Data { get; set; } // 数据文件 + public string DataType { get; set; } // 文件类型 + public Signatory Signatory { get; set; } // 签署方信息 + public string SigAlgType { get; set; } // 签署算法 RSA SM2 + + public string FileName { get; set; } + } + + public class Signatory + { + public string BizId { get; set; } // 业务Id + public string TenantType { get; set; } // 数据签名签署方类型，PERSONAL（个人）、COMPANY（企业） + public Seal Seal { get; set; } // 印章信息 + public Company Company { get; set; } // 公司信息 + public Operator Operator { get; set; } // 签署人信息 + } + + public enum TenantType + { + PERSONAL, // 个人 + COMPANY // 企业 + } + + public class Seal + { + public long Id { get; set; } // 印章ID + public string Name { get; set; } // 印章名称 + } + + public class Company + { + public long Id { get; set; } // 公司ID + public string Name { get; set; } // 公司名称 + } + + public class Operator + { + public string Name { get; set; } // 签署人姓名 + public string Contact { get; set; } // 签署人联系方式 + } + + // 封装数据签名响应 + public class SignatureResponse + { + public int Code { get; set; } // 响应码 + public CustomDataSignResponse Result { get; set; } // 无校验签署结果 + public string Message { get; set; } // 响应消息 + } + + public class CustomDataSignResponse + { + public long Id { get; set; } // id + public string BusinessId { get; set; } // 业务id + public string SealImgBase64 { get; set; } // 签名图片base64 + public string TimestampImgBase64 { get; set; } // 时间戳图片base64 + public string Result { get; set; } // 签名结果 + } + + // 封装获取数据签名详细信息请求 + public class DetailRequest + { + public string BizId { get; set; } // 业务Id + public long? Id { get; set; } // 数据签名Id + } + + // 封装获取数据签名详细信息响应 + public class DetailResponse + { + public int Code { get; set; } // 响应码 + public string Message { get; set; } // 响应信息 + public DataSignBean Result { get; set; } // 数据签章信息 + } + + public class DataSignBean + { + public long Id { get; set; } // 数据签名ID + public Seal Seal { get; set; } // 印章信息 + public Company Company { get; set; } // 公司信息 + public Operator Operator { get; set; } // 签署人信息 + public VerifyResult VerifyResult { get; set; } // 签名结果 + public string SealImgBase64 { get; set; } // 签名图片base64 + public string TimestampImgBase64 { get; set; } // 时间戳图片base64 + } + + public class VerifyResult + { + public string SignResult { get; set; } // 签名后数据 + public string StrAlgName { get; set; } // 签名所用算法 + public string SerialNumber { get; set; } // 签名证书编号 + public string Organization { get; set; } // 证书颁发机构 + public string Signatory { get; set; } // 签署方信息 + public string CertDateFrom { get; set; } // 证书有效期开始 + public string CertDateTo { get; set; } // 证书有效期结束 + public string SignDate { get; set; } // 签署时间 + } + + // 封装下载数据签名原文请求 + public class DownloadRequest + { + public string BizId { get; set; } // 业务Id + public long Id { get; set; } // 数据签名Id + } + + // 封装下载存证报告请求 + public class EvidenceDownloadRequest + { + public long ContractId { get; set; } // 合同id + public string BizId { get; set; } // 业务Id + } + +} diff --git a/DocumentManagement/DocumentEntity/DocumentExtension.cs b/DocumentManagement/DocumentEntity/DocumentExtension.cs index 00433fe..7113232 100644 --- a/DocumentManagement/DocumentEntity/DocumentExtension.cs +++ b/DocumentManagement/DocumentEntity/DocumentExtension.cs @@ -43,7 +43,7 @@ namespace DocumentManagement { int Result = 0; try - { + { var AnaesthesiaText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement && (x as XTextInputFieldElement).ID == "field6").FirstOrDefault(); if (AnaesthesiaText.Text != "") Result += int.Parse(AnaesthesiaText.Text); @@ -54,7 +54,7 @@ namespace DocumentManagement && (x as XTextInputFieldElement).ID == "field8").FirstOrDefault(); if (AgeText.Text != "") Result += int.Parse(AgeText.Text); var field9 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement - && (x as XTextInputFieldElement).ID == "field9").FirstOrDefault(); + && (x as XTextInputFieldElement).ID == "field9").FirstOrDefault(); var field10 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement && (x as XTextInputFieldElement).ID == "field10").FirstOrDefault(); var field11 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement @@ -63,15 +63,15 @@ namespace DocumentManagement var asa = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement && (x as XTextRadioBoxElement).GroupName == "皮肤" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); if (asa != null) - field9.Text = asa.FormulaValue; + field9.Text = asa.FormulaValue; var asa2 = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement && (x as XTextRadioBoxElement).GroupName == "预计手术时间" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); if (asa2 != null) - field10.Text = asa2.FormulaValue; + field10.Text = asa2.FormulaValue; var asa3 = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement && (x as XTextRadioBoxElement).GroupName == "手术施压" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); if (asa3 != null) - field11.Text = asa3.FormulaValue; + field11.Text = asa3.FormulaValue; if (field9.Text != "") Result += int.Parse(field9.Text); if (field10.Text != "") Result += int.Parse(field10.Text); @@ -374,6 +374,68 @@ namespace DocumentManagement && (x as XTextInputFieldElement).ID == "field14").FirstOrDefault(); patientId.Text = (num > 0 ? num.ToString() : ""); } + else if (XmlFileName == "压疮风险评估表") + { + int num = 0; + var asa = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement + && (x as XTextRadioBoxElement).GroupName == "麻醉方式与手术体位" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); + if (asa != null) + { + num += int.Parse(asa.FormulaValue); + var field6 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field6").FirstOrDefault(); + field6.Text = asa.FormulaValue; + } + var hf = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement + && (x as XTextRadioBoxElement).GroupName == "体型(BMI)" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); + if (hf != null) + { + num += int.Parse(hf.FormulaValue); + var field7 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field7").FirstOrDefault(); + field7.Text = hf.FormulaValue; + } + var age = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement + && (x as XTextRadioBoxElement).GroupName == "年龄" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); + if (age != null) + { + num += int.Parse(age.FormulaValue); + var field8 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field8").FirstOrDefault(); + field8.Text = age.FormulaValue; + } + var pf = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement + && (x as XTextRadioBoxElement).GroupName == "皮肤" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); + if (pf != null) + { + num += int.Parse(pf.FormulaValue); + var field8 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field9").FirstOrDefault(); + field8.Text = pf.FormulaValue; + } + var sssj = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement + && (x as XTextRadioBoxElement).GroupName == "预计手术时间" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); + if (sssj != null) + { + num += int.Parse(sssj.FormulaValue); + var field = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field10").FirstOrDefault(); + field.Text = sssj.FormulaValue; + } + var gwjb = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement + && (x as XTextRadioBoxElement).GroupName == "手术施压" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault(); + if (gwjb != null) + { + num += int.Parse(gwjb.FormulaValue); + var field = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field11").FirstOrDefault(); + field.Text = gwjb.FormulaValue; + } + + var patientId = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field12").FirstOrDefault(); + patientId.Text = (num > 0 ? num.ToString() : ""); + } } catch (Exception ex) { diff --git a/DocumentManagement/DocumentEntity/EventCodeCompiler.cs b/DocumentManagement/DocumentEntity/EventCodeCompiler.cs index e7e2917..1e80205 100644 --- a/DocumentManagement/DocumentEntity/EventCodeCompiler.cs +++ b/DocumentManagement/DocumentEntity/EventCodeCompiler.cs @@ -1,13 +1,19 @@ -using DCSoft.Writer; +using AIMS.Infrastructure.CA; +using AIMSExtension; +using DCSoft.Writer; using DCSoft.Writer.Controls; using DCSoft.Writer.Dom; using DocumentManagement.UI; using HelperDB; using System; using System.CodeDom.Compiler; +using System.Data; using System.Drawing; +using System.IO; using System.Linq; +using System.Text; using System.Windows.Forms; +using System.Xml.Linq; namespace DocumentManagement { @@ -44,7 +50,7 @@ namespace DocumentManagement var element = (eventSender as XTextDocument).CurrentInputField; if (element != null) { - element.Text = element.Text.Replace("\r", "").Replace("\n",""); + element.Text = element.Text.Replace("\r", "").Replace("\n", ""); } } } @@ -148,26 +154,41 @@ namespace DocumentManagement else { frmSelectPersonDoc personDoc = new frmSelectPersonDoc(); - personDoc.PersonType = (eventSender as XTextImageElement).Alt == "" ? "麻醉医生" : (eventSender as XTextImageElement).Alt; + personDoc.PersonType = (eventSender as XTextImageElement).Alt == null ? "麻醉医生" : (eventSender as XTextImageElement).Alt; personDoc.ShowDialog(); if (personDoc.SelectPersonData > 0) { int PersonId = personDoc.SelectPersonData; - string SignatureStr = GetSignatureStr(PersonId); - DCSoft.Drawing.XImageValue img = new DCSoft.Drawing.XImageValue(); - img.ImageDataBase64String = SignatureStr; - (eventSender as XTextImageElement).Image = img; - (eventSender as XTextImageElement).Alt = "麻醉医生"; - (eventSender as XTextImageElement).Title = PersonId.ToString(); - (eventSender as XTextImageElement).EditorRefreshView(); - } - else - { - //清空图片 - (eventSender as XTextImageElement).Image = null; - (eventSender as XTextImageElement).Alt = "麻醉医生"; - (eventSender as XTextImageElement).Title = ""; - (eventSender as XTextImageElement).EditorRefreshView(); + DataTable Person = GetPerson(PersonId); + if (Person != null && Person.Rows.Count > 0) + { + string Id = Person.Rows[0][3].ToString(); + string Name = Person.Rows[0][0].ToString(); + string Contact = Person.Rows[0][1].ToString(); + string SignatureStr = Person.Rows[0][2].ToString(); + + + if (SignatureStr == null || SignatureStr == "") + SignatureStr = new SignManage().GetSignStr(args.WriterControl.SaveDocumentToString("txt"), args.WriterControl.Document.FileName,Id, Name, Contact); + + if (SignatureStr != null && SignatureStr != "") + { + DCSoft.Drawing.XImageValue img = new DCSoft.Drawing.XImageValue(); + img.ImageDataBase64String = SignatureStr; + (eventSender as XTextImageElement).Image = img; + //(eventSender as XTextImageElement).Alt = "麻醉医生"; + (eventSender as XTextImageElement).Title = PersonId.ToString(); + (eventSender as XTextImageElement).EditorRefreshView(); + } + } + else + { + //清空图片 + (eventSender as XTextImageElement).Image = null; + (eventSender as XTextImageElement).Alt = "麻醉医生"; + (eventSender as XTextImageElement).Title = ""; + (eventSender as XTextImageElement).EditorRefreshView(); + } } //属性赋值判断 @@ -179,12 +200,12 @@ namespace DocumentManagement } eet.MouseDblClick += Eet_MouseDblClick; } - public string GetSignatureStr(int SelectPersonData) + public DataTable GetPerson(int SelectPersonData) { - string SignatureStr = ""; - string sql = "select SignatureStr from Person where id=" + SelectPersonData; - SignatureStr = DBHelper.ExecuteScalar(sql).ToString(); - return SignatureStr; + DataTable Person = new DataTable(); + string sql = "select Name,SignatureIndex,SignatureStr,id from Person where id=" + SelectPersonData; + Person = DBHelper.GetDataTable(sql); + return Person; } } } diff --git a/DocumentManagement/DocumentManagement.csproj b/DocumentManagement/DocumentManagement.csproj index d795e43..14595ea 100644 --- a/DocumentManagement/DocumentManagement.csproj +++ b/DocumentManagement/DocumentManagement.csproj @@ -47,9 +47,16 @@ False ..\AIMS\Extensions\Microsoft.Office.Interop.Excel.dll + + False + ..\AIMS\Extensions\Newtonsoft.Json.dll + + + ..\AIMS\Extensions\System.Net.Http.dll + @@ -120,7 +127,6 @@ - diff --git a/DocumentManagement/GoldPrinter/PrinterPageSetting.cs b/DocumentManagement/GoldPrinter/PrinterPageSetting.cs index cbd2ff1..73f535a 100644 --- a/DocumentManagement/GoldPrinter/PrinterPageSetting.cs +++ b/DocumentManagement/GoldPrinter/PrinterPageSetting.cs @@ -35,10 +35,10 @@ namespace GoldPrinter { this._printerPageSetting = new WinPrinterPageSetting(); } - else if (this._printModeFlag == PrintModeFlag.Web) - { - this._printerPageSetting = new WebPrinterPageSetting(); - } + //else if (this._printModeFlag == PrintModeFlag.Web) + //{ + // this._printerPageSetting = new WebPrinterPageSetting(); + //} } } diff --git a/DocumentManagement/UI/frmSelectPerson.cs b/DocumentManagement/UI/frmSelectPerson.cs index 1ce09e7..125a629 100644 --- a/DocumentManagement/UI/frmSelectPerson.cs +++ b/DocumentManagement/UI/frmSelectPerson.cs @@ -11,8 +11,8 @@ namespace DocumentManagement /// /// 医生 麻醉医生 麻醉护士 /// - public string PersonType = ""; - public int SelectPersonData ; + public string PersonType = ""; + public int SelectPersonData; public frmSelectPersonDoc() { @@ -28,7 +28,7 @@ namespace DocumentManagement for (int i = 0; i < dgvSelectPerson.Rows.Count; i++) { - if (SelectPersonData==int.Parse(dgvSelectPerson.Rows[i].Cells["IdColumn"].Value.ToString())) + if (SelectPersonData == int.Parse(dgvSelectPerson.Rows[i].Cells["IdColumn"].Value.ToString())) { dgvSelectPerson.Rows[i].Cells["CheckBoxColumn"].Value = true; } @@ -47,15 +47,15 @@ namespace DocumentManagement } private void txtHelpCode_TextChanged(object sender, EventArgs e) - { - dgvSelectPerson.DataSource = GetPersonDataTableByDepId( txtHelpCode.Text.Trim(), PersonType); + { + dgvSelectPerson.DataSource = GetPersonDataTableByDepId(txtHelpCode.Text.Trim(), txtHelpCode.Text == "" ? PersonType : ""); } private void dgvSelectPerson_CellClick(object sender, DataGridViewCellEventArgs e) { if (Convert.ToBoolean(dgvSelectPerson.CurrentRow.Cells["CheckBoxColumn"].EditedFormattedValue) == false) { - SelectPersonData=int.Parse(dgvSelectPerson.CurrentRow.Cells["IdColumn"].Value.ToString()); + SelectPersonData = int.Parse(dgvSelectPerson.CurrentRow.Cells["IdColumn"].Value.ToString()); dgvSelectPerson.CurrentRow.Cells["CheckBoxColumn"].Value = true; } else @@ -74,35 +74,39 @@ namespace DocumentManagement dgv.BackgroundColor = System.Drawing.Color.Snow; } - public static DataTable GetPersonDataTableByDepId( string HelpCode, string PersonType) + public static DataTable GetPersonDataTableByDepId(string HelpCode, string PersonType) { string strSql = ""; if (HelpCode == "简拼/汉字/ICD码") { HelpCode = ""; - } + } if (PersonType == "医生") { - strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; + strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; } - if (PersonType == "麻醉医生") + else if (PersonType == "麻醉医生") { - strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; + strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; } - if (PersonType == "麻醉护士") + else if (PersonType == "麻醉护士") { strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; } - if (PersonType == "手术室护士") + else if (PersonType == "手术室护士") { strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='手术室护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; } - if (PersonType == "护士") + else if (PersonType == "护士") { - strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType like '%护士%' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; + strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType like '%护士%' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; + } + else + { + strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; } return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } diff --git a/DocumentManagement/UI/frmTemplate.cs b/DocumentManagement/UI/frmTemplate.cs index 12407c3..a447b43 100644 --- a/DocumentManagement/UI/frmTemplate.cs +++ b/DocumentManagement/UI/frmTemplate.cs @@ -686,52 +686,52 @@ namespace DocumentManagement //} } - private void mXML2RTF_Click(object sender, EventArgs e) - { - MessageBox.Show("此处演示在后台将XDesigner.Writer格式的XML文档转换为RTF文档，不显示用户界面，可以运用在ASP.NET或Service程序中。"); - string sourceFileName = null; - string descFileName = null; - using (OpenFileDialog dlg = new OpenFileDialog()) - { - dlg.Filter = "XML文件|*.xml"; - dlg.CheckFileExists = true; - dlg.ShowReadOnly = false; - dlg.Title = "请选择一个XDesigner.Writer程序保存的XML文件"; - if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) - { - sourceFileName = dlg.FileName; - } - else - { - return; - } - } - using (SaveFileDialog dlg = new SaveFileDialog()) - { - dlg.Filter = "RTF文件(*.rtf)|*.rtf"; - dlg.CheckPathExists = true; - dlg.OverwritePrompt = true; - if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) - { - descFileName = dlg.FileName; - } - else - { - return; - } - } + //private void mXML2RTF_Click(object sender, EventArgs e) + //{ + // MessageBox.Show("此处演示在后台将XDesigner.Writer格式的XML文档转换为RTF文档，不显示用户界面，可以运用在ASP.NET或Service程序中。"); + // string sourceFileName = null; + // string descFileName = null; + // using (OpenFileDialog dlg = new OpenFileDialog()) + // { + // dlg.Filter = "XML文件|*.xml"; + // dlg.CheckFileExists = true; + // dlg.ShowReadOnly = false; + // dlg.Title = "请选择一个XDesigner.Writer程序保存的XML文件"; + // if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) + // { + // sourceFileName = dlg.FileName; + // } + // else + // { + // return; + // } + // } + // using (SaveFileDialog dlg = new SaveFileDialog()) + // { + // dlg.Filter = "RTF文件(*.rtf)|*.rtf"; + // dlg.CheckPathExists = true; + // dlg.OverwritePrompt = true; + // if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) + // { + // descFileName = dlg.FileName; + // } + // else + // { + // return; + // } + // } - XTextDocument document = new XTextDocument(); - document.Load(sourceFileName, "xml"); - using (System.Drawing.Graphics g = document.CreateGraphics()) - { - document.RefreshSize(g); - document.ExecuteLayout(); - document.RefreshPages(); - document.Save(descFileName, "rtf"); - } - MessageBox.Show(string.Format("成功的将“{0}”转换为“{1}”。", sourceFileName, descFileName)); - } + // XTextDocument document = new XTextDocument(); + // document.Load(sourceFileName, "xml"); + // using (System.Drawing.Graphics g = document.CreateGraphics()) + // { + // document.RefreshSize(g); + // document.ExecuteLayout(); + // document.RefreshPages(); + // document.Save(descFileName, "rtf"); + // } + // MessageBox.Show(string.Format("成功的将“{0}”转换为“{1}”。", sourceFileName, descFileName)); + //} /// /// 文档内容发生改变事件 @@ -1245,46 +1245,46 @@ namespace DocumentManagement myEditControl.ExecuteCommand("InsertInputField", false, field); } - private void mPrintMultiDocument_Click(object sender, EventArgs e) - { - using (DCSoft.Writer.Printing.WriterPrintDocument pd = new DCSoft.Writer.Printing.WriterPrintDocument()) - { - while (true) - { - using (OpenFileDialog dlg = new OpenFileDialog()) - { - dlg.Filter = "*.xml|*.xml"; - dlg.CheckFileExists = true; - if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) - { - XTextDocument doc = new XTextDocument(); - doc.Load(dlg.FileName, "xml"); - using (Graphics g = doc.CreateGraphics()) - { - doc.RefreshSize(g); - } - doc.ExecuteLayout(); - doc.RefreshPages(); - pd.Documents.Add(doc); - } - else - { - break; - } - } - } - if (pd.Documents.Count > 0) - { - using (PrintPreviewDialog dlg = new PrintPreviewDialog()) - { - dlg.Document = pd; - pd.UpdateDocumentsState(); - dlg.ShowDialog(this); - pd.RestoreDocumentsState(); - } - } - } - } + //private void mPrintMultiDocument_Click(object sender, EventArgs e) + //{ + // using (DCSoft.Writer.Printing.WriterPrintDocument pd = new DCSoft.Writer.Printing.WriterPrintDocument()) + // { + // while (true) + // { + // using (OpenFileDialog dlg = new OpenFileDialog()) + // { + // dlg.Filter = "*.xml|*.xml"; + // dlg.CheckFileExists = true; + // if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) + // { + // XTextDocument doc = new XTextDocument(); + // doc.Load(dlg.FileName, "xml"); + // using (Graphics g = doc.CreateGraphics()) + // { + // doc.RefreshSize(g); + // } + // doc.ExecuteLayout(); + // doc.RefreshPages(); + // pd.Documents.Add(doc); + // } + // else + // { + // break; + // } + // } + // } + // if (pd.Documents.Count > 0) + // { + // using (PrintPreviewDialog dlg = new PrintPreviewDialog()) + // { + // dlg.Document = pd; + // pd.UpdateDocumentsState(); + // dlg.ShowDialog(this); + // pd.RestoreDocumentsState(); + // } + // } + // } + //} private void mPrintDocumentBackground_Click(object sender, EventArgs e) { diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index 7e7b080..012a275 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -547,7 +547,7 @@ namespace DrawGraph return DateTime.Now; } } - catch (Exception ex) + catch (Exception) { return DateTime.Now; } diff --git a/DrawGraph/BoardPack/AbandonTablePackObj.cs b/DrawGraph/BoardPack/AbandonTablePackObj.cs index 118a7d3..45be4c6 100644 --- a/DrawGraph/BoardPack/AbandonTablePackObj.cs +++ b/DrawGraph/BoardPack/AbandonTablePackObj.cs @@ -54,7 +54,7 @@ namespace DrawGraph } } - public float EndY + public new float EndY { get { @@ -66,7 +66,7 @@ namespace DrawGraph } } - public float EndX + public new float EndX { get { @@ -79,7 +79,7 @@ namespace DrawGraph } [JsonIgnore] - private float RealEndY + private new float RealEndY { get { @@ -94,7 +94,7 @@ namespace DrawGraph } [JsonIgnore] - private float RealEndX + private new float RealEndX { get { diff --git a/DrawGraphManagement/DrawGraphManagement.csproj b/DrawGraphManagement/DrawGraphManagement.csproj index 464b850..33b1294 100644 --- a/DrawGraphManagement/DrawGraphManagement.csproj +++ b/DrawGraphManagement/DrawGraphManagement.csproj @@ -77,11 +77,6 @@ False ..\AIMS\Extensions\Newtonsoft.Json.dll - - False - .\PdfiumViewer.dll - False - diff --git a/DrawGraphManagement/MainUp.Designer.cs b/DrawGraphManagement/MainUp.Designer.cs index 52a9692..dfdb2f7 100644 --- a/DrawGraphManagement/MainUp.Designer.cs +++ b/DrawGraphManagement/MainUp.Designer.cs @@ -380,8 +380,7 @@ } #endregion - - private System.Windows.Forms.ComboBox cmbManageList; + private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtManageName; diff --git a/DrawGraphManagement/MyUserControl/UCAttrib.cs b/DrawGraphManagement/MyUserControl/UCAttrib.cs index fbe8742..42e27aa 100644 --- a/DrawGraphManagement/MyUserControl/UCAttrib.cs +++ b/DrawGraphManagement/MyUserControl/UCAttrib.cs @@ -7,7 +7,7 @@ namespace DrawGraphManagement.MyUserControl { public class UCAttrib : UCBase { - PackObjBase selectPoB = null; + //PackObjBase selectPoB = null; public UCAttrib(PackObjBase pob) {