diff --git a/AIMS/OperationAanesthesia/frmRecoverPatient.Designer.cs b/AIMS/OperationAanesthesia/frmRecoverPatient.Designer.cs
index 356d189..cc0ade3 100644
--- a/AIMS/OperationAanesthesia/frmRecoverPatient.Designer.cs
+++ b/AIMS/OperationAanesthesia/frmRecoverPatient.Designer.cs
@@ -489,6 +489,7 @@
//
// panel3
//
+ this.panel3.AutoScroll = true;
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(3, 17);
this.panel3.Name = "panel3";
diff --git a/AIMSEntity/BLL/Extension/BOperationRecord.cs b/AIMSEntity/BLL/Extension/BOperationRecord.cs
index 2949d1b..ad31fcc 100644
--- a/AIMSEntity/BLL/Extension/BOperationRecord.cs
+++ b/AIMSEntity/BLL/Extension/BOperationRecord.cs
@@ -33,13 +33,12 @@ namespace AIMSBLL
return _record;
}
BOperationRecord.SelectSingle(PatientId, RecoverId, ref _record);
-
- if (RecoverId == 1 && (_record.Breath == null || _record.Breath == ""))
- {
- _record.Breath = "10";
- }
+
if (_record.InRoomTime != null)
+ {
_record.OperationDate = _record.InRoomTime.Value.ToShortDateString();
+ _record.OpeDay = _record.InRoomTime.Value.ToString("yyyy-MM-dd");
+ }
string ASALevel = "";
DataTable OperationFrontdt = BOperationApply.GetOperationFrontDataTableByPatientId(PatientId);
@@ -110,16 +109,20 @@ 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.OrtherDoctorId = OperationDoingdt.Rows[0]["OrtherDoctorId"].ToString().Trim();
if (_record.SpecialCase == null || _record.SpecialCase == "") _record.SpecialCase = "无";
_record.OperationRoom = OperationDoingdt.Rows[0]["OperationRoom"].ToString().Trim();
- }
+ if (_record.Breath == null || _record.Breath == "")
+ _record.Breath = "10";
- if (_record.InRoomTime != null)
- {
- _record.OpeDay = _record.InRoomTime.Value.ToString("yyyy-MM-dd");
+ if (_record.OpeSpecialCondition == null || _record.OpeSpecialCondition == "")
+ _record.OpeSpecialCondition = "无特殊情况";
+ if (_record.SpecialEvent == null || _record.SpecialEvent == "")
+ _record.SpecialEvent = "-";
+ if (_record.Remark1 == null || _record.Remark1 == "")
+ _record.Remark1 = "-";
}
-
+
_record.OpeRecordInfo = BOperationRecordInfo.SelectSingle("OperationRecordId=" + _record.Id, null);
if (_record.OpeRecordInfo == null || _record.OpeRecordInfo.Id == null)
{
@@ -131,6 +134,10 @@ namespace AIMSBLL
{
_record.OpeRecordInfo.OperationLevel = OperationFrontdt.Rows[0]["OperationLevelName"].ToString();
}
+
+ _record.OpeRecordInfo.InfoRemark = "-";
+ _record.OpeRecordInfo.RuleNurse = "-";
+
_record.OpeRecordInfo.OperatorId = PublicMethod.OperatorName;
_record.OpeRecordInfo.OperatorTime = DateTime.Now;
_record.OpeRecordInfo.Id = BOperationRecordInfo.Insert(_record.OpeRecordInfo);
diff --git a/AIMSEntity/BLL/Extension/BOperationTemplate.cs b/AIMSEntity/BLL/Extension/BOperationTemplate.cs
index f780610..d383ca7 100644
--- a/AIMSEntity/BLL/Extension/BOperationTemplate.cs
+++ b/AIMSEntity/BLL/Extension/BOperationTemplate.cs
@@ -164,27 +164,27 @@ namespace AIMSBLL
if (BFactEvents.IsValid(EventId))
{
FactEvents FactEventObj = new FactEvents();
- FactEventObj.PatientId = PatientId;
- FactEventObj.EventId = EventId;
- TimeSpan BeginTimets = DateTime.Parse(dr["BeginTime"].ToString()).Subtract(DateTime.Parse(dr["InRoomTime"].ToString()));
- TimeSpan EndTimets = DateTime.Parse(dr["EndTime"].ToString()).Subtract(DateTime.Parse(dr["InRoomTime"].ToString()));
+ FactEventObj.PatientId = PatientId;
+ FactEventObj.EventId = EventId;
+ TimeSpan BeginTimets = DateTime.Parse(dr["BeginTime"].ToString()).Subtract(DateTime.Parse(dr["InRoomTime"].ToString()));
+ TimeSpan EndTimets = DateTime.Parse(dr["EndTime"].ToString()).Subtract(DateTime.Parse(dr["InRoomTime"].ToString()));
- FactEventObj.EventBeginTime = InRoomTime.AddSeconds(BeginTimets.TotalSeconds);
- FactEventObj.EventEndTime = InRoomTime.AddSeconds(EndTimets.TotalSeconds);
- if (dr["BeginTime"].ToString() == dr["EndTime"].ToString())
- {
- FactEventObj.IsContinue = 0;
- }
- else
- {
- FactEventObj.IsContinue = 1;
- }
- FactEventObj.EventTypeId = TypeId;
+ FactEventObj.EventBeginTime = InRoomTime.AddSeconds(BeginTimets.TotalSeconds);
+ FactEventObj.EventEndTime = InRoomTime.AddSeconds(EndTimets.TotalSeconds);
+ if (dr["BeginTime"].ToString() == dr["EndTime"].ToString())
+ {
+ FactEventObj.IsContinue = 0;
+ }
+ else
+ {
+ FactEventObj.IsContinue = 1;
+ }
+ FactEventObj.EventTypeId = TypeId;
- FactEventObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo;
- FactEventObj.OperatorName = AIMSExtension.PublicMethod.OperatorName;
- FactEventObj.OperateDate = NewInRoomTime;
- BFactEvents.Add(FactEventObj);
+ FactEventObj.OperatorNo = AIMSExtension.PublicMethod.OperatorNo;
+ FactEventObj.OperatorName = AIMSExtension.PublicMethod.OperatorName;
+ FactEventObj.OperateDate = NewInRoomTime;
+ BFactEvents.Add(FactEventObj);
}
}
diff --git a/DrawGraph/AreaManage/MonitorManage.cs b/DrawGraph/AreaManage/MonitorManage.cs
index ddd7ad7..96312a5 100644
--- a/DrawGraph/AreaManage/MonitorManage.cs
+++ b/DrawGraph/AreaManage/MonitorManage.cs
@@ -15,11 +15,7 @@ namespace DrawGraph
/// 监测管理类
///
public class MonitorManage : AreaManageBase
- {
- ///
- /// 监测文本的对象
- ///
- TextPackObj janCePack = null;
+ {
///
/// 图表的对象
///
@@ -38,9 +34,7 @@ namespace DrawGraph
}
public void init()
- {
- //监测文本的对象
- janCePack = GetPackObjectOTag("PhysioDataManage_TextPackObj_17") as TextPackObj;
+ {
//图表的对象
chartPack = GetPackObjectOTag("PhysioDataManage_ChartPackObj_6") as ChartPackObj;
//自己要用的手术对象
diff --git a/DrawGraph/AreaManage/PhysioDataConfig.cs b/DrawGraph/AreaManage/PhysioDataConfig.cs
index b2dacb6..ca7dbae 100644
--- a/DrawGraph/AreaManage/PhysioDataConfig.cs
+++ b/DrawGraph/AreaManage/PhysioDataConfig.cs
@@ -365,6 +365,11 @@ namespace DrawGraph
string sql = "Select * FROM PhysioDataConfig where ConfigType='麻醉体征' order by PhysioOrder asc";
return GetListBySql(sql);
}
+ public static IList GetEventList()
+ {
+ string sql = "Select * FROM PhysioDataConfig where ConfigType='事件' order by PhysioOrder asc";
+ return GetListBySql(sql);
+ }
#endregion
#region 数据操作
diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs
index 2c06d69..f8a93c6 100644
--- a/DrawGraph/AreaManage/PhysioDataManage.cs
+++ b/DrawGraph/AreaManage/PhysioDataManage.cs
@@ -312,13 +312,13 @@ namespace DrawGraph
if (myOpeRecord.SelPhysioConfig != null)
{
PhysioData pdTemp = rePD(sender, e);
- if (pdTemp == null) return;
+ if (pdTemp == null) return;
DateTime insTime = GetRecordTime(pdTemp.RecordTime);
CurPhysioData = pdTemp;
CurPhysioData.RecordTime = insTime;
myOpeRecord.SelPhysioConfig.ModifyAddItem(CurPhysioData, CurPhysioData);
- ZedControl.Refresh();
+ ZedControl.Refresh();
}
}
else
@@ -531,7 +531,7 @@ namespace DrawGraph
Legend legend = myPane.Legend;
legend.IsVisible = true;
legend.Position = LegendPos.Float;//定位图标位置
- legend.Location = new Location(janCePack.RealX, janCePack.RealEndY - 0.02, CoordType.PaneFraction);
+ legend.Location = new Location(janCePack.RealX, janCePack.RealEndY, CoordType.PaneFraction);
legend.Border.Width = 0;
legend.Border.IsVisible = false; //不显示图标外边框
legend.Gap = 2.0f;
@@ -640,6 +640,21 @@ namespace DrawGraph
myOpeRecord.PhysioAnesConfigList.Add(pp);
}
}
+ //加载事件图标
+ IList dtevent = PhysioDataConfig.GetEventList();
+ for (int i = 0; i < dtevent.Count; i++)
+ {
+ PhysioDataConfig pp = dtevent[i];
+ pp.ConfigType = "事件";
+ pp.ConveColor = System.Drawing.Color.White;
+
+ pp.IsValid = true;
+ pp.ClearTagstr(ZedControl);
+ pp.phListPack = phListPack;
+ pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin,
+ myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN));
+ pp.initCurve();
+ }
}
catch (Exception ex)
{