From 7ff33d156b976e41733c53336c7197f905f0550c Mon Sep 17 00:00:00 2001 From: leomon Date: Mon, 15 May 2023 18:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=A3=80=E7=B4=A2=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=8A=A5=E9=94=99=20=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=90=8E=E9=87=8D=E7=BD=AE=E6=8E=A7=E4=BB=B6=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=87=BA=E5=AE=A4=E6=97=B6=E9=97=B4=E4=BB=A5=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=20=E4=BA=8B=E4=BB=B6=E6=9C=BA?= =?UTF-8?q?=E6=8E=A7=E5=91=BC=E5=90=B8=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmAanesthesiaPainlessRecord.cs | 143 +++-- .../frmAanesthesiaRecord.cs | 42 +- .../frmFactEventsNew.Designer.cs | 234 ++++---- AIMS/OperationAanesthesia/frmFactEventsNew.cs | 102 +++- AIMS/Program.cs | 2 +- AIMSEntity/DAL/AutoGenerate/DFactEvents.cs | 516 +++++++++--------- AIMSEntity/DAL/Extension/DFactEvents.cs | 10 +- AIMSEntity/Extensions/BOperationRecord.cs | 1 + AIMSEntity/ObjectQuery/FactEventsMap.cs | 4 + DrawGraph/AreaManage/FactEvents.cs | 36 ++ DrawGraph/AreaManage/PhysioDataConfig.cs | 27 + DrawGraph/AreaManage/TokenEditorManage.cs | 4 +- 12 files changed, 658 insertions(+), 463 deletions(-) diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs index c7402c1..8cc9f68 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs @@ -86,7 +86,7 @@ namespace AIMS.OperationAanesthesia btnChage.Visible = true; } //this.MaximizeBox = false; - this.MinimizeBox = false; + //this.MinimizeBox = false; LoadAnesRescue(); } @@ -436,13 +436,13 @@ namespace AIMS.OperationAanesthesia { if (PatientId == 0) return; DateTimeInput tb = sender as DateTimeInput; - if (_record != null && _record.OutRoomTime != null) - { - if ((tb.Name == "txtBG" || tb.Name == "txtCG") && tb.Text.Trim() == "") - { - return; - } - } + //if (_record != null && _record.OutRoomTime != null) + //{ + // if ((tb.Name == "txtBG" || tb.Name == "txtCG") && tb.Text.Trim() == "") + // { + // return; + // } + //} if (tb.Text.Trim() == "" && tb.CustomFormat == " ") { @@ -616,7 +616,7 @@ namespace AIMS.OperationAanesthesia { DrawGraph.FactEvents Inevent = null; DateTimeInput tb = obj as DateTimeInput; - if (_record.StateName == "手术中") + if (_record.StateName == "手术中" || tb.Name.Equals("txtCG") || tb.Name.Equals("txtBG")) { DeleteEventTime("txtAnaesthesiaBegin", "麻醉开始", tb, ref Inevent); DeleteEventTime("txtOperationBegin", "手术开始", tb, ref Inevent); @@ -753,10 +753,18 @@ namespace AIMS.OperationAanesthesia { curTimeTemp = _record.lastPageBegin; } - if (state != 1) + if (state == 0) { Inevent = BFactEvents.Insert(PatientId, EventName, curTimeTemp, curTimeTemp, RecoverId); } + else if (state == 2) + { + string eventName = ""; + if (EventName == "插管" || EventName == "喉罩") eventName = "'3','9'"; + if (EventName == "拔管" || EventName == "拔喉罩") eventName = "'4','10'"; + BFactEvents.Delete(" EventId in (" + eventName + ") and PatientId=" + PatientId, null); + Inevent = BFactEvents.Insert(PatientId, EventName, curTimeTemp, curTimeTemp, RecoverId); + } else { updateEventTime(EventName, curTimeTemp, ref Inevent); @@ -1004,7 +1012,7 @@ namespace AIMS.OperationAanesthesia zgcAnaesRecord.Visible = false; timerLoadAnesRescue = new System.Windows.Forms.Timer(components); timerLoadAnesRescue.Enabled = true;//调试时设置为FALSE ， - timerLoadAnesRescue.Interval = 300; + timerLoadAnesRescue.Interval = 200; timerLoadAnesRescue.Tick -= TimerLoadAnesRescue_Tick; timerLoadAnesRescue.Tick += TimerLoadAnesRescue_Tick; timerLoadAnesRescue.Start(); @@ -1059,6 +1067,7 @@ namespace AIMS.OperationAanesthesia btnCancelOperation.Enabled = false; btnCancelIn.Enabled = false; LastMonitorDataTime = null; + LastAnesMonitorDataTime = null; ClearTimeText(); if (templateManage != null) { @@ -1351,6 +1360,7 @@ namespace AIMS.OperationAanesthesia #region 采集程序 public DateTime? LastMonitorDataTime = null; + public DateTime? LastAnesMonitorDataTime = null; private void timerGetCollectorData_Tick() { if (State == AIMSExtension.EditState.BROWSE || _record.StateName != "手术中" || NowRoom == null || isReadOnly == true) return; @@ -1392,6 +1402,31 @@ namespace AIMS.OperationAanesthesia } } + if (LastAnesMonitorDataTime == null || dtTime > LastAnesMonitorDataTime.Value.AddMinutes(9)) + { + foreach (PhysioDataConfig addPP in _record.PhysioAnesConfigList) + { + string key = addPP.Name; + string value = addPP.Enname; + if (addPP.IsValid == false) continue; + if (value == null || value == "") continue; + if (_record.AnesthesiaBeginTime != null && InsertTime < _record.AnesthesiaBeginTime) continue; + LastAnesMonitorDataTime = dtTime; + + int minMinutes = -5; + DataTable dtPhysioData = BOperationRecord.getPhysioDataByTimeName(NowRoom.Ip, value, InsertTime.AddMinutes(minMinutes), InsertTime.AddSeconds(1)); + if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) + { + foreach (DataRow dr in dtPhysioData.Rows) + { + PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, dtTime, dr["ParamValue"].ToString()); + physioDatas.Add(pdTemp); + continue; + } + } + } + } + //有有创清空无创 foreach (var pdTemp in physioDatas) { @@ -1420,9 +1455,16 @@ namespace AIMS.OperationAanesthesia foreach (var pdTemp in physioDatas) { if (pdTemp.Value < 0) continue; - PhysioDataConfig addPP = _record.PhysioConfigList.Where(a => pdTemp.PhysioDataConfigId == a.Id).ToList()[0]; - addPP.AddPointItem(pdTemp); - date++; + List addPP = _record.PhysioConfigList.Where(a => pdTemp.PhysioDataConfigId == a.Id).ToList(); + if (addPP == null || addPP.Count == 0) + { + addPP = _record.PhysioAnesConfigList.Where(a => pdTemp.PhysioDataConfigId == a.Id).ToList(); + } + if (addPP != null && addPP.Count > 0) + { + addPP[0].AddPointItem(pdTemp); + date++; + } } if (dtTime > _record.lastPageBegin && ((TimeSpan)(dtTime - _record.lastPageBegin)).TotalHours < 24 && date > 0) @@ -1596,6 +1638,7 @@ namespace AIMS.OperationAanesthesia if (timerGetTextCollectorData != null) { LastMonitorDataTime = null; + LastAnesMonitorDataTime = null; timerGetTextCollectorData.Enabled = false; timerGetTextCollectorData.Stop(); } @@ -1766,53 +1809,52 @@ namespace AIMS.OperationAanesthesia if (dr["ParameterName"] != null && dr["ParameterName"].ToString() != "" && dr["ParameterName"].ToString().Equals(addPP.Id.ToString())) { DateTime RecordTime = DateTime.Parse(dr["InsertTime"].ToString()); + if (RecordTime < _record.InRoomTime) continue; if (!isCgtime(addPP.Name, RecordTime)) continue; PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, RecordTime, dr["ParamValue"].ToString()); addPP.AddPointItem(pdTemp); } } } - //foreach (var addPP in _record.PhysioAnesConfigList) - //{ - // if (addPP.IsValid == false) continue; - // foreach (DataRow dr in dtPhysioData.Rows) - // { - // if (dr["ParameterName"] != null && dr["ParameterName"].ToString() != "" && dr["ParameterName"].ToString().Equals(addPP.Id.ToString())) - // { - // DateTime RecordTime = DateTime.Parse(dr["InsertTime"].ToString()); - // PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, RecordTime, dr["ParamValue"].ToString()); - // addPP.AddPointItem(pdTemp); - // } - // } - //} + foreach (var addPP in _record.PhysioAnesConfigList) + { + if (addPP.IsValid == false) continue; + foreach (DataRow dr in dtPhysioData.Rows) + { + if (dr["ParameterName"] != null && dr["ParameterName"].ToString() != "" && dr["ParameterName"].ToString().Equals(addPP.Id.ToString())) + { + DateTime RecordTime = DateTime.Parse(dr["InsertTime"].ToString()); + if (RecordTime < _record.InRoomTime) continue; + PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, RecordTime, dr["ParamValue"].ToString()); + addPP.AddPointItem(pdTemp); + } + } + } } } private void UpdatePhysioDataResp() { BOperationRecord.UpdatePhysioDataRespByTime(_record); - //获取机控呼吸时间范围 值 - //机控时间范围点重置 开始到结束删除+画点 - - //string PhysioDataConfigIds = "3,12"; - //DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value, PhysioDataConfigIds); - //List Ids = PhysioDataConfigIds.Split(',').ToList(); - //if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) - //{ - // foreach (PhysioDataConfig addPP in _record.PhysioConfigList) - // { - // if (!Ids.Contains(addPP.Id.ToString())) continue; - // addPP.clearAddObj(zgcAnaesRecord); - // if (addPP.IsDefalultShow == false) continue; - // for (int i = 0; i < dtPhysioData.Rows.Count; i++) - // { - // if (dtPhysioData.Rows[i]["Name"].ToString().Equals(addPP.Name.ToString())) - // { - // PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, DateTime.Parse(dtPhysioData.Rows[i]["RecordTime"].ToString()), dtPhysioData.Rows[i]["Value"].ToString()); - // addPP.AddPointItem(pdTemp, false); - // } - // } - // } - //} + string PhysioDataConfigIds = "3,12"; + DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value, PhysioDataConfigIds); + List Ids = PhysioDataConfigIds.Split(',').ToList(); + if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) + { + foreach (PhysioDataConfig addPP in _record.PhysioConfigList) + { + if (!Ids.Contains(addPP.Id.ToString())) continue; + addPP.clearAddObj(zgcAnaesRecord); + if (addPP.IsDefalultShow == false) continue; + for (int i = 0; i < dtPhysioData.Rows.Count; i++) + { + if (dtPhysioData.Rows[i]["Name"].ToString().Equals(addPP.Name.ToString())) + { + PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, DateTime.Parse(dtPhysioData.Rows[i]["RecordTime"].ToString()), dtPhysioData.Rows[i]["Value"].ToString()); + addPP.AddPointItem(pdTemp, false); + } + } + } + } } private void clearSelectCouve_Click(Object sender, EventArgs e) @@ -1899,6 +1941,7 @@ namespace AIMS.OperationAanesthesia } if (_record.SpileInTime != null) { + this.cmbCGType.SelectedIndexChanged -= new System.EventHandler(this.cmbCGType_SelectedIndexChanged); cmbCGType.Text = _record.InCGType; txtCG.CustomFormat = "MM-dd HH:mm"; txtCG.Tag = _record.SpileInTime.Value; diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index 5f934ff..e93b7e6 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -1932,6 +1932,7 @@ namespace AIMS.OperationAanesthesia if (dr["ParameterName"] != null && dr["ParameterName"].ToString() != "" && dr["ParameterName"].ToString().Equals(addPP.Id.ToString())) { DateTime RecordTime = DateTime.Parse(dr["InsertTime"].ToString()); + if (RecordTime < _record.InRoomTime) continue; if (!isCgtime(addPP.Name, RecordTime)) continue; PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, RecordTime, dr["ParamValue"].ToString()); addPP.AddPointItem(pdTemp); @@ -1946,6 +1947,7 @@ namespace AIMS.OperationAanesthesia if (dr["ParameterName"] != null && dr["ParameterName"].ToString() != "" && dr["ParameterName"].ToString().Equals(addPP.Id.ToString())) { DateTime RecordTime = DateTime.Parse(dr["InsertTime"].ToString()); + if (RecordTime < _record.InRoomTime) continue; PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, RecordTime, dr["ParamValue"].ToString()); addPP.AddPointItem(pdTemp); } @@ -1956,26 +1958,26 @@ namespace AIMS.OperationAanesthesia private void UpdatePhysioDataResp() { BOperationRecord.UpdatePhysioDataRespByTime(_record); - //string PhysioDataConfigIds = "3,12"; - //DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value, PhysioDataConfigIds); - //List Ids = PhysioDataConfigIds.Split(',').ToList(); - //if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) - //{ - // foreach (PhysioDataConfig addPP in _record.PhysioConfigList) - // { - // if (!Ids.Contains(addPP.Id.ToString())) continue; - // addPP.clearAddObj(zgcAnaesRecord); - // if (addPP.IsDefalultShow == false) continue; - // for (int i = 0; i < dtPhysioData.Rows.Count; i++) - // { - // if (dtPhysioData.Rows[i]["Name"].ToString().Equals(addPP.Name.ToString())) - // { - // PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, DateTime.Parse(dtPhysioData.Rows[i]["RecordTime"].ToString()), dtPhysioData.Rows[i]["Value"].ToString()); - // addPP.AddPointItem(pdTemp, false); - // } - // } - // } - //} + string PhysioDataConfigIds = "3,12"; + DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value, PhysioDataConfigIds); + List Ids = PhysioDataConfigIds.Split(',').ToList(); + if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) + { + foreach (PhysioDataConfig addPP in _record.PhysioConfigList) + { + if (!Ids.Contains(addPP.Id.ToString())) continue; + addPP.clearAddObj(zgcAnaesRecord); + if (addPP.IsDefalultShow == false) continue; + for (int i = 0; i < dtPhysioData.Rows.Count; i++) + { + if (dtPhysioData.Rows[i]["Name"].ToString().Equals(addPP.Name.ToString())) + { + PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, DateTime.Parse(dtPhysioData.Rows[i]["RecordTime"].ToString()), dtPhysioData.Rows[i]["Value"].ToString()); + addPP.AddPointItem(pdTemp, false); + } + } + } + } } private void clearSelectCouve_Click(Object sender, EventArgs e) diff --git a/AIMS/OperationAanesthesia/frmFactEventsNew.Designer.cs b/AIMS/OperationAanesthesia/frmFactEventsNew.Designer.cs index f9301b1..92454e4 100644 --- a/AIMS/OperationAanesthesia/frmFactEventsNew.Designer.cs +++ b/AIMS/OperationAanesthesia/frmFactEventsNew.Designer.cs @@ -41,13 +41,6 @@ namespace AIMS.PublicUI.UI this.btnAdd = new DevComponents.DotNetBar.ButtonX(); this.btnSave = new DevComponents.DotNetBar.ButtonX(); this.dgvEvents = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.TypeName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.EventName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.BeginTime = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); - this.Continue = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.EndTime = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); - this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Remark = new AIMS.PublicUI.UI.DataGridViewComboEditTipBoxColumn(); this.panel1 = new System.Windows.Forms.Panel(); this.TabSelEvents = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); @@ -70,6 +63,13 @@ namespace AIMS.PublicUI.UI this.dataGridViewComboEditTipBoxColumn1 = new AIMS.PublicUI.UI.DataGridViewComboEditTipBoxColumn(); this.dataGridViewComboEditBoxColumn1 = new AIMS.PublicUI.UI.DataGridViewComboEditBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.TypeName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.EventName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BeginTime = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); + this.Continue = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.EndTime = new DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn(); + this.EventValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Remark = new AIMS.PublicUI.UI.DataGridViewComboEditTipBoxColumn(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvEvents)).BeginInit(); this.panel1.SuspendLayout(); @@ -188,7 +188,7 @@ namespace AIMS.PublicUI.UI this.BeginTime, this.Continue, this.EndTime, - this.Value, + this.EventValue, this.Remark}); dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; @@ -223,114 +223,6 @@ namespace AIMS.PublicUI.UI this.dgvEvents.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvEvents_EditingControlShowing); this.dgvEvents.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvEvents_RowsAdded); // - // TypeName - // - this.TypeName.HeaderText = "类型"; - this.TypeName.Name = "TypeName"; - this.TypeName.Visible = false; - this.TypeName.Width = 60; - // - // EventName - // - this.EventName.HeaderText = "事件名称"; - this.EventName.Name = "EventName"; - this.EventName.Width = 290; - // - // BeginTime - // - this.BeginTime.AutoAdvance = true; - // - // - // - this.BeginTime.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.BeginTime.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; - this.BeginTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.BeginTime.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; - this.BeginTime.ButtonDropDown.Visible = true; - this.BeginTime.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; - this.BeginTime.HeaderText = "开始时间"; - this.BeginTime.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; - // - // - // - // - // - // - this.BeginTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.BeginTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - // - // - // - this.BeginTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.BeginTime.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); - this.BeginTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; - // - // - // - this.BeginTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.BeginTime.MonthCalendar.Visible = false; - this.BeginTime.Name = "BeginTime"; - this.BeginTime.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.BeginTime.Width = 90; - // - // Continue - // - this.Continue.HeaderText = "持续"; - this.Continue.Name = "Continue"; - this.Continue.Width = 60; - // - // EndTime - // - this.EndTime.AutoAdvance = true; - // - // - // - this.EndTime.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.EndTime.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; - this.EndTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.EndTime.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; - this.EndTime.ButtonDropDown.Visible = true; - this.EndTime.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; - this.EndTime.HeaderText = "结束时间"; - this.EndTime.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; - // - // - // - // - // - // - this.EndTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.EndTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); - // - // - // - this.EndTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.EndTime.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); - this.EndTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; - // - // - // - this.EndTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.EndTime.MonthCalendar.Visible = false; - this.EndTime.Name = "EndTime"; - this.EndTime.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.EndTime.Width = 90; - // - // Value - // - this.Value.HeaderText = "值"; - this.Value.Name = "Value"; - this.Value.Width = 65; - // - // Remark - // - this.Remark.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox; - this.Remark.HeaderText = "备注"; - this.Remark.Name = "Remark"; - this.Remark.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Remark.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.Remark.Width = 235; - // // panel1 // this.panel1.BackColor = System.Drawing.Color.PaleTurquoise; @@ -547,6 +439,114 @@ namespace AIMS.PublicUI.UI this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.Width = 200; // + // TypeName + // + this.TypeName.HeaderText = "类型"; + this.TypeName.Name = "TypeName"; + this.TypeName.Visible = false; + this.TypeName.Width = 60; + // + // EventName + // + this.EventName.HeaderText = "事件名称"; + this.EventName.Name = "EventName"; + this.EventName.Width = 290; + // + // BeginTime + // + this.BeginTime.AutoAdvance = true; + // + // + // + this.BeginTime.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; + this.BeginTime.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; + this.BeginTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.BeginTime.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; + this.BeginTime.ButtonDropDown.Visible = true; + this.BeginTime.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; + this.BeginTime.HeaderText = "开始时间"; + this.BeginTime.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; + // + // + // + // + // + // + this.BeginTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.BeginTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + // + // + // + this.BeginTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.BeginTime.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); + this.BeginTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + // + // + // + this.BeginTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.BeginTime.MonthCalendar.Visible = false; + this.BeginTime.Name = "BeginTime"; + this.BeginTime.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.BeginTime.Width = 90; + // + // Continue + // + this.Continue.HeaderText = "持续"; + this.Continue.Name = "Continue"; + this.Continue.Width = 60; + // + // EndTime + // + this.EndTime.AutoAdvance = true; + // + // + // + this.EndTime.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; + this.EndTime.BackgroundStyle.Class = "DataGridViewDateTimeBorder"; + this.EndTime.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.EndTime.BackgroundStyle.TextColor = System.Drawing.SystemColors.WindowText; + this.EndTime.ButtonDropDown.Visible = true; + this.EndTime.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime; + this.EndTime.HeaderText = "结束时间"; + this.EndTime.InputHorizontalAlignment = DevComponents.Editors.eHorizontalAlignment.Left; + // + // + // + // + // + // + this.EndTime.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.EndTime.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1); + // + // + // + this.EndTime.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.EndTime.MonthCalendar.DisplayMonth = new System.DateTime(2018, 1, 1, 0, 0, 0, 0); + this.EndTime.MonthCalendar.FirstDayOfWeek = System.DayOfWeek.Monday; + // + // + // + this.EndTime.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.EndTime.MonthCalendar.Visible = false; + this.EndTime.Name = "EndTime"; + this.EndTime.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.EndTime.Width = 90; + // + // EventValue + // + this.EventValue.HeaderText = "值"; + this.EventValue.Name = "EventValue"; + this.EventValue.Width = 65; + // + // Remark + // + this.Remark.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox; + this.Remark.HeaderText = "备注"; + this.Remark.Name = "Remark"; + this.Remark.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Remark.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.Remark.Width = 235; + // // frmFactEventsNew // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -608,7 +608,7 @@ namespace AIMS.PublicUI.UI private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn BeginTime; private System.Windows.Forms.DataGridViewTextBoxColumn Continue; private DevComponents.DotNetBar.Controls.DataGridViewDateTimeInputColumn EndTime; - private System.Windows.Forms.DataGridViewTextBoxColumn Value; + private System.Windows.Forms.DataGridViewTextBoxColumn EventValue; private DataGridViewComboEditTipBoxColumn Remark; } } \ No newline at end of file diff --git a/AIMS/OperationAanesthesia/frmFactEventsNew.cs b/AIMS/OperationAanesthesia/frmFactEventsNew.cs index 820e17f..9f861a0 100644 --- a/AIMS/OperationAanesthesia/frmFactEventsNew.cs +++ b/AIMS/OperationAanesthesia/frmFactEventsNew.cs @@ -264,10 +264,11 @@ namespace AIMS.PublicUI.UI { if (item.EventEndTime != item.EventBeginTime) { + this.dgvEvents.Rows[index].Cells["Continue"].Value = "-->"; this.dgvEvents.Rows[index].Cells["EndTime"].Value = item.EventEndTime; } } - //this.dgvEvents.Rows[index].Cells["Value"].Value = item.Value; + this.dgvEvents.Rows[index].Cells["EventValue"].Value = item.EventValue; } for (int i = 0; i < dgvEvents.Columns.Count; i++) { @@ -496,10 +497,10 @@ namespace AIMS.PublicUI.UI { _event.Remark = ""; } - //if (dr.Cells["Value"].EditedFormattedValue.ToString() != "") - //{ - // _event.Value = dr.Cells["Value"].Value.ToString(); - //} + if (dr.Cells["EventValue"].EditedFormattedValue.ToString() != "") + { + _event.EventValue = dr.Cells["EventValue"].Value.ToString(); + } _event.IsContinue = dr.Cells["Continue"].EditedFormattedValue.ToString() != "" ? 1 : 0; if (dr.Tag == null) @@ -554,6 +555,36 @@ namespace AIMS.PublicUI.UI private void SetEventTime(FactEvents _event, ref bool IsChage) { + if (_event != null && _event.EventName == "机控呼吸") + { + if (_event.EventValue != null) + { + DateTime EventEndTime = _event.EventEndTime.Value; + if (_event.IsContinue == 1 && _event.EventEndTime.Value == _event.EventBeginTime.Value) + { + EventEndTime = OperationRecord.getOpeMaxTime(_record); + } + if (EventEndTime > DateTime.Now) EventEndTime = DateTime.Now; + DateTime insTime = GetRecordTime(_event.EventBeginTime.Value); + TimeSpan tsp = EventEndTime - insTime; + + List PhysioDatas = new List(); + foreach (var addPP in _record.PhysioConfigList) + { + if (addPP.Id != 12) continue; + for (int i = 0; i < (tsp.TotalMinutes / 5); i++) + { + PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, insTime.AddMinutes(i * 5), Convert.ToInt32(_event.EventValue)); + PhysioDatas.Add(pdTemp); + } + } + if (PhysioDatas.Count > 0) + { + PhysioDataService.AddPhysioDatas(PhysioDatas); + UpdatePhysioDataResp(); + } + } + } if (_event != null && _event.EventName == "入室" && _record.InRoomTime != _event.EventBeginTime) { _record.InRoomTime = _event.EventBeginTime; IsChage = true; @@ -609,8 +640,27 @@ namespace AIMS.PublicUI.UI BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } } + public DateTime GetRecordTime(DateTime pdTemp, int collectInterval = 5) + { + DateTime result = Convert.ToDateTime(pdTemp.ToString("yyyy-MM-dd HH:mm:00.000")); + //小于入室时间默认不画 + for (int i = 0; i < (480 / 5); i++) + {//InRoomTime.Value + DateTime tempTime = _record.PageBegin.AddMinutes(i * 5); + if (tempTime >= result && result < tempTime.AddMinutes(5)) + { + result = tempTime; + break; + } + } + return result; + } private void DelEventTime(FactEvents _event) { + if (_event != null && _event.EventName == "机控呼吸") + { + UpdatePhysioDataResp(); + } //if (_event != null && _event.EventName == "入室" ) { _record.InRoomTime = null; } if (_event != null && _event.EventName == "手术开始") { @@ -891,27 +941,27 @@ namespace AIMS.PublicUI.UI public void UpdatePhysioDataResp() { BOperationRecord.UpdatePhysioDataRespByTime(_record); - //string PhysioDataConfigIds = "3,12"; - //DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value, PhysioDataConfigIds); - //List Ids = PhysioDataConfigIds.Split(',').ToList(); - //if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) - //{ - // foreach (PhysioDataConfig addPP in _record.PhysioConfigList) - // { - // if (!Ids.Contains(addPP.Id.ToString())) continue; - // if (zgcAnaesRecord != null) - // addPP.clearAddObj(zgcAnaesRecord); - // if (addPP.IsDefalultShow == false) continue; - // for (int i = 0; i < dtPhysioData.Rows.Count; i++) - // { - // if (dtPhysioData.Rows[i]["Name"].ToString().Equals(addPP.Name.ToString())) - // { - // PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, DateTime.Parse(dtPhysioData.Rows[i]["RecordTime"].ToString()), dtPhysioData.Rows[i]["Value"].ToString()); - // addPP.AddPointItem(pdTemp, false); - // } - // } - // } - //} + string PhysioDataConfigIds = "3,12"; + DataTable dtPhysioData = BOperationRecord.getByOpeIDIsPhysioData(_record.Id.Value, PhysioDataConfigIds); + List Ids = PhysioDataConfigIds.Split(',').ToList(); + if (dtPhysioData != null && dtPhysioData.Rows.Count > 0) + { + foreach (PhysioDataConfig addPP in _record.PhysioConfigList) + { + if (!Ids.Contains(addPP.Id.ToString())) continue; + if (zgcAnaesRecord != null) + addPP.clearAddObj(zgcAnaesRecord); + if (addPP.IsDefalultShow == false) continue; + for (int i = 0; i < dtPhysioData.Rows.Count; i++) + { + if (dtPhysioData.Rows[i]["Name"].ToString().Equals(addPP.Name.ToString())) + { + PhysioData pdTemp = PhysioDataConfig.newPhysioData(addPP, _record.Id.Value, DateTime.Parse(dtPhysioData.Rows[i]["RecordTime"].ToString()), dtPhysioData.Rows[i]["Value"].ToString()); + addPP.AddPointItem(pdTemp, false); + } + } + } + } } private void dgvEvents_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) diff --git a/AIMS/Program.cs b/AIMS/Program.cs index c0829bd..4ad07a0 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/DAL/AutoGenerate/DFactEvents.cs b/AIMSEntity/DAL/AutoGenerate/DFactEvents.cs index e3cbe31..c25250f 100644 --- a/AIMSEntity/DAL/AutoGenerate/DFactEvents.cs +++ b/AIMSEntity/DAL/AutoGenerate/DFactEvents.cs @@ -10,77 +10,81 @@ using DrawGraph; namespace AIMSDAL { internal partial class DFactEvents - { - #region 插入实体操作部份 - /// + { + #region 插入实体操作部份 + /// /// 插入 /// - /// Command对象 + /// Command对象 /// 实体类对象 /// 标识列值或影响的记录行数 - internal static int Insert(SqlCommand cmd, FactEvents factEvents) - { - cmd.Parameters.Clear(); - cmd.CommandText = "insert into FactEvents (EventTypeId,PatientId,EventId,EventBeginTime,EventEndTime,IsContinue,Remark,OperatorNo,OperatorName,OperateDate) values (@EventTypeId,@PatientId,@EventId,@EventBeginTime,@EventEndTime,@IsContinue,@Remark,@OperatorNo,@OperatorName,@OperateDate);select @@identity"; - //从实体中取出值放入Command的参数列表 - cmd.Parameters.Add(new SqlParameter("@EventTypeId", factEvents.EventTypeId.HasValue ? (object)factEvents.EventTypeId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@PatientId", factEvents.PatientId.HasValue ? (object)factEvents.PatientId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@EventId", factEvents.EventId.HasValue ? (object)factEvents.EventId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@EventBeginTime", factEvents.EventBeginTime.HasValue ? (object)factEvents.EventBeginTime.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@EventEndTime", factEvents.EventEndTime.HasValue ? (object)factEvents.EventEndTime.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@IsContinue", factEvents.IsContinue.HasValue ? (object)factEvents.IsContinue.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@Remark", factEvents.Remark == null ? (object)DBNull.Value : (object)factEvents.Remark)); - cmd.Parameters.Add(new SqlParameter("@OperatorNo", factEvents.OperatorNo == null ? (object)DBNull.Value : (object)factEvents.OperatorNo)); - cmd.Parameters.Add(new SqlParameter("@OperatorName", factEvents.OperatorName == null ? (object)DBNull.Value : (object)factEvents.OperatorName)); - cmd.Parameters.Add(new SqlParameter("@OperateDate", factEvents.OperateDate.HasValue ? (object)factEvents.OperateDate.Value : (object)DBNull.Value)); - return Convert.ToInt32(cmd.ExecuteScalar()); - } - /// + internal static int Insert(SqlCommand cmd, FactEvents factEvents) + { + cmd.Parameters.Clear(); + cmd.CommandText = "insert into FactEvents (EventTypeId,PatientId,EventId,EventBeginTime,EventEndTime,IsContinue,Remark,OperatorNo,OperatorName,OperateDate,EventValue,Extend1,Extend2,Extend3) values (@EventTypeId,@PatientId,@EventId,@EventBeginTime,@EventEndTime,@IsContinue,@Remark,@OperatorNo,@OperatorName,@OperateDate,@EventValue,@Extend1,@Extend2,@Extend3);select @@identity"; + //从实体中取出值放入Command的参数列表 + cmd.Parameters.Add(new SqlParameter("@EventTypeId",factEvents.EventTypeId.HasValue?(object)factEvents.EventTypeId.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@PatientId",factEvents.PatientId.HasValue?(object)factEvents.PatientId.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventId",factEvents.EventId.HasValue?(object)factEvents.EventId.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventBeginTime",factEvents.EventBeginTime.HasValue?(object)factEvents.EventBeginTime.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventEndTime",factEvents.EventEndTime.HasValue?(object)factEvents.EventEndTime.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@IsContinue",factEvents.IsContinue.HasValue?(object)factEvents.IsContinue.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@Remark",factEvents.Remark==null?(object)DBNull.Value:(object)factEvents.Remark)); + cmd.Parameters.Add(new SqlParameter("@OperatorNo",factEvents.OperatorNo==null?(object)DBNull.Value:(object)factEvents.OperatorNo)); + cmd.Parameters.Add(new SqlParameter("@OperatorName",factEvents.OperatorName==null?(object)DBNull.Value:(object)factEvents.OperatorName)); + cmd.Parameters.Add(new SqlParameter("@OperateDate",factEvents.OperateDate.HasValue?(object)factEvents.OperateDate.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventValue",factEvents.EventValue==null?(object)DBNull.Value:(object)factEvents.EventValue)); + cmd.Parameters.Add(new SqlParameter("@Extend1",factEvents.Extend1==null?(object)DBNull.Value:(object)factEvents.Extend1)); + cmd.Parameters.Add(new SqlParameter("@Extend2",factEvents.Extend2==null?(object)DBNull.Value:(object)factEvents.Extend2)); + cmd.Parameters.Add(new SqlParameter("@Extend3",factEvents.Extend3==null?(object)DBNull.Value:(object)factEvents.Extend3)); + return Convert.ToInt32(cmd.ExecuteScalar()); + } + /// /// 不使用事务的插入方法 /// /// 实体类对象 /// 标识列值或影响的记录行数 - internal static int Insert(FactEvents factEvents) - { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) - { - conn.Open(); + internal static int Insert(FactEvents factEvents) + { + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + { + conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { return Insert(cmd, factEvents); } - } - } - - /// + } + } + + /// /// 使用事务的插入方法 /// /// 实现共享Connection的对象 /// 实体类对象 /// 标识列值或影响的记录行数 - internal static int Insert(Connection connection, FactEvents factEvents) + internal static int Insert(Connection connection,FactEvents factEvents) { return Insert(connection.Command, factEvents); } - #endregion - - #region 删除实体操作 - - /// + #endregion + + #region 删除实体操作 + + /// /// 删除 /// - /// Command对象 + /// Command对象 /// 实体类对象 /// 影响的记录行数 - internal static int ExcuteDeleteCommand(SqlCommand cmd, FactEvents factEvents) + internal static int ExcuteDeleteCommand(SqlCommand cmd, FactEvents factEvents) { - cmd.Parameters.Clear(); + cmd.Parameters.Clear(); cmd.CommandText = "delete from FactEvents where Id=@Id"; //从实体中取出值放入Command的参数列表 - cmd.Parameters.Add(new SqlParameter("@Id", factEvents.Id)); + cmd.Parameters.Add(new SqlParameter("@Id", factEvents.Id)); return cmd.ExecuteNonQuery(); } - /// + /// /// 不使用事务的删除方法 /// /// 实体类对象 @@ -96,18 +100,18 @@ namespace AIMSDAL } } } - /// + /// /// 使用事务的删除方法 /// /// 实现共享Connection的对象 /// 实体类对象 /// 影响的记录行数 - internal static int Delete(Connection connection, FactEvents factEvents) + internal static int Delete(Connection connection,FactEvents factEvents) { - return ExcuteDeleteCommand(connection.Command, factEvents); - } - - /// + return ExcuteDeleteCommand(connection.Command, factEvents); + } + + /// /// 执行删除命令 /// /// Command对象 @@ -134,8 +138,8 @@ namespace AIMSDAL } return cmd.ExecuteNonQuery(); } - - /// + + /// /// 不使用事务的删除方法 /// /// 对象查询语句 @@ -152,8 +156,8 @@ namespace AIMSDAL } } } - - /// + + /// /// 使用事务的删除方法 /// /// 实现共享Connection的对象 @@ -164,62 +168,66 @@ namespace AIMSDAL { return ExcuteDeleteCommand(connection.Command, oql, parameters); } - - #endregion - - #region 更新实体操作 - - /// + + #endregion + + #region 更新实体操作 + + /// /// 更新 /// - /// Command对象 + /// Command对象 /// 实体类对象 /// 影响的记录行数 - internal static int ExcuteUpdateCommand(SqlCommand cmd, FactEvents factEvents) - { - cmd.CommandText = "update FactEvents set EventTypeId=@EventTypeId,PatientId=@PatientId,EventId=@EventId,EventBeginTime=@EventBeginTime,EventEndTime=@EventEndTime,IsContinue=@IsContinue,Remark=@Remark,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate where Id=@Id"; - //从实体中取出值放入Command的参数列表 - cmd.Parameters.Add(new SqlParameter("@EventTypeId", factEvents.EventTypeId.HasValue ? (object)factEvents.EventTypeId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@PatientId", factEvents.PatientId.HasValue ? (object)factEvents.PatientId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@EventId", factEvents.EventId.HasValue ? (object)factEvents.EventId.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@EventBeginTime", factEvents.EventBeginTime.HasValue ? (object)factEvents.EventBeginTime.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@EventEndTime", factEvents.EventEndTime.HasValue ? (object)factEvents.EventEndTime.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@IsContinue", factEvents.IsContinue.HasValue ? (object)factEvents.IsContinue.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@Remark", factEvents.Remark == null ? (object)DBNull.Value : (object)factEvents.Remark)); - cmd.Parameters.Add(new SqlParameter("@OperatorNo", factEvents.OperatorNo == null ? (object)DBNull.Value : (object)factEvents.OperatorNo)); - cmd.Parameters.Add(new SqlParameter("@OperatorName", factEvents.OperatorName == null ? (object)DBNull.Value : (object)factEvents.OperatorName)); - cmd.Parameters.Add(new SqlParameter("@OperateDate", factEvents.OperateDate.HasValue ? (object)factEvents.OperateDate.Value : (object)DBNull.Value)); - cmd.Parameters.Add(new SqlParameter("@Id", factEvents.Id)); + internal static int ExcuteUpdateCommand(SqlCommand cmd, FactEvents factEvents) + { + cmd.CommandText = "update FactEvents set EventTypeId=@EventTypeId,PatientId=@PatientId,EventId=@EventId,EventBeginTime=@EventBeginTime,EventEndTime=@EventEndTime,IsContinue=@IsContinue,Remark=@Remark,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,EventValue=@EventValue,Extend1=@Extend1,Extend2=@Extend2,Extend3=@Extend3 where Id=@Id"; + //从实体中取出值放入Command的参数列表 + cmd.Parameters.Add(new SqlParameter("@EventTypeId",factEvents.EventTypeId.HasValue?(object)factEvents.EventTypeId.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@PatientId",factEvents.PatientId.HasValue?(object)factEvents.PatientId.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventId",factEvents.EventId.HasValue?(object)factEvents.EventId.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventBeginTime",factEvents.EventBeginTime.HasValue?(object)factEvents.EventBeginTime.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventEndTime",factEvents.EventEndTime.HasValue?(object)factEvents.EventEndTime.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@IsContinue",factEvents.IsContinue.HasValue?(object)factEvents.IsContinue.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@Remark",factEvents.Remark==null?(object)DBNull.Value:(object)factEvents.Remark)); + cmd.Parameters.Add(new SqlParameter("@OperatorNo",factEvents.OperatorNo==null?(object)DBNull.Value:(object)factEvents.OperatorNo)); + cmd.Parameters.Add(new SqlParameter("@OperatorName",factEvents.OperatorName==null?(object)DBNull.Value:(object)factEvents.OperatorName)); + cmd.Parameters.Add(new SqlParameter("@OperateDate",factEvents.OperateDate.HasValue?(object)factEvents.OperateDate.Value:(object)DBNull.Value)); + cmd.Parameters.Add(new SqlParameter("@EventValue",factEvents.EventValue==null?(object)DBNull.Value:(object)factEvents.EventValue)); + cmd.Parameters.Add(new SqlParameter("@Extend1",factEvents.Extend1==null?(object)DBNull.Value:(object)factEvents.Extend1)); + cmd.Parameters.Add(new SqlParameter("@Extend2",factEvents.Extend2==null?(object)DBNull.Value:(object)factEvents.Extend2)); + cmd.Parameters.Add(new SqlParameter("@Extend3",factEvents.Extend3==null?(object)DBNull.Value:(object)factEvents.Extend3)); + cmd.Parameters.Add(new SqlParameter("@Id", factEvents.Id)); return cmd.ExecuteNonQuery(); - } - - /// + } + + /// /// 不使用事务的更新方法 /// /// 实体类对象 /// 影响的记录行数 - internal static int Update(FactEvents factEvents) - { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) - { - conn.Open(); + internal static int Update(FactEvents factEvents) + { + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) + { + conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { return ExcuteUpdateCommand(cmd, factEvents); } - } - } - /// + } + } + /// /// 使用事务的更新方法 /// /// 实现共享Connection的对象 /// 实体类对象 /// 影响的记录行数 - internal static int Update(Connection connection, FactEvents factEvents) + internal static int Update(Connection connection,FactEvents factEvents) { return ExcuteUpdateCommand(connection.Command, factEvents); - } - /// + } + /// /// 执行更新命令 /// /// Command对象 @@ -231,7 +239,7 @@ namespace AIMSDAL //解析过滤部份Sql语句 string updateString = SyntaxAnalyzer.ParseSql(oql, new FactEventsMap()); cmd.CommandText = "update FactEvents set " + updateString; - cmd.Parameters.Clear(); + cmd.Parameters.Clear(); //添加参数 if (parameters != null) { @@ -242,8 +250,8 @@ namespace AIMSDAL } return cmd.ExecuteNonQuery(); } - - /// + + /// /// 不使用事务的更新方法 /// /// 对象查询语句 @@ -260,8 +268,8 @@ namespace AIMSDAL } } } - - /// + + /// /// 使用事务的更新方法 /// /// 实现共享Connection的对象 @@ -272,17 +280,17 @@ namespace AIMSDAL { return ExcuteUpdateCommand(connection.Command, oql, parameters); } - #endregion - - #region 查询实体集合 - /// + #endregion + + #region 查询实体集合 + /// /// 执行Command获取对象列表 /// /// Command对象 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象列表 - internal static List ExcuteSelectCommand(SqlCommand cmd, RecursiveType recursiveType, int recursiveDepth) + internal static List ExcuteSelectCommand(SqlCommand cmd,RecursiveType recursiveType,int recursiveDepth) { List factEventsList = new List(); using (SqlDataReader dr = cmd.ExecuteReader()) @@ -293,25 +301,25 @@ namespace AIMSDAL factEventsList.Add(factEvents); } } - return factEventsList; + return factEventsList; } - /// + /// /// 执行查询命令 /// /// Command对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 - internal static List ExcuteSelectCommand(SqlCommand cmd, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) + internal static List ExcuteSelectCommand(SqlCommand cmd, string oql, ParameterList parameters,RecursiveType recursiveType,int recursiveDepth) { //解析过滤部份Sql语句 string filterString = SyntaxAnalyzer.ParseSql(oql, new FactEventsMap()); if (filterString != string.Empty) { - if (filterString.Trim().ToLower().IndexOf("order ") != 0) - filterString = " where " + filterString; + if(filterString.Trim().ToLower().IndexOf("order ")!=0) + filterString = " where " + filterString; } cmd.Parameters.Clear(); cmd.CommandText = "select * from FactEvents " + filterString; @@ -325,14 +333,14 @@ namespace AIMSDAL } return ExcuteSelectCommand(cmd, recursiveType, recursiveDepth); } - - /// + + /// /// 根据对象查询语句查询实体集合 /// /// 实体类对象集合 internal static List Select() { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -342,15 +350,15 @@ namespace AIMSDAL } } } - /// + /// /// 根据对象查询语句查询实体集合 /// - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 internal static List Select(RecursiveType recursiveType, int recursiveDepth) { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -360,8 +368,8 @@ namespace AIMSDAL } } } - - /// + + /// /// 根据对象查询语句查询实体集合 /// /// 对象查询语句 @@ -369,7 +377,7 @@ namespace AIMSDAL /// 实体类对象集合 internal static List Select(string oql, ParameterList parameters) { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -378,18 +386,18 @@ namespace AIMSDAL } } } - - /// + + /// /// 根据对象查询语句查询实体集合 /// /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 - internal static List Select(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) + internal static List Select(string oql, ParameterList parameters,RecursiveType recursiveType, int recursiveDepth) { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) @@ -398,62 +406,62 @@ namespace AIMSDAL } } } - - /// + + /// /// 根据对象查询语句查询实体集合（启用事务） /// /// 连接对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象集合 internal static List Select(Connection connection, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { - return ExcuteSelectCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth); + return ExcuteSelectCommand(connection.Command, oql, parameters,recursiveType, recursiveDepth); } - #endregion - - #region 查询单个实体 - - /// + #endregion + + #region 查询单个实体 + + /// /// 递归查询单个实体 /// /// Command对象 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 - internal static FactEvents ExcuteSelectSingleCommand(SqlCommand cmd, RecursiveType recursiveType, int recursiveDepth) - { - FactEvents factEvents = null; - using (SqlDataReader dr = cmd.ExecuteReader()) + internal static FactEvents ExcuteSelectSingleCommand(SqlCommand cmd,RecursiveType recursiveType,int recursiveDepth) + { + FactEvents factEvents=null; + using (SqlDataReader dr = cmd.ExecuteReader()) { - if (dr.Read()) - factEvents = DataReaderToEntity(dr); - } - if (factEvents == null) - return factEvents; + if(dr.Read()) + factEvents = DataReaderToEntity(dr); + } + if(factEvents==null) + return factEvents; return factEvents; - } - /// + } + /// /// 更据对象查询语句递归查询单个实体 /// /// Command对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 - internal static FactEvents ExcuteSelectSingleCommand(SqlCommand cmd, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) + internal static FactEvents ExcuteSelectSingleCommand(SqlCommand cmd, string oql, ParameterList parameters,RecursiveType recursiveType,int recursiveDepth) { //解析过滤部份Sql语句 string filterString = SyntaxAnalyzer.ParseSql(oql, new FactEventsMap()); - if (filterString != string.Empty) - { - filterString = " where " + filterString; - } + if(filterString!=string.Empty) + { + filterString=" where "+filterString; + } cmd.CommandText = "select * from FactEvents " + filterString; - cmd.Parameters.Clear(); + cmd.Parameters.Clear(); //添加参数 if (parameters != null) { @@ -464,29 +472,29 @@ namespace AIMSDAL } return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth); } - - /// + + /// /// 更据对象查询语句递归查询单个实体 /// /// Command对象 /// 对象查询语句 /// 参数列表 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 internal static FactEvents SelectSingle(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth) { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { return ExcuteSelectSingleCommand(cmd, oql, parameters, recursiveType, recursiveDepth); - } - } + } + } } - - /// + + /// /// 更据对象查询语句查询单个实体 /// /// Command对象 @@ -495,10 +503,10 @@ namespace AIMSDAL /// 实体对象 internal static FactEvents SelectSingle(string oql, ParameterList parameters) { - return SelectSingle(oql, parameters, RecursiveType.Parent, 1); + return SelectSingle(oql,parameters,RecursiveType.Parent,1); } - - /// + + /// /// 更据对象查询语句并启用事务查询单个实体 /// /// 连接对象 @@ -509,132 +517,148 @@ namespace AIMSDAL { return ExcuteSelectSingleCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth); } - - /// + + /// /// 更据主键值递归查询单个实体 /// /// Command对象 /// 主键值 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体对象 - internal static FactEvents SelectSingle(SqlCommand cmd, int? id, RecursiveType recursiveType, int recursiveDepth) - { - cmd.Parameters.Clear(); - if (id.HasValue) - { - cmd.CommandText = "select * from FactEvents where Id=@pk"; - cmd.Parameters.Add(new SqlParameter("@pk", id.Value)); - } - else - { - cmd.CommandText = "select * from FactEvents where Id is null"; - } - return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth); - } - - /// + internal static FactEvents SelectSingle(SqlCommand cmd, int? id,RecursiveType recursiveType,int recursiveDepth) + { + cmd.Parameters.Clear(); + if(id.HasValue) + { + cmd.CommandText = "select * from FactEvents where Id=@pk"; + cmd.Parameters.Add(new SqlParameter("@pk",id.Value)); + } + else + { + cmd.CommandText = "select * from FactEvents where Id is null"; + } + return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth); + } + + /// /// 按主键字段查询特定实体 /// /// 主键值 /// 实体类对象 internal static FactEvents SelectSingle(int? id) { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { - return SelectSingle(cmd, id, RecursiveType.Parent, 1); - } - } + return SelectSingle(cmd,id,RecursiveType.Parent,1); + } + } } - /// + /// /// 按主键字段查询特定实体 /// /// 主键值 - /// 递归类型 + /// 递归类型 /// 递归深度 /// 实体类对象 internal static FactEvents SelectSingle(int? id, RecursiveType recursiveType, int recursiveDepth) { - using (SqlConnection conn = new SqlConnection(Connection.ConnectionString)) + using(SqlConnection conn=new SqlConnection(Connection.ConnectionString)) { conn.Open(); using (SqlCommand cmd = conn.CreateCommand()) { - return SelectSingle(cmd, id, recursiveType, recursiveDepth); - } - } + return SelectSingle(cmd,id, recursiveType, recursiveDepth); + } + } } - - /// + + /// /// 使用事务并按主键字段查询特定实体 /// - /// 连接对象 + /// 连接对象 /// 主键值 /// 实体类对象 - internal static FactEvents SelectSingle(Connection connection, int? id, RecursiveType recursiveType, int recursiveDepth) + internal static FactEvents SelectSingle(Connection connection,int? id, RecursiveType recursiveType, int recursiveDepth) { - return SelectSingle(connection.Command, id, recursiveType, recursiveDepth); + return SelectSingle(connection.Command, id, recursiveType, recursiveDepth); } - #endregion - - - /// + #endregion + + + /// /// 从DataReader中取出值生成实体对象 /// /// 查询对象 /// 过滤条件字符串 - private static FactEvents DataReaderToEntity(SqlDataReader dr) - { - FactEvents entity = new FactEvents(); - if (dr["Id"] != System.DBNull.Value) - { - entity.Id = Convert.ToInt32(dr["Id"]); - } - if (dr["EventTypeId"] != System.DBNull.Value) - { - entity.EventTypeId = Convert.ToInt32(dr["EventTypeId"]); - } - if (dr["PatientId"] != System.DBNull.Value) - { - entity.PatientId = Convert.ToInt32(dr["PatientId"]); - } - if (dr["EventId"] != System.DBNull.Value) - { - entity.EventId = Convert.ToInt32(dr["EventId"]); - } - if (dr["EventBeginTime"] != System.DBNull.Value) - { - entity.EventBeginTime = Convert.ToDateTime(dr["EventBeginTime"]); - } - if (dr["EventEndTime"] != System.DBNull.Value) - { - entity.EventEndTime = Convert.ToDateTime(dr["EventEndTime"]); - } - if (dr["IsContinue"] != System.DBNull.Value) - { - entity.IsContinue = Convert.ToInt32(dr["IsContinue"]); - } - if (dr["Remark"] != System.DBNull.Value) - { - entity.Remark = dr["Remark"].ToString(); - } - if (dr["OperatorNo"] != System.DBNull.Value) - { - entity.OperatorNo = dr["OperatorNo"].ToString(); - } - if (dr["OperatorName"] != System.DBNull.Value) - { - entity.OperatorName = dr["OperatorName"].ToString(); - } - if (dr["OperateDate"] != System.DBNull.Value) - { - entity.OperateDate = Convert.ToDateTime(dr["OperateDate"]); - } - return entity; - } - } + private static FactEvents DataReaderToEntity(SqlDataReader dr) + { + FactEvents entity = new FactEvents (); + if(dr["Id"]!=System.DBNull.Value) + { + entity.Id=Convert.ToInt32(dr["Id"]); + } + if(dr["EventTypeId"]!=System.DBNull.Value) + { + entity.EventTypeId=Convert.ToInt32(dr["EventTypeId"]); + } + if(dr["PatientId"]!=System.DBNull.Value) + { + entity.PatientId=Convert.ToInt32(dr["PatientId"]); + } + if(dr["EventId"]!=System.DBNull.Value) + { + entity.EventId=Convert.ToInt32(dr["EventId"]); + } + if(dr["EventBeginTime"]!=System.DBNull.Value) + { + entity.EventBeginTime=Convert.ToDateTime(dr["EventBeginTime"]); + } + if(dr["EventEndTime"]!=System.DBNull.Value) + { + entity.EventEndTime=Convert.ToDateTime(dr["EventEndTime"]); + } + if(dr["IsContinue"]!=System.DBNull.Value) + { + entity.IsContinue=Convert.ToInt32(dr["IsContinue"]); + } + if(dr["Remark"]!=System.DBNull.Value) + { + entity.Remark=dr["Remark"].ToString(); + } + if(dr["OperatorNo"]!=System.DBNull.Value) + { + entity.OperatorNo=dr["OperatorNo"].ToString(); + } + if(dr["OperatorName"]!=System.DBNull.Value) + { + entity.OperatorName=dr["OperatorName"].ToString(); + } + if(dr["OperateDate"]!=System.DBNull.Value) + { + entity.OperateDate=Convert.ToDateTime(dr["OperateDate"]); + } + if(dr["EventValue"]!=System.DBNull.Value) + { + entity.EventValue=dr["EventValue"].ToString(); + } + if(dr["Extend1"]!=System.DBNull.Value) + { + entity.Extend1=dr["Extend1"].ToString(); + } + if(dr["Extend2"]!=System.DBNull.Value) + { + entity.Extend2=dr["Extend2"].ToString(); + } + if(dr["Extend3"]!=System.DBNull.Value) + { + entity.Extend3=dr["Extend3"].ToString(); + } + return entity; + } + } } diff --git a/AIMSEntity/DAL/Extension/DFactEvents.cs b/AIMSEntity/DAL/Extension/DFactEvents.cs index 0f91e1f..0a1b9e0 100644 --- a/AIMSEntity/DAL/Extension/DFactEvents.cs +++ b/AIMSEntity/DAL/Extension/DFactEvents.cs @@ -84,6 +84,11 @@ namespace AIMSDAL strSql1.Append("OperateDate,"); strSql2.Append("'" + model.OperateDate + "',"); } + if (model.EventValue != null) + { + strSql1.Append("EventValue,"); + strSql2.Append("'" + model.EventValue + "',"); + } strSql.Append("insert into FactEvents("); strSql.Append(strSql1.ToString().Remove(strSql1.Length - 1)); strSql.Append(")"); @@ -174,7 +179,7 @@ namespace AIMSDAL { StringBuilder strSql = new StringBuilder(); strSql.Append("select top 1 "); - strSql.Append(" Id,EventTypeId,PatientId,EventId,EventBeginTime,EventEndTime,IsContinue,Remark,OperatorNo,OperatorName,OperateDate "); + strSql.Append(" Id,EventTypeId,PatientId,EventId,EventBeginTime,EventEndTime,IsContinue,Remark,OperatorNo,OperatorName,OperateDate,EventValue "); strSql.Append(" from FactEvents "); strSql.Append(" where Id=" + Id + " "); FactEvents model = new FactEvents(); @@ -216,6 +221,7 @@ namespace AIMSDAL { model.OperateDate = DateTime.Parse(ds.Tables[0].Rows[0]["OperateDate"].ToString()); } + model.EventValue = ds.Tables[0].Rows[0]["EventValue"].ToString(); return model; } return model; @@ -224,7 +230,7 @@ namespace AIMSDAL public static DataTable GetDataTable(int PatientId, int EventTypeId) { StringBuilder strSql = new StringBuilder(); - strSql.Append("SELECT s.Id, e.Id AS EventId, e.Name AS EventName,e.Remark AS EventRemark, s.EventBeginTime, s.EventEndTime, s.Remark, s.[OperatorNo],s.[OperatorName],s.[OperateDate]"); + strSql.Append("SELECT s.Id, e.Id AS EventId, e.Name AS EventName,e.Remark AS EventRemark, EventValue,s.EventBeginTime, s.EventEndTime, s.Remark, s.[OperatorNo],s.[OperatorName],s.[OperateDate]"); strSql.Append(" FROM FactEvents s LEFT JOIN Events e ON e.Id =s.EventId WHERE s.EventTypeId=" + EventTypeId + " AND s.PatientId=" + PatientId + " ORDER BY s.EventBeginTime"); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } diff --git a/AIMSEntity/Extensions/BOperationRecord.cs b/AIMSEntity/Extensions/BOperationRecord.cs index 3a040fd..b0159ae 100644 --- a/AIMSEntity/Extensions/BOperationRecord.cs +++ b/AIMSEntity/Extensions/BOperationRecord.cs @@ -384,6 +384,7 @@ namespace AIMSBLL FactEventsObj.EventId = int.Parse(dt.Rows[i]["EventId"].ToString()); FactEventsObj.Remark = dt.Rows[i]["Remark"].ToString(); FactEventsObj.EventRemark = dt.Rows[i]["EventRemark"].ToString(); + FactEventsObj.EventValue = dt.Rows[i]["EventValue"].ToString(); FactEventsObj.EventBeginTime = DateTime.Parse(DateTime.Parse(dt.Rows[i]["EventBeginTime"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); FactEventsObj.EventEndTime = DateTime.Parse(DateTime.Parse(dt.Rows[i]["EventEndTime"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); FactEventsObj.OperatorNo = dt.Rows[i]["OperatorNo"].ToString(); diff --git a/AIMSEntity/ObjectQuery/FactEventsMap.cs b/AIMSEntity/ObjectQuery/FactEventsMap.cs index f1a9e46..465f797 100644 --- a/AIMSEntity/ObjectQuery/FactEventsMap.cs +++ b/AIMSEntity/ObjectQuery/FactEventsMap.cs @@ -20,6 +20,10 @@ namespace AIMSObjectQuery dictionary.Add("operatorno", "OperatorNo"); dictionary.Add("operatorname", "OperatorName"); dictionary.Add("operatedate", "OperateDate"); + dictionary.Add("eventvalue", "EventValue"); + dictionary.Add("extend1", "Extend1"); + dictionary.Add("extend2", "Extend2"); + dictionary.Add("extend3", "Extend3"); } #region IMap 成员 diff --git a/DrawGraph/AreaManage/FactEvents.cs b/DrawGraph/AreaManage/FactEvents.cs index 59bf3d2..d6b0f20 100644 --- a/DrawGraph/AreaManage/FactEvents.cs +++ b/DrawGraph/AreaManage/FactEvents.cs @@ -19,6 +19,10 @@ namespace DrawGraph private string _operatorno; private string _operatorname; private DateTime? _operatedate; + private string eventValue; + private string extend1; + private string extend2; + private string extend3; public string EventRemark; @@ -115,6 +119,38 @@ namespace DrawGraph set { _operatedate = value; } get { return _operatedate; } } + /// + /// + /// + public string EventValue + { + set { eventValue = value; } + get { return eventValue; } + } + /// + /// + /// + public string Extend1 + { + get { return extend1; } + set { extend1 = value; } + } + /// + /// + /// + public string Extend2 + { + get { return extend2; } + set { extend2 = value; } + } + /// + /// + /// + public string Extend3 + { + get { return extend3; } + set { extend3 = value; } + } #endregion Model /// diff --git a/DrawGraph/AreaManage/PhysioDataConfig.cs b/DrawGraph/AreaManage/PhysioDataConfig.cs index ca7dbae..2196383 100644 --- a/DrawGraph/AreaManage/PhysioDataConfig.cs +++ b/DrawGraph/AreaManage/PhysioDataConfig.cs @@ -413,6 +413,33 @@ namespace DrawGraph } } + public void UpdatePointItem(PhysioData pd, bool isInsertDB = true) + { + //如果是负数则不执行操作 + if (pd.Value <= 0) return; + bool isHave = false; + foreach (PointPair pptemp in APhysioParams) + { + PhysioData temp1 = PointPairToPhysioData(pptemp); + if (pd.isEquert(temp1) && temp1.Value != Double.MaxValue) + { + isHave = true; + + break; + } + } + if (!isHave) + this.APhysioParams.Add(pd); + Sort(); + if (curve != null) + curve.Points = APhysioParams; + if (isInsertDB == true) + PhysioDataService.AddPhysioData(pd); + if (ShowText == true) + { + DrawTextPhysioData(pd); + } + } /// /// 增加一点生理数据,往数据库中写入数据 /// diff --git a/DrawGraph/AreaManage/TokenEditorManage.cs b/DrawGraph/AreaManage/TokenEditorManage.cs index ee5eeb5..25ea553 100644 --- a/DrawGraph/AreaManage/TokenEditorManage.cs +++ b/DrawGraph/AreaManage/TokenEditorManage.cs @@ -53,6 +53,7 @@ namespace DrawGraph //} //DevComponents.DotNetBar.Controls.EditToken edit1 = new DevComponents.DotNetBar.Controls.EditToken("", "无"); //tokenEditor.Tokens.Add(edit1); + tokenEditor.IsPopupOpen = false; //弹出下拉框 foreach (DataRow item in dt.Rows) { DevComponents.DotNetBar.Controls.EditToken edit = new DevComponents.DotNetBar.Controls.EditToken(item["Id"].ToString(), item["Name"].ToString()); @@ -148,6 +149,7 @@ namespace DrawGraph foreach (var item in tokenEditor.SelectedTokens) { + if (item.Text == "") break; namevalue.Add(item.Text); idvalue.Add(item.Value); } @@ -215,7 +217,7 @@ namespace DrawGraph List tagvalue = new List(); foreach (var item in tokenEditor.SelectedTokens) - { + { namevalue.Add(item.Text); idvalue.Add(item.Value); tagvalue.Add(GetWorkerTags(item.Text, item.Value));