diff --git a/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBillNew.Designer.cs b/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBillNew.Designer.cs index f75e1a8..f60833f 100644 --- a/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBillNew.Designer.cs +++ b/AIMS/OperationDoing/AnasRecoverBill/frmAnasRecoverBillNew.Designer.cs @@ -1299,7 +1299,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmAnasRecoverBillNew"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "恢复记录单"; + this.Text = " "; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.frmAnasRecordBillNew_Load); this.panel3.ResumeLayout(false); diff --git a/AIMSEntity/BLL/Extension/BOperationRecord.cs b/AIMSEntity/BLL/Extension/BOperationRecord.cs index aa2719c..ea7f5c7 100644 --- a/AIMSEntity/BLL/Extension/BOperationRecord.cs +++ b/AIMSEntity/BLL/Extension/BOperationRecord.cs @@ -15,7 +15,7 @@ using DrawGraph; namespace AIMSBLL { public partial class BOperationRecord - { + { public static OperationRecord getRecord(OperationRecord _record, int PatientId, int RecoverId) { if (_record == null) _record = new OperationRecord(); @@ -30,6 +30,10 @@ namespace AIMSBLL _record.OperationBeginTime = titleTime.OperationBeginTime; _record.OperationEndTime = titleTime.OperationEndTime; _record.OutRoomTime = titleTime.OutRoomTime; + if (titleTime.OutRoomTime != null && titleTime.InRoomTime != null) + _record.SpareFive = Convert.ToInt32(((TimeSpan)(titleTime.OutRoomTime - titleTime.InRoomTime)).TotalMinutes).ToString() + "分钟"; + else + _record.SpareFive = ""; DataTable OperationFrontdt = BOperationApply.GetOperationFrontDataTableByPatientId(PatientId); if (OperationFrontdt.Rows.Count > 0) @@ -95,13 +99,61 @@ namespace AIMSBLL if (_record.OpeRecoverInInfo == null) _record.OpeRecoverInInfo = new OperationRecoverInInfo(); _record.OpeRecoverOutInfo = BOperationRecoverOutInfo.SelectSingle("PatientId=" + _record.PatientId, null); - if (_record.OpeRecoverOutInfo == null) _record.OpeRecoverOutInfo = new OperationRecoverOutInfo(); - + if (_record.OpeRecoverOutInfo == null) _record.OpeRecoverOutInfo = new OperationRecoverOutInfo(); + _record.FactBloodGasAnalysisList = BFactBloodGasAnalysis.Select("OperationRecordId=" + _record.Id, null); foreach (var item in _record.FactBloodGasAnalysisList) { item.FactBloodGasAnalysisDataList = BFactBloodGasAnalysisData.Select("RecordId=" + item.Id, null); } + + int x = 0; + double allDrugDose = 0, allOutDose = 0; + _record.SpareTwo = ""; + _record.SpareThree = ""; + _record.SpareFour = ""; + foreach (var item in _record.FactDrugList) + { + string dose = ""; + if (dose.Trim() != "") dose += " "; + dose += ((double)item.Dosage).ToString(); + if (item.DosageUnit != null) + { + dose += item.DosageUnit; + } + _record.SpareFour += string.Format("({0}){1} {2} {3}{4}{5} ", x + 1, (item.DrugBeginTime == item.DrugEndTime) ? item.DrugBeginTime.ToShortTimeString() : item.DrugBeginTime.ToShortTimeString() + "->" + item.DrugEndTime.ToShortTimeString(), item.DrugName.Trim(), dose, "", item.DrugChannel == null ? "" : " " + item.DrugChannel.ToString()); + if (item.Dosage != 0) + { + Double val = Convert.ToDouble(item.Dosage); + allDrugDose += val; + } + x++; + } + _record.SpareTwo = allDrugDose.ToString(); + foreach (var item in _record.FactOutputLiquidsList) + { + string dose = ""; + if (dose.Trim() != "") dose += " "; + dose += ((double)item.Dosage).ToString(); + if (item.DosageUnit != null) + { + dose += item.DosageUnit; + } + _record.SpareFour += string.Format("({0}){1} {2} {3} ", x + 1, (item.BeginTime == item.EndTime) ? item.BeginTime.ToShortTimeString() : item.BeginTime.ToShortTimeString() + "->" + item.EndTime.ToShortTimeString(), item.OutputLiquidsName.Trim(), dose); + + if (item.DosageUnit.Trim() == "mL" || item.DosageUnit.Trim() == "ml" || item.DosageUnit.Trim() == "ML") + { + if (item.Dosage != 0) + { + Double val = Convert.ToDouble(item.Dosage); + allOutDose += val; + } + } + x++; + } + _record.SpareThree = allOutDose.ToString(); + + return _record; } diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index 99dfcfa..7b6ba7f 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/DrawGraph/AreaManage/DrugsManage.cs @@ -76,7 +76,6 @@ namespace DrawGraph } #endregion 重写的事件结束 - #region 绑定区域数据 public override void Bind() { diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index a6e1f31..276078d 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -90,7 +90,7 @@ namespace DrawGraph if (axis != null) { DateTime dt = DateTime.Now.AddMinutes(-DateTime.Now.Minute).AddMinutes(15).AddSeconds(-DateTime.Now.Second).AddMilliseconds(-DateTime.Now.Millisecond); - axis.BeginTime = dt; //这是错误的显示时会加1分钟 + axis.BeginTime = dt; } } }