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" ?>
<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>
<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>

6
AIMS/DocManager/frmDocument3.cs
View File

@ -441,11 +441,6 @@ namespace AIMS.OperationAfter.UI
EMRExtension.OpenEMRS(Patient.PatientId, Patient.ApplyId);
}
private void buttonX2_Click(object sender, EventArgs e)
{
BOperationReview.SetDocumentXmlStatic("不计费耗材使用清单");
}
private void btnDelete_Click(object sender, EventArgs e)
{
//判断是否选择患者
@ -461,6 +456,7 @@ namespace AIMS.OperationAfter.UI
if (dialogResult == DialogResult.Yes)
{
DocumentDAL.DeletePrintDocument2(DModel);
PublicMethod.WriteLog("删除文书" + tsbDoc.SelectedTab.Text, Patient.PatientId);
this.ucClassify.RefreshTree(this.Patient.PatientId);
CloseTab();
}

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

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

2
AIMS/FormLogin.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using AIMSBLL;
using AIMSExtension;
using AIMSModel;
using DevComponents.DotNetBar;
@ -52,6 +53,7 @@ namespace AIMS
Role role = BRole.GetModel(PersonObj.RoleId.Value);
AIMSExtension.PublicMethod.PermissionLevel = role.PermissionLevel == null ? 0 : role.PermissionLevel.Value;
AIMSExtension.PublicMethod.RoleName = BMenu.GetMenuRootListManageStr(AIMSExtension.PublicMethod.RoleId, "功能权限");
PublicMethod.WriteLog("登录", PersonObj.Id.Value);
Hide();
//在这里为编辑器注册
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 (messing != "") MessageBox.Show(messing, "系统提示");
//if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！")
// btnOperationInfo_Click(null, null);
if (messing == "请与手术信息选择手术分级！" || messing == "请与手术信息选择手术切口！")
btnOperationInfo_Click(null, null);
return;
}
}
@ -2157,17 +2157,19 @@ namespace AIMS.OperationAanesthesia
isTrue = false;
}
//if (_record.OpeRecordInfo.OperationLevel == null || _record.OpeRecordInfo.OperationLevel.ToString().Trim() == "")
//{
// message = "请与手术信息选择手术分级！";
// isTrue = false;
//}
//if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "")
//{
// message = "请与手术信息选择手术切口！";
// isTrue = false;
//}
if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{
if (_record.OpeRecordInfo.OperationLevel == null || _record.OpeRecordInfo.OperationLevel.ToString().Trim() == "")
{
message = "请与手术信息选择手术分级！";
isTrue = false;
}
if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "")
{
message = "请与手术信息选择手术切口！";
isTrue = false;
}
}
}
return isTrue;

21
AIMS/OperationAanesthesia/frmInstrumentRecord.cs
View File

@ -1161,15 +1161,18 @@ namespace AIMS.OperationAanesthesia
message = "请与手术信息选择手术分级！";
isTrue = false;
}
if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "")
if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{
message = "请与手术信息选择手术切口！";
isTrue = false;
}
if (_record.OperationDoctor == null || _record.OperationDoctor.Trim() == "")
{
message = "请添加手术医师！";
isTrue = false;
if (_record.OpeRecordInfo.OperationCut == null || _record.OpeRecordInfo.OperationCut.ToString().Trim() == "")
{
message = "请与手术信息选择手术切口！";
isTrue = false;
}
if (_record.OperationDoctor == null || _record.OperationDoctor.Trim() == "")
{
message = "请添加手术医师！";
isTrue = false;
}
}
return isTrue;
@ -1860,7 +1863,7 @@ namespace AIMS.OperationAanesthesia
}
}
catch (Exception )
catch (Exception)
{
//出错处理，终止打印，设置e.HasMorePages参数，初始化相关变量
e.HasMorePages = false;

4
AIMS/OperationAanesthesia/frmInstrumentRecord2.cs
View File

@ -906,6 +906,10 @@ namespace AIMS.OperationAanesthesia
for (int i = 0; i < dr.Count(); i++)
{
var name = dr[i].ItemArray[0].ToString();
if (name=="InRoomTime")
{
name = name;
}
var value = dr[i].ItemArray[1].ToString();
XTextInputFieldElement element = query.Where(x => x.FieldSettings.ListSource.SourceName == value).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;
if (txtOperationCut.DataSource == null) BindBasicDictionaryToComboBox(txtOperationCut, "手术切口");
if (!PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{
cboOperationLevel.Enabled = false;
txtOperationCut.Enabled = false;
}
}
/// <summary>
@ -694,20 +700,23 @@ namespace AIMS.OperationAanesthesia
{
bool b = true;
if (cboOperationLevel.Text == "" || cboOperationLevel.Text == "未分级")
if (PublicMethod.RoleName.Contains("术中填写手术等级切口等级"))
{
MessageBox.Show("请填手术分级");
label19.ForeColor = Color.Red;
cboOperationLevel.Focus();
b = false;
if (cboOperationLevel.Text == "" || cboOperationLevel.Text == "未分级")
{
MessageBox.Show("请填手术分级");
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;
}
#endregion

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

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

8
AIMS/OperationFront/frmOperationSchedulePlan.cs
View File

@ -3860,7 +3860,7 @@ namespace AIMS.OperationFront.UI
foreach (ucPlanOperationRoomCard item in ucOpeRooms)
{
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);
}
//SelectPanel.Invalidate();
@ -3875,7 +3875,7 @@ namespace AIMS.OperationFront.UI
{
if (item.operationRoom.Id.Value != UpdateRoom) continue;
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);
}
//SelectPanel.Invalidate();
@ -3887,7 +3887,7 @@ namespace AIMS.OperationFront.UI
{
if (item.operationRoom.Id.Value != UpdateRoom) continue;
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.FillRoomDetail();
}
@ -4226,7 +4226,7 @@ namespace AIMS.OperationFront.UI
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"));
DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, " State <> 'ÍË»Ø' ", "");
DataTable Newdt = AIMSExtension.PublicMethod.GetNewDataTable(NowPatientDataTable, " State <> 'ÍË»Ø' ", "PlanOrder");
if (Newdt == null || Newdt.Rows.Count <= 0) return;
frmPrintingArrangemen frm = new frmPrintingArrangemen();
frm.dt = Newdt;

2
AIMS/PublicUI/frmCreateTemplate.cs
View File

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

2
DocumentManagement/DocumentEntity/PatientRecord.cs
View File

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

98
DrawGraph/AreaManage/PhysioDataManage.cs
View File

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

3
DrawGraph/AreaManage/PhysioDataService.cs
View File

@ -40,7 +40,8 @@ namespace DrawGraph
{
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)