AIMSBS/AIMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

画点优化 模板使用优化

Browse Source
This commit is contained in:
leomon 2023-04-17 17:21:15 +08:00
parent 4fd95d182a
commit 7f6c0f696b
14 changed files with 164 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AIMS/AIMS.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<AtuoUpdate> <AtuoUpdate>
<ConnectionString>Data Source=.;Initial Catalog=AIMSDB_DLSJZQZYYY;User ID=sa;Password=Test2020;</ConnectionString> <ConnectionString>Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020;</ConnectionString>
<DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString> <DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString>
<HisConnectionStringOracel>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;</HisConnectionStringOracel> <HisConnectionStringOracel>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;</HisConnectionStringOracel>
</AtuoUpdate> </AtuoUpdate>

10
AIMS/DocManager/frmDocument3.cs
View File

@ -78,10 +78,10 @@ namespace AIMS.OperationAfter.UI
ucClassify.RefreshTree(Patient.PatientId); ucClassify.RefreshTree(Patient.PatientId);
tsbDoc.TabItemClose += new TabStrip.UserActionEventHandler(tsbDoc_TabItemClose); tsbDoc.TabItemClose += new TabStrip.UserActionEventHandler(tsbDoc_TabItemClose);
if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("删除医疗文书")) if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("删除医疗文书"))
{ {
btnDelete.Visible = true; btnDelete.Visible = true;
} }
} }
/// <summary> /// <summary>
@ -441,11 +441,6 @@ namespace AIMS.OperationAfter.UI
EMRExtension.OpenEMRS(Patient.PatientId, Patient.ApplyId); EMRExtension.OpenEMRS(Patient.PatientId, Patient.ApplyId);
} }
private void buttonX2_Click(object sender, EventArgs e)
{
BOperationReview.SetDocumentXmlStatic("不计费耗材使用清单");
}
private void btnDelete_Click(object sender, EventArgs e) private void btnDelete_Click(object sender, EventArgs e)
{ {
//判断是否选择患者 //判断是否选择患者
@ -461,6 +456,7 @@ namespace AIMS.OperationAfter.UI
if (dialogResult == DialogResult.Yes) if (dialogResult == DialogResult.Yes)
{ {
DocumentDAL.DeletePrintDocument2(DModel); DocumentDAL.DeletePrintDocument2(DModel);
PublicMethod.WriteLog("删除文书" + tsbDoc.SelectedTab.Text, Patient.PatientId);
this.ucClassify.RefreshTree(this.Patient.PatientId); this.ucClassify.RefreshTree(this.Patient.PatientId);
CloseTab(); CloseTab();
} }

30
AIMS/DocManager/frmDocument3.designer.cs generated
View File

@ -42,11 +42,11 @@
this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter();
this.panel5 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnDelete = new DevComponents.DotNetBar.ButtonX();
this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX();
this.btnSel = new DevComponents.DotNetBar.ButtonX(); this.btnSel = new DevComponents.DotNetBar.ButtonX();
this.lblPatient = new DevComponents.DotNetBar.LabelX(); this.lblPatient = new DevComponents.DotNetBar.LabelX();
this.expandablePanel1 = new DevComponents.DotNetBar.ExpandablePanel(); this.expandablePanel1 = new DevComponents.DotNetBar.ExpandablePanel();
this.btnDelete = new DevComponents.DotNetBar.ButtonX();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
@ -287,6 +287,20 @@
this.panelEx1.Style.GradientAngle = 90; this.panelEx1.Style.GradientAngle = 90;
this.panelEx1.TabIndex = 0; 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 // buttonX1
// //
this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
@ -353,20 +367,6 @@
this.expandablePanel1.TitleStyle.GradientAngle = 90; this.expandablePanel1.TitleStyle.GradientAngle = 90;
this.expandablePanel1.TitleText = "文档目录"; 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 // frmDocument3
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

4
AIMS/FormLogin.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using AIMSBLL; using AIMSBLL;
using AIMSExtension;
using AIMSModel; using AIMSModel;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
@ -45,13 +46,14 @@ namespace AIMS
AIMSExtension.PublicMethod.OperatorId = PersonObj.Id.Value; AIMSExtension.PublicMethod.OperatorId = PersonObj.Id.Value;
AIMSExtension.PublicMethod.OperatorNo = PersonObj.No; AIMSExtension.PublicMethod.OperatorNo = PersonObj.No;
AIMSExtension.PublicMethod.OperatorName = PersonObj.Name; 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.DepId = PersonObj.DepId.Value;
AIMSExtension.PublicMethod.LocalIP = AIMSExtension.PublicMethod.GetLocalIP(); AIMSExtension.PublicMethod.LocalIP = AIMSExtension.PublicMethod.GetLocalIP();
AIMSExtension.PublicMethod.DeptName = BDepartment.GetModel(PersonObj.DepId.Value).Name; AIMSExtension.PublicMethod.DeptName = BDepartment.GetModel(PersonObj.DepId.Value).Name;
Role role = BRole.GetModel(PersonObj.RoleId.Value); Role role = BRole.GetModel(PersonObj.RoleId.Value);
AIMSExtension.PublicMethod.PermissionLevel = role.PermissionLevel == null ? 0 : role.PermissionLevel.Value; AIMSExtension.PublicMethod.PermissionLevel = role.PermissionLevel == null ? 0 : role.PermissionLevel.Value;
AIMSExtension.PublicMethod.RoleName = BMenu.GetMenuRootListManageStr(AIMSExtension.PublicMethod.RoleId, "功能权限"); AIMSExtension.PublicMethod.RoleName = BMenu.GetMenuRootListManageStr(AIMSExtension.PublicMethod.RoleId, "功能权限");
PublicMethod.WriteLog("登录", PersonObj.Id.Value);
Hide(); Hide();
//在这里为编辑器注册 //在这里为编辑器注册
new System.Threading.Thread(Reg).Start(); new System.Threading.Thread(Reg).Start();

28
AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs
View File

@ -761,8 +761,8 @@ namespace AIMS.OperationAanesthesia
if (GetOpeState(ref messing) == false) if (GetOpeState(ref messing) == false)
{ {
if (messing != "") MessageBox.Show(messing, "系统提示"); if (messing != "") MessageBox.Show(messing, "系统提示");
//if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！") if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！")
// btnOperationInfo_Click(null, null); btnOperationInfo_Click(null, null);
return; return;
} }
} }
@ -2157,17 +2157,19 @@ namespace AIMS.OperationAanesthesia
isTrue = false; isTrue = false;
} }
//if (_record.OpeRecordInfo.OperationLevel == null || _record.OpeRecordInfo.OperationLevel.ToString().Trim() == "") if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
//{ {
// message = "请与手术信息选择手术分级！"; if (_record.OpeRecordInfo.OperationLevel == null || _record.OpeRecordInfo.OperationLevel.ToString().Trim() == "")
// isTrue = false; {
//} message = "请与手术信息选择手术分级！";
//if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "") isTrue = false;
//{ }
// message = "请与手术信息选择手术切口！"; if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "")
// isTrue = false; {
//} message = "请与手术信息选择手术切口！";
isTrue = false;
}
}
} }
return isTrue; return isTrue;

