From 80dc2a83ebf92893a03ff6b068021312c7624eab Mon Sep 17 00:00:00 2001 From: leomo Date: Sun, 6 Nov 2022 22:02:55 +0800 Subject: [PATCH] =?UTF-8?q?1105=E6=B5=8B=E8=AF=95=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/OperationAfter/frmOperationManage.cs | 27 +++++++++++-- AIMS/OperationFront/frmOperationFrontVisit.cs | 4 +- .../OremrUserControl/UCOperationGoodsBill5.cs | 40 +++++++++---------- AIMS/ReportManager/frmOperationPlanReport.cs | 2 +- AIMSEntity/BLL/Extension/BDepartment.cs | 4 +- AIMSEntity/DAL/Extension/DDepartment.cs | 4 +- AIMSEntity/Extensions/SelectPatient.cs | 4 +- 7 files changed, 53 insertions(+), 32 deletions(-) diff --git a/AIMS/OperationAfter/frmOperationManage.cs b/AIMS/OperationAfter/frmOperationManage.cs index 8b7b486..92efbf9 100644 --- a/AIMS/OperationAfter/frmOperationManage.cs +++ b/AIMS/OperationAfter/frmOperationManage.cs @@ -32,7 +32,7 @@ namespace AIMS.OperationAfter.UI dgv.BackgroundColor = System.Drawing.Color.Snow; List list = new List(); - list = BDepartment.GetDepartmentAllList("诊疗部门"); + list = BDepartment.GetDepartmentAllList(); list.Insert(0, new Department { Id = -1, @@ -96,14 +96,33 @@ namespace AIMS.OperationAfter.UI Room += item.Value + ","; } - string type = rboZQ.Checked == true ? "择期" : "急诊"; + string type = ""; + if (rboZQ.Checked == true) + type = "择期"; + if (rboJZ.Checked == true) + type = "急诊"; string inNO = txtArchivesNo.Text; string name = txtName.Text; DataTable dt = BOperationApply.GetOperationFrontDataTable(dtpBegInDate.Value.ToString("yyyy-MM-dd"), dtpEndDate.Value.AddDays(1).ToString("yyyy-MM-dd")); - dgv.DataSource = AIMSExtension.PublicMethod.GetNewDataTable(dt, "State IN ('已排程','已访视') and ApplyDepName LIKE '%" + Department + "%'", ""); + string Where = ""; + if (state == "") + Where += " StateId >1 "; + else + Where += " StateId IN (" + state + ") "; + if (Department != "") + Where += " and ApplyDepName LIKE '%" + Department + "%' "; + if (Room != "") + Where += " and OperationRoomId IN (" + Room + ") "; + if (type != "") + Where += " and OperationType='" + type + "' "; + if (inNO != "") + Where += " and MdrecNo LIKE '%" + inNO + "%' "; + if (name != "") + Where += " and PatientName LIKE '%" + name + "%' "; + dgv.DataSource = AIMSExtension.PublicMethod.GetNewDataTable(dt, Where, ""); for (int i = 0; i < dgv.Rows.Count; i++) { @@ -151,7 +170,7 @@ namespace AIMS.OperationAfter.UI void frmOperationApplyDetail_FormClosed(object sender, FormClosedEventArgs e) { btnFind_Click(null, null); - } + } private void tsbPrint_Click(object sender, EventArgs e) { diff --git a/AIMS/OperationFront/frmOperationFrontVisit.cs b/AIMS/OperationFront/frmOperationFrontVisit.cs index ba32a3a..fb09fd8 100644 --- a/AIMS/OperationFront/frmOperationFrontVisit.cs +++ b/AIMS/OperationFront/frmOperationFrontVisit.cs @@ -32,7 +32,7 @@ namespace AIMS.OperationFront.UI dtpEndDate2.Value = DateTime.Parse(dtpEndDate2.Value.ToString("yyyy-MM-dd")).AddDays(4); List list = new List(); - list = BDepartment.GetDepartmentAllList("诊疗部门"); + list = BDepartment.GetDepartmentAllList(); list.Insert(0, new Department { Id = -1, @@ -49,7 +49,7 @@ namespace AIMS.OperationFront.UI List list2 = new List(); - list2 = BDepartment.GetDepartmentAllList("诊疗部门"); + list2 = BDepartment.GetDepartmentAllList(); list2.Insert(0, new Department { Id = -1, diff --git a/AIMS/OremrUserControl/UCOperationGoodsBill5.cs b/AIMS/OremrUserControl/UCOperationGoodsBill5.cs index c0f80ae..f77681a 100644 --- a/AIMS/OremrUserControl/UCOperationGoodsBill5.cs +++ b/AIMS/OremrUserControl/UCOperationGoodsBill5.cs @@ -260,26 +260,26 @@ namespace AIMS.OremrUserControl { try { - string result = ""; - if (txtFront.Text.Trim() != "" && txtFront.Text.Trim() != "\\") - { - int a = int.Parse(txtFront.Text); - result = (a).ToString(); - } - if (txtDoing.Text.Trim() != "" && txtDoing.Text.Trim() != "\\") - { - int b = int.Parse(txtDoing.Text); - result = (b).ToString(); - } - if (txtFront.Text.Trim() != "" && txtDoing.Text.Trim() != "" && txtDoing.Text.Trim() != "\\" && txtFront.Text.Trim() != "\\") - { - int a = int.Parse(txtFront.Text); - int b = int.Parse(txtDoing.Text); - result = (a + b).ToString(); - } - this.txtCloseFront.Text = result; - this.txtCloseLast.Text = result; - this.txtSkinCloseLast.Text = result; + //string result = ""; + //if (txtFront.Text.Trim() != "" && txtFront.Text.Trim() != "\\") + //{ + // int a = int.Parse(txtFront.Text); + // result = (a).ToString(); + //} + //if (txtDoing.Text.Trim() != "" && txtDoing.Text.Trim() != "\\") + //{ + // int b = int.Parse(txtDoing.Text); + // result = (b).ToString(); + //} + //if (txtFront.Text.Trim() != "" && txtDoing.Text.Trim() != "" && txtDoing.Text.Trim() != "\\" && txtFront.Text.Trim() != "\\") + //{ + // int a = int.Parse(txtFront.Text); + // int b = int.Parse(txtDoing.Text); + // result = (a + b).ToString(); + //} + //this.txtCloseFront.Text = result; + //this.txtCloseLast.Text = result; + //this.txtSkinCloseLast.Text = result; } catch (Exception ex) { diff --git a/AIMS/ReportManager/frmOperationPlanReport.cs b/AIMS/ReportManager/frmOperationPlanReport.cs index 8e70ca7..1fb3e4d 100644 --- a/AIMS/ReportManager/frmOperationPlanReport.cs +++ b/AIMS/ReportManager/frmOperationPlanReport.cs @@ -35,7 +35,7 @@ namespace AIMS.ReportManager dgv.BackgroundColor = System.Drawing.Color.Snow; List list = new List(); - list = BDepartment.GetDepartmentAllList("诊疗部门"); + list = BDepartment.GetDepartmentAllList(); list.Insert(0, new Department { Id = -1, diff --git a/AIMSEntity/BLL/Extension/BDepartment.cs b/AIMSEntity/BLL/Extension/BDepartment.cs index 5dacb5f..236465a 100644 --- a/AIMSEntity/BLL/Extension/BDepartment.cs +++ b/AIMSEntity/BLL/Extension/BDepartment.cs @@ -51,9 +51,9 @@ namespace AIMSBLL { return DDepartment.GetDepartmentDataTable(strWhere); } - public static List GetDepartmentAllList(string Kind) + public static List GetDepartmentAllList( ) { - return DDepartment.GetDepartmentAllList(Kind); + return DDepartment.GetDepartmentAllList( ); } public static List GetDepartmentAllListBYSql(string Kind) { diff --git a/AIMSEntity/DAL/Extension/DDepartment.cs b/AIMSEntity/DAL/Extension/DDepartment.cs index ec8213e..aba1bba 100644 --- a/AIMSEntity/DAL/Extension/DDepartment.cs +++ b/AIMSEntity/DAL/Extension/DDepartment.cs @@ -159,14 +159,14 @@ namespace AIMSDAL return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } - public static List GetDepartmentAllList(string Kind) + public static List GetDepartmentAllList( ) { List DepartmentListObj = new List(); StringBuilder strSql = new StringBuilder(); strSql.Append("select "); strSql.Append("Id,Name,HelpCode,Kind,Clinic,Hospital,DepOrder,DepAddress,IsValid,OperatorNo,OperatorName,OperateDate "); strSql.Append(" from Department "); - strSql.Append(" where IsValid=1 and Kind='" + Kind + "'"); + strSql.Append(" where IsValid=1 "); DataTable dt = HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); for (int i = 0; i < dt.Rows.Count; i++) diff --git a/AIMSEntity/Extensions/SelectPatient.cs b/AIMSEntity/Extensions/SelectPatient.cs index 8abe619..0406448 100644 --- a/AIMSEntity/Extensions/SelectPatient.cs +++ b/AIMSEntity/Extensions/SelectPatient.cs @@ -64,7 +64,9 @@ namespace AIMSBLL "of1.ApplyOperationInfoName, of1.OperationDoctor, of1.State ," + "of1.AnesthesiaDoctor,of1.OperationRoomId,of1.InstrumentNurse,of1.TourNurse " + "FROM V_OperationFront of1 WHERE of1.OrderOperationTime>='" + BeginDate + "' AND of1.OrderOperationTime<'" + EndDate + "' "; - if (isLoginPerson == true) strSql += " and AnesthesiaDoctor like '%" + person + "%'"; + if (isLoginPerson == true) { + strSql += " and AnesthesiaDoctor like '%" + person + "%' and InstrumentNurse like '%" + person + "%' and TourNurse like '%" + person + "%'"; + } if (isEnOpe == true) strSql += " and state ='手术结束'"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); }