From 69be80fcc16f70779ff96401498ec73012f8d829 Mon Sep 17 00:00:00 2001 From: leomon Date: Tue, 15 Nov 2022 20:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=B9=A6=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/DataDictionary/frmOperationRoom.cs | 26 ++- .../frmOperationRoom.designer.cs | 186 ++++++++++++------ AIMS/DataDictionary/frmOperationRoom.resx | 6 + .../frmAnasRecordBill2.Designer.cs | 3 +- .../AnasRecordBill/frmAnasRecordBill2.cs | 42 ++-- .../AnasRecordBill/frmAnasRecordInstrument.cs | 21 +- .../AnasRecordBill/frmSelectPatientNew2.cs | 2 +- .../OperationFront/frmOperationApplyDetail.cs | 1 + .../frmOperationSchedulePlan.cs | 2 + AIMS/OremrUserControl/ucDocument.Designer.cs | 180 +++++++++-------- AIMS/OremrUserControl/ucDocument.cs | 18 +- AIMS/OremrUserControl/ucDocument.resx | 26 +-- AIMSEntity/BLL/Extension/BOperationRecord.cs | 2 + .../DAL/AutoGenerate/DOperationApply.cs | 15 +- AIMSEntity/DAL/AutoGenerate/DOperationRoom.cs | 16 +- AIMSEntity/DAL/AutoGenerate/DOrisPatient.cs | 13 +- AIMSEntity/DAL/Extension/DOperationApply.cs | 21 +- AIMSEntity/DAL/Extension/DOperationRoom.cs | 14 +- .../Model/AutoGenerate/OperationRoom.cs | 18 ++ AIMSEntity/ObjectQuery/OperationRoomMap.cs | 2 + .../DocumentEntity/BindEvents.cs | 104 ++++++++++ .../DocumentEntity/DocumentExtension.cs | 129 +++++++++--- .../DocumentEntity/EventCodeCompiler.cs | 8 +- DocumentManagement/DocumentManagement.csproj | 1 + DocumentManagement/UI/frmTemplate.cs | 27 +-- DrawGraph/AreaManage/OperationRecord.cs | 8 + 26 files changed, 599 insertions(+), 292 deletions(-) create mode 100644 DocumentManagement/DocumentEntity/BindEvents.cs diff --git a/AIMS/DataDictionary/frmOperationRoom.cs b/AIMS/DataDictionary/frmOperationRoom.cs index 8fd5ad3..a868a51 100644 --- a/AIMS/DataDictionary/frmOperationRoom.cs +++ b/AIMS/DataDictionary/frmOperationRoom.cs @@ -63,6 +63,8 @@ namespace DataDictionary.UI this.dgvOperationsRoom.Rows[index].Cells["oName"].Value = item.Name; this.dgvOperationsRoom.Rows[index].Cells["type"].Value = item.Site; this.dgvOperationsRoom.Rows[index].Cells["Ip1"].Value = item.Ip; + this.dgvOperationsRoom.Rows[index].Cells["Ip2"].Value = item.Ip2; + this.dgvOperationsRoom.Rows[index].Cells["Ip3"].Value = item.Ip3; this.dgvOperationsRoom.Rows[index].Cells["OrderBy"].Value = item.RoomOrder; this.dgvOperationsRoom.Rows[index].Cells["IsValid"].Value = item.IsValid == 1 ? "有效" : "无效"; } @@ -112,17 +114,25 @@ namespace DataDictionary.UI { txtIp1.Text = dgvOperationsRoom.SelectedRows[0].Cells["Ip1"].Value.ToString(); } + if (dgvOperationsRoom.SelectedRows[0].Cells["Ip2"].EditedFormattedValue.ToString() != "") + { + txtIp2.Text = dgvOperationsRoom.SelectedRows[0].Cells["Ip2"].Value.ToString(); + } + if (dgvOperationsRoom.SelectedRows[0].Cells["Ip3"].EditedFormattedValue.ToString() != "") + { + txtIp3.Text = dgvOperationsRoom.SelectedRows[0].Cells["Ip3"].Value.ToString(); + } cbotype.Text = dgvOperationsRoom.SelectedRows[0].Cells["type"].Value.ToString(); txtOrderBy.Text = dgvOperationsRoom.SelectedRows[0].Cells["OrderBy"].Value.ToString(); chkIsValid.Checked = dgvOperationsRoom.SelectedRows[0].Cells["IsValid"].Value.ToString() == "有效" ? true : false; - try - { - cboDepartment.Text = dgvOperationsRoom.SelectedRows[0].Cells["DepartmentNameColumn"].EditedFormattedValue.ToString(); - } - catch (Exception) - { - } + //try + //{ + // cboDepartment.Text = dgvOperationsRoom.SelectedRows[0].Cells["DepartmentNameColumn"].EditedFormattedValue.ToString(); + //} + //catch (Exception) + //{ + //} } /// /// 取消事件 @@ -157,6 +167,8 @@ namespace DataDictionary.UI opr.Name = txtName.Text.Trim(); opr.HelpCode = PublicMethod.GetFirstLetter(txtName.Text.Trim()); opr.Ip = txtIp1.Text.Trim(); + opr.Ip2 = txtIp2.Text.Trim(); + opr.Ip3 = txtIp3.Text.Trim(); opr.Site = cbotype.Text.Trim(); opr.RoomOrder = Convert.ToInt32(txtOrderBy.Text.Trim()); opr.IsValid = chkIsValid.Checked == true ? 1 : 0; diff --git a/AIMS/DataDictionary/frmOperationRoom.designer.cs b/AIMS/DataDictionary/frmOperationRoom.designer.cs index 49b0b93..cc22e2e 100644 --- a/AIMS/DataDictionary/frmOperationRoom.designer.cs +++ b/AIMS/DataDictionary/frmOperationRoom.designer.cs @@ -57,14 +57,6 @@ this.label2 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); this.dgvOperationsRoom = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.type = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Ip1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DepartmentNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.OrderBy = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.IsValid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -74,6 +66,18 @@ this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.txtIp2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.txtIp3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.type = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Ip1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Ip2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Ip3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DepartmentNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.OrderBy = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.IsValid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.toolStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -99,7 +103,7 @@ this.tsbExit}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(811, 57); + this.toolStrip1.Size = new System.Drawing.Size(916, 57); this.toolStrip1.TabIndex = 5; this.toolStrip1.Text = "toolStrip1"; // @@ -179,6 +183,8 @@ this.panel1.BackColor = System.Drawing.Color.White; this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel1.Controls.Add(this.cbotype); + this.panel1.Controls.Add(this.txtIp3); + this.panel1.Controls.Add(this.txtIp2); this.panel1.Controls.Add(this.txtIp1); this.panel1.Controls.Add(this.txtName); this.panel1.Controls.Add(this.label6); @@ -193,7 +199,7 @@ this.panel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel1.Location = new System.Drawing.Point(0, 57); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(811, 103); + this.panel1.Size = new System.Drawing.Size(916, 103); this.panel1.TabIndex = 6; // // cbotype @@ -290,7 +296,7 @@ this.chkAll.AutoSize = true; this.chkAll.Checked = true; this.chkAll.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAll.Location = new System.Drawing.Point(704, 58); + this.chkAll.Location = new System.Drawing.Point(809, 58); this.chkAll.Name = "chkAll"; this.chkAll.Size = new System.Drawing.Size(84, 24); this.chkAll.TabIndex = 8; @@ -344,7 +350,7 @@ this.panel2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel2.Location = new System.Drawing.Point(0, 160); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(811, 329); + this.panel2.Size = new System.Drawing.Size(916, 329); this.panel2.TabIndex = 7; // // dgvOperationsRoom @@ -369,6 +375,8 @@ this.type, this.oName, this.Ip1, + this.Ip2, + this.Ip3, this.DepartmentNameColumn, this.OrderBy, this.IsValid}); @@ -387,60 +395,9 @@ this.dgvOperationsRoom.Name = "dgvOperationsRoom"; this.dgvOperationsRoom.RowTemplate.Height = 23; this.dgvOperationsRoom.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvOperationsRoom.Size = new System.Drawing.Size(811, 329); + this.dgvOperationsRoom.Size = new System.Drawing.Size(916, 329); this.dgvOperationsRoom.TabIndex = 0; // - // Id - // - this.Id.DataPropertyName = "Id"; - this.Id.HeaderText = "编号"; - this.Id.Name = "Id"; - this.Id.Visible = false; - // - // Index - // - this.Index.DataPropertyName = "Index"; - this.Index.HeaderText = "序号"; - this.Index.Name = "Index"; - this.Index.Width = 80; - // - // type - // - this.type.HeaderText = "地点"; - this.type.Name = "type"; - // - // oName - // - this.oName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.oName.DataPropertyName = "oName"; - this.oName.HeaderText = "名称"; - this.oName.Name = "oName"; - // - // Ip1 - // - this.Ip1.DataPropertyName = "Ip"; - this.Ip1.HeaderText = "Ip地址"; - this.Ip1.Name = "Ip1"; - this.Ip1.Width = 140; - // - // DepartmentNameColumn - // - this.DepartmentNameColumn.HeaderText = "所属科室"; - this.DepartmentNameColumn.Name = "DepartmentNameColumn"; - this.DepartmentNameColumn.Visible = false; - // - // OrderBy - // - this.OrderBy.DataPropertyName = "OrderBy"; - this.OrderBy.HeaderText = "排序顺序"; - this.OrderBy.Name = "OrderBy"; - // - // IsValid - // - this.IsValid.DataPropertyName = "IsValid"; - this.IsValid.HeaderText = "是否有效"; - this.IsValid.Name = "IsValid"; - // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.DataPropertyName = "Id"; @@ -500,11 +457,106 @@ this.dataGridViewTextBoxColumn9.HeaderText = "是否有效"; this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; // + // txtIp2 + // + this.txtIp2.BackColor = System.Drawing.Color.White; + // + // + // + this.txtIp2.Border.Class = "TextBoxBorder"; + this.txtIp2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtIp2.DisabledBackColor = System.Drawing.Color.White; + this.txtIp2.ForeColor = System.Drawing.Color.Black; + this.txtIp2.Location = new System.Drawing.Point(500, 10); + this.txtIp2.Name = "txtIp2"; + this.txtIp2.PreventEnterBeep = true; + this.txtIp2.Size = new System.Drawing.Size(167, 26); + this.txtIp2.TabIndex = 402; + // + // txtIp3 + // + this.txtIp3.BackColor = System.Drawing.Color.White; + // + // + // + this.txtIp3.Border.Class = "TextBoxBorder"; + this.txtIp3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtIp3.DisabledBackColor = System.Drawing.Color.White; + this.txtIp3.ForeColor = System.Drawing.Color.Black; + this.txtIp3.Location = new System.Drawing.Point(673, 10); + this.txtIp3.Name = "txtIp3"; + this.txtIp3.PreventEnterBeep = true; + this.txtIp3.Size = new System.Drawing.Size(167, 26); + this.txtIp3.TabIndex = 402; + // + // Id + // + this.Id.DataPropertyName = "Id"; + this.Id.HeaderText = "编号"; + this.Id.Name = "Id"; + this.Id.Visible = false; + // + // Index + // + this.Index.DataPropertyName = "Index"; + this.Index.HeaderText = "序号"; + this.Index.Name = "Index"; + this.Index.Width = 80; + // + // type + // + this.type.HeaderText = "地点"; + this.type.Name = "type"; + // + // oName + // + this.oName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.oName.DataPropertyName = "oName"; + this.oName.HeaderText = "名称"; + this.oName.Name = "oName"; + // + // Ip1 + // + this.Ip1.DataPropertyName = "Ip"; + this.Ip1.HeaderText = "Ip地址"; + this.Ip1.Name = "Ip1"; + this.Ip1.Width = 140; + // + // Ip2 + // + this.Ip2.DataPropertyName = "Ip2"; + this.Ip2.HeaderText = "IP地址2"; + this.Ip2.Name = "Ip2"; + // + // Ip3 + // + this.Ip3.DataPropertyName = "Ip3"; + this.Ip3.HeaderText = "IP地址3"; + this.Ip3.Name = "Ip3"; + // + // DepartmentNameColumn + // + this.DepartmentNameColumn.HeaderText = "所属科室"; + this.DepartmentNameColumn.Name = "DepartmentNameColumn"; + this.DepartmentNameColumn.Visible = false; + // + // OrderBy + // + this.OrderBy.DataPropertyName = "OrderBy"; + this.OrderBy.HeaderText = "排序顺序"; + this.OrderBy.Name = "OrderBy"; + // + // IsValid + // + this.IsValid.DataPropertyName = "IsValid"; + this.IsValid.HeaderText = "是否有效"; + this.IsValid.Name = "IsValid"; + // // frmOperationRoom // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(811, 489); + this.ClientSize = new System.Drawing.Size(916, 489); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Controls.Add(this.toolStrip1); @@ -559,11 +611,15 @@ private DevComponents.Editors.ComboItem comboItem2; private DevComponents.DotNetBar.Controls.TextBoxX txtIp1; private DevComponents.DotNetBar.Controls.TextBoxX txtName; + private DevComponents.DotNetBar.Controls.TextBoxX txtIp3; + private DevComponents.DotNetBar.Controls.TextBoxX txtIp2; private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn type; private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn Ip1; + private System.Windows.Forms.DataGridViewTextBoxColumn Ip2; + private System.Windows.Forms.DataGridViewTextBoxColumn Ip3; private System.Windows.Forms.DataGridViewTextBoxColumn DepartmentNameColumn; private System.Windows.Forms.DataGridViewTextBoxColumn OrderBy; private System.Windows.Forms.DataGridViewTextBoxColumn IsValid; diff --git a/AIMS/DataDictionary/frmOperationRoom.resx b/AIMS/DataDictionary/frmOperationRoom.resx index cbe907a..2cdf15b 100644 --- a/AIMS/DataDictionary/frmOperationRoom.resx +++ b/AIMS/DataDictionary/frmOperationRoom.resx @@ -135,6 +135,12 @@ True + + True + + + True + True diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs index 32df05c..12771a4 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.Designer.cs @@ -859,8 +859,7 @@ this.superTabMain.TabIndex = 14; this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.spTabQXQDD, - this.spTabBM}); - this.superTabMain.SelectedTabChanged += new System.EventHandler(this.superTabMain_SelectedTabChanged); + this.spTabBM}); // // superTabControlPanel1 // diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs index 3266d0e..cdf4a39 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill2.cs @@ -14,6 +14,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; +using System.Diagnostics; using System.Drawing; using System.Drawing.Printing; using System.IO; @@ -2248,9 +2249,25 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI { //MessageBox.Show("未连接到服务器 请联系管理员或稍后再试！", "系统提示"); frmLISResult lISResult = new frmLISResult(); - lISResult.PatientNo = _record.InHospitalNo; - lISResult.Show(); - + //lISResult.PatientNo = _record.InHospitalNo; + //lISResult.Show(); + if (PublicMethod.GetHospitalName().Contains("秦皇岛")) + { + try + { + string patientId = "orcl:LDQ:5:1:0:" + _record.HISPatientId + ":" + _record.VisitTimes + ""; + Process myprocess = new Process(); + ProcessStartInfo startInfo = new ProcessStartInfo(@"C:\APPSOFT\zlSoftCISInterface.exe", patientId); + PublicMethod.WriteLog(new Exception(@"C:\APPSOFT\zlSoftCISInterface.exe" + patientId)); + myprocess.StartInfo = startInfo; + myprocess.StartInfo.UseShellExecute = false; + myprocess.Start(); + } + catch (Exception ex) + { + MessageBox.Show(@"在C:\APPSOFT\zlSoftCISInterface.exe路径下找不到“zlSoftCISInterface.exe”"); + } + } } private void btnChage_Click(object sender, EventArgs e) { @@ -2258,24 +2275,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI frmchargRecord.TemplateType = "麻醉"; frmchargRecord.Show(); frmchargRecord.BringToFront(); - } - private void superTabMain_SelectedTabChanged(object sender, DevComponents.DotNetBar.SuperTabStripSelectedTabChangedEventArgs e) - { - //int LocationY = Convert.ToInt32(templateManage.ZedControl.Height * 0.08); - //templateManage2.LocationY = 0; - //if (superTabMain.SelectedTab.Name == "spTabQXQDD") - //{ - // int LocationY = Convert.ToInt32(templateManage.ZedControl.Height * 0.04); - // templateManage.LocationY = LocationY; - // templateManage.SetPYL(); - //} - //else - //{ - // int LocationY = Convert.ToInt32(templateManage.ZedControl.Height * 0.065); - // templateManage2.LocationY = LocationY; - // templateManage2.SetPYL(); - //} - } + } private void frmAnasRecordBill2_VisibleChanged(object sender, EventArgs e) { if (this.Visible == false) diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs index 6d54478..c5f4027 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs @@ -16,6 +16,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; +using System.Diagnostics; using System.Drawing; using System.Drawing.Printing; using System.IO; @@ -1201,9 +1202,23 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI private void btnsjzx_Click(object sender, EventArgs e) { - frmLISResult lISResult = new frmLISResult(); - lISResult.PatientNo = _record.InHospitalNo; - lISResult.Show(); + if (PublicMethod.GetHospitalName().Contains("秦皇岛")) + { + try + { + string patientId = "orcl:LDQ:5:1:0:" + _record.HISPatientId + ":" + _record.VisitTimes + ""; + Process myprocess = new Process(); + ProcessStartInfo startInfo = new ProcessStartInfo(@"C:\APPSOFT\zlSoftCISInterface.exe", patientId); + PublicMethod.WriteLog(new Exception(@"C:\APPSOFT\zlSoftCISInterface.exe" + patientId)); + myprocess.StartInfo = startInfo; + myprocess.StartInfo.UseShellExecute = false; + myprocess.Start(); + } + catch (Exception ex) + { + MessageBox.Show(@"在C:\APPSOFT\zlSoftCISInterface.exe路径下找不到“zlSoftCISInterface.exe”"); + } + } } #endregion diff --git a/AIMS/OperationDoing/AnasRecordBill/frmSelectPatientNew2.cs b/AIMS/OperationDoing/AnasRecordBill/frmSelectPatientNew2.cs index f3fee61..9b7a9d1 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmSelectPatientNew2.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmSelectPatientNew2.cs @@ -288,7 +288,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI //判断当前字符串是否为正确IP地址 if (PublicMethod.IsRightIP(IPadd.ToString())) { - if (room.Ip == IPadd.ToString()) + if (room.Ip == IPadd.ToString() || room.Ip2 == IPadd.ToString()|| room.Ip3 == IPadd.ToString() ) { return room; } diff --git a/AIMS/OperationFront/frmOperationApplyDetail.cs b/AIMS/OperationFront/frmOperationApplyDetail.cs index 43cd00d..5d80539 100644 --- a/AIMS/OperationFront/frmOperationApplyDetail.cs +++ b/AIMS/OperationFront/frmOperationApplyDetail.cs @@ -848,6 +848,7 @@ namespace AIMS.OperationFront.UI OperationApplyObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo; OperationApplyObj.OperatorName = AIMSExtension.PublicMethod.OperatorName; OperationApplyObj.OperateDate = AIMSExtension.PublicMethod.SystemDate(); + OperationApplyObj.OperationSite = "手术室"; try { diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 9e08908..a8b06ce 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -4102,6 +4102,8 @@ namespace AIMS.OperationFront.UI dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); } } + selApply=null; + RoomCardManage.SelectIds = null; //lblcount.Text = "ǰ" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + ""; }; frmOperationApplyDetail.ShowDialog(); diff --git a/AIMS/OremrUserControl/ucDocument.Designer.cs b/AIMS/OremrUserControl/ucDocument.Designer.cs index cf414cd..f900894 100644 --- a/AIMS/OremrUserControl/ucDocument.Designer.cs +++ b/AIMS/OremrUserControl/ucDocument.Designer.cs @@ -31,22 +31,18 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ucDocument)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.tsbSave = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbSaveAndPrint = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbPreview = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbCheckout = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.tsbExit = new System.Windows.Forms.ToolStripButton(); this.myEditControl = new DCSoft.Writer.Controls.WriterControl(); this.writerCommandControler1 = new DCSoft.Writer.Commands.WriterCommandControler(this.components); - this.cmEdit = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripSeparator(); - this.tsbSave = new System.Windows.Forms.ToolStripButton(); - this.tsbSaveAndPrint = new System.Windows.Forms.ToolStripButton(); - this.tsbPreview = new System.Windows.Forms.ToolStripButton(); - this.tsbCheckout = new System.Windows.Forms.ToolStripButton(); - this.tsbExit = new System.Windows.Forms.ToolStripButton(); this.cmRedo = new System.Windows.Forms.ToolStripMenuItem(); this.cmUndo = new System.Windows.Forms.ToolStripMenuItem(); this.cmCut = new System.Windows.Forms.ToolStripMenuItem(); @@ -57,6 +53,11 @@ this.cmAlignLeft = new System.Windows.Forms.ToolStripMenuItem(); this.cmAlignCenter = new System.Windows.Forms.ToolStripMenuItem(); this.cmAlignRight = new System.Windows.Forms.ToolStripMenuItem(); + this.cmEdit = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.writerCommandControler1)).BeginInit(); this.cmEdit.SuspendLayout(); @@ -75,7 +76,8 @@ this.tsbPreview, this.toolStripSeparator2, this.tsbCheckout, - this.toolStripSeparator3, + this.toolStripSeparator4, + this.toolStripButton1, this.tsbExit}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; @@ -83,74 +85,6 @@ this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 49); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 49); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 49); - // - // myEditControl - // - this.myEditControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.myEditControl.Location = new System.Drawing.Point(0, 49); - this.myEditControl.Name = "myEditControl"; - this.myEditControl.Size = new System.Drawing.Size(865, 399); - this.myEditControl.TabIndex = 5; - // - // cmEdit - // - this.cmEdit.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.cmRedo, - this.cmUndo, - this.toolStripMenuItem4, - this.cmCut, - this.cmCopy, - this.cmPaste, - this.toolStripMenuItem5, - this.cmColor, - this.cmFont, - this.toolStripMenuItem6, - this.cmAlignLeft, - this.cmAlignCenter, - this.cmAlignRight, - this.toolStripMenuItem8}); - this.cmEdit.Name = "cmEdit"; - this.cmEdit.Size = new System.Drawing.Size(125, 248); - // - // toolStripMenuItem4 - // - this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(121, 6); - // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(121, 6); - // - // toolStripMenuItem6 - // - this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(121, 6); - // - // toolStripMenuItem8 - // - this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(121, 6); - // // tsbSave // this.tsbSave.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -162,6 +96,11 @@ this.tsbSave.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbSave.Click += new System.EventHandler(this.tsbSave_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49); + // // tsbSaveAndPrint // this.tsbSaveAndPrint.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -173,6 +112,11 @@ this.tsbSaveAndPrint.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbSaveAndPrint.Click += new System.EventHandler(this.tsbSaveAndPrint_Click); // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 49); + // // tsbPreview // this.tsbPreview.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -184,6 +128,11 @@ this.tsbPreview.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbPreview.Click += new System.EventHandler(this.tsbPreview_Click); // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 49); + // // tsbCheckout // this.tsbCheckout.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -195,6 +144,24 @@ this.tsbCheckout.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbCheckout.Click += new System.EventHandler(this.tsbCheckout_Click); // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 49); + // + // toolStripButton1 + // + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); + this.toolStripButton1.Image = global::AIMS.Properties.Resources.图标_麻醉知情同意书; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(64, 46); + this.toolStripButton1.Text = " 计算结果"; + this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.toolStripButton1.Visible = false; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); @@ -206,6 +173,14 @@ this.tsbExit.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbExit.Click += new System.EventHandler(this.tsbExit_Click); // + // myEditControl + // + this.myEditControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.myEditControl.Location = new System.Drawing.Point(0, 49); + this.myEditControl.Name = "myEditControl"; + this.myEditControl.Size = new System.Drawing.Size(865, 399); + this.myEditControl.TabIndex = 5; + // // cmRedo // this.writerCommandControler1.SetCommandName(this.cmRedo, "Redo"); @@ -286,13 +261,53 @@ this.cmAlignRight.Size = new System.Drawing.Size(124, 22); this.cmAlignRight.Text = "右对齐"; // + // cmEdit + // + this.cmEdit.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cmRedo, + this.cmUndo, + this.toolStripMenuItem4, + this.cmCut, + this.cmCopy, + this.cmPaste, + this.toolStripMenuItem5, + this.cmColor, + this.cmFont, + this.toolStripMenuItem6, + this.cmAlignLeft, + this.cmAlignCenter, + this.cmAlignRight, + this.toolStripMenuItem8}); + this.cmEdit.Name = "cmEdit"; + this.cmEdit.Size = new System.Drawing.Size(125, 248); + // + // toolStripMenuItem4 + // + this.toolStripMenuItem4.Name = "toolStripMenuItem4"; + this.toolStripMenuItem4.Size = new System.Drawing.Size(121, 6); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(121, 6); + // + // toolStripMenuItem6 + // + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(121, 6); + // + // toolStripMenuItem8 + // + this.toolStripMenuItem8.Name = "toolStripMenuItem8"; + this.toolStripMenuItem8.Size = new System.Drawing.Size(121, 6); + // // ucDocument // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.myEditControl); this.Controls.Add(this.toolStrip1); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "ucDocument"; this.Size = new System.Drawing.Size(865, 448); this.Load += new System.EventHandler(this.ucDocument_Load); @@ -316,7 +331,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripButton tsbExit; private System.Windows.Forms.ToolStripButton tsbCheckout; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private DCSoft.Writer.Controls.WriterControl myEditControl; private DCSoft.Writer.Commands.WriterCommandControler writerCommandControler1; private System.Windows.Forms.ContextMenuStrip cmEdit; @@ -334,5 +348,7 @@ private System.Windows.Forms.ToolStripMenuItem cmAlignCenter; private System.Windows.Forms.ToolStripMenuItem cmAlignRight; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem8; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } diff --git a/AIMS/OremrUserControl/ucDocument.cs b/AIMS/OremrUserControl/ucDocument.cs index 43a15ce..d9f09dc 100644 --- a/AIMS/OremrUserControl/ucDocument.cs +++ b/AIMS/OremrUserControl/ucDocument.cs @@ -112,7 +112,7 @@ namespace AIMS.OremrUserControl { element.Text = info.GetValue(Patient, null).ToString(); } - } + } } else { @@ -165,7 +165,7 @@ namespace AIMS.OremrUserControl } } } - DocumentExtension.SetDocumentDefaultValue(TModel.XmlFileName,myEditControl.Document,Patient); + DocumentExtension.SetDocumentDefaultValue(TModel.XmlFileName, myEditControl.Document, Patient); } string xmlStatic = DocumentDAL.GetEventXml(DModel.TemplateId); if (xmlStatic != string.Empty) @@ -190,6 +190,13 @@ namespace AIMS.OremrUserControl tsbSave.Visible = false; tsbSaveAndPrint.Text = "打印"; } + + string XmlFileName = TModel.XmlFileName; + if (DModel != null) XmlFileName = DModel.XmlFileName; + if (XmlFileName == "压疮风险评估表" || XmlFileName == "不计费耗材使用清单") + { + toolStripButton1.Visible = true; + } } void myEditControl_AfterExecuteCommand(object eventSender, DCSoft.Writer.Commands.WriterCommandEventArgs args) @@ -377,6 +384,13 @@ namespace AIMS.OremrUserControl CloseP(); } + private void toolStripButton1_Click(object sender, EventArgs e) + { + string XmlFileName = TModel.XmlFileName; + if (DModel != null) XmlFileName = DModel.XmlFileName; + DocumentExtension.GetDocumentValue(DModel.XmlFileName, myEditControl.Document, Patient); + } + private void tsbCheckout_Click(object sender, EventArgs e) { if (tsbCheckout.Text == " 查看痕迹") diff --git a/AIMS/OremrUserControl/ucDocument.resx b/AIMS/OremrUserControl/ucDocument.resx index 19c519d..98f903d 100644 --- a/AIMS/OremrUserControl/ucDocument.resx +++ b/AIMS/OremrUserControl/ucDocument.resx @@ -123,14 +123,11 @@ 143, 17 - - 394, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAVpJREFUOE/Fk7FLAlEcx+8/6U+4PQfHwuU2wyEkCXI7iOBGheDavBZpiRw8Glzs + cQAAEnEB89x6jgAAAVpJREFUOE/Fk7FLAlEcx+8/6U+4PQfHwuU2wyEkCXI7iOBGheDavBZpiRw8Glzs EEwiOLjBxMG8EAcLlGhIkd7rrEgMvr331CwUUgn6wC3v/X6f3/f94KQ/xW28Il/xkLEpaq13jI7nI+cQ 0ZiwJp9uElQac4gKRQrzgiAQa8EXzcG/k0VAcxBNEmhM4rb6QtLtDeBXr6eFGSZQDgjkjRSC8QIiuiNE cjiLsEGwm6YosSRn5Wcmt6cFJ5eemL66eYzHpxdRkC7cwrdlQlZS2E5SqCkC9YgNYVLR9J2xILiX+XFZ @@ -142,7 +139,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAVJJREFUOE+1kD9Lw1AUxfuN8gE6ZHfJpnQKdrFbxo4pCHUzk3SRdrAoZKmhUEJR + cQAAEnEB89x6jgAAAVJJREFUOE+1kD9Lw1AUxfuN8gE6ZHfJpnQKdrFbxo4pCHUzk3SRdrAoZKmhUEJR AxmKBLF/KA4qtlgtWoovbWOpWjjmvgZBUpUIPXCXd+/5nXtfbKVq92bQ7TF0y0Xlcozm9Su86RxB+3eR USsx7Jsudo1FEahss+UQ7YhhOPngDfPC4+bUHoOo1CFulRBPlbGmdlGsMpg1NwxQfcCxM8JZa8rNstbx zZZvtpDM2ljPmBDlAqQdBn0ZQMl1oOQYlEKQLJd4HZg3fPjpxUN8s8i3yJ+MwwBKlFRKXkCUjAHnavBt @@ -154,7 +151,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAVZJREFUOE+tkMFLAkEUxv2DBO952EMX8TLnPS2B4EKHOQpdtsvacZcgvAgSSpAY + cQAAEnEB89x6jgAAAVZJREFUOE+tkMFLAkEUxv2DBO952EMX8TLnPS2B4EKHOQpdtsvacZcgvAgSSpAY 22KIB0EYqCQqsUsgiMNCm0W0UHTq8LVvCqGDq4IfDMO8+b7fezOpjWs0GqPpd/F3VJJS4qTl/6st1Mtb BKdSw3v0MQ94Xh9icL8agORUPHTFrQrI5wgGt0BTqMtV1G4LOE4NYRiifz0EM/h6gJ54UM9onnfALQe6 bq4eJgVBqII0OnXf27fXA5DMUlmFWdFCT6zxgXL2Dbf1CWZNYR9PwEpD6NYI7qmEGL4mgyhsHkXQyxL5 @@ -166,7 +163,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAT5JREFUOE+9kSFPxEAQhftT+hPuJ1RWViIrkSuRK5ErK1eeXFm5ssmZNYSSQNgL + cQAAEnEB89x6jgAAAT5JREFUOE+9kSFPxEAQhftT+hPuJ1RWViIrkSuRK5ErK1eeXFm5ssmZNYSSQNgL CSFBsA7cY2b27not5CpIeMkzzc733kyLP8v5iOyQ3QdYF/D4/IrDk8vi4aWs82i1xfi0X4dw6lJm6+GH gFaZdQhXZvkRoOYIMcFYBzckWinb9vTNZd+/fM6BXPekLyAlIL7RIAGW0tuEzbXH7uFjgliqy7IDVack 7SKUjbCUvJTqMnhz5bC7e88Q3peVJD1JOq9h+3xc47LDmNCaKMPssrEHAO3Lw8dkcRfokPO/w28Y7gPB @@ -177,7 +174,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAZRJREFUOE+1kqFuHDEURecP9hP2ExYWGgYaLjQMNAw0CFgVGQ40XGi40HBQZThS + cQAAEnEB89x6jgAAAZRJREFUOE+1kqFuHDEURecP9hP2ExYWGgYaLjQMNAw0CFgVGQ40XGi40HBQZThS qtRRChYals3tfXYm2aQbVapUS0eWZuae5/c8w39ZKToIMTj8fHrEy+Pr6/v8DfHoXwneoJ5Do8we9lbB HyxxbX9+engvlFCtEQupNSCMtu1f7y3y5OCshjM71ETxaQtr9J8CCQv+YBii8OxZ3aFMBnHUMHuF4LbI foDdfxSEVRDgnWFFQfPoL7CipcDbLjA36r0grALpu7B65tHD5o2RMLiivuw+CEbXh1a4z+w/a9S4gQ9s @@ -190,7 +187,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAT9JREFUOE9jwAcu3Xr1v2rSof9QLukgv33/f//89f+vPXhPuiGfv/4EawZhr4wl + cQAAEnEB89x6jgAAAT9JREFUOE9jwAcu3Xr1v2rSof9QLukgv33/f//89f+vPXhPuiGfv/4EawZhr4wl pBvQNv/M/7ZZh/7bx8//r+/f/3/v8dukGQKy9dOXH/9DyxaDDfBImUO8AduO3vqfVLMBrOHUlWf/9cP7 wYacuvSIOENAmm/dfwNXbJ04FWxAUsk8wgY8e/Xpv334/P+h+Yv/h2ZOA9PWkUAD3Ov/y5vn/3/0FGEw VlA1Yc//pIZV/6/cevz/2Llb/0+du/f/+h2gN0AG2Of/TymdjdsAUKCBnPvx0zcMRQ2TtoFdoONcjt2A @@ -201,7 +198,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAALZJREFUOE9jGEZgQseE/7jw9P7p/6HKcAOQwnOnz/1//PDx/yXzloA1gvggDGJD + cQAAEnEB89x6jgAAALZJREFUOE9jGEZgQseE/7jw9P7p/6HKcAOQwnOnz/1//PDx/yXzloA1gvggDGJD leEGIIVQJsPqpavBmkCGgfjIckQBkAEGGgb/vby8/js4BGBgfn5+/AbOnz8fpOB/Y2Pj//379//X19cH 8/v7+//D5EDqcAKQooSMBLgX7O3twZpAhoH4IINANE6AHgboBuAEHz98/A/TDMKg2ACJEW0ALjBwBty/ fx/ufBAGxQbZrqARYGAAAIsJsq+EVytAAAAAAElFTkSuQmCC @@ -210,22 +207,25 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAADFJREFUOE9jGDTgPxGYtgCbjYQwdQE2G9AxbQE2Gwlh6gJsNqBj2gJsNhLCwwMw + cQAAEnEB89x6jgAAADFJREFUOE9jGDTgPxGYtgCbjYQwdQE2G9AxbQE2Gwlh6gJsNqBj2gJsNhLCwwMw MAAA3ddBv2ARh7EAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAAD1JREFUOE/djTEKACAMxAr2/1/WJWOGIgeCgWx3pN7TvfaN3INYxWQexCoTuQex + cQAAEnEB89x6jgAAAD1JREFUOE/djTEKACAMxAr2/1/WJWOGIgeCgWx3pN7TvfaN3INYxWQexCoTuQex isk8iFUmcg9iFZP5P1Qdb5tK0V1/owgAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - dAAAEnQB3mYfeAAAACtJREFUOE9jGBTgP5mYdgCbbdgw9QA204nBwwlg8x8xmHYAm23Y8PAADAwA4MY9 + cQAAEnEB89x6jgAAACtJREFUOE9jGBTgP5mYdgCbbdgw9QA204nBwwlg8x8xmHYAm23Y8PAADAwA4MY9 w+4nm/MAAAAASUVORK5CYII= + + 394, 17 + \ No newline at end of file diff --git a/AIMSEntity/BLL/Extension/BOperationRecord.cs b/AIMSEntity/BLL/Extension/BOperationRecord.cs index f519bad..4505c48 100644 --- a/AIMSEntity/BLL/Extension/BOperationRecord.cs +++ b/AIMSEntity/BLL/Extension/BOperationRecord.cs @@ -72,6 +72,8 @@ namespace AIMSBLL DataTable OperationFrontdt = BOperationApply.GetOperationFrontDataTableByPatientId(PatientId); if (OperationFrontdt.Rows.Count > 0) { + _record.HISPatientId = OperationFrontdt.Rows[0]["HISPatientId"].ToString() ; + _record.VisitTimes = OperationFrontdt.Rows[0]["VisitTimes"].ToString() ; _record.DepartmentId = int.Parse(OperationFrontdt.Rows[0]["DepartmentId"].ToString()); _record.ApplyDepartmentName = OperationFrontdt.Rows[0]["ApplyDepName"].ToString() + " " + OperationFrontdt.Rows[0]["SickBed"].ToString(); _record.ApplyDepName = OperationFrontdt.Rows[0]["ApplyDepName"].ToString(); diff --git a/AIMSEntity/DAL/AutoGenerate/DOperationApply.cs b/AIMSEntity/DAL/AutoGenerate/DOperationApply.cs index d286d29..7e2041b 100644 --- a/AIMSEntity/DAL/AutoGenerate/DOperationApply.cs +++ b/AIMSEntity/DAL/AutoGenerate/DOperationApply.cs @@ -199,7 +199,7 @@ namespace AIMSDAL /// 影响的记录行数 internal static int ExcuteUpdateCommand(SqlCommand cmd, OperationApply operationApply) { - cmd.CommandText = "update OperationApply set Oris_PatientId=@Oris_PatientId,ApplyDepId=@ApplyDepId,OperationType=@OperationType,OrderOperationTime=@OrderOperationTime,OperationTimeLeight=@OperationTimeLeight,IsReturnOperation=@IsReturnOperation,IsPlanReturnOperation=@IsPlanReturnOperation,IsNotPlanReturnOperation=@IsNotPlanReturnOperation,DiagnoseRemark=@DiagnoseRemark,OperationRemark=@OperationRemark,OperationLevelId=@OperationLevelId,Contagion=@Contagion,Intern=@Intern,Other=@Other,ApplyTime=@ApplyTime,ApplyOperatorNo=@ApplyOperatorNo,VerifyTime=@VerifyTime,VerifyOperatorNo=@VerifyOperatorNo,PlanOperationTime=@PlanOperationTime,PlanOrder=@PlanOrder,OperationRoomId=@OperationRoomId,State=@State,ASA=@ASA,HeartFunctionLevel=@HeartFunctionLevel,IsFasting=@IsFasting,Remark=@Remark,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,OperationSite=@OperationSite,OrderNo=@OrderNo,MedicalRecord=@MedicalRecord,MedicalRecordTime=@MedicalRecordTime where Id=@Id"; + cmd.CommandText = "update OperationApply set Oris_PatientId=@Oris_PatientId,ApplyDepId=@ApplyDepId,OperationType=@OperationType,OrderOperationTime=@OrderOperationTime,OperationTimeLeight=@OperationTimeLeight,IsReturnOperation=@IsReturnOperation,IsPlanReturnOperation=@IsPlanReturnOperation,IsNotPlanReturnOperation=@IsNotPlanReturnOperation,DiagnoseRemark=@DiagnoseRemark,OperationRemark=@OperationRemark,OperationLevelId=@OperationLevelId,Contagion=@Contagion,Intern=@Intern,Other=@Other,ApplyTime=@ApplyTime,ApplyOperatorNo=@ApplyOperatorNo,PlanOperationTime=@PlanOperationTime,PlanOrder=@PlanOrder,OperationRoomId=@OperationRoomId,State=@State,Remark=@Remark,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,OperationSite=@OperationSite,OrderNo=@OrderNo where Id=@Id"; //从实体中取出值放入Command的参数列表 cmd.Parameters.Add(new SqlParameter("@Oris_PatientId", operationApply.OrisPatientId.HasValue ? (object)operationApply.OrisPatientId.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@ApplyDepId", operationApply.ApplyDepId.HasValue ? (object)operationApply.ApplyDepId.Value : (object)DBNull.Value)); @@ -216,24 +216,17 @@ namespace AIMSDAL cmd.Parameters.Add(new SqlParameter("@Intern", operationApply.Intern == null ? (object)DBNull.Value : (object)operationApply.Intern)); cmd.Parameters.Add(new SqlParameter("@Other", operationApply.Other == null ? (object)DBNull.Value : (object)operationApply.Other)); cmd.Parameters.Add(new SqlParameter("@ApplyTime", operationApply.ApplyTime.HasValue ? (object)operationApply.ApplyTime.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@ApplyOperatorNo", operationApply.ApplyOperatorNo == null ? (object)DBNull.Value : (object)operationApply.ApplyOperatorNo)); - cmd.Parameters.Add(new SqlParameter("@VerifyTime", operationApply.VerifyTime.HasValue ? (object)operationApply.VerifyTime.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@VerifyOperatorNo", operationApply.VerifyOperatorNo == null ? (object)DBNull.Value : (object)operationApply.VerifyOperatorNo)); + cmd.Parameters.Add(new SqlParameter("@ApplyOperatorNo", operationApply.ApplyOperatorNo == null ? (object)DBNull.Value : (object)operationApply.ApplyOperatorNo)); cmd.Parameters.Add(new SqlParameter("@PlanOperationTime", operationApply.PlanOperationTime.HasValue ? (object)operationApply.PlanOperationTime.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@PlanOrder", operationApply.PlanOrder.HasValue ? (object)operationApply.PlanOrder.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@OperationRoomId", operationApply.OperationRoomId.HasValue ? (object)operationApply.OperationRoomId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@State", operationApply.State.HasValue ? (object)operationApply.State.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@ASA", operationApply.ASA == null ? (object)DBNull.Value : (object)operationApply.ASA)); - cmd.Parameters.Add(new SqlParameter("@HeartFunctionLevel", operationApply.HeartFunctionLevel == null ? (object)DBNull.Value : (object)operationApply.HeartFunctionLevel)); - cmd.Parameters.Add(new SqlParameter("@IsFasting", operationApply.IsFasting.HasValue ? (object)operationApply.IsFasting.Value : (object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@State", operationApply.State.HasValue ? (object)operationApply.State.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@Remark", operationApply.Remark == null ? (object)DBNull.Value : (object)operationApply.Remark)); cmd.Parameters.Add(new SqlParameter("@OperatorNo", operationApply.OperatorNo == null ? (object)DBNull.Value : (object)operationApply.OperatorNo)); cmd.Parameters.Add(new SqlParameter("@OperatorName", operationApply.OperatorName == null ? (object)DBNull.Value : (object)operationApply.OperatorName)); cmd.Parameters.Add(new SqlParameter("@OperateDate", operationApply.OperateDate.HasValue ? (object)operationApply.OperateDate.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@OperationSite", operationApply.OperationSite == null ? (object)DBNull.Value : (object)operationApply.OperationSite)); - cmd.Parameters.Add(new SqlParameter("@OrderNo", operationApply.OrderNo == null ? (object)DBNull.Value : (object)operationApply.OrderNo)); - cmd.Parameters.Add(new SqlParameter("@MedicalRecord", operationApply.MedicalRecord == null ? (object)DBNull.Value : (object)operationApply.MedicalRecord)); - cmd.Parameters.Add(new SqlParameter("@MedicalRecordTime", operationApply.MedicalRecordTime.HasValue ? (object)operationApply.MedicalRecordTime.Value : (object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@OrderNo", operationApply.OrderNo == null ? (object)DBNull.Value : (object)operationApply.OrderNo)); cmd.Parameters.Add(new SqlParameter("@Id", operationApply.Id)); return cmd.ExecuteNonQuery(); } diff --git a/AIMSEntity/DAL/AutoGenerate/DOperationRoom.cs b/AIMSEntity/DAL/AutoGenerate/DOperationRoom.cs index a8f7f60..26a5887 100644 --- a/AIMSEntity/DAL/AutoGenerate/DOperationRoom.cs +++ b/AIMSEntity/DAL/AutoGenerate/DOperationRoom.cs @@ -20,11 +20,13 @@ namespace AIMSDAL internal static int Insert(SqlCommand cmd, OperationRoom operationRoom) { cmd.Parameters.Clear(); - cmd.CommandText = "insert into OperationRoom (Name,HelpCode,Ip,RoomOrder,IsValid,OperatorNo,OperatorName,OperateDate,Site,PhysioSetting) values (@Name,@HelpCode,@Ip,@RoomOrder,@IsValid,@OperatorNo,@OperatorName,@OperateDate,@Site,@PhysioSetting);select @@identity"; + cmd.CommandText = "insert into OperationRoom (Name,HelpCode,Ip,Ip2,Ip3,RoomOrder,IsValid,OperatorNo,OperatorName,OperateDate,Site,PhysioSetting) values (@Name,@HelpCode,@Ip,@Ip2,@Ip3,@RoomOrder,@IsValid,@OperatorNo,@OperatorName,@OperateDate,@Site,@PhysioSetting);select @@identity"; //从实体中取出值放入Command的参数列表 cmd.Parameters.Add(new SqlParameter("@Name", operationRoom.Name == null ? (object)DBNull.Value : (object)operationRoom.Name)); cmd.Parameters.Add(new SqlParameter("@HelpCode", operationRoom.HelpCode == null ? (object)DBNull.Value : (object)operationRoom.HelpCode)); cmd.Parameters.Add(new SqlParameter("@Ip", operationRoom.Ip == null ? (object)DBNull.Value : (object)operationRoom.Ip)); + cmd.Parameters.Add(new SqlParameter("@Ip2", operationRoom.Ip2 == null ? (object)DBNull.Value : (object)operationRoom.Ip2)); + cmd.Parameters.Add(new SqlParameter("@Ip3", operationRoom.Ip3 == null ? (object)DBNull.Value : (object)operationRoom.Ip3)); cmd.Parameters.Add(new SqlParameter("@RoomOrder", operationRoom.RoomOrder.HasValue ? (object)operationRoom.RoomOrder.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@IsValid", operationRoom.IsValid.HasValue ? (object)operationRoom.IsValid.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@OperatorNo", operationRoom.OperatorNo == null ? (object)DBNull.Value : (object)operationRoom.OperatorNo)); @@ -176,11 +178,13 @@ namespace AIMSDAL /// 影响的记录行数 internal static int ExcuteUpdateCommand(SqlCommand cmd, OperationRoom operationRoom) { - cmd.CommandText = "update OperationRoom set Name=@Name,HelpCode=@HelpCode,Ip=@Ip,RoomOrder=@RoomOrder,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,Site=@Site,PhysioSetting=@PhysioSetting where Id=@Id"; + cmd.CommandText = "update OperationRoom set Name=@Name,HelpCode=@HelpCode,Ip=@Ip,Ip2=@Ip2,Ip3=@Ip3,RoomOrder=@RoomOrder,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,Site=@Site,PhysioSetting=@PhysioSetting where Id=@Id"; //从实体中取出值放入Command的参数列表 cmd.Parameters.Add(new SqlParameter("@Name", operationRoom.Name == null ? (object)DBNull.Value : (object)operationRoom.Name)); cmd.Parameters.Add(new SqlParameter("@HelpCode", operationRoom.HelpCode == null ? (object)DBNull.Value : (object)operationRoom.HelpCode)); cmd.Parameters.Add(new SqlParameter("@Ip", operationRoom.Ip == null ? (object)DBNull.Value : (object)operationRoom.Ip)); + cmd.Parameters.Add(new SqlParameter("@Ip2", operationRoom.Ip2 == null ? (object)DBNull.Value : (object)operationRoom.Ip2)); + cmd.Parameters.Add(new SqlParameter("@Ip3", operationRoom.Ip3 == null ? (object)DBNull.Value : (object)operationRoom.Ip3)); cmd.Parameters.Add(new SqlParameter("@RoomOrder", operationRoom.RoomOrder.HasValue ? (object)operationRoom.RoomOrder.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@IsValid", operationRoom.IsValid.HasValue ? (object)operationRoom.IsValid.Value : (object)DBNull.Value)); cmd.Parameters.Add(new SqlParameter("@OperatorNo", operationRoom.OperatorNo == null ? (object)DBNull.Value : (object)operationRoom.OperatorNo)); @@ -604,6 +608,14 @@ namespace AIMSDAL { entity.Ip = dr["Ip"].ToString(); } + if (dr["Ip2"] != System.DBNull.Value) + { + entity.Ip2 = dr["Ip2"].ToString(); + } + if (dr["Ip3"] != System.DBNull.Value) + { + entity.Ip3 = dr["Ip3"].ToString(); + } if (dr["RoomOrder"] != System.DBNull.Value) { entity.RoomOrder = Convert.ToInt32(dr["RoomOrder"]); diff --git a/AIMSEntity/DAL/AutoGenerate/DOrisPatient.cs b/AIMSEntity/DAL/AutoGenerate/DOrisPatient.cs index ac9bf5a..9bd9426 100644 --- a/AIMSEntity/DAL/AutoGenerate/DOrisPatient.cs +++ b/AIMSEntity/DAL/AutoGenerate/DOrisPatient.cs @@ -197,7 +197,7 @@ namespace AIMSDAL /// 影响的记录行数 internal static int ExcuteUpdateCommand(SqlCommand cmd, OrisPatient orisPatient) { - cmd.CommandText = "update Oris_Patient set MdrecNo=@MdrecNo,ArchivesNo=@ArchivesNo,Name=@Name,Sex=@Sex,BirthDay=@BirthDay,Age=@Age,Height=@Height,Weight=@Weight,DepId=@DepId,Illdistrict=@Illdistrict,SickBed=@SickBed,BloodType=@BloodType,RHBloodType=@RHBloodType,PatientKind=@PatientKind,InHosDate=@InHosDate,IdentityCard=@IdentityCard,Contacts=@Contacts,ContactsPhone=@ContactsPhone,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,PatientType=@PatientType,HisPatientId=@HisPatientId,VisitTimes=@VisitTimes,Address=@Address,Nation=@Nation,Extend1=@Extend1,Extend2=@Extend2,Extend3=@Extend3,Extend4=@Extend4,Extend5=@Extend5 where Id=@Id"; + cmd.CommandText = "update Oris_Patient set MdrecNo=@MdrecNo,ArchivesNo=@ArchivesNo,Name=@Name,Sex=@Sex,BirthDay=@BirthDay,Age=@Age,Height=@Height,Weight=@Weight,DepId=@DepId,Illdistrict=@Illdistrict,SickBed=@SickBed,BloodType=@BloodType,RHBloodType=@RHBloodType,PatientKind=@PatientKind,InHosDate=@InHosDate,IdentityCard=@IdentityCard,Contacts=@Contacts,ContactsPhone=@ContactsPhone,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,PatientType=@PatientType where Id=@Id"; //从实体中取出值放入Command的参数列表 cmd.Parameters.Add(new SqlParameter("@MdrecNo", orisPatient.MdrecNo == null ? (object)DBNull.Value : (object)orisPatient.MdrecNo)); cmd.Parameters.Add(new SqlParameter("@ArchivesNo", orisPatient.ArchivesNo == null ? (object)DBNull.Value : (object)orisPatient.ArchivesNo)); @@ -220,16 +220,7 @@ namespace AIMSDAL cmd.Parameters.Add(new SqlParameter("@OperatorNo", orisPatient.OperatorNo == null ? (object)DBNull.Value : (object)orisPatient.OperatorNo)); cmd.Parameters.Add(new SqlParameter("@OperatorName", orisPatient.OperatorName == null ? (object)DBNull.Value : (object)orisPatient.OperatorName)); cmd.Parameters.Add(new SqlParameter("@OperateDate", orisPatient.OperateDate.HasValue ? (object)orisPatient.OperateDate.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@PatientType", orisPatient.PatientType == null ? (object)DBNull.Value : (object)orisPatient.PatientType)); - cmd.Parameters.Add(new SqlParameter("@HisPatientId", orisPatient.HisPatientId == null ? (object)DBNull.Value : (object)orisPatient.HisPatientId)); - cmd.Parameters.Add(new SqlParameter("@VisitTimes", orisPatient.VisitTimes == null ? (object)DBNull.Value : (object)orisPatient.VisitTimes)); - cmd.Parameters.Add(new SqlParameter("@Address", orisPatient.Address == null ? (object)DBNull.Value : (object)orisPatient.Address)); - cmd.Parameters.Add(new SqlParameter("@Nation", orisPatient.Nation == null ? (object)DBNull.Value : (object)orisPatient.Nation)); - cmd.Parameters.Add(new SqlParameter("@Extend1", orisPatient.Extend1 == null ? (object)DBNull.Value : (object)orisPatient.Extend1)); - cmd.Parameters.Add(new SqlParameter("@Extend2", orisPatient.Extend2 == null ? (object)DBNull.Value : (object)orisPatient.Extend2)); - cmd.Parameters.Add(new SqlParameter("@Extend3", orisPatient.Extend3 == null ? (object)DBNull.Value : (object)orisPatient.Extend3)); - cmd.Parameters.Add(new SqlParameter("@Extend4", orisPatient.Extend4 == null ? (object)DBNull.Value : (object)orisPatient.Extend4)); - cmd.Parameters.Add(new SqlParameter("@Extend5", orisPatient.Extend5 == null ? (object)DBNull.Value : (object)orisPatient.Extend5)); + cmd.Parameters.Add(new SqlParameter("@PatientType", orisPatient.PatientType == null ? (object)DBNull.Value : (object)orisPatient.PatientType)); cmd.Parameters.Add(new SqlParameter("@Id", orisPatient.Id)); return cmd.ExecuteNonQuery(); } diff --git a/AIMSEntity/DAL/Extension/DOperationApply.cs b/AIMSEntity/DAL/Extension/DOperationApply.cs index 8610974..1727c1d 100644 --- a/AIMSEntity/DAL/Extension/DOperationApply.cs +++ b/AIMSEntity/DAL/Extension/DOperationApply.cs @@ -18,7 +18,7 @@ namespace AIMSDAL { StringBuilder strSql = new StringBuilder(); strSql.Append("insert into [OperationApply]("); - strSql.Append("Oris_PatientId,ApplyDepId,OperationType,OrderOperationTime,OperationTimeLeight,IsReturnOperation,IsPlanReturnOperation,IsNotPlanReturnOperation,DiagnoseRemark,OperationRemark,OperationLevelId,Contagion,Intern,Other,ApplyTime,ApplyOperatorNo,State,Remark,OperatorNo,OperatorName,OperateDate"); + strSql.Append("Oris_PatientId,ApplyDepId,OperationType,OrderOperationTime,OperationTimeLeight,IsReturnOperation,IsPlanReturnOperation,IsNotPlanReturnOperation,DiagnoseRemark,OperationRemark,OperationLevelId,Contagion,Intern,Other,ApplyTime,ApplyOperatorNo,State,Remark,OperatorNo,OperatorName,OperateDate,OperationSite"); strSql.Append(")"); strSql.Append(" values ("); strSql.Append("" + OperationApplyObj.OrisPatientId + ","); @@ -43,7 +43,8 @@ namespace AIMSDAL strSql.Append("'" + OperationApplyObj.Remark + "',"); strSql.Append("'" + OperationApplyObj.OperatorNo + "',"); strSql.Append("'" + OperationApplyObj.OperatorName + "',"); - strSql.Append("'" + OperationApplyObj.OperateDate + "'"); + strSql.Append("'" + OperationApplyObj.OperateDate + "',"); + strSql.Append("'" + OperationApplyObj.OperationSite + "'"); strSql.Append(")"); HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString()); } @@ -128,7 +129,7 @@ namespace AIMSDAL OperationApply OperationApplyObj = new OperationApply(); StringBuilder strSql = new StringBuilder(); strSql.Append("select "); - strSql.Append("Id,Oris_PatientId,ApplyDepId,OperationType,OrderOperationTime,OperationTimeLeight,IsReturnOperation,IsPlanReturnOperation,IsNotPlanReturnOperation,DiagnoseRemark,OperationRemark,OperationLevelId,Contagion,Intern,Other,ApplyTime,ApplyOperatorNo,PlanOperationTime,OperationRoomId,State,Remark,OperatorNo,OperatorName,OperateDate,PlanOrder "); + strSql.Append("Id,Oris_PatientId,ApplyDepId,OperationType,OrderOperationTime,OperationTimeLeight,IsReturnOperation,IsPlanReturnOperation,IsNotPlanReturnOperation,DiagnoseRemark,OperationRemark,OperationLevelId,Contagion,Intern,Other,ApplyTime,ApplyOperatorNo,PlanOperationTime,OperationRoomId,State,Remark,OperatorNo,OperatorName,OperateDate,PlanOrder,OperationSite,OrderNo "); strSql.Append(" from OperationApply "); strSql.Append(" where Id=" + Id + ""); DataSet ds = HelperDB.DbHelperSQL.GetDataSet(strSql.ToString()); @@ -201,6 +202,18 @@ namespace AIMSDAL { OperationApplyObj.OperateDate = DateTime.Parse(ds.Tables[0].Rows[0]["OperateDate"].ToString()); } + if (ds.Tables[0].Rows[0]["OperationSite"].ToString() != "") + { + OperationApplyObj.OperationSite = ds.Tables[0].Rows[0]["OperationSite"].ToString() ; + } + if (ds.Tables[0].Rows[0]["OrderNo"].ToString() != "") + { + OperationApplyObj.OrderNo = ds.Tables[0].Rows[0]["OrderNo"].ToString() ; + } + if (ds.Tables[0].Rows[0]["OperationSite"].ToString() != "") + { + OperationApplyObj.OperationSite = ds.Tables[0].Rows[0]["OperationSite"].ToString() ; + } } return OperationApplyObj; } @@ -240,7 +253,7 @@ namespace AIMSDAL "of1.VerifyTime, of1.VerifyOperatorName," + "of1.PlanOperationTime, of1.OperationRoom, of1.AnesthesiaDoctor," + "of1.InstrumentNurse, of1.TourNurse, of1.AnesthesiaDoctorSucceed," + - "of1.InstrumentNurseSucceed, of1.TourNurseSucceed,of1.ASA,of1.HeartFunctionLevel,of1.IsFasting, of1.Remark,ApplyDiagnoseInfoId,ApplyOperationInfoId ,of1.PlanOrder,of1.OperationRoomId ,of1.MedicalRecord,of1.PatientType " + + "of1.InstrumentNurseSucceed, of1.TourNurseSucceed,of1.ASA,of1.HeartFunctionLevel,of1.IsFasting, of1.Remark,ApplyDiagnoseInfoId,ApplyOperationInfoId ,of1.PlanOrder,of1.OperationRoomId ,of1.MedicalRecord,of1.PatientType,of1.HISPatientId,of1.VisitTimes " + "FROM V_OperationFront of1 WHERE of1.PatientId='" + PatientId + "'"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } diff --git a/AIMSEntity/DAL/Extension/DOperationRoom.cs b/AIMSEntity/DAL/Extension/DOperationRoom.cs index 16d3cbd..645760a 100644 --- a/AIMSEntity/DAL/Extension/DOperationRoom.cs +++ b/AIMSEntity/DAL/Extension/DOperationRoom.cs @@ -15,12 +15,14 @@ namespace AIMSDAL { StringBuilder strSql = new StringBuilder(); strSql.Append("insert into [OperationRoom]("); - strSql.Append("Name,HelpCode,Ip,RoomOrder,IsValid,OperatorNo,OperatorName,OperateDate"); + strSql.Append("Name,HelpCode,Ip,Ip2,Ip3,RoomOrder,IsValid,OperatorNo,OperatorName,OperateDate"); strSql.Append(")"); strSql.Append(" values ("); strSql.Append("'" + OperationRoomObj.Name + "',"); strSql.Append("'" + OperationRoomObj.HelpCode + "',"); strSql.Append("'" + OperationRoomObj.Ip + "',"); + strSql.Append("'" + OperationRoomObj.Ip2 + "',"); + strSql.Append("'" + OperationRoomObj.Ip3 + "',"); strSql.Append("" + OperationRoomObj.RoomOrder + ","); strSql.Append("" + OperationRoomObj.IsValid + ","); strSql.Append("'" + OperationRoomObj.OperatorNo + "',"); @@ -35,7 +37,7 @@ namespace AIMSDAL OperationRoom OperationRoomObj = new OperationRoom(); StringBuilder strSql = new StringBuilder(); strSql.Append("select "); - strSql.Append("Id,Name,HelpCode,Ip,RoomOrder,IsValid,OperatorNo,OperatorName,OperateDate "); + strSql.Append("Id,Name,HelpCode,Ip,Ip2,Ip3,RoomOrder,IsValid,OperatorNo,OperatorName,OperateDate "); strSql.Append(" from OperationRoom "); strSql.Append(" where Id=" + Id + ""); DataSet ds = HelperDB.DbHelperSQL.GetDataSet(strSql.ToString()); @@ -48,6 +50,8 @@ namespace AIMSDAL OperationRoomObj.Name = ds.Tables[0].Rows[0]["Name"].ToString(); OperationRoomObj.HelpCode = ds.Tables[0].Rows[0]["HelpCode"].ToString(); OperationRoomObj.Ip = ds.Tables[0].Rows[0]["Ip"].ToString(); + OperationRoomObj.Ip2 = ds.Tables[0].Rows[0]["Ip2"].ToString(); + OperationRoomObj.Ip3 = ds.Tables[0].Rows[0]["Ip3"].ToString(); if (ds.Tables[0].Rows[0]["RoomOrder"].ToString() != "") { OperationRoomObj.RoomOrder = int.Parse(ds.Tables[0].Rows[0]["RoomOrder"].ToString()); @@ -69,7 +73,7 @@ namespace AIMSDAL public static DataTable GetDataTable(string strWhere) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],[Ip],[RoomOrder],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid"); + strSql.Append("select [Id],[Name],[HelpCode],[Ip],[Ip2],[Ip3],[RoomOrder],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid"); strSql.Append(" FROM OperationRoom "); if (strWhere.Trim() != "") { @@ -84,7 +88,7 @@ namespace AIMSDAL List OperationRoomObjs = new List(); StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],[Ip],[RoomOrder],IsValid ,OperatorNo,OperatorName,OperateDate "); + strSql.Append("select [Id],[Name],[HelpCode],[Ip],[Ip2],[Ip3],[RoomOrder],IsValid ,OperatorNo,OperatorName,OperateDate "); strSql.Append(" FROM OperationRoom "); if (strWhere.Trim() != "") { @@ -103,6 +107,8 @@ namespace AIMSDAL OperationRoomObj.Name = ds.Tables[0].Rows[i]["Name"].ToString(); OperationRoomObj.HelpCode = ds.Tables[0].Rows[i]["HelpCode"].ToString(); OperationRoomObj.Ip = ds.Tables[0].Rows[i]["Ip"].ToString(); + OperationRoomObj.Ip2 = ds.Tables[0].Rows[i]["Ip2"].ToString(); + OperationRoomObj.Ip3 = ds.Tables[0].Rows[i]["Ip3"].ToString(); if (ds.Tables[0].Rows[i]["RoomOrder"].ToString() != "") { OperationRoomObj.RoomOrder = int.Parse(ds.Tables[0].Rows[i]["RoomOrder"].ToString()); diff --git a/AIMSEntity/Model/AutoGenerate/OperationRoom.cs b/AIMSEntity/Model/AutoGenerate/OperationRoom.cs index f5b80dc..30523bf 100644 --- a/AIMSEntity/Model/AutoGenerate/OperationRoom.cs +++ b/AIMSEntity/Model/AutoGenerate/OperationRoom.cs @@ -12,6 +12,8 @@ namespace AIMSModel private string name; private string helpCode; private string ip; + private string ip2; + private string ip3; private int? roomOrder; private int? isValid; private string operatorNo; @@ -55,6 +57,22 @@ namespace AIMSModel } /// /// + /// + public string Ip2 + { + get{ return ip2; } + set{ ip2=value; } + } + /// + /// + /// + public string Ip3 + { + get{ return ip3; } + set{ ip3=value; } + } + /// + /// /// public int? RoomOrder { diff --git a/AIMSEntity/ObjectQuery/OperationRoomMap.cs b/AIMSEntity/ObjectQuery/OperationRoomMap.cs index f262e3e..1e263e1 100644 --- a/AIMSEntity/ObjectQuery/OperationRoomMap.cs +++ b/AIMSEntity/ObjectQuery/OperationRoomMap.cs @@ -13,6 +13,8 @@ namespace AIMSObjectQuery dictionary.Add("name", "Name"); dictionary.Add("helpcode", "HelpCode"); dictionary.Add("ip", "Ip"); + dictionary.Add("ip2", "Ip2"); + dictionary.Add("ip3", "Ip3"); dictionary.Add("roomorder", "RoomOrder"); dictionary.Add("isvalid", "IsValid"); dictionary.Add("operatorno", "OperatorNo"); diff --git a/DocumentManagement/DocumentEntity/BindEvents.cs b/DocumentManagement/DocumentEntity/BindEvents.cs new file mode 100644 index 0000000..c1692df --- /dev/null +++ b/DocumentManagement/DocumentEntity/BindEvents.cs @@ -0,0 +1,104 @@ +using DCSoft.Writer.Dom; +using System; +using System.Xml.Linq; + +namespace DocumentManagement +{ + public class BindEventss + { + private static XTextDocument doc; + private static XTextContainerElement container; + public BindEventss(DCSoft.Writer.Controls.WriterControl myEditControl) + { + doc = myEditControl.Document; + container = myEditControl.Document; + + } + public static void MouseClickEvent(XTextElement element) + { + } + + public static void ContentChangedEvent(XTextElement element) + { + } + private static void SetValueById(string Id, string type, object value) + { + var element = doc.GetElementsById(Id).FirstElement; + if (element != null) + { + var pChecked = element.GetType().GetProperty(type); + pChecked.SetValue(element, value, null); + element.EditorRefreshView(); + } + } + + private static string GetValueById(string Id, string type) + { + string result = null; + var element = doc.GetElementsById(Id).FirstElement; + if (element != null) + { + var pChecked = element.GetType().GetProperty(type); + result = pChecked.GetValue(element, null).ToString(); + } + return result; + } + + private static void SetValueByName(string name, string type, object value) + { + var element = doc.GetElementsByName(name).FirstElement; + if (element != null) + { + var pChecked = element.GetType().GetProperty(type); + pChecked.SetValue(element, value, null); + element.EditorRefreshView(); + } + } + + private static bool GetCheckedValueByName(string name) + { + bool? result = null; + var element = doc.GetElementsByName(name).FirstElement; + if (element != null) + { + var pChecked = element.GetType().GetProperty("Checked"); + result = Convert.ToBoolean(pChecked.GetValue(element, null)); + } + return result.Value; + } + + public void BindEven(string name) + { + var element = doc.GetElementsByName(name).FirstElement; + var p = element.GetType().GetProperty("Name").GetValue(element, null); + if (p == null) + return; + string pName = p.ToString(); + switch (pName) + { + case "麻醉方式与手术体位": + SetValueById("field6", "Text", element.Text); + SetValueById("field12", "Text", GetValueById("field6", "Text")); + break; + case "体型(BMI)": + SetValueById("field7", "Text", element.Text); + break; + case "年龄": + SetValueById("field8", "Text", element.Text); + break; + case "皮肤": + SetValueById("field9", "Text", element.Text); + break; + case "预计手术时间": + SetValueById("field10", "Text", element.Text); + break; + case "手术施压": + SetValueById("field11", "Text", element.Text); + break; + default: + break; + } + + } + } +} \ No newline at end of file diff --git a/DocumentManagement/DocumentEntity/DocumentExtension.cs b/DocumentManagement/DocumentEntity/DocumentExtension.cs index 00d769f..9997077 100644 --- a/DocumentManagement/DocumentEntity/DocumentExtension.cs +++ b/DocumentManagement/DocumentEntity/DocumentExtension.cs @@ -10,6 +10,99 @@ namespace DocumentManagement { public static class DocumentExtension { + public static void GetDocumentValue(string DocName, XTextDocument Document, PatientRecord Patient) + { + if (DocName == "不计费耗材使用清单") + { + int j = 131; + int K = 211; + for (int i = 51; i < 113; i++) + { + SetTextValue(Document, "field" + K.ToString(), "field" + i.ToString(), "field" + j.ToString()); + j++; + K++; + } + int c1 = 113; + int c2 = 193; + for (int i = 35; i < 50; i++) + { + SetTextValue(Document, "field" + i.ToString(), "field" + c1.ToString(), "field" + c2.ToString()); + c1++; + c2++; + } + var AllPriceText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field50").FirstOrDefault(); + double Result = GetTextAllValue(Document, 131, 208); + if (Result != 0) + { + AllPriceText.Text = Result.ToString(); + } + } + if (DocName == "压疮风险评估表") + { + 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); + var BMItext = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field7").FirstOrDefault(); + if (BMItext.Text != "") Result += int.Parse(BMItext.Text); + var AgeText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (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(); + if (field9.Text != "") Result += int.Parse(field9.Text); + var field10 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field10").FirstOrDefault(); + if (field10.Text != "") Result += int.Parse(field10.Text); + var field11 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field11").FirstOrDefault(); + if (field11.Text != "") Result += int.Parse(field11.Text); + } + catch (Exception) + { + } + var field12 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field12").FirstOrDefault(); + if (Result != 0) field12.Text = Result.ToString(); + + } + } + public static void SetTextValue(XTextDocument Document, string one, string count, string price) + { + var onepriceText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == one).FirstOrDefault(); + var CountText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == count).FirstOrDefault(); + var PriceText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == price).FirstOrDefault(); + if (onepriceText != null && CountText != null && PriceText != null) + if (onepriceText.Text != "" && CountText.Text != "") + { + double num = double.Parse(CountText.Text); + double oneprice = double.Parse(onepriceText.Text); + PriceText.Text = (num * oneprice).ToString(); + } + + } + public static double GetTextAllValue(XTextDocument Document, int minNum, int maxNum) + { + double Result = 0; + for (int i = minNum; i < maxNum; i++) + { + var PriceText = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field" + i).FirstOrDefault(); + if (PriceText.Text != "") + { + double price = double.Parse(PriceText.Text); + Result += price; + } + } + return Result; + } public static void SetDocumentDefaultValue(string DocName, XTextDocument Document, PatientRecord Patient) { if (DocName == "压疮风险评估表") @@ -86,25 +179,25 @@ namespace DocumentManagement if (Age > 0) { - if (item.ID == "年龄_1" && (Age >= 80 || Age <= 1)) + if (item.ID == "年龄_1" && Age < 50) { item.Checked = true; if (AgeText != null) AgeText.Text = "1"; } - else if (item.ID == "年龄_2" && Age < 50) + else if (item.ID == "年龄_2" && Age >= 50 && Age <= 64) { item.Checked = true; if (AgeText != null) AgeText.Text = "2"; } - else if (item.ID == "年龄_3" && (Age >= 50 && Age <= 64)) + else if (item.ID == "年龄_3" && Age >= 65 && Age <= 79) { item.Checked = true; if (AgeText != null) AgeText.Text = "3"; } - else if (item.ID == "年龄_4" && (Age >= 65 && Age <= 79)) + else if (item.ID == "年龄_4" && (Age >= 80 || Age <= 1)) { item.Checked = true; if (AgeText != null) @@ -218,32 +311,4 @@ namespace DocumentManagement // break; // } //} - -//var p = element.GetType().GetProperty("Name").GetValue(element, null); -//if (p == null) -// return; -//string pName = p.ToString(); -//switch (pName) -//{ -// case "麻醉方式与手术体位": -// SetValueById("field6", "Text", element.Text); -// break; -// case "体型(BMI)": -// SetValueById("field7", "Text", element.Text); -// break; -// case "年龄": -// SetValueById("field8", "Text", element.Text); -// break; -// case "皮肤": -// SetValueById("field9", "Text", element.Text); -// break; -// case "预计手术时间": -// SetValueById("field10", "Text", element.Text); -// break; -// case "手术施压": -// SetValueById("field11", "Text", element.Text); -// break; -// default: -// break; -//} diff --git a/DocumentManagement/DocumentEntity/EventCodeCompiler.cs b/DocumentManagement/DocumentEntity/EventCodeCompiler.cs index f26421d..e83f8cc 100644 --- a/DocumentManagement/DocumentEntity/EventCodeCompiler.cs +++ b/DocumentManagement/DocumentEntity/EventCodeCompiler.cs @@ -65,13 +65,7 @@ namespace DocumentManagement } public static void MouseClickEvent(XTextElement element){ - -// var pName = element.GetType().GetProperty(""Name"").GetValue(element,null).ToString(); -// if(pName == null) return; -// if ((pName == ""高血压"" || pName == ""冠心病"" || pName == ""瓣膜病"" || pName == ""心律失常"") && GetCheckedValue(pName)) -// { -// SetCheckedValue(""心血管系统正常"",false); -// } + " + strMouseClickEvent + @" } diff --git a/DocumentManagement/DocumentManagement.csproj b/DocumentManagement/DocumentManagement.csproj index cbc9ade..fdb9b8d 100644 --- a/DocumentManagement/DocumentManagement.csproj +++ b/DocumentManagement/DocumentManagement.csproj @@ -54,6 +54,7 @@ + diff --git a/DocumentManagement/UI/frmTemplate.cs b/DocumentManagement/UI/frmTemplate.cs index 91dbda3..d591c0a 100644 --- a/DocumentManagement/UI/frmTemplate.cs +++ b/DocumentManagement/UI/frmTemplate.cs @@ -361,8 +361,7 @@ namespace DocumentManagement result = Convert.ToBoolean(pChecked.GetValue(element, null)); } return result.Value; - } - + } } } "; @@ -385,29 +384,7 @@ namespace DocumentManagement //myEditControl.Document.GetElementsByName("").FirstElement; } } - - private void SetCheckedValue(string name, bool value) - { - var element = myEditControl.Document.GetElementsByName(name).FirstElement; - if (element != null) - { - var pChecked = element.GetType().GetProperty("Checked"); - pChecked.SetValue(element, value, null); - } - } - - private bool GetCheckedValue(string name) - { - bool? result = null; - var element = myEditControl.Document.GetElementsByName(name).FirstElement; - if (element != null) - { - var pChecked = element.GetType().GetProperty("Checked"); - result = Convert.ToBoolean(pChecked.GetValue(element, null)); - } - return result.Value; - } - + /// /// Handle after load document /// diff --git a/DrawGraph/AreaManage/OperationRecord.cs b/DrawGraph/AreaManage/OperationRecord.cs index 947e41e..bd0492c 100644 --- a/DrawGraph/AreaManage/OperationRecord.cs +++ b/DrawGraph/AreaManage/OperationRecord.cs @@ -14,6 +14,7 @@ namespace DrawGraph private string hISPatientId; private string inHospitalNo; private string medicalHistoryNo; + private string visitTimes; private int? departmentId; private string name; private string sex; @@ -52,6 +53,13 @@ namespace DrawGraph set { medicalHistoryNo = value; } } + [ClassAttributs(Description = "住院次数")] + public string VisitTimes + { + get { return visitTimes; } + set { visitTimes = value; } + } + [ClassAttributs(Description = "科室编号")] public int? DepartmentId {