diff --git a/AIMS/AIMS.xml b/AIMS/AIMS.xml index 093bb06..8fe8536 100644 --- a/AIMS/AIMS.xml +++ b/AIMS/AIMS.xml @@ -1,6 +1,6 @@  - Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020; + Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;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/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index 95d926e..24ad6c5 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -1103,7 +1103,7 @@ namespace AIMS.OperationAanesthesia LoadAnesRescue(); } - private System.Windows.Forms.Timer timerLoadAnesRescue; + //private System.Windows.Forms.Timer timerLoadAnesRescue; public void LoadAnesRescue() { @@ -1114,18 +1114,19 @@ namespace AIMS.OperationAanesthesia circularProgress2.Visible = true; zgcAnaesRecord.Visible = false; zgcAnaesRecord2.Visible = false; - timerLoadAnesRescue = new System.Windows.Forms.Timer(components); - timerLoadAnesRescue.Enabled = true;//调试时设置为FALSE ， - timerLoadAnesRescue.Interval = 200; - timerLoadAnesRescue.Tick -= TimerLoadAnesRescue_Tick; - timerLoadAnesRescue.Tick += TimerLoadAnesRescue_Tick; - timerLoadAnesRescue.Start(); - //TimerLoadAnesRescue_Tick(null, null); + TimerLoadAnesRescue_Tick(null, null); + + //timerLoadAnesRescue = new System.Windows.Forms.Timer(components); + //timerLoadAnesRescue.Enabled = true;//调试时设置为FALSE ， + //timerLoadAnesRescue.Interval = 200; + //timerLoadAnesRescue.Tick -= TimerLoadAnesRescue_Tick; + //timerLoadAnesRescue.Tick += TimerLoadAnesRescue_Tick; + //timerLoadAnesRescue.Start(); } private void TimerLoadAnesRescue_Tick(object sender, EventArgs e) - { - timerLoadAnesRescue.Dispose(); + { + //timerLoadAnesRescue.Dispose(); try { if (PatientId > 0 && State == AIMSExtension.EditState.ADD) diff --git a/AIMS/OperationAanesthesia/frmFactEventsNew.cs b/AIMS/OperationAanesthesia/frmFactEventsNew.cs index 9f861a0..584e34f 100644 --- a/AIMS/OperationAanesthesia/frmFactEventsNew.cs +++ b/AIMS/OperationAanesthesia/frmFactEventsNew.cs @@ -42,6 +42,7 @@ namespace AIMS.PublicUI.UI /// 修改事件 /// public event EventParamHandler EventParam; + public bool IsDeleteConcet = false; public frmFactEventsNew() { @@ -390,7 +391,7 @@ namespace AIMS.PublicUI.UI er.clearAddObj(zgcAnaesRecord); BFactEvents.Delete(er); DelEventTime(er); - EventParam(); + IsDeleteConcet = true; _record.FactEventsList.Remove(er); dgvEvents.Rows.Remove(dgvEvents.CurrentRow); } @@ -825,6 +826,10 @@ namespace AIMS.PublicUI.UI //} //this.Hide(); //e.Cancel = true; + if (IsDeleteConcet == true) + { + EventParam(); + } } public bool equelEvents(FactEvents oldDrug, FactEvents newDrug) diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.Designer.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.Designer.cs index 83bf966..a45298c 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.Designer.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord.Designer.cs @@ -1527,7 +1527,7 @@ this.txtTourNurse2.Name = "txtTourNurse2"; this.txtTourNurse2.Size = new System.Drawing.Size(120, 22); this.txtTourNurse2.TabIndex = 847; - this.txtTourNurse2.DoubleClick += new System.EventHandler(this.txtTourNurse_Click); + this.txtTourNurse2.DoubleClick += new System.EventHandler(this.txtTourNurse2_Click); // // txtOperationDoctor2 // @@ -1579,7 +1579,7 @@ this.txtInstrumentNurse2.Name = "txtInstrumentNurse2"; this.txtInstrumentNurse2.Size = new System.Drawing.Size(120, 22); this.txtInstrumentNurse2.TabIndex = 848; - this.txtInstrumentNurse2.DoubleClick += new System.EventHandler(this.txtInstrumentNurse_Click); + this.txtInstrumentNurse2.DoubleClick += new System.EventHandler(this.txtInstrumentNurse2_Click); // // panelQXList2 // diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs index d2b7358..fb434f3 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord.cs @@ -3,10 +3,8 @@ using AIMS.OperationFront.UI; using AIMS.OremrUserControl; using AIMS.PublicUI.UI; using AIMSBLL; -using AIMSDAL; using AIMSExtension; using AIMSModel; -using DevComponents.DotNetBar; using DevComponents.Editors.DateTimeAdv; using DocumentManagement; using DrawGraph; @@ -15,11 +13,9 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; -using System.Diagnostics; using System.Drawing; using System.Drawing.Printing; using System.Linq; -using System.Reflection; using System.Windows.Forms; namespace AIMS.OperationAanesthesia @@ -1654,9 +1650,9 @@ namespace AIMS.OperationAanesthesia } _record.InstrumentList2.ApplianceRecordList = GetApplianceRecord2(); BApplianceRecord.InsertListData(_record.InstrumentList2.ApplianceRecordList); - DBManage.AddPerson(_record, SelectOperationDoctorData, 1); - DBManage.AddPerson(_record, SelectInstrumentNurseData, 6); - DBManage.AddPerson(_record, SelectTourNurseData, 7); + //DBManage.AddPerson(_record, SelectOperationDoctorData, 1); + //DBManage.AddPerson(_record, SelectInstrumentNurseData, 6); + //DBManage.AddPerson(_record, SelectTourNurseData, 7); } catch (Exception ex) @@ -1695,8 +1691,8 @@ namespace AIMS.OperationAanesthesia if (txtOperationPosition.Text != "") txtOperationPosition.Text = txtOperationPosition.Text.Substring(0, txtOperationPosition.Text.LastIndexOf(" ,")); txtOperationDoctor2.Text = txtOperationDoctor.Text; - txtInstrumentNurse2.Text = txtInstrumentNurse.Text; - txtTourNurse2.Text = txtTourNurse.Text; + //txtInstrumentNurse2.Text = txtInstrumentNurse.Text; + //txtTourNurse2.Text = txtTourNurse.Text; } else { @@ -1705,8 +1701,8 @@ namespace AIMS.OperationAanesthesia templateManage.Bind(); zgcAnaesRecord.Refresh(); txtOperationDoctor.Text = txtOperationDoctor2.Text; - txtInstrumentNurse.Text = txtInstrumentNurse2.Text; - txtTourNurse.Text = txtTourNurse2.Text; + //txtInstrumentNurse.Text = txtInstrumentNurse2.Text; + //txtTourNurse.Text = txtTourNurse2.Text; } } @@ -2044,7 +2040,7 @@ namespace AIMS.OperationAanesthesia int idxStart = txtTourNurse.Text.LastIndexOf(","); txtTourNurse.Text = txtTourNurse.Text.Substring(0, idxStart); } - txtTourNurse2.Text = txtTourNurse.Text; + //txtTourNurse2.Text = txtTourNurse.Text; } private List SelectInstrumentNurseData = new List(); //一助 @@ -2072,7 +2068,7 @@ namespace AIMS.OperationAanesthesia int idxStart = txtInstrumentNurse.Text.LastIndexOf(","); txtInstrumentNurse.Text = txtInstrumentNurse.Text.Substring(0, idxStart); } - txtInstrumentNurse2.Text = txtInstrumentNurse.Text; + //txtInstrumentNurse2.Text = txtInstrumentNurse.Text; } private PublicUI.UI.frmSelectPerson frmOperationDoctor; @@ -2103,25 +2099,61 @@ namespace AIMS.OperationAanesthesia txtOperationDoctor2.Text = txtOperationDoctor.Text; } - /// - /// 根据工作类型 选择医生术者赋值TextBox - /// - /// 医生术者TextBox - /// 工作类型 - public void setDoctor(TextBox controlTextBox, string workersType) + private PublicUI.UI.frmSelectPerson frmTourNurse2; + private List SelectTourNurseData2 = new List(); //一助 + private void txtTourNurse2_Click(object sender, EventArgs e) { - PublicUI.UI.frmSelectPerson frmOperationDoctor = new PublicUI.UI.frmSelectPerson(); - frmOperationDoctor.PersonType = workersType; - frmOperationDoctor.SelectDepartmentName = "手术室"; - frmOperationDoctor.SelectPersonData = new List(); - frmOperationDoctor.ShowDialog(); - - foreach (int RowId in frmOperationDoctor.SelectPersonData) - { - controlTextBox.Text = BPerson.GetModel(RowId).Name; - } + frmTourNurse2 = new PublicUI.UI.frmSelectPerson(); + frmTourNurse2.PersonType = "手术室护士"; + frmTourNurse2.SelectDepartmentName = "手术室"; + frmTourNurse2.SelectPersonData = SelectTourNurseData2; + frmTourNurse2.FormClosed += new FormClosedEventHandler(frmTourNurse2_FormClosed); + frmTourNurse2.ShowDialog(); } + void frmTourNurse2_FormClosed(object sender, FormClosedEventArgs e) + { + txtTourNurse2.Text = ""; + if (frmTourNurse2.SelectPersonData.Count > 0) + { + SelectTourNurseData2 = frmTourNurse2.SelectPersonData; + foreach (int RowId in frmTourNurse2.SelectPersonData) + { + txtTourNurse2.Text += BPerson.SelectSingle(RowId).Name + ","; + } + int idxStart = txtTourNurse2.Text.LastIndexOf(","); + txtTourNurse2.Text = txtTourNurse2.Text.Substring(0, idxStart); + } + } + + private List SelectInstrumentNurseData2 = new List(); //一助 + private PublicUI.UI.frmSelectPerson frmInstrumentNurse2; + private void txtInstrumentNurse2_Click(object sender, EventArgs e) + { + frmInstrumentNurse2 = new PublicUI.UI.frmSelectPerson(); + frmInstrumentNurse2.PersonType = "手术室护士"; + frmInstrumentNurse2.SelectDepartmentName = "手术室"; + frmInstrumentNurse2.SelectPersonData = SelectInstrumentNurseData2; + frmInstrumentNurse2.FormClosed += new FormClosedEventHandler(frmInstrumentNurse2_FormClosed); + frmInstrumentNurse2.ShowDialog(); + } + + void frmInstrumentNurse2_FormClosed(object sender, FormClosedEventArgs e) + { + txtInstrumentNurse2.Text = ""; + if (frmInstrumentNurse2.SelectPersonData.Count > 0) + { + SelectInstrumentNurseData2 = frmInstrumentNurse2.SelectPersonData; + foreach (int RowId in frmInstrumentNurse2.SelectPersonData) + { + txtInstrumentNurse2.Text += BPerson.SelectSingle(RowId).Name + ","; + } + int idxStart = txtInstrumentNurse2.Text.LastIndexOf(","); + txtInstrumentNurse2.Text = txtInstrumentNurse2.Text.Substring(0, idxStart); + } + } + + private void button9_Click(object sender, EventArgs e) { if (superTabMain.SelectedTab.Name == "spTabQXQDD") @@ -2220,7 +2252,7 @@ namespace AIMS.OperationAanesthesia if (_record != null) { EMRExtension.OpenFeesRecord(_record, "护士"); - } + } } private void frmAnasRecordInstrument_VisibleChanged(object sender, EventArgs e) diff --git a/AIMS/OperationAfter/frmExportConfig.cs b/AIMS/OperationAfter/frmExportConfig.cs index 7ac5bf0..2dd79d1 100644 --- a/AIMS/OperationAfter/frmExportConfig.cs +++ b/AIMS/OperationAfter/frmExportConfig.cs @@ -99,25 +99,32 @@ namespace AIMS.OperationAfter.UI private void tsbSave_Click(object sender, EventArgs e) { - EndEdit(); - exportConfig.Name = txtName.Text; - exportConfig.Note = DataGridViewPath; - ExportConfig dgvSetting = CreateDataGridViewSetting(dataGridView2); - string ss = JsonConvert.SerializeObject(dgvSetting); - exportConfig.Value = ss; - exportConfig.IsValid = 1; - exportConfig.OperatorNo = PublicMethod.OperatorNo; - exportConfig.OperatorName = PublicMethod.OperatorName; - exportConfig.OperateDate = DateTime.Now; - exportConfig.Extend1 = PublicMethod.RoleId.ToString(); + try + { + EndEdit(); + exportConfig.Name = txtName.Text; + exportConfig.Note = DataGridViewPath; + ExportConfig dgvSetting = CreateDataGridViewSetting(dataGridView2); + string ss = JsonConvert.SerializeObject(dgvSetting); + exportConfig.Value = ss; + exportConfig.IsValid = 1; + exportConfig.OperatorNo = PublicMethod.OperatorNo; + exportConfig.OperatorName = PublicMethod.OperatorName; + exportConfig.OperateDate = DateTime.Now; + exportConfig.Extend1 = PublicMethod.RoleId.ToString(); - if (exportConfig.Id != null && exportConfig.Id.Value > 0) - { - BSysConfig.Update(exportConfig); + if (exportConfig.Id != null && exportConfig.Id.Value > 0) + { + BSysConfig.Update(exportConfig); + } + else + { + exportConfig.Id = BSysConfig.Insert(exportConfig); + } } - else - { - exportConfig.Id = BSysConfig.Insert(exportConfig); + catch (Exception ex) + { + throw; } DialogResult = DialogResult.OK; Close(); @@ -138,9 +145,9 @@ namespace AIMS.OperationAfter.UI export.PrintName = column.Cells["headerTextDataGridViewTextBoxColumn"].Value.ToString(); export.Width = int.Parse(column.Cells["widthDataGridViewTextBoxColumn"].Value.ToString()); export.IsVisible = bool.Parse(column.Cells["visibleDataGridViewCheckBoxColumn"].Value.ToString()); - export.IsPrint = bool.Parse(column.Cells["printShow"].Value.ToString()); - export.PrintWidth = int.Parse(column.Cells["printWidth"].Value.ToString()); - export.PrintSize = int.Parse(column.Cells["PrintSize"].Value.ToString()); + export.IsPrint = column.Cells["printShow"].Value==null?false:bool.Parse(column.Cells["printShow"].Value.ToString()); + export.PrintWidth =column.Cells["printWidth"].Value==null?8: int.Parse(column.Cells["printWidth"].Value.ToString()); + export.PrintSize =column.Cells["PrintSize"].Value==null?8: int.Parse(column.Cells["PrintSize"].Value.ToString()); dataGridViewSetting.Exports.Add(export); } diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index 47e3c8c..9f3461e 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -3562,24 +3562,6 @@ namespace AIMS.OperationFront.UI { try { - - dtpSearchTime.Value = DateTime.Now; - string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString(); - labelWeek.Text = week; - if (RoomCardManage.IsAllowPassOpe == true) - { btnpass.Visible = true; toolStripSeparator3.Visible = true; } - else - { btnpass.Visible = false; toolStripSeparator3.Visible = false; } - - SSSDept = BDepartment.Select(" NAME ='' and IsValid=1 ", null, RecursiveType.None, 0); - MZKDept = BDepartment.Select(" NAME ='' and IsValid=1 ", null, RecursiveType.None, 0); - if ((MZKDept == null || MZKDept.Count <= 0) && SSSDept != null) MZKDept = SSSDept; - - ControlExtension.GetOperationSite(labelSite, CboOperationSite); - FirstLoad(); - - this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged); - RoomCardManage.IsAllowPat = RoomCardManage.GetRolePermission("ų̻"); RoomCardManage.IsAllowAns = RoomCardManage.GetRolePermission("ų"); RoomCardManage.IsAllowNur = RoomCardManage.GetRolePermission("ų̻ʿ"); @@ -3608,6 +3590,24 @@ namespace AIMS.OperationFront.UI { mnuChangeOptRoomTo.Visible = false; } + + dtpSearchTime.Value = DateTime.Now; + string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString(); + labelWeek.Text = week; + if (RoomCardManage.IsAllowPassOpe == true) + { btnpass.Visible = true; toolStripSeparator3.Visible = true; } + else + { btnpass.Visible = false; toolStripSeparator3.Visible = false; } + + SSSDept = BDepartment.Select(" NAME ='' and IsValid=1 ", null, RecursiveType.None, 0); + MZKDept = BDepartment.Select(" NAME ='' and IsValid=1 ", null, RecursiveType.None, 0); + if ((MZKDept == null || MZKDept.Count <= 0) && SSSDept != null) MZKDept = SSSDept; + + ControlExtension.GetOperationSite(labelSite, CboOperationSite); + FirstLoad(); + + this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged); + } catch (Exception ex) { diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index f1fb77d..fec01f2 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/DrawGraph/AreaManage/DrugsManage.cs @@ -397,7 +397,7 @@ namespace DrawGraph //addDrug1.clearDNAndDT(ZedControl); drugsy = addDrug1.nowY; if (drugsy <= maxDrugsy) - temp.drawText2(H3pack.RealX + 0.006f, drugsy); + temp.drawText2(H3pack.RealX + 0.003f, drugsy); else ListAddDrugs(DrugListstr, i, temp); foreach (FactDrug item in temp.ChildFactDrugList) @@ -413,7 +413,7 @@ namespace DrawGraph //因为相同则取得相同对象的Y,为当前的对象的高度 drugsy = addDrug1item.nowY; if (drugsy <= maxDrugsy) - item.drawText2(H3pack.RealX + 0.006f, drugsy); + item.drawText2(H3pack.RealX + 0.003f, drugsy); else ListAddDrugs(DrugListstr, i, item); continue; @@ -426,7 +426,7 @@ namespace DrawGraph if (isChildEqual == true) continue; if (drugsy <= maxDrugsy) { - temp.drawText(H3pack.RealX + 0.006f, drugsy); + temp.drawText(H3pack.RealX + 0.003f, drugsy); if (temp.DrugName != "氧气" && isEqual == false) rowDrugsIndex++; } diff --git a/DrawGraph/AreaManage/FactDrug.cs b/DrawGraph/AreaManage/FactDrug.cs index 3f1176f..5b23987 100644 --- a/DrawGraph/AreaManage/FactDrug.cs +++ b/DrawGraph/AreaManage/FactDrug.cs @@ -314,10 +314,14 @@ namespace DrawGraph if (this.DrugChannel != null && this.DrugChannel != "") DrName += "(" + this.DrugChannel + ")"; if (this.DosageUnit != null && this.DosageUnit != "") DrName += "(" + this.DosageUnit + ")"; if (this.BloodType != null && this.BloodType != "") DrName += "(" + this.BloodType + ")"; + + float fsize = 6f; + if (DrName.Length > 20) fsize = 5f; + if (DrName.Length > 28) fsize = 4.6f; if (DrugKind.Contains("麻") || DrugKind.Contains("精神")) - ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Red, 6f); + ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Red, fsize); else - ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Black, 6f); + ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Black, fsize); } } diff --git a/DrawGraph/AreaManage/IconManage.cs b/DrawGraph/AreaManage/IconManage.cs index 92565a9..cd6adad 100644 --- a/DrawGraph/AreaManage/IconManage.cs +++ b/DrawGraph/AreaManage/IconManage.cs @@ -128,12 +128,11 @@ namespace DrawGraph double span = getYPositionByListIndex(1, eventy, eventendy, 2); List eventListstr = new List(); eventListstr.Add("【事件】"); - myOpeRecord.FactEventsList.Sort(new FactEventsComparer()); + myOpeRecord.FactEventsList.Sort(new FactEventsComparer()); //循环加药集体 for (int i = 0; i < myOpeRecord.FactEventsList.Count; i++) { - FactEvents temp = myOpeRecord.FactEventsList[i]; - //ShowRespDate(temp, null); + FactEvents temp = myOpeRecord.FactEventsList[i]; //判断该事件是否存在当前时间段 if (IfInTimeExist(temp.EventBeginTime.Value, temp.EventEndTime.Value) == false) continue; diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index b4febac..7e7b080 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -353,7 +353,7 @@ namespace DrawGraph addDrug1.clearDNAndDT(ZedControl); drugsy = addDrug1.nowY; if (drugsy <= maxDrugsy) - temp.drawText(H3pack.RealX + 0.006f, drugsy); + temp.drawText(H3pack.RealX + 0.003f, drugsy); else ListAddDrugs(SapListstr, i, temp); foreach (FactDrug item in temp.ChildFactDrugList) @@ -369,7 +369,7 @@ namespace DrawGraph ////因为相同则取得相同对象的Y,为当前的对象的高度 drugsy = addDrug1item.nowY; if (drugsy <= maxDrugsy) - item.drawText(H3pack.RealX + 0.006f, drugsy); + item.drawText(H3pack.RealX + 0.003f, drugsy); else ListAddDrugs(SapListstr, i, item); continue; @@ -382,7 +382,7 @@ namespace DrawGraph if (isChildEqual == true) continue; if (drugsy <= maxDrugsy) { - temp.drawText(H3pack.RealX + 0.006f, drugsy); + temp.drawText(H3pack.RealX + 0.003f, drugsy); if (isEqual == false) rowDrugsIndex++; }