33
AIMS/OperationAanesthesia/frmInstrumentRecord.cs
View File

@ -1161,15 +1161,18 @@ namespace AIMS.OperationAanesthesia
message = "请与手术信息选择手术分级！"; message = "请与手术信息选择手术分级！";
isTrue = false; isTrue = false;
} }
if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "") if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{ {
message = "请与手术信息选择手术切口！"; if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "")
isTrue = false; {
} message = "请与手术信息选择手术切口！";
if (_record.OperationDoctor == null || _record.OperationDoctor.Trim() == "") isTrue = false;
{ }
message = "请添加手术医师！"; if (_record.OperationDoctor == null || _record.OperationDoctor.Trim() == "")
isTrue = false; {
message = "请添加手术医师！";
isTrue = false;
}
} }
return isTrue; return isTrue;
@ -1606,7 +1609,7 @@ namespace AIMS.OperationAanesthesia
BApplianceRecord.InsertListData(_record.InstrumentList.ApplianceRecordList); BApplianceRecord.InsertListData(_record.InstrumentList.ApplianceRecordList);
DBManage.AddPerson(_record, SelectOperationDoctorData, 1); DBManage.AddPerson(_record, SelectOperationDoctorData, 1);
DBManage.AddPerson(_record, SelectInstrumentNurseData, 6); DBManage.AddPerson(_record, SelectInstrumentNurseData, 6);
DBManage.AddPerson(_record, SelectTourNurseData, 7); DBManage.AddPerson(_record, SelectTourNurseData, 7);
} }
catch (Exception ex) catch (Exception ex)
@ -1860,7 +1863,7 @@ namespace AIMS.OperationAanesthesia
} }
} }
catch (Exception ) catch (Exception)
{ {
//出错处理，终止打印，设置e.HasMorePages参数，初始化相关变量 //出错处理，终止打印，设置e.HasMorePages参数，初始化相关变量
e.HasMorePages = false; e.HasMorePages = false;
@ -1878,12 +1881,12 @@ namespace AIMS.OperationAanesthesia
} }
if (superTabMain.SelectedTab.Name == "spTabQXQDD") if (superTabMain.SelectedTab.Name == "spTabQXQDD")
{ {
SaveInstrument(sender); SaveInstrument(sender);
} }
else else
{ {
SaveInstrument2(sender); SaveInstrument2(sender);
} }
mPanes = new List<MasterPane>(); mPanes = new List<MasterPane>();
UpPanes = new List<MasterPane>(); UpPanes = new List<MasterPane>();
@ -2210,7 +2213,7 @@ namespace AIMS.OperationAanesthesia
txtOperation.Text = txtOperation.Text.Substring(0, idxStart); txtOperation.Text = txtOperation.Text.Substring(0, idxStart);
} }
DBManage.AddOperation(_record, SelectOperationData); DBManage.AddOperation(_record, SelectOperationData);
} }
private void frmAnasRecordInstrument_VisibleChanged(object sender, EventArgs e) private void frmAnasRecordInstrument_VisibleChanged(object sender, EventArgs e)
{ {
@ -2243,7 +2246,7 @@ namespace AIMS.OperationAanesthesia
} }
string messing = ""; string messing = "";
if (GetOpeState(ref messing) == false) if (GetOpeState(ref messing) == false)
{ {
if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！") if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！")
btnOperationInfo_Click(null, null); btnOperationInfo_Click(null, null);
return; return;

4
AIMS/OperationAanesthesia/frmInstrumentRecord2.cs
View File

@ -906,6 +906,10 @@ namespace AIMS.OperationAanesthesia
for (int i = 0; i < dr.Count(); i++) for (int i = 0; i < dr.Count(); i++)
{ {
var name = dr[i].ItemArray[0].ToString(); var name = dr[i].ItemArray[0].ToString();
if (name=="InRoomTime")
{
name = name;
}
var value = dr[i].ItemArray[1].ToString(); var value = dr[i].ItemArray[1].ToString();
XTextInputFieldElement element = query.Where(x => x.FieldSettings.ListSource.SourceName == value).FirstOrDefault(); XTextInputFieldElement element = query.Where(x => x.FieldSettings.ListSource.SourceName == value).FirstOrDefault();
PropertyInfo info = p.Where(px => px.Name == name).FirstOrDefault(); PropertyInfo info = p.Where(px => px.Name == name).FirstOrDefault();

33
AIMS/OperationAanesthesia/frmOperationInfoNew2.cs
View File

@ -91,6 +91,12 @@ namespace AIMS.OperationAanesthesia
cboOperationLevel.SelectedIndex = -1; cboOperationLevel.SelectedIndex = -1;
if (txtOperationCut.DataSource == null) BindBasicDictionaryToComboBox(txtOperationCut, "手术切口"); if (txtOperationCut.DataSource == null) BindBasicDictionaryToComboBox(txtOperationCut, "手术切口");
if (!PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{
cboOperationLevel.Enabled = false;
txtOperationCut.Enabled = false;
}
} }
/// <summary> /// <summary>
@ -694,20 +700,23 @@ namespace AIMS.OperationAanesthesia
{ {
bool b = true; bool b = true;
if (cboOperationLevel.Text == "" || cboOperationLevel.Text == "未分级") if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{ {
MessageBox.Show("请填手术分级"); if (cboOperationLevel.Text == "" || cboOperationLevel.Text == "未分级")
label19.ForeColor = Color.Red; {
cboOperationLevel.Focus(); MessageBox.Show("请填手术分级");
b = false; 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; return b;
} }
#endregion #endregion

14
AIMS/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.cs
View File

@ -177,6 +177,7 @@ namespace AIMS.OperationAanesthesia
foreach (var item in feesRecords) foreach (var item in feesRecords)
{ {
if (!SelChargName.Contains(item.ChargName)) continue; if (!SelChargName.Contains(item.ChargName)) continue;
fee = item;
Patient = PatientRecord.GetPatientRecord(item.PatientId.Value); Patient = PatientRecord.GetPatientRecord(item.PatientId.Value);
if (item.FeeTypeId == "精神II类") if (item.FeeTypeId == "精神II类")
{ {
@ -228,10 +229,13 @@ namespace AIMS.OperationAanesthesia
element.Text = info.GetValue(Patient, null).ToString(); element.Text = info.GetValue(Patient, null).ToString();
} }
} }
var Text8 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement if (fee != null)
&& (x as XTextInputFieldElement).Name == "批号").FirstOrDefault(); {
if (Text8 != null) var Text8 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
Text8.Text = fee.InsureNO; && (x as XTextInputFieldElement).Name == "批号").FirstOrDefault();
if (Text8 != null)
Text8.Text = fee.InsureNO;
}
} }
else else
{ {
@ -248,7 +252,7 @@ namespace AIMS.OperationAanesthesia
} }
DModel.XmlFileName = TModel.XmlFileName; DModel.XmlFileName = TModel.XmlFileName;
DModel.TemplateId = TModel.Id; DModel.TemplateId = TModel.Id;
DModel.OrderNo =fee.Extend4 ; DModel.OrderNo = fee.Extend4;
//患者基本信息赋值 //患者基本信息赋值
var query = from XTextElement in myEditControl.Document.Fields.ToArray() var query = from XTextElement in myEditControl.Document.Fields.ToArray()
where XTextElement is XTextInputFieldElement where XTextElement is XTextInputFieldElement

8
AIMS/OperationFront/frmOperationSchedulePlan.cs
View File

@ -3860,7 +3860,7 @@ namespace AIMS.OperationFront.UI
foreach (ucPlanOperationRoomCard item in ucOpeRooms) foreach (ucPlanOperationRoomCard item in ucOpeRooms)
{ {
item.PlanOperationTime = dtpSearchTime.Value; 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.LoadInfo(Newdt);
} }
//SelectPanel.Invalidate(); //SelectPanel.Invalidate();
@ -3875,7 +3875,7 @@ namespace AIMS.OperationFront.UI
{ {
if (item.operationRoom.Id.Value != UpdateRoom) continue; if (item.operationRoom.Id.Value != UpdateRoom) continue;
item.PlanOperationTime = dtpSearchTime.Value; 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.LoadInfo(Newdt);
} }
//SelectPanel.Invalidate(); //SelectPanel.Invalidate();
@ -3887,7 +3887,7 @@ namespace AIMS.OperationFront.UI
{ {
if (item.operationRoom.Id.Value != UpdateRoom) continue; if (item.operationRoom.Id.Value != UpdateRoom) continue;
item.PlanOperationTime = dtpSearchTime.Value; 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.LoadInfo(Newdt);
item.FillRoomDetail(); item.FillRoomDetail();
} }
@ -4226,7 +4226,7 @@ namespace AIMS.OperationFront.UI
private void button3_Click(object sender, EventArgs e) 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")); 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; if (Newdt == null || Newdt.Rows.Count <= 0) return;
frmPrintingArrangemen frm = new frmPrintingArrangemen(); frmPrintingArrangemen frm = new frmPrintingArrangemen();
frm.dt = Newdt; frm.dt = Newdt;

2
AIMS/PublicUI/frmCreateTemplate.cs
View File

@ -1257,7 +1257,7 @@ namespace AIMS.PublicUI.UI
OperationTemplateOutputLiquidsObj.TypeId = TypeId; OperationTemplateOutputLiquidsObj.TypeId = TypeId;
OperationTemplateOutputLiquidsObj.ItemKindName = "出量"; OperationTemplateOutputLiquidsObj.ItemKindName = "出量";
OperationTemplateOutputLiquidsObj.InRoomTime = InRoomTime; OperationTemplateOutputLiquidsObj.InRoomTime = InRoomTime;
OperationTemplateOutputLiquidsObj.ItemId = factOutput.OutputLiquidsTypeId; OperationTemplateOutputLiquidsObj.ItemId = factOutput.OutputLiquidsId;
OperationTemplateOutputLiquidsObj.BeginTime = factOutput.BeginTime; OperationTemplateOutputLiquidsObj.BeginTime = factOutput.BeginTime;
OperationTemplateOutputLiquidsObj.EndTime = factOutput.EndTime; OperationTemplateOutputLiquidsObj.EndTime = factOutput.EndTime;
OperationTemplateOutputLiquidsObj.Value = factOutput.Dosage; OperationTemplateOutputLiquidsObj.Value = factOutput.Dosage;

2
DocumentManagement/DocumentEntity/PatientRecord.cs
View File

@ -240,7 +240,7 @@ namespace DocumentManagement
StringBuilder strSql = new StringBuilder(); StringBuilder strSql = new StringBuilder();
strSql.Append(" select *"); strSql.Append(" select *");
strSql.Append(" from V_OperationRecordALL where"); 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()); return DbHelperSQL.GetDataTable(strSql.ToString());
} }
catch (Exception ex) catch (Exception ex)

