From 85ae9e317aaa2c521d1b986045eed3568d81c499 Mon Sep 17 00:00:00 2001 From: leomon Date: Wed, 3 May 2023 01:14:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AF=E5=89=8D=E7=A6=81=E9=A3=9F=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=98=AF=20=E5=A2=9E=E5=8A=A0=E6=9C=AF=E5=90=8E?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=20=E6=9C=AF=E5=90=8E=E8=AF=8A=E6=96=AD=20?= =?UTF-8?q?=E6=89=8B=E6=9C=AF=E6=96=B9=E5=BC=8F=20=E9=BA=BB=E9=86=89?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E9=BA=BB=E9=86=89=E8=8D=AF=E6=8C=81?= =?UTF-8?q?=E7=BB=AD=2020ml=2030=E6=AF=AB=E5=8D=87=E4=B8=80=E8=A1=8C=20?= =?UTF-8?q?=E8=99=9A=E7=BA=BF=E7=A8=8D=E5=BE=AE=E7=B2=97=E4=B8=80=E7=82=B9?= =?UTF-8?q?=20=E6=80=BB=E5=87=BA=E9=87=8F=E5=8D=95=E7=8B=AC=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=B0=BF=E9=87=8F=E5=92=8C=E5=87=BA=E8=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmAanesthesiaRecord.Designer.cs | 43 +++++++++--------- AIMS/OperationAanesthesia/frmSeleteRoom.cs | 2 + .../frmSeleteRoom.designer.cs | 2 + AIMS/PublicUI/frmCreateTemplate.cs | 2 +- AIMSEntity/BLL/Extension/BOperationRecord.cs | 7 +-- AIMSEntity/DAL/Extension/DOperationRecord.cs | 4 +- .../DocumentEntity/DocumentExtension.cs | 28 +----------- DocumentManagement/UI/ShowPacsText.cs | 3 ++ DrawGraph/AreaManage/BaseInfoBottomManage.cs | 24 ++++++++++ DrawGraph/AreaManage/DBManage.cs | 43 ++++++++++++++++++ DrawGraph/AreaManage/MonitorManage.cs | 8 +++- DrawGraph/AreaManage/OutputManage.cs | 44 +++++++++++++------ 12 files changed, 139 insertions(+), 71 deletions(-) diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index d15668f..f4af1be 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -33,6 +33,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel14 = new System.Windows.Forms.Panel(); + this.button10 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button(); this.btnCancelIn = new System.Windows.Forms.Button(); @@ -131,7 +132,6 @@ this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.button10 = new System.Windows.Forms.Button(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -217,6 +217,27 @@ this.panel14.Size = new System.Drawing.Size(160, 931); this.panel14.TabIndex = 5; // + // button10 + // + this.button10.BackColor = System.Drawing.Color.Transparent; + this.button10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.button10.Cursor = System.Windows.Forms.Cursors.Hand; + this.button10.Dock = System.Windows.Forms.DockStyle.Top; + this.button10.FlatAppearance.BorderSize = 0; + this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button10.Font = new System.Drawing.Font("微软雅黑", 11F); + this.button10.ForeColor = System.Drawing.Color.DimGray; + this.button10.Image = global::AIMS.Properties.Resources.安全检查; + this.button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button10.Location = new System.Drawing.Point(0, 550); + this.button10.Name = "button10"; + this.button10.Size = new System.Drawing.Size(160, 50); + this.button10.TabIndex = 16; + this.button10.Text = " 安全核查"; + this.button10.UseVisualStyleBackColor = false; + this.button10.Visible = false; + this.button10.Click += new System.EventHandler(this.button10_Click); + // // button8 // this.button8.BackColor = System.Drawing.Color.Transparent; @@ -1968,26 +1989,6 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // button10 - // - this.button10.BackColor = System.Drawing.Color.Transparent; - this.button10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.button10.Cursor = System.Windows.Forms.Cursors.Hand; - this.button10.Dock = System.Windows.Forms.DockStyle.Top; - this.button10.FlatAppearance.BorderSize = 0; - this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button10.Font = new System.Drawing.Font("微软雅黑", 11F); - this.button10.ForeColor = System.Drawing.Color.DimGray; - this.button10.Image = global::AIMS.Properties.Resources.安全检查; - this.button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button10.Location = new System.Drawing.Point(0, 550); - this.button10.Name = "button10"; - this.button10.Size = new System.Drawing.Size(160, 50); - this.button10.TabIndex = 16; - this.button10.Text = " 安全核查"; - this.button10.UseVisualStyleBackColor = false; - this.button10.Click += new System.EventHandler(this.button10_Click); - // // frmAanesthesiaRecord // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/AIMS/OperationAanesthesia/frmSeleteRoom.cs b/AIMS/OperationAanesthesia/frmSeleteRoom.cs index 0f70cd4..1e2beee 100644 --- a/AIMS/OperationAanesthesia/frmSeleteRoom.cs +++ b/AIMS/OperationAanesthesia/frmSeleteRoom.cs @@ -20,6 +20,8 @@ namespace AIMS.OperationAanesthesia public frmSeleteRoom() { InitializeComponent(); + panel1.Height = ControlExtension.SiteRooms.Count * 30 ; + this.Height = ControlExtension.SiteRooms.Count * 30 + 50; } private void frmDeletePhysio_Load(object sender, EventArgs e) diff --git a/AIMS/OperationAanesthesia/frmSeleteRoom.designer.cs b/AIMS/OperationAanesthesia/frmSeleteRoom.designer.cs index addbfa6..e48d864 100644 --- a/AIMS/OperationAanesthesia/frmSeleteRoom.designer.cs +++ b/AIMS/OperationAanesthesia/frmSeleteRoom.designer.cs @@ -47,6 +47,7 @@ namespace AIMS.OperationAanesthesia // btnDelete // this.btnDelete.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDelete.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.btnDelete.Location = new System.Drawing.Point(14, 274); this.btnDelete.Name = "btnDelete"; this.btnDelete.Size = new System.Drawing.Size(86, 30); @@ -57,6 +58,7 @@ namespace AIMS.OperationAanesthesia // btnSave // this.btnSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSave.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.btnSave.Location = new System.Drawing.Point(106, 274); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(86, 30); diff --git a/AIMS/PublicUI/frmCreateTemplate.cs b/AIMS/PublicUI/frmCreateTemplate.cs index 475cbea..82ee71b 100644 --- a/AIMS/PublicUI/frmCreateTemplate.cs +++ b/AIMS/PublicUI/frmCreateTemplate.cs @@ -313,7 +313,7 @@ namespace AIMS.PublicUI.UI object value = dgvDrugsSQ.Rows[e.RowIndex].Cells[e.ColumnIndex].Value; if (!((DataGridViewComboBoxCell)dgvDrugsSQ.Rows[e.RowIndex].Cells[e.ColumnIndex]).Items.Contains(value)) { - ((DataGridViewComboBoxCell)dgvDrugsSQ.Rows[e.RowIndex].Cells[e.ColumnIndex]).Items.Add(value); + //((DataGridViewComboBoxCell)dgvDrugsSQ.Rows[e.RowIndex].Cells[e.ColumnIndex]).Items.Add(value); e.ThrowException = false; } } diff --git a/AIMSEntity/BLL/Extension/BOperationRecord.cs b/AIMSEntity/BLL/Extension/BOperationRecord.cs index ca68676..2949d1b 100644 --- a/AIMSEntity/BLL/Extension/BOperationRecord.cs +++ b/AIMSEntity/BLL/Extension/BOperationRecord.cs @@ -110,12 +110,7 @@ namespace AIMSBLL _record.AnesthesiaDoctor = OperationDoingdt.Rows[0]["AnesthesiaDoctorId"].ToString().Trim(); _record.InstrumentNurse = OperationDoingdt.Rows[0]["InstrumentNurseId"].ToString().Trim(); _record.TourNurse = OperationDoingdt.Rows[0]["TourNurseId"].ToString().Trim(); - _record.OrtherDoctorId = OperationDoingdt.Rows[0]["OrtherDoctorId"].ToString().Trim(); - //_record.SpecialCase = OperationDoingdt.Rows[0]["SpecialCase"].ToString().Trim(); - //if (_record.SpecialCase == null || _record.SpecialCase == "") _record.SpecialCase = "无"; - //if (OperationDoingdt.Rows[0]["Fasting"].ToString() != "") - // _record.Fasting = int.Parse(OperationDoingdt.Rows[0]["Fasting"].ToString()); - //_record.BloodType = OperationDoingdt.Rows[0]["BloodType"].ToString().Trim(); + _record.OrtherDoctorId = OperationDoingdt.Rows[0]["OrtherDoctorId"].ToString().Trim(); if (_record.SpecialCase == null || _record.SpecialCase == "") _record.SpecialCase = "无"; _record.OperationRoom = OperationDoingdt.Rows[0]["OperationRoom"].ToString().Trim(); } diff --git a/AIMSEntity/DAL/Extension/DOperationRecord.cs b/AIMSEntity/DAL/Extension/DOperationRecord.cs index 0c57403..8eb6459 100644 --- a/AIMSEntity/DAL/Extension/DOperationRecord.cs +++ b/AIMSEntity/DAL/Extension/DOperationRecord.cs @@ -15,9 +15,9 @@ namespace AIMSDAL public static int AddTitleTime(int PatientId, int ApplyId, int RecoverId, int State, DateTime Time, int RoomId) { string ApplyAnaesthesiaMethod = BApplyAnaesthesiaMethod.GetApplyAnaesthesiaMethod(ApplyId); - string strSql = "INSERT INTO OperationRecord(PatientId,OperationApplyId,RecoverId,[State],InRoomTime,OperatorNo,OperatorName,OperateDate,RoomId,AnaesthesiaMethodName)" + + string strSql = "INSERT INTO OperationRecord(PatientId,OperationApplyId,RecoverId,[State],InRoomTime,OperatorNo,OperatorName,OperateDate,RoomId,AnaesthesiaMethodName,Fasting)" + "VALUES (" + PatientId + "," + ApplyId + "," + RecoverId + ",'" + State + "','" + Time + "','" + AIMSExtension.PublicMethod.OperatorNo + "','" - + AIMSExtension.PublicMethod.OperatorName + "','" + AIMSExtension.PublicMethod.SystemDate() + "','" + RoomId + "','" + ApplyAnaesthesiaMethod + "');select @@identity "; + + AIMSExtension.PublicMethod.OperatorName + "','" + AIMSExtension.PublicMethod.SystemDate() + "','" + RoomId + "','" + ApplyAnaesthesiaMethod + "','是');select @@identity "; return Convert.ToInt32(HelperDB.DbHelperSQL.ExecNonQuery(strSql)); } diff --git a/DocumentManagement/DocumentEntity/DocumentExtension.cs b/DocumentManagement/DocumentEntity/DocumentExtension.cs index cde980c..213f366 100644 --- a/DocumentManagement/DocumentEntity/DocumentExtension.cs +++ b/DocumentManagement/DocumentEntity/DocumentExtension.cs @@ -236,7 +236,7 @@ namespace DocumentManagement string strH = hf == null ? "" : hf.Text; UpdateASA(Patient.ApplyId, strASA, strH); } - else if (XmlFileName == "麻醉术前访视评估记录单") + else if (XmlFileName == "麻醉术前访视评估记录单" || XmlFileName == "麻醉术前访视评估单") { string asaname = ""; string niyme = ""; @@ -259,31 +259,7 @@ namespace DocumentManagement } } UpdateASA(Patient.ApplyId, asaname, niyme); - } - else if (XmlFileName == "麻醉术前访视评估记录") - { - string asaname = ""; - string niyme = ""; - var asa = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement - && (x as XTextRadioBoxElement).Name == "asa"); - foreach (var item in asa) - { - if ((item as XTextRadioBoxElement).Checked == true) - { - asaname = item.Text; - } - } - var niy = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement - && (x as XTextRadioBoxElement).Name == "xgnfj"); - foreach (var item in niy) - { - if ((item as XTextRadioBoxElement).Checked == true) - { - niyme = item.Text; - } - } - UpdateASA(Patient.ApplyId, asaname, niyme); - } + } else if (XmlFileName == "麻醉知情同意书") { var asa = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement diff --git a/DocumentManagement/UI/ShowPacsText.cs b/DocumentManagement/UI/ShowPacsText.cs index 928949c..55b22e3 100644 --- a/DocumentManagement/UI/ShowPacsText.cs +++ b/DocumentManagement/UI/ShowPacsText.cs @@ -48,6 +48,9 @@ namespace DocumentManagement.UI string SelectedText = ((System.Windows.Forms.TextBoxBase)((System.Windows.Forms.DataGridView)sender).EditingControl).SelectedText; if (SelectedText != "") txtSelText.Text = SelectedText; + else + txtSelText.Text = "-"; + } } } diff --git a/DrawGraph/AreaManage/BaseInfoBottomManage.cs b/DrawGraph/AreaManage/BaseInfoBottomManage.cs index a15c2b5..dfda818 100644 --- a/DrawGraph/AreaManage/BaseInfoBottomManage.cs +++ b/DrawGraph/AreaManage/BaseInfoBottomManage.cs @@ -161,6 +161,9 @@ namespace DrawGraph case "OperationRecord.Operation": //手术名称 ope_Click(aEdit1, e); break; + case "OperationRecord.Diagnose": //手术名称 + opeDisease_Click(aEdit1, e); + break; case "OperationRecord.OrtherDoctorId": Worker_Click(aEdit1, e, 4); break; @@ -395,6 +398,27 @@ namespace DrawGraph AIMSExtension.PublicMethod.WriteLog(ex); } } + private void opeDisease_Click(AbleEditPackObj sender, EventArgs e) + { + try + { + AbleEditPackObj ableEdit = sender; + if (ableEdit == null) return; + if (myOpeRecord == null) return; + if (ableEdit.ControlType == EControlType.Directory) + { + SelDict(sender, e, ableEdit.ControlTitleText); + } + else if (ableEdit.ControlType == EControlType.Directorys) + { + SetDirectorysMethod(ableEdit); + } + } + catch (Exception ex) + { + AIMSExtension.PublicMethod.WriteLog(ex); + } + } private void Anaes_Click(AbleEditPackObj sender, EventArgs e) { try diff --git a/DrawGraph/AreaManage/DBManage.cs b/DrawGraph/AreaManage/DBManage.cs index 9986940..4a76289 100644 --- a/DrawGraph/AreaManage/DBManage.cs +++ b/DrawGraph/AreaManage/DBManage.cs @@ -153,6 +153,10 @@ namespace DrawGraph { i += AddOperation(_operationRecord, _operationRecord.Operation); } + else if (items[1] == "Diagnose") + { + i += AddDiagnose(_operationRecord, _operationRecord.Diagnose); + } else if (items[1] == "Applyoperation") { i += AddApplyOperation(_operationRecord, _operationRecord.Applyoperation); @@ -370,6 +374,38 @@ namespace DrawGraph } return i; } + public static int AddDiagnose(OperationRecord _operationRecord, string Diagnose) + { + int i = 0; + if (Diagnose.Trim() == "" || Diagnose == ",") + { + DeleteDiagnose(_operationRecord.PatientId.Value); + i++; + } + else + { + DeleteDiagnose(_operationRecord.PatientId.Value); + i++; + string[] Operationstr = Diagnose.Split(','); + foreach (string DiagnoseId in Operationstr) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("insert into [FactDiagnoseInfo]("); + strSql.Append("PatientId,ApplyId,[DiagnoseId],OperatorNo,OperatorName,OperateDate "); + strSql.Append(")"); + strSql.Append(" values ("); + strSql.Append("" + _operationRecord.PatientId + ","); + strSql.Append("" + _operationRecord.OperationApplyId + ","); + strSql.Append("" + DiagnoseId + ","); + strSql.Append("'" + AIMSExtension.PublicMethod.OperatorNo + "',"); + strSql.Append("'" + AIMSExtension.PublicMethod.OperatorName + "',"); + strSql.Append("'" + DateTime.Now + "'"); + strSql.Append(")"); + i += HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString()); + } + } + return i; + } public static int AddApplyOperation(OperationRecord _operationRecord, string Operation) { int i = 0; @@ -590,6 +626,13 @@ namespace DrawGraph strSql.Append(" where PatientId=" + PatientId + " "); HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString()); } + public static void DeleteDiagnose(int PatientId) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("delete FactDiagnoseInfo "); + strSql.Append(" where PatientId=" + PatientId + " "); + HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString()); + } public static void DeleteOperationSite(int PatientId) { StringBuilder strSql = new StringBuilder(); diff --git a/DrawGraph/AreaManage/MonitorManage.cs b/DrawGraph/AreaManage/MonitorManage.cs index 04ff56a..ddd7ad7 100644 --- a/DrawGraph/AreaManage/MonitorManage.cs +++ b/DrawGraph/AreaManage/MonitorManage.cs @@ -115,10 +115,14 @@ namespace DrawGraph font = new System.Drawing.Font("宋体", 5f); } + LinesPackObj pack2 = template.GetPackObjectOTag("MonitorManage_LinesPackObj_9"); + int RowsCount = 4; + if (pack2 != null) + RowsCount = Convert.ToInt32(pack2.XPageSpan / pack2.XMajorGridStep); //pan.Controls.Clear(); ToolTip toolTip1 = new System.Windows.Forms.ToolTip(); int Width = pan.Width; - int Height = pan.Height / 4; + int Height = pan.Height / RowsCount; List panPanels = new List(); //循环加载数值生命体征 for (int x = 0; x < myOpeRecord.PhysioConfigList.Count; x++) @@ -196,7 +200,7 @@ namespace DrawGraph System.Windows.Forms.Panel wmpanel = new System.Windows.Forms.Panel(); wmpanel.Size = pan.Size; wmpanel.Dock = DockStyle.Fill; - for (int i = 3; i >= 0; i--) + for (int i = RowsCount - 1; i >= 0; i--) { if (i > panPanels.Count - 1) { diff --git a/DrawGraph/AreaManage/OutputManage.cs b/DrawGraph/AreaManage/OutputManage.cs index db3d642..d8d588d 100644 --- a/DrawGraph/AreaManage/OutputManage.cs +++ b/DrawGraph/AreaManage/OutputManage.cs @@ -17,7 +17,7 @@ namespace DrawGraph /// 药品区域 /// public RectangleFramePackObj sapPpack; - public LinesPackObj lines ; + public LinesPackObj lines; public LinePackObj H3pack; public LinePackObj H5pack; public int RowsCount; @@ -52,7 +52,7 @@ namespace DrawGraph H3pack = template.GetPackObjectOTag("OutputManage_LinePackObj_11"); H5pack = template.GetPackObjectOTag("OutputManage_LinePackObj_5"); sapPpack = template.GetPackObjectOTag("OutputManage_RectangleFramePackObj_10"); - lines = template.GetPackObjectOTag("OutputManage_LinesPackObj_15"); + lines = template.GetPackObjectOTag("OutputManage_LinesPackObj_15"); RowsCount = Convert.ToInt32(lines.XPageSpan / lines.XMajorGridStep); } #endregion @@ -145,27 +145,27 @@ namespace DrawGraph for (int i = 0; i < _FactOutputLiquidsList.Count; i++) { - FactOutputLiquids temp = _FactOutputLiquidsList[i]; + FactOutputLiquids temp = _FactOutputLiquidsList[i]; bool isEqual = false; bool isChildEqual = false; //以行号返回具休的位置 drugsy = sapPpack.RealY + getYPositionByListIndex(rowDrugsIndex, sapPpack.RealY, sapPpack.RealEndY, RowsCount); - SetDrug(temp, curTimeTemp, drugsy); + SetDrug(temp, curTimeTemp, drugsy); //判断是否重复的 主药或组药 for (int j = 0; j < i; j++) { - FactOutputLiquids addDrug1 = _FactOutputLiquidsList[j]; + FactOutputLiquids addDrug1 = _FactOutputLiquidsList[j]; //如果加药品ID相同并且加加药ID不同，则认为加了同一种加药 - if (addDrug1.Equal(temp) ) + if (addDrug1.Equal(temp)) { addDrug1.clearDNAndDT(ZedControl); //因为相同则取得相同对象的Y,为当前的对象的高度 drugsy = addDrug1.nowY; isEqual = true; continue; - } + } } if (isChildEqual == true) continue; if (drugsy <= maxDrugsy) @@ -175,7 +175,7 @@ namespace DrawGraph rowDrugsIndex++; } else - ListAddDrugs(DrugListstr, i, temp); + ListAddDrugs(DrugListstr, i, temp); } myOpeRecord.OutsListstr = DrugListstr; @@ -188,19 +188,37 @@ namespace DrawGraph } private void DrawOutDose() - { + { try { - double allOutDose = 0; + double allOutDose = 0; + double nlDose = 0; + double sxDose = 0; myOpeRecord.FactOutputLiquidsList.ForEach(item => { if (item.DosageUnit.Trim() == "mL" || item.DosageUnit.Trim() == "ml" || item.DosageUnit.Trim() == "ML") { Double val = Convert.ToDouble(item.Dosage); allOutDose += val; + if (item.OutputLiquidsName == "尿量") + nlDose += val; + else if (item.OutputLiquidsName == "失血") + sxDose += val; } }); - template.SetObjValue(myOpeRecord, "OperationRecord.OutAmount", allOutDose.ToString(), allOutDose.ToString(), allOutDose.ToString() != myOpeRecord.OutAmount ? true : false); + template.SetObjValue(myOpeRecord, "OperationRecord.OutAmount", allOutDose.ToString(), allOutDose.ToString(), allOutDose.ToString() != myOpeRecord.OutAmount ? true : false); + + string outStr = ""; + if (nlDose > 0) + { + outStr += "尿量 " + nlDose + " ml\n"; + } + if (sxDose > 0) + { + outStr += "失血 " + sxDose + " ml\n"; + } + if (outStr != "") + template.SetObjValue(myOpeRecord, "OperationRecord.Crystal", outStr, outStr, false); } catch (Exception ex) { @@ -209,7 +227,7 @@ namespace DrawGraph } private void SetDrug(FactOutputLiquids temp, DateTime curTimeTemp, double y) { - if (temp.IsContinue == 1 && temp.BeginTime == temp.EndTime) temp.End = curTimeTemp; + if (temp.IsContinue == 1 && temp.BeginTime == temp.EndTime) temp.End = curTimeTemp; temp.EqualDose = null; temp.setAnasArr(ZedControl, H5pack.RealX, sapPpack.RealEndX, myOpeRecord.PageBegin, myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); temp.nowY = y; @@ -223,7 +241,7 @@ namespace DrawGraph { dose += temp.DosageUnit; } - DrugListstr.Add(string.Format("({0}){1} {2} {3}{4}{5}", i + 1, (temp.BeginTime == temp.EndTime) ? temp.BeginTime.ToShortTimeString() : temp.BeginTime.ToShortTimeString() + "->" + temp.EndTime.ToShortTimeString(), temp.OutputLiquidsName.Trim(), dose, "","")); + DrugListstr.Add(string.Format("({0}){1} {2} {3}{4}{5}", i + 1, (temp.BeginTime == temp.EndTime) ? temp.BeginTime.ToShortTimeString() : temp.BeginTime.ToShortTimeString() + "->" + temp.EndTime.ToShortTimeString(), temp.OutputLiquidsName.Trim(), dose, "", "")); //DrugListstr.Append(" "); } #endregion