From 949ef914f3543f10f585d26298b8bb4bace1f6d9 Mon Sep 17 00:00:00 2001 From: leomon Date: Wed, 14 Jun 2023 09:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=96=97=E6=96=87=E4=B9=A6=E7=B2=98?= =?UTF-8?q?=E8=B4=B4=E5=A4=84=E7=90=86=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/Extensions/EMRExtension.cs | 1 + .../frmAanesthesiaRecord.cs | 43 +++++++++++++------ .../frmSelectPatientNew2.cs | 7 ++- AIMSExtension/PublicMethod.cs | 4 +- .../DocumentEntity/EventCodeCompiler.cs | 18 +++++++- 5 files changed, 52 insertions(+), 21 deletions(-) diff --git a/AIMS/Extensions/EMRExtension.cs b/AIMS/Extensions/EMRExtension.cs index 535ccb1..28e64af 100644 --- a/AIMS/Extensions/EMRExtension.cs +++ b/AIMS/Extensions/EMRExtension.cs @@ -26,6 +26,7 @@ namespace AIMS frmFeesRecord frmchargRecord = new frmFeesRecord(_record, "麻醉"); frmchargRecord.Show(); frmchargRecord.BringToFront(); + frmchargRecord.TopMost = true; } } public static void OpenEMRS(int patientid, int applyid) diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index d8f6b95..c65e00e 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -1096,7 +1096,7 @@ namespace AIMS.OperationAanesthesia frmSelectPatient.isMainOpen = true; frmSelectPatient.tempfrmAnasRecord = this; frmSelectPatient.FormClosed += new FormClosedEventHandler(frmSelectPatient_FormClosed); - frmSelectPatient.ShowDialog(); + frmSelectPatient.ShowDialog(); } void frmSelectPatient_FormClosed(object sender, FormClosedEventArgs e) @@ -1226,7 +1226,7 @@ namespace AIMS.OperationAanesthesia frmFact.zgcAnaesRecord = zgcAnaesRecord; frmFact.DrugTypeId = RecoverId; // 事件类型 1 麻醉单事件 2 麻醉恢复单 frmFact.DrugsParam += FrmFactDrug_DrugsParam; - frmFact.ShowDialog(); + frmFact.ShowDialog(); } private void btnOperationInfo_Click(object sender, EventArgs e) @@ -1236,7 +1236,7 @@ namespace AIMS.OperationAanesthesia AIMS.OperationAanesthesia.frmOperationInfoNew2 frmOperationInfo = new frmOperationInfoNew2(); frmOperationInfo._record = _record; //frmOperationInfo.FormClosed += new FormClosedEventHandler(plRefresh_Click); - frmOperationInfo.ShowDialog(); + frmOperationInfo.ShowDialog(); } else { @@ -1253,7 +1253,7 @@ namespace AIMS.OperationAanesthesia frmFactDrug.zgcAnaesRecord = zgcAnaesRecord; frmFactDrug.DrugTypeId = RecoverId; // 事件类型 1 麻醉单事件 2 麻醉恢复单 frmFactDrug.DrugsParam += FrmFactDrug_DrugsParam; - frmFactDrug.ShowDialog(); + frmFactDrug.ShowDialog(); } else { @@ -1278,7 +1278,7 @@ namespace AIMS.OperationAanesthesia frmFactEventsNew.zgcAnaesRecord = zgcAnaesRecord; frmFactEventsNew.EventTypeId = RecoverId; // 事件类型 1 麻醉单事件 2 麻醉恢复单 frmFactEventsNew.EventParam += frmFactEventsNew_EventsParam; - frmFactEventsNew.ShowDialog(); + frmFactEventsNew.ShowDialog(); } else { @@ -1307,7 +1307,7 @@ namespace AIMS.OperationAanesthesia frmFactOutputLiquids.zgcAnaesRecord = zgcAnaesRecord; frmFactOutputLiquids.OutputLiquidTypeId = RecoverId; // 事件类型 1 麻醉单事件 2 麻醉恢复单 frmFactOutputLiquids.OutParam += FrmFactOutputLiquids_OutParam; - frmFactOutputLiquids.ShowDialog(); + frmFactOutputLiquids.ShowDialog(); } else { @@ -1324,7 +1324,7 @@ namespace AIMS.OperationAanesthesia { frmAanesthesiaQuality frmAnaseDataQuality = new frmAanesthesiaQuality(); frmAnaseDataQuality._record = _record; - frmAnaseDataQuality.ShowDialog(); + frmAnaseDataQuality.ShowDialog(); } private void btnCancelOperation_Click(object sender, EventArgs e) { @@ -1435,7 +1435,7 @@ namespace AIMS.OperationAanesthesia //刷新到当前页 ReviewEvent(); }); - frm.ShowDialog(); + frm.ShowDialog(); } private void btnBloodGasAnalysis_Click(object sender, EventArgs e) { @@ -1448,7 +1448,7 @@ namespace AIMS.OperationAanesthesia { reDrawAnalysis(); }); - frmFactBloodGasAnalysis.ShowDialog(); + frmFactBloodGasAnalysis.ShowDialog(); } else { @@ -1578,6 +1578,21 @@ namespace AIMS.OperationAanesthesia } } + + //有机械呼吸情况自主呼吸 + foreach (var pdTemp in physioDatas) + { + if (pdTemp.PhysioDataConfigId == 12) + { + foreach (var temp in physioDatas) + { + if (temp.PhysioDataConfigId == 3) + { + temp.Value = -1; + } + } + } + } foreach (var pdTemp in physioDatas) { if (pdTemp.Value < 0) continue; @@ -1860,7 +1875,7 @@ namespace AIMS.OperationAanesthesia templateManage.Bind("MonitorManage"); zgcAnaesRecord.Refresh(); }); - frm.ShowDialog(); + frm.ShowDialog(); }); menuStrip.Items.Add(mnuAddDrug); @@ -1890,7 +1905,7 @@ namespace AIMS.OperationAanesthesia if (PatientId == 0) return; frmPhysioDataUpdateLog Log = new frmPhysioDataUpdateLog(); Log.OperationRecordId = _record.Id.Value; - Log.ShowDialog(); + Log.ShowDialog(); } private void ModifyRoom_Click(object sender, EventArgs e) @@ -2468,7 +2483,7 @@ namespace AIMS.OperationAanesthesia fnc.textBox2.Focus(); fnc.groupBox1.Visible = false; } - fnc.ShowDialog(); + fnc.ShowDialog(); } private void btnxldlx_Click(object sender, EventArgs e) @@ -2570,8 +2585,6 @@ namespace AIMS.OperationAanesthesia ReviewEvent(); } } - #endregion - private void label11_Click(object sender, EventArgs e) { DialogResult dialog = MessageBox.Show("是否重启采集程序！", "系统提示", MessageBoxButtons.YesNo); @@ -2580,5 +2593,7 @@ namespace AIMS.OperationAanesthesia PublicMethod.StartCollectorDataProgram(true); } } + #endregion + } } diff --git a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs index 4ce14f2..02bcae6 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs +++ b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs @@ -347,13 +347,12 @@ namespace AIMS.OperationAanesthesia { if (frmAnasRecord.State == AIMSExtension.EditState.BROWSE) { - frmAnasRecord.Show(); - frmAnasRecord.BringToFront(); - frmAnasRecord.TopMost = true; + frmAnasRecord.Show(this); + frmAnasRecord.Focus(); } else frmAnasRecord.ShowDialog(); - + FillDgv(); } else diff --git a/AIMSExtension/PublicMethod.cs b/AIMSExtension/PublicMethod.cs index 07ee14d..bca9de6 100644 --- a/AIMSExtension/PublicMethod.cs +++ b/AIMSExtension/PublicMethod.cs @@ -624,7 +624,7 @@ namespace AIMSExtension System.Diagnostics.Process[] myProcesses = System.Diagnostics.Process.GetProcesses(); foreach (System.Diagnostics.Process myProcess in myProcesses) { - if (myProcess.ProcessName == "DataCollector2") + if (myProcess.ProcessName == "DataCollector2" || myProcess.ProcessName == "DataCollector") { myProcess.CloseMainWindow(); myProcess.Kill(); @@ -636,7 +636,7 @@ namespace AIMSExtension } if (Directory.Exists(@"C:\采集程序")) { - if (!PublicMethod.FindProcess("DataCollector2")) + if (!PublicMethod.FindProcess("DataCollector2") && !PublicMethod.FindProcess("DataCollector")) { Process myprocess = new Process(); ProcessStartInfo startInfo = new ProcessStartInfo(@"C:\采集程序\DataCollector.exe"); diff --git a/DocumentManagement/DocumentEntity/EventCodeCompiler.cs b/DocumentManagement/DocumentEntity/EventCodeCompiler.cs index 86f9047..e7e2917 100644 --- a/DocumentManagement/DocumentEntity/EventCodeCompiler.cs +++ b/DocumentManagement/DocumentEntity/EventCodeCompiler.cs @@ -29,11 +29,27 @@ namespace DocumentManagement eet = new ElementEventTemplate(); eet.MouseClick += new ElementMouseEventHandler(eetChk_MouseClick); eet.MouseDblClick += Eet_MouseDblClick; + eet.KeyUp += Eet_KeyUp; eet.ContentChanged += new ContentChangedEventHandler(eet_ContentChanged); myEditControl.GlobalEventTemplate_Element = eet; } + private void Eet_KeyUp(object eventSender, ElementKeyEventArgs args) + { + if (args.KeyCode == Keys.V && args.Control == true) + { + if ((eventSender as XTextDocument).CurrentInputField != null) + { + var element = (eventSender as XTextDocument).CurrentInputField; + if (element != null) + { + element.Text = element.Text.Replace("\r", "").Replace("\n",""); + } + } + } + } + public CompilerErrorCollection Errors { get { return cr.Errors; } } void eet_ContentChanged(object eventSender, ContentChangedEventArgs args) @@ -88,7 +104,7 @@ namespace DocumentManagement if (IsLoad) if (args.Element is XTextInputFieldElement) { - var element = args.Element as XTextInputFieldElement; + var element = args.Element as XTextInputFieldElement; if (element != null && element.Name == "Pacs") { var patientId = element.WriterControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement