diff --git a/AIMS/AIMS.xml b/AIMS/AIMS.xml index 71c6330..a1d6e41 100644 --- a/AIMS/AIMS.xml +++ b/AIMS/AIMS.xml @@ -1,6 +1,6 @@  - Data Source=.;Initial Catalog=AIMSDB_DLSJZQZYYY;User ID=sa;Password=Test2020; + Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020; Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39; diff --git a/AIMS/DocManager/frmDocument3.cs b/AIMS/DocManager/frmDocument3.cs index 64b74d7..1f94baa 100644 --- a/AIMS/DocManager/frmDocument3.cs +++ b/AIMS/DocManager/frmDocument3.cs @@ -78,10 +78,10 @@ namespace AIMS.OperationAfter.UI ucClassify.RefreshTree(Patient.PatientId); tsbDoc.TabItemClose += new TabStrip.UserActionEventHandler(tsbDoc_TabItemClose); - + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("删除医疗文书")) { - btnDelete.Visible = true; + btnDelete.Visible = true; } } /// @@ -441,11 +441,6 @@ namespace AIMS.OperationAfter.UI EMRExtension.OpenEMRS(Patient.PatientId, Patient.ApplyId); } - private void buttonX2_Click(object sender, EventArgs e) - { - BOperationReview.SetDocumentXmlStatic("不计费耗材使用清单"); - } - private void btnDelete_Click(object sender, EventArgs e) { //判断是否选择患者 @@ -461,6 +456,7 @@ namespace AIMS.OperationAfter.UI if (dialogResult == DialogResult.Yes) { DocumentDAL.DeletePrintDocument2(DModel); + PublicMethod.WriteLog("删除文书" + tsbDoc.SelectedTab.Text, Patient.PatientId); this.ucClassify.RefreshTree(this.Patient.PatientId); CloseTab(); } diff --git a/AIMS/DocManager/frmDocument3.designer.cs b/AIMS/DocManager/frmDocument3.designer.cs index 86f775b..46b48fd 100644 --- a/AIMS/DocManager/frmDocument3.designer.cs +++ b/AIMS/DocManager/frmDocument3.designer.cs @@ -42,11 +42,11 @@ this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter(); this.panel5 = new System.Windows.Forms.Panel(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnDelete = new DevComponents.DotNetBar.ButtonX(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.btnSel = new DevComponents.DotNetBar.ButtonX(); this.lblPatient = new DevComponents.DotNetBar.LabelX(); this.expandablePanel1 = new DevComponents.DotNetBar.ExpandablePanel(); - this.btnDelete = new DevComponents.DotNetBar.ButtonX(); this.panel2.SuspendLayout(); this.groupBox2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -287,6 +287,20 @@ this.panelEx1.Style.GradientAngle = 90; this.panelEx1.TabIndex = 0; // + // btnDelete + // + this.btnDelete.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnDelete.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDelete.Location = new System.Drawing.Point(613, 11); + this.btnDelete.Margin = new System.Windows.Forms.Padding(2); + this.btnDelete.Name = "btnDelete"; + this.btnDelete.Size = new System.Drawing.Size(76, 23); + this.btnDelete.TabIndex = 6; + this.btnDelete.Text = "删除文书"; + this.btnDelete.Visible = false; + this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); + // // buttonX1 // this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; @@ -353,20 +367,6 @@ this.expandablePanel1.TitleStyle.GradientAngle = 90; this.expandablePanel1.TitleText = "文档目录"; // - // btnDelete - // - this.btnDelete.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDelete.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDelete.Location = new System.Drawing.Point(612, 11); - this.btnDelete.Margin = new System.Windows.Forms.Padding(2); - this.btnDelete.Name = "btnDelete"; - this.btnDelete.Size = new System.Drawing.Size(76, 23); - this.btnDelete.TabIndex = 6; - this.btnDelete.Text = "删除文书"; - this.btnDelete.Visible = false; - this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); - // // frmDocument3 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/AIMS/FormLogin.cs b/AIMS/FormLogin.cs index 7db26fb..b1f2270 100644 --- a/AIMS/FormLogin.cs +++ b/AIMS/FormLogin.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; using AIMSBLL; +using AIMSExtension; using AIMSModel; using DevComponents.DotNetBar; @@ -45,13 +46,14 @@ namespace AIMS AIMSExtension.PublicMethod.OperatorId = PersonObj.Id.Value; AIMSExtension.PublicMethod.OperatorNo = PersonObj.No; AIMSExtension.PublicMethod.OperatorName = PersonObj.Name; - AIMSExtension.PublicMethod.RoleId = PersonObj.RoleId.Value; + AIMSExtension.PublicMethod.RoleId = PersonObj.RoleId.Value; AIMSExtension.PublicMethod.DepId = PersonObj.DepId.Value; AIMSExtension.PublicMethod.LocalIP = AIMSExtension.PublicMethod.GetLocalIP(); AIMSExtension.PublicMethod.DeptName = BDepartment.GetModel(PersonObj.DepId.Value).Name; Role role = BRole.GetModel(PersonObj.RoleId.Value); AIMSExtension.PublicMethod.PermissionLevel = role.PermissionLevel == null ? 0 : role.PermissionLevel.Value; AIMSExtension.PublicMethod.RoleName = BMenu.GetMenuRootListManageStr(AIMSExtension.PublicMethod.RoleId, "功能权限"); + PublicMethod.WriteLog("登录", PersonObj.Id.Value); Hide(); //在这里为编辑器注册 new System.Threading.Thread(Reg).Start(); diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index 259d009..1a9289b 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -761,8 +761,8 @@ namespace AIMS.OperationAanesthesia if (GetOpeState(ref messing) == false) { if (messing != "") MessageBox.Show(messing, "系统提示"); - //if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！") - // btnOperationInfo_Click(null, null); + if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！") + btnOperationInfo_Click(null, null); return; } } @@ -2157,17 +2157,19 @@ namespace AIMS.OperationAanesthesia isTrue = false; } - //if (_record.OpeRecordInfo.OperationLevel == null || _record.OpeRecordInfo.OperationLevel.ToString().Trim() == "") - //{ - // message = "请与手术信息选择手术分级！"; - // isTrue = false; - //} - //if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "") - //{ - // message = "请与手术信息选择手术切口！"; - // isTrue = false; - //} - + if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级")) + { + if (_record.OpeRecordInfo.OperationLevel == null || _record.OpeRecordInfo.OperationLevel.ToString().Trim() == "") + { + message = "请与手术信息选择手术分级！"; + isTrue = false; + } + if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "") + { + message = "请与手术信息选择手术切口！"; + isTrue = false; + } + } } return isTrue; diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs index a045509..f8a0337 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs @@ -1161,15 +1161,18 @@ namespace AIMS.OperationAanesthesia message = "请与手术信息选择手术分级！"; isTrue = false; } - if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "") + if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级")) { - message = "请与手术信息选择手术切口！"; - isTrue = false; - } - if (_record.OperationDoctor == null || _record.OperationDoctor.Trim() == "") - { - message = "请添加手术医师！"; - isTrue = false; + if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "") + { + message = "请与手术信息选择手术切口！"; + isTrue = false; + } + if (_record.OperationDoctor == null || _record.OperationDoctor.Trim() == "") + { + message = "请添加手术医师！"; + isTrue = false; + } } return isTrue; @@ -1606,7 +1609,7 @@ namespace AIMS.OperationAanesthesia BApplianceRecord.InsertListData(_record.InstrumentList.ApplianceRecordList); DBManage.AddPerson(_record, SelectOperationDoctorData, 1); DBManage.AddPerson(_record, SelectInstrumentNurseData, 6); - DBManage.AddPerson(_record, SelectTourNurseData, 7); + DBManage.AddPerson(_record, SelectTourNurseData, 7); } catch (Exception ex) @@ -1860,7 +1863,7 @@ namespace AIMS.OperationAanesthesia } } - catch (Exception ) + catch (Exception) { //出错处理，终止打印，设置e.HasMorePages参数，初始化相关变量 e.HasMorePages = false; @@ -1878,12 +1881,12 @@ namespace AIMS.OperationAanesthesia } if (superTabMain.SelectedTab.Name == "spTabQXQDD") { - SaveInstrument(sender); + SaveInstrument(sender); } else { - SaveInstrument2(sender); - } + SaveInstrument2(sender); + } mPanes = new List(); UpPanes = new List(); @@ -2210,7 +2213,7 @@ namespace AIMS.OperationAanesthesia txtOperation.Text = txtOperation.Text.Substring(0, idxStart); } DBManage.AddOperation(_record, SelectOperationData); - } + } private void frmAnasRecordInstrument_VisibleChanged(object sender, EventArgs e) { @@ -2243,7 +2246,7 @@ namespace AIMS.OperationAanesthesia } string messing = ""; if (GetOpeState(ref messing) == false) - { + { if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！") btnOperationInfo_Click(null, null); return; diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs index 98a4178..fbc2e28 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs @@ -906,6 +906,10 @@ namespace AIMS.OperationAanesthesia for (int i = 0; i < dr.Count(); i++) { var name = dr[i].ItemArray[0].ToString(); + if (name=="InRoomTime") + { + name = name; + } var value = dr[i].ItemArray[1].ToString(); XTextInputFieldElement element = query.Where(x => x.FieldSettings.ListSource.SourceName == value).FirstOrDefault(); PropertyInfo info = p.Where(px => px.Name == name).FirstOrDefault(); diff --git a/AIMS/OperationAanesthesia/frmOperationInfoNew2.cs b/AIMS/OperationAanesthesia/frmOperationInfoNew2.cs index 8d744c2..a374dae 100644 --- a/AIMS/OperationAanesthesia/frmOperationInfoNew2.cs +++ b/AIMS/OperationAanesthesia/frmOperationInfoNew2.cs @@ -91,6 +91,12 @@ namespace AIMS.OperationAanesthesia cboOperationLevel.SelectedIndex = -1; if (txtOperationCut.DataSource == null) BindBasicDictionaryToComboBox(txtOperationCut, "手术切口"); + + if (!PublicMethod.RoleName.Contains("术中填写手术等级切口等级")) + { + cboOperationLevel.Enabled = false; + txtOperationCut.Enabled = false; + } } /// @@ -694,20 +700,23 @@ namespace AIMS.OperationAanesthesia { bool b = true; - if (cboOperationLevel.Text == "" || cboOperationLevel.Text == "未分级") + if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级")) { - MessageBox.Show("请填手术分级"); - label19.ForeColor = Color.Red; - cboOperationLevel.Focus(); - b = false; + if (cboOperationLevel.Text == "" || cboOperationLevel.Text == "未分级") + { + MessageBox.Show("请填手术分级"); + label19.ForeColor = Color.Red; + cboOperationLevel.Focus(); + b = false; + } + if (txtOperationCut.Text == "") + { + MessageBox.Show("请填写切口类型"); + label20.ForeColor = Color.Red; + txtOperationCut.Focus(); + b = false; + } } - //if (txtOperationCut.Text == "") - //{ - // MessageBox.Show("请填写切口类型"); - // label20.ForeColor = Color.Red; - // txtOperationCut.Focus(); - // b = false; - //} return b; } #endregion diff --git a/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs b/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs index cb020b5..e1c7aba 100644 --- a/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs +++ b/AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs @@ -177,6 +177,7 @@ namespace AIMS.OperationAanesthesia foreach (var item in feesRecords) { if (!SelChargName.Contains(item.ChargName)) continue; + fee = item; Patient = PatientRecord.GetPatientRecord(item.PatientId.Value); if (item.FeeTypeId == "精神II类") { @@ -228,10 +229,13 @@ namespace AIMS.OperationAanesthesia element.Text = info.GetValue(Patient, null).ToString(); } } - var Text8 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement - && (x as XTextInputFieldElement).Name == "批号").FirstOrDefault(); - if (Text8 != null) - Text8.Text = fee.InsureNO; + if (fee != null) + { + var Text8 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).Name == "批号").FirstOrDefault(); + if (Text8 != null) + Text8.Text = fee.InsureNO; + } } else { @@ -248,7 +252,7 @@ namespace AIMS.OperationAanesthesia } DModel.XmlFileName = TModel.XmlFileName; DModel.TemplateId = TModel.Id; - DModel.OrderNo =fee.Extend4 ; + DModel.OrderNo = fee.Extend4; //患者基本信息赋值 var query = from XTextElement in myEditControl.Document.Fields.ToArray() where XTextElement is XTextInputFieldElement diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 612efe5..c593ec4 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -3860,7 +3860,7 @@ namespace AIMS.OperationFront.UI foreach (ucPlanOperationRoomCard item in ucOpeRooms) { item.PlanOperationTime = dtpSearchTime.Value; - DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, "OperationRoomId ='" + item.OperationRoomId + "' and State <> '˻' ", ""); + DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, "OperationRoomId ='" + item.OperationRoomId + "' and State <> '˻' ", "PlanOrder"); item.LoadInfo(Newdt); } //SelectPanel.Invalidate(); @@ -3875,7 +3875,7 @@ namespace AIMS.OperationFront.UI { if (item.operationRoom.Id.Value != UpdateRoom) continue; item.PlanOperationTime = dtpSearchTime.Value; - DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, "OperationRoomId ='" + item.OperationRoomId + "' and State <> '˻' ", ""); + DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, "OperationRoomId ='" + item.OperationRoomId + "' and State <> '˻' ", "PlanOrder"); item.LoadInfo(Newdt); } //SelectPanel.Invalidate(); @@ -3887,7 +3887,7 @@ namespace AIMS.OperationFront.UI { if (item.operationRoom.Id.Value != UpdateRoom) continue; item.PlanOperationTime = dtpSearchTime.Value; - DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, "OperationRoomId ='" + item.OperationRoomId + "' and State <> '˻' ", ""); + DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, "OperationRoomId ='" + item.OperationRoomId + "' and State <> '˻' ", "PlanOrder"); item.LoadInfo(Newdt); item.FillRoomDetail(); } @@ -4226,7 +4226,7 @@ namespace AIMS.OperationFront.UI private void button3_Click(object sender, EventArgs e) { NowPatientDataTable = BOperationApply.GetOperationFrontDataTable(dtpSearchTime.Value.ToString("yyyy-MM-dd 00:00:00"), dtpSearchTime.Value.ToString("yyyy-MM-dd 23:59:59")); - DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, " State <> '˻' ", ""); + DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, " State <> '˻' ", "PlanOrder"); if (Newdt == null || Newdt.Rows.Count <= 0) return; frmPrintingArrangemen frm = new frmPrintingArrangemen(); frm.dt = Newdt; diff --git a/AIMS/PublicUI/frmCreateTemplate.cs b/AIMS/PublicUI/frmCreateTemplate.cs index 6b9016f..a0f7952 100644 --- a/AIMS/PublicUI/frmCreateTemplate.cs +++ b/AIMS/PublicUI/frmCreateTemplate.cs @@ -1257,7 +1257,7 @@ namespace AIMS.PublicUI.UI OperationTemplateOutputLiquidsObj.TypeId = TypeId; OperationTemplateOutputLiquidsObj.ItemKindName = "出量"; OperationTemplateOutputLiquidsObj.InRoomTime = InRoomTime; - OperationTemplateOutputLiquidsObj.ItemId = factOutput.OutputLiquidsTypeId; + OperationTemplateOutputLiquidsObj.ItemId = factOutput.OutputLiquidsId; OperationTemplateOutputLiquidsObj.BeginTime = factOutput.BeginTime; OperationTemplateOutputLiquidsObj.EndTime = factOutput.EndTime; OperationTemplateOutputLiquidsObj.Value = factOutput.Dosage; diff --git a/DocumentManagement/DocumentEntity/PatientRecord.cs b/DocumentManagement/DocumentEntity/PatientRecord.cs index ec5080d..e6edec4 100644 --- a/DocumentManagement/DocumentEntity/PatientRecord.cs +++ b/DocumentManagement/DocumentEntity/PatientRecord.cs @@ -240,7 +240,7 @@ namespace DocumentManagement StringBuilder strSql = new StringBuilder(); strSql.Append(" select *"); strSql.Append(" from V_OperationRecordALL where"); - strSql.Append(" PatientId = '" + patientId + "'"); + strSql.Append(" PatientId = '" + patientId + "' and (RecoverId is null or RecoverId =1)"); return DbHelperSQL.GetDataTable(strSql.ToString()); } catch (Exception ex) diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index acbde6e..9020b46 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -159,37 +159,10 @@ namespace DrawGraph { //取得点击位置图例的中文 PhysioDataConfig appTemp = reClickParamName(sender1, mousePt); - if (appTemp != null) - { - if (myOpeRecord.SelPhysioConfig == null) - { - appTemp.IsClick = true; - myOpeRecord.SelPhysioConfig = appTemp; - myOpeRecord.SelPhysioConfig.PatientId = myOpeRecord.Id.Value; - myOpeRecord.SelPhysioConfig.onClick(e); - } - else - { - if (myOpeRecord.SelPhysioConfig.Name == appTemp.Name) - { - myOpeRecord.SelPhysioConfig.IsClick = false; - myOpeRecord.SelPhysioConfig.onClick(e); - myOpeRecord.SelPhysioConfig = null; - } - else - { - myOpeRecord.SelPhysioConfig.IsClick = false; - myOpeRecord.SelPhysioConfig.onClick(e); - appTemp.IsClick = true; - myOpeRecord.SelPhysioConfig = appTemp; - myOpeRecord.SelPhysioConfig.PatientId = myOpeRecord.Id.Value; - myOpeRecord.SelPhysioConfig.onClick(e); - } - } - } + ClickPhysioDataConfig(e, appTemp); } //如果点击在麻醉单子范围内 - if (pane != null) + else if (pane != null) { if (myOpeRecord.SelPhysioConfig != null && myOpeRecord.SelPhysioConfig.IsClick) { @@ -229,22 +202,74 @@ namespace DrawGraph myOpeRecord.SAreaObj.StartPD = pdTemp; myOpeRecord.SAreaObj.StartPDs = rePDs(sender, e); } + //if (e.Button == System.Windows.Forms.MouseButtons.Left && e.Clicks == 1) + //{ + // if ((AnesOpeStatue == DoAnesOpeStatus.VIEW || AnesOpeStatue == DoAnesOpeStatus.SelectArea) && myOpeRecord.SelPhysioConfig == null) + // { + // List pdTemps = rePDs(sender as ZedGraphControl, e); + // if (pdTemps != null) + // { + // foreach (var pdTemp in pdTemps) + // { + // PhysioData pdTrue = GetPDOfPhysioParams(pdTemp); + // if (pdTrue != null) + // { + // ClickPhysioDataConfig(e, pdTrue.config); + // return; + // } + // } + // } + // } + //} } } - - if (!isLegendArea(sender1, mousePt) && pane == null) + else { if (myOpeRecord.SelPhysioConfig != null) { myOpeRecord.SelPhysioConfig.IsClick = false; myOpeRecord.SelPhysioConfig.onClick(e); myOpeRecord.SelPhysioConfig = null; + //ZedControl.AxisChange(); + ZedControl.Refresh(); } } } - //ZedControl.AxisChange(); - ZedControl.Refresh(); } + + private void ClickPhysioDataConfig(MouseEventArgs e, PhysioDataConfig appTemp) + { + if (appTemp != null) + { + if (myOpeRecord.SelPhysioConfig == null) + { + appTemp.IsClick = true; + myOpeRecord.SelPhysioConfig = appTemp; + myOpeRecord.SelPhysioConfig.PatientId = myOpeRecord.Id.Value; + myOpeRecord.SelPhysioConfig.onClick(e); + } + else + { + if (myOpeRecord.SelPhysioConfig.Name == appTemp.Name) + { + myOpeRecord.SelPhysioConfig.IsClick = false; + myOpeRecord.SelPhysioConfig.onClick(e); + myOpeRecord.SelPhysioConfig = null; + } + else + { + myOpeRecord.SelPhysioConfig.IsClick = false; + myOpeRecord.SelPhysioConfig.onClick(e); + appTemp.IsClick = true; + myOpeRecord.SelPhysioConfig = appTemp; + myOpeRecord.SelPhysioConfig.PatientId = myOpeRecord.Id.Value; + myOpeRecord.SelPhysioConfig.onClick(e); + } + } + ZedControl.Refresh(); + } + } + public override void MouseMove(ZedGraphControl sender, MouseEventArgs e) { double x = Convert.ToDouble(Convert.ToDouble(e.X) / Convert.ToDouble(sender.Width)); @@ -279,7 +304,6 @@ namespace DrawGraph } aSyncTip.ViewStr = viewStr; aSyncTip.Show(x, (y + yP)); - //ZedControl.AxisChange(); ZedControl.Refresh(); } //考虑客户端拖拽数据库处理不及时 可以采用批量缓存新增修改的数据点集中处理 @@ -399,6 +423,8 @@ namespace DrawGraph { pdTrue.config.DelItem(pdTrue); } + //if (myOpeRecord.SelPhysioConfig != null) + // ClickPhysioDataConfig(e, pdTrue.config); } } } @@ -427,14 +453,14 @@ namespace DrawGraph myOpeRecord.SAreaObj.StartPD.RecordTime, myOpeRecord.SAreaObj.EndPd.RecordTime, startValue2, endValue2); - + List selparameters = new List(); foreach (PhysioDataConfig addPP in myOpeRecord.PhysioConfigList) { bool istrue = false; foreach (int item in pdTemps) { - if (item == addPP.Id && addPP.YAisx==0) + if (item == addPP.Id && addPP.YAisx == 0) { istrue = true; break; @@ -442,7 +468,7 @@ namespace DrawGraph } foreach (int item in pdTemps2) { - if (item == addPP.Id && addPP.YAisx==1) + if (item == addPP.Id && addPP.YAisx == 1) { istrue = true; break; @@ -450,7 +476,7 @@ namespace DrawGraph } if (istrue == true) selparameters.Add(addPP); - } + } if (selparameters.Count <= 0) return; DeletePhysios frm = new DeletePhysios(myOpeRecord.Id.Value, diff --git a/DrawGraph/AreaManage/PhysioDataService.cs b/DrawGraph/AreaManage/PhysioDataService.cs index 794b4c9..f8721f3 100644 --- a/DrawGraph/AreaManage/PhysioDataService.cs +++ b/DrawGraph/AreaManage/PhysioDataService.cs @@ -34,13 +34,14 @@ namespace DrawGraph } public static void AddPhysioDatas2(List physioData) - { + { StringBuilder insterStr = new StringBuilder(); foreach (var item in physioData) - { + { insterStr.Append(" INSERT PhysioData (PatientId, PhysioDataConfigId, RecordTime, Value )VALUES ('" + item.PatientId + "' , '" + item.PhysioDataConfigId + "' ,'" + item.RecordTime + "', '" + item.ValueString + "' )"); - } - DBHelper.ExecNonQuery(insterStr.ToString()); + } + if (insterStr.ToString() != "") + DBHelper.ExecNonQuery(insterStr.ToString()); } public static void UpdatePhysioData(PhysioData oldphysioData, PhysioData newphysioData, string OperatorName)