diff --git a/AIMS/OperationAanesthesia/frmFactSpeedyDrug.cs b/AIMS/OperationAanesthesia/frmFactSpeedyDrug.cs index 94ab544..e65c69d 100644 --- a/AIMS/OperationAanesthesia/frmFactSpeedyDrug.cs +++ b/AIMS/OperationAanesthesia/frmFactSpeedyDrug.cs @@ -284,7 +284,7 @@ namespace AIMS.PublicUI.UI } else if (_dataGridView.Rows[e.RowIndex].Cells[14].Value != null && _dataGridView.Rows[e.RowIndex].Cells[14].Value.ToString() != "") { - DateTime time = DateTime.Parse(_dataGridView.Rows[e.RowIndex].Cells[14].Value.ToString()); + DateTime time = DateTime.Parse(_dataGridView.Rows[e.RowIndex].Cells[14].Value.ToString()); starttime = time; } } @@ -1141,6 +1141,7 @@ namespace AIMS.PublicUI.UI DateTime begindate = new DateTime(_record.InRoomTime.Value.Year, _record.InRoomTime.Value.Month, _record.InRoomTime.Value.Day, DateTime.Now.Hour, DateTime.Now.Minute, 0); _dataGridView.CurrentRow.Cells[14].Value = begindate; } + if (tabDrugs.SelectedTab.Name == "P3") _dataGridView.CurrentRow.Cells[5].Value = "泵入"; index = 0; dgvYP.Visible = false; AddNewNullRows(); diff --git a/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs b/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs index e1c7aba..482cdaa 100644 --- a/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs +++ b/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs @@ -234,7 +234,7 @@ namespace AIMS.OperationAanesthesia var Text8 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement && (x as XTextInputFieldElement).Name == "批号").FirstOrDefault(); if (Text8 != null) - Text8.Text = fee.InsureNO; + Text8.Text = fee.InsureNO; } } else @@ -310,6 +310,10 @@ namespace AIMS.OperationAanesthesia && (x as XTextInputFieldElement).Name == "处方单号").FirstOrDefault(); if (Text8 != null) Text8.Text = "00" + fee.Extend4; + var Text9 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field18").FirstOrDefault(); + if (Text9 != null && fee.ChargName.Contains("瑞芬")) + Text9.Text = "术中静脉泵入"; DocumentExtension.SetDocumentDefaultValue(TModel.XmlFileName, myEditControl.Document, Patient); } string xmlStatic = DocumentDAL.GetEventXml(DModel.TemplateId); diff --git a/AIMS/OperationAfter/frmOperationCharg3.cs b/AIMS/OperationAfter/frmOperationCharg3.cs index d5dab51..8cfc5ee 100644 --- a/AIMS/OperationAfter/frmOperationCharg3.cs +++ b/AIMS/OperationAfter/frmOperationCharg3.cs @@ -105,12 +105,6 @@ namespace AIMS.OperationAfter.UI /// private void tsbSettingDGV_Click(object sender, EventArgs e) { - frmExportConfig formDataGridViewConfig = new frmExportConfig(dgvDrugs, exportConfig, DataGridViewPath, this.Text); - if (formDataGridViewConfig.ShowDialog() == DialogResult.OK) - { - exportConfig = formDataGridViewConfig.exportConfig; - ConfigDataGridView(formDataGridViewConfig.exportConfig); - } } private static string GetControlPath(Control control) { @@ -475,6 +469,41 @@ namespace AIMS.OperationAfter.UI } } } + else if (e.ColumnIndex == 14) + { + DialogResult dialog = MessageBox.Show("是否批量填写？", "系统提示", MessageBoxButtons.YesNo); + if (dialog == DialogResult.Yes) + { + string batchNo = dgvDrugs.Rows[e.RowIndex].Cells[14].EditedFormattedValue.ToString(); + for (int i = 0; i < dgvDrugs.Rows.Count; i++) + { + dgvDrugs.Rows[i].Cells[14].Value = batchNo; + } + } + } + else if (e.ColumnIndex == 15) + { + DialogResult dialog = MessageBox.Show("是否批量填写？", "系统提示", MessageBoxButtons.YesNo); + if (dialog == DialogResult.Yes) + { + string batchNo = dgvDrugs.Rows[e.RowIndex].Cells[15].EditedFormattedValue.ToString(); + for (int i = 0; i < dgvDrugs.Rows.Count; i++) + { + dgvDrugs.Rows[i].Cells[15].Value = batchNo; + } + } + } + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + frmExportConfig formDataGridViewConfig = new frmExportConfig(dgvDrugs, exportConfig, DataGridViewPath, this.Text); + if (formDataGridViewConfig.ShowDialog() == DialogResult.OK) + { + exportConfig = formDataGridViewConfig.exportConfig; + ConfigDataGridView(formDataGridViewConfig.exportConfig); + } + } } } diff --git a/AIMS/OperationAfter/frmOperationCharg3.designer.cs b/AIMS/OperationAfter/frmOperationCharg3.designer.cs index 62dd8cd..4165f59 100644 --- a/AIMS/OperationAfter/frmOperationCharg3.designer.cs +++ b/AIMS/OperationAfter/frmOperationCharg3.designer.cs @@ -28,14 +28,16 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.cboRoom = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label22 = new System.Windows.Forms.Label(); this.tsbSettingDGV = new System.Windows.Forms.Button(); @@ -99,9 +101,9 @@ this.dataGridViewTextBoxColumn31 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dgvDrugs = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.panel1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dtpEnd)).BeginInit(); @@ -109,7 +111,6 @@ this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvOperation)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvDrugs)).BeginInit(); - this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -126,6 +127,31 @@ this.panel1.Size = new System.Drawing.Size(1350, 51); this.panel1.TabIndex = 0; // + // toolStrip1 + // + this.toolStrip1.BackColor = System.Drawing.Color.AliceBlue; + this.toolStrip1.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(25, 25); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton2, + this.toolStripButton1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1350, 49); + this.toolStrip1.TabIndex = 36; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + 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(65, 46); + this.toolStripButton1.Text = "导出Excel"; + this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.toolStripButton1.Click += new System.EventHandler(this.button1_Click); + // // cboRoom // this.cboRoom.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -464,19 +490,19 @@ // dgvOperation // this.dgvOperation.AllowUserToAddRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(247)))), ((int)(((byte)(255))))); - this.dgvOperation.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(247)))), ((int)(((byte)(255))))); + this.dgvOperation.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; this.dgvOperation.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvOperation.BackgroundColor = System.Drawing.Color.Snow; this.dgvOperation.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvOperation.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 10F); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvOperation.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; this.dgvOperation.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvOperation.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, @@ -807,45 +833,45 @@ this.dgvDrugs.AllowUserToAddRows = false; this.dgvDrugs.AllowUserToResizeColumns = false; this.dgvDrugs.AllowUserToResizeRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.MintCream; - this.dgvDrugs.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.MintCream; + this.dgvDrugs.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; this.dgvDrugs.BackgroundColor = System.Drawing.Color.White; this.dgvDrugs.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; this.dgvDrugs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvDrugs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn21}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvDrugs.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvDrugs.DefaultCellStyle = dataGridViewCellStyle20; this.dgvDrugs.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvDrugs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.dgvDrugs.EnableHeadersVisualStyles = false; - this.dgvDrugs.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dgvDrugs.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvDrugs.Location = new System.Drawing.Point(480, 132); this.dgvDrugs.Margin = new System.Windows.Forms.Padding(0); this.dgvDrugs.MultiSelect = false; this.dgvDrugs.Name = "dgvDrugs"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDrugs.RowHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle21.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDrugs.RowHeadersDefaultCellStyle = dataGridViewCellStyle21; this.dgvDrugs.RowHeadersVisible = false; this.dgvDrugs.RowTemplate.Height = 25; this.dgvDrugs.ShowCellErrors = false; @@ -858,36 +884,23 @@ // dataGridViewTextBoxColumn21 // this.dataGridViewTextBoxColumn21.DataPropertyName = "id"; - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Red; - this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Red; + this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle19; this.dataGridViewTextBoxColumn21.HeaderText = "ID"; this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; this.dataGridViewTextBoxColumn21.Visible = false; this.dataGridViewTextBoxColumn21.Width = 30; // - // toolStrip1 + // toolStripButton2 // - this.toolStrip1.BackColor = System.Drawing.Color.AliceBlue; - this.toolStrip1.Font = new System.Drawing.Font("微软雅黑", 10.5F); - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(25, 25); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1350, 49); - this.toolStrip1.TabIndex = 36; - this.toolStrip1.Text = "toolStrip1"; - // - // toolStripButton1 - // - 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(65, 46); - this.toolStripButton1.Text = "导出Excel"; - this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.toolStripButton1.Click += new System.EventHandler(this.button1_Click); + this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 9F); + this.toolStripButton2.Image = global::AIMS.Properties.Resources.图标_设置; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(60, 46); + this.toolStripButton2.Text = "导出设置"; + this.toolStripButton2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // frmOperationCharg3 // @@ -904,6 +917,8 @@ this.Load += new System.EventHandler(this.frmOperationDruggCheck_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.panel4.ResumeLayout(false); @@ -913,8 +928,6 @@ this.groupBox1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvOperation)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvDrugs)).EndInit(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); this.ResumeLayout(false); } @@ -987,5 +1000,6 @@ private DevComponents.DotNetBar.ButtonX btnDelete; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/AIMS/Program.cs b/AIMS/Program.cs index 4ad07a0..c0829bd 100644 --- a/AIMS/Program.cs +++ b/AIMS/Program.cs @@ -133,7 +133,7 @@ namespace AIMS } else { - MessageBox.Show(e.Exception.Message + "\r\n" + e.Exception.StackTrace, "系统信息"); + //MessageBox.Show(e.Exception.Message + "\r\n" + e.Exception.StackTrace, "系统信息"); AIMSExtension.PublicMethod.WriteLog(e.Exception); } } diff --git a/AIMSEntity/BLL/Extension/BFeesRecordReport.cs b/AIMSEntity/BLL/Extension/BFeesRecordReport.cs index 1e98e11..2f36c0a 100644 --- a/AIMSEntity/BLL/Extension/BFeesRecordReport.cs +++ b/AIMSEntity/BLL/Extension/BFeesRecordReport.cs @@ -62,8 +62,8 @@ ROW_NUMBER() OVER (ORDER BY FeeCode ASC) AS noo, pt.MdrecNo 病志号或住址, FeesRecord.ExecWork 处方医生, FeesRecord.Extend5 发药人, - Conclusion 事故损耗, - IsInsure 结存数 + Conclusion 余量废弃, + IsInsure 废弃人签字 FROM FeesRecord LEFT JOIN Oris_Patient pt on pt.id=PatientId LEFT JOIN V_OperationRecordInfo voi on voi.RecoredId=FeesRecord.OperationRecordId diff --git a/AIMSEntity/BLL/Extension/BOperationRecord.cs b/AIMSEntity/BLL/Extension/BOperationRecord.cs index db19a39..717dd2c 100644 --- a/AIMSEntity/BLL/Extension/BOperationRecord.cs +++ b/AIMSEntity/BLL/Extension/BOperationRecord.cs @@ -33,11 +33,11 @@ namespace AIMSBLL return _record; } BOperationRecord.SelectSingle(PatientId, RecoverId, ref _record); - + if (_record.InRoomTime != null) { _record.OperationDate = _record.InRoomTime.Value.ToShortDateString(); - _record.OpeDay = _record.InRoomTime.Value.ToString("yyyy-MM-dd"); + _record.OpeDay = _record.InRoomTime.Value.ToString("yyyy-MM-dd"); } string ASALevel = ""; @@ -117,14 +117,8 @@ namespace AIMSBLL if (_record.Breath == null || _record.Breath == "") _record.Breath = "10"; - if (_record.OpeSpecialCondition == null || _record.OpeSpecialCondition == "") - _record.OpeSpecialCondition = "无特殊情况"; - if (_record.SpecialEvent == null || _record.SpecialEvent == "") - _record.SpecialEvent = "-"; - if (_record.Remark1 == null || _record.Remark1 == "") - _record.Remark1 = "-"; } - + _record.OpeRecordInfo = BOperationRecordInfo.SelectSingle("OperationRecordId=" + _record.Id, null); if (_record.OpeRecordInfo == null || _record.OpeRecordInfo.Id == null) { @@ -136,13 +130,51 @@ namespace AIMSBLL { _record.OpeRecordInfo.OperationLevel = OperationFrontdt.Rows[0]["OperationLevelName"].ToString(); } - - _record.OpeRecordInfo.InfoRemark = "-"; - _record.OpeRecordInfo.NeedleDirection = "-"; - + if (PublicMethod.HospitalName.Contains("漳浦")) + { + if (_record.OpeRecordInfo.InfoRemark == null || _record.OpeRecordInfo.InfoRemark == "") + _record.OpeRecordInfo.InfoRemark = "-"; + if (_record.OpeRecordInfo.NeedleDirection == null || _record.OpeRecordInfo.NeedleDirection == "") + _record.OpeRecordInfo.NeedleDirection = "-"; + if (_record.OpeRecordInfo.PunctureRemark2 == null || _record.OpeRecordInfo.PunctureRemark2 == "") + _record.OpeRecordInfo.PunctureRemark2 = "有"; + } _record.OpeRecordInfo.OperatorId = PublicMethod.OperatorName; _record.OpeRecordInfo.OperatorTime = DateTime.Now; _record.OpeRecordInfo.Id = BOperationRecordInfo.Insert(_record.OpeRecordInfo); + //是否启用默认项 + if (PublicMethod.HospitalName.Contains("漳浦")) + { + if (_record.OpeSpecialCondition == null || _record.OpeSpecialCondition == "") + _record.OpeSpecialCondition = "无特殊情况"; + if (_record.SpecialEvent == null || _record.SpecialEvent == "") + _record.SpecialEvent = "-"; + if (_record.Remark1 == null || _record.Remark1 == "") + _record.Remark1 = "-"; + if (_record.Remark2 == null || _record.Remark2 == "") + _record.Remark2 = "否"; + if (_record.SpileWard == null || _record.SpileWard == "") + _record.SpileWard = "手术室"; + if (_record.MuscleStrengthRecovery == null || _record.MuscleStrengthRecovery == "") + _record.MuscleStrengthRecovery = "差"; + if (_record.CoughReflex == null || _record.CoughReflex == "") + _record.CoughReflex = "有"; + if (_record.InOperaRoomState == null || _record.InOperaRoomState == "") + _record.InOperaRoomState = "清醒"; + if (_record.ControlledAnalgesia == null || _record.ControlledAnalgesia == "") + _record.ControlledAnalgesia = "无"; + if (_record.AnalgesiaRate == null || _record.AnalgesiaRate == "") + _record.AnalgesiaRate = "无"; + if (_record.AnalgesiaModel == null || _record.AnalgesiaModel == "") + _record.AnalgesiaModel = "-"; + if (_record.Pulse == null || _record.Pulse == "") + _record.Pulse = "病房"; + if (_record.RouteMonitoring == null || _record.RouteMonitoring == "") + _record.RouteMonitoring = "自主呼吸氧气"; + if (_record.Entourage == null || _record.Entourage == "") + _record.Entourage = "麻醉医师,护士"; + BOperationRecord.Update(_record); + } } _record.AnalgesiaRecord = BOperationRecordAnalgesia.SelectSingle("OperationRecordId=" + _record.Id, null); if (_record.AnalgesiaRecord == null || _record.AnalgesiaRecord.Id == null) diff --git a/AIMSEntity/DAL/Extension/DOperationApply.cs b/AIMSEntity/DAL/Extension/DOperationApply.cs index e3dd4a2..bc97c6c 100644 --- a/AIMSEntity/DAL/Extension/DOperationApply.cs +++ b/AIMSEntity/DAL/Extension/DOperationApply.cs @@ -326,7 +326,7 @@ namespace AIMSDAL { try { - string sql = string.Format(@"update OperationApply set {0} where state in(1,2,3,4) and PlanOperationTime<'" + SearchTime.ToString("yyyy-MM-dd 23:59:59") + "' and PlanOperationTime>'" + SearchTime.ToString("yyyy-MM-dd 00:00:00") + "' and OperationRoomId =" + CurrentRoom, DoctorNuresName); + string sql = string.Format(@"update OperationApply set {0} where state in(1,2,3,4,5) and PlanOperationTime<'" + SearchTime.ToString("yyyy-MM-dd 23:59:59") + "' and PlanOperationTime>'" + SearchTime.ToString("yyyy-MM-dd 00:00:00") + "' and OperationRoomId =" + CurrentRoom, DoctorNuresName); return DBHelper.ExecNonQuery(sql); } catch (Exception) diff --git a/DrawGraph/AreaManage/BaseInfoBottomManage.cs b/DrawGraph/AreaManage/BaseInfoBottomManage.cs index 36a9f37..9571553 100644 --- a/DrawGraph/AreaManage/BaseInfoBottomManage.cs +++ b/DrawGraph/AreaManage/BaseInfoBottomManage.cs @@ -89,16 +89,20 @@ namespace DrawGraph if (ableEdit.ClassDataSourceName == "OperationRecord.OperationDoctor" && myOpeRecord.OpeRecordInfo.Extend4 != null && myOpeRecord.OpeRecordInfo.Extend4 != "" && myOpeRecord.OpeRecordInfo.Extend4 != "|") { - text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText, myOpeRecord.OpeRecordInfo.Extend4 ); + text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText, myOpeRecord.OpeRecordInfo.Extend4); } else if (ableEdit.ClassDataSourceName == "OperationRecord.AnesthesiaDoctor" && myOpeRecord.OpeRecordInfo.Extend5 != null && myOpeRecord.OpeRecordInfo.Extend5 != "" && myOpeRecord.OpeRecordInfo.Extend5 != "|") { - text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText, myOpeRecord.OpeRecordInfo.Extend5 ); + text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText, myOpeRecord.OpeRecordInfo.Extend5); } else { text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText); } + if (ableEdit.ControlTitleText == "人员" && text == "") + { + text = "无"; + } //设置属性的值 template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value); break; @@ -545,6 +549,16 @@ namespace DrawGraph tokenEditor.Leave += TokenEditor_Leave2; } + if (ableEdit.ControlTitleText == "人员" && tokenEditor.SelectedTokens.Count > 0) + { + for (int i = tokenEditor.SelectedTokens.Count-1; i >= 0; i--) + { + if (tokenEditor.SelectedTokens[i].Text == "无") + { + tokenEditor.SelectedTokens.Remove(tokenEditor.SelectedTokens[i]); + } + } + } EditTextBox_DoubleClick(tokenEditor.EditTextBox, null); tokenEditor.EditTextBox.Select(); } diff --git a/DrawGraph/AreaManage/DBManage.cs b/DrawGraph/AreaManage/DBManage.cs index 10a5a6c..2941f34 100644 --- a/DrawGraph/AreaManage/DBManage.cs +++ b/DrawGraph/AreaManage/DBManage.cs @@ -426,6 +426,10 @@ namespace DrawGraph string[] Operationstr = Operation.Split(','); foreach (string OperationId in Operationstr) { + string Name = ""; + string sql = string.Format("select Name from Operation where Id = '{0}'", OperationId ); + object dt = DBHelper.ExecuteScalar(sql); + if (dt != null) { Name = dt.ToString(); } StringBuilder strSql = new StringBuilder(); strSql.Append("insert into [ApplyOperationInfo]("); strSql.Append("OperationApplyId,OperationId,OperatorNo,OperatorName,OperateDate,OperationName,LeftRemark,RightRemark"); @@ -436,7 +440,7 @@ namespace DrawGraph strSql.Append("'" + AIMSExtension.PublicMethod.OperatorNo + "',"); strSql.Append("'" + AIMSExtension.PublicMethod.OperatorName + "',"); strSql.Append("'" + DateTime.Now + "',"); - strSql.Append("'',");//" + FactOperationInfoObj.OperationName + " + strSql.Append("'" + Name + "',");//" + FactOperationInfoObj.OperationName + " strSql.Append("'',");//" + FactOperationInfoObj.LeftRemark + " strSql.Append("''");//" + FactOperationInfoObj.RightRemark + " strSql.Append(")"); diff --git a/DrawGraph/AreaManage/TokenEditorManage.cs b/DrawGraph/AreaManage/TokenEditorManage.cs index 8c57025..abf2141 100644 --- a/DrawGraph/AreaManage/TokenEditorManage.cs +++ b/DrawGraph/AreaManage/TokenEditorManage.cs @@ -22,9 +22,11 @@ namespace DrawGraph { case "OperationRecord.AnesthesiaDoctor": //麻醉医生 PersonType = "2"; + IsSearch = false; break; case "OperationRecord.OperationDoctor": PersonType = "0"; + IsSearch = false; break; case "OperationRecord.InstrumentNurse": PersonType = "3"; @@ -38,6 +40,9 @@ namespace DrawGraph case "OperationRecord.OrtherDoctorId": PersonType = "4"; break; + case "OperationRecord.AnaesthesiaMethodName": + IsSearch = false; + break; } DataTable dt = DBManage.GetDictDataTable(OpeRecord, txt.Text, aEdit.ControlTitleText, PersonType, (IsSearch == true ? aEdit.PackValue : "")); @@ -67,8 +72,8 @@ namespace DrawGraph tokenEditor.DropDownHeight = 250; break; } - if (tokenEditor.IsPopupOpen == false) - tokenEditor.IsPopupOpen = true; + //if (tokenEditor.IsPopupOpen == false) + tokenEditor.IsPopupOpen = true; //弹出下拉框 } catch (System.Exception ex) { @@ -112,7 +117,7 @@ namespace DrawGraph if (dt != null) { string name = dt.ToString(); - result = text.Replace(name, ""); + result = text.Replace(name, "");//.Replace(",", "，") } return result; } @@ -151,7 +156,7 @@ namespace DrawGraph if (aEdit.ClassDataSourceName == "OperationRecord.Applydiagnose") { - _template.SetObjValue(OpeRecord, "OperationRecord.Diagnose", Value, Key, true); + _template.SetObjValue(OpeRecord, "OperationRecord.Diagnose", Value, Key, true); } } public static void SaveDictItemText(TemplateManage _template, OperationRecord OpeRecord, TokenEditor tokenEditor, AbleEditPackObj aEdit, bool IsVisible = false) @@ -214,11 +219,6 @@ namespace DrawGraph Key = ""; Tag = ""; } - if (IsVisible == true) - aEdit.IsVisible = !aEdit.IsVisible; - if (aEdit.PackValue != Value) - //设置属性的值 - _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Key, true); if (aEdit.ClassDataSourceName == "OperationRecord.OperationDoctor") { @@ -228,6 +228,11 @@ namespace DrawGraph { _template.SetObjValue(OpeRecord, "OperationRecord.OpeRecordInfo.Extend5", Tag, Tag, true); } + if (IsVisible == true) + aEdit.IsVisible = !aEdit.IsVisible; + if (aEdit.PackValue != Value) + //设置属性的值 + _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Key, true); } } } diff --git a/DrawGraph/BoardPack/AbleEditPackObj.cs b/DrawGraph/BoardPack/AbleEditPackObj.cs index aab7357..511031b 100644 --- a/DrawGraph/BoardPack/AbleEditPackObj.cs +++ b/DrawGraph/BoardPack/AbleEditPackObj.cs @@ -385,12 +385,12 @@ namespace DrawGraph if (base.ClassDataSourceName == "OperationRecord.OpeRecordInfo.NeuroPlexusAround") //手术诊断 comboBox.MaxHeightLines = 1; comboBox.SelectedTokens.Clear(); - if (base.PackText.Contains(",")) + if (base.PackValue.Contains(",")) { string[] strArray1 = base.PackValue.Split(','); string[] strArray = base.PackText.Split(','); - for (int i = 0; i < strArray.Length; i++) + for (int i = 0; i < strArray1.Length; i++) { comboBox.SelectedTokens.Add(new DevComponents.DotNetBar.Controls.EditToken(strArray1[i], strArray[i])); } @@ -714,7 +714,7 @@ namespace DrawGraph DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = new DevComponents.DotNetBar.Controls.TokenEditor(); tokenEditor.BackgroundStyle.Class = "DateTimeInputBackground"; tokenEditor.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - tokenEditor.Separators.Add(","); + //tokenEditor.Separators.Add(","); this.control = tokenEditor; } else