102
DrawGraph/AreaManage/PhysioDataManage.cs
View File

@ -159,37 +159,10 @@ namespace DrawGraph
{ {
//取得点击位置图例的中文 //取得点击位置图例的中文
PhysioDataConfig appTemp = reClickParamName(sender1, mousePt); PhysioDataConfig appTemp = reClickParamName(sender1, mousePt);
if (appTemp != null) ClickPhysioDataConfig(e, appTemp);
{
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);
}
}
}
} }
//如果点击在麻醉单子范围内 //如果点击在麻醉单子范围内
if (pane != null) else if (pane != null)
{ {
if (myOpeRecord.SelPhysioConfig != null && myOpeRecord.SelPhysioConfig.IsClick) if (myOpeRecord.SelPhysioConfig != null && myOpeRecord.SelPhysioConfig.IsClick)
{ {
@ -229,22 +202,74 @@ namespace DrawGraph
myOpeRecord.SAreaObj.StartPD = pdTemp; myOpeRecord.SAreaObj.StartPD = pdTemp;
myOpeRecord.SAreaObj.StartPDs = rePDs(sender, e); 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<PhysioData> 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;
// }
// }
// }
// }
//}
} }
} }
else
if (!isLegendArea(sender1, mousePt) && pane == null)
{ {
if (myOpeRecord.SelPhysioConfig != null) if (myOpeRecord.SelPhysioConfig != null)
{ {
myOpeRecord.SelPhysioConfig.IsClick = false; myOpeRecord.SelPhysioConfig.IsClick = false;
myOpeRecord.SelPhysioConfig.onClick(e); myOpeRecord.SelPhysioConfig.onClick(e);
myOpeRecord.SelPhysioConfig = null; 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) public override void MouseMove(ZedGraphControl sender, MouseEventArgs e)
{ {
double x = Convert.ToDouble(Convert.ToDouble(e.X) / Convert.ToDouble(sender.Width)); double x = Convert.ToDouble(Convert.ToDouble(e.X) / Convert.ToDouble(sender.Width));
@ -279,7 +304,6 @@ namespace DrawGraph
} }
aSyncTip.ViewStr = viewStr; aSyncTip.ViewStr = viewStr;
aSyncTip.Show(x, (y + yP)); aSyncTip.Show(x, (y + yP));
//ZedControl.AxisChange();
ZedControl.Refresh(); ZedControl.Refresh();
} }
//考虑客户端拖拽数据库处理不及时 可以采用批量缓存新增修改的数据点集中处理 //考虑客户端拖拽数据库处理不及时 可以采用批量缓存新增修改的数据点集中处理
@ -399,6 +423,8 @@ namespace DrawGraph
{ {
pdTrue.config.DelItem(pdTrue); pdTrue.config.DelItem(pdTrue);
} }
//if (myOpeRecord.SelPhysioConfig != null)
// ClickPhysioDataConfig(e, pdTrue.config);
} }
} }
} }
@ -427,14 +453,14 @@ namespace DrawGraph
myOpeRecord.SAreaObj.StartPD.RecordTime, myOpeRecord.SAreaObj.StartPD.RecordTime,
myOpeRecord.SAreaObj.EndPd.RecordTime, myOpeRecord.SAreaObj.EndPd.RecordTime,
startValue2, endValue2); startValue2, endValue2);
List<PhysioDataConfig> selparameters = new List<PhysioDataConfig>(); List<PhysioDataConfig> selparameters = new List<PhysioDataConfig>();
foreach (PhysioDataConfig addPP in myOpeRecord.PhysioConfigList) foreach (PhysioDataConfig addPP in myOpeRecord.PhysioConfigList)
{ {
bool istrue = false; bool istrue = false;
foreach (int item in pdTemps) foreach (int item in pdTemps)
{ {
if (item == addPP.Id && addPP.YAisx==0) if (item == addPP.Id && addPP.YAisx == 0)
{ {
istrue = true; istrue = true;
break; break;
@ -442,7 +468,7 @@ namespace DrawGraph
} }
foreach (int item in pdTemps2) foreach (int item in pdTemps2)
{ {
if (item == addPP.Id && addPP.YAisx==1) if (item == addPP.Id && addPP.YAisx == 1)
{ {
istrue = true; istrue = true;
break; break;
@ -450,7 +476,7 @@ namespace DrawGraph
} }
if (istrue == true) if (istrue == true)
selparameters.Add(addPP); selparameters.Add(addPP);
} }
if (selparameters.Count <= 0) return; if (selparameters.Count <= 0) return;
DeletePhysios frm = new DeletePhysios(myOpeRecord.Id.Value, DeletePhysios frm = new DeletePhysios(myOpeRecord.Id.Value,

9
DrawGraph/AreaManage/PhysioDataService.cs
View File

@ -34,13 +34,14 @@ namespace DrawGraph
} }
public static void AddPhysioDatas2(List<PhysioData> physioData) public static void AddPhysioDatas2(List<PhysioData> physioData)
{ {
StringBuilder insterStr = new StringBuilder(); StringBuilder insterStr = new StringBuilder();
foreach (var item in physioData) foreach (var item in physioData)
{ {
insterStr.Append(" INSERT PhysioData (PatientId, PhysioDataConfigId, RecordTime, Value )VALUES ('" + item.PatientId + "' , '" + item.PhysioDataConfigId + "' ,'" + item.RecordTime + "', '" + item.ValueString + "' )"); 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) public static void UpdatePhysioData(PhysioData oldphysioData, PhysioData newphysioData, string OperatorName)