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

1105测试文档

Browse Source
This commit is contained in:
leomo 2022-11-06 22:02:55 +08:00
parent 51ad99e58e
commit 80dc2a83eb
7 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
AIMS/OperationAfter/frmOperationManage.cs
View File

@ -32,7 +32,7 @@ namespace AIMS.OperationAfter.UI
dgv.BackgroundColor = System.Drawing.Color.Snow;
List<Department> list = new List<Department>();
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)
{

4
AIMS/OperationFront/frmOperationFrontVisit.cs
View File

@ -32,7 +32,7 @@ namespace AIMS.OperationFront.UI
dtpEndDate2.Value = DateTime.Parse(dtpEndDate2.Value.ToString("yyyy-MM-dd")).AddDays(4);
List<Department> list = new List<Department>();
list = BDepartment.GetDepartmentAllList("诊疗部门");
list = BDepartment.GetDepartmentAllList();
list.Insert(0, new Department
{
Id = -1,
@ -49,7 +49,7 @@ namespace AIMS.OperationFront.UI
List<Department> list2 = new List<Department>();
list2 = BDepartment.GetDepartmentAllList("诊疗部门");
list2 = BDepartment.GetDepartmentAllList();
list2.Insert(0, new Department
{
Id = -1,

40
AIMS/OremrUserControl/UCOperationGoodsBill5.cs
View File

@ -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)
{

2
AIMS/ReportManager/frmOperationPlanReport.cs
View File

@ -35,7 +35,7 @@ namespace AIMS.ReportManager
dgv.BackgroundColor = System.Drawing.Color.Snow;
List<Department> list = new List<Department>();
list = BDepartment.GetDepartmentAllList("诊疗部门");
list = BDepartment.GetDepartmentAllList();
list.Insert(0, new Department
{
Id = -1,

4
AIMSEntity/BLL/Extension/BDepartment.cs
View File

@ -51,9 +51,9 @@ namespace AIMSBLL
{
return DDepartment.GetDepartmentDataTable(strWhere);
}
public static List<Department> GetDepartmentAllList(string Kind)
public static List<Department> GetDepartmentAllList( )
{
return DDepartment.GetDepartmentAllList(Kind);
return DDepartment.GetDepartmentAllList( );
}
public static List<Department> GetDepartmentAllListBYSql(string Kind)
{

4
AIMSEntity/DAL/Extension/DDepartment.cs
View File

@ -159,14 +159,14 @@ namespace AIMSDAL
return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
}
public static List<Department> GetDepartmentAllList(string Kind)
public static List<Department> GetDepartmentAllList( )
{
List<Department> DepartmentListObj = new List<Department>();
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++)

4
AIMSEntity/Extensions/SelectPatient.cs
View File

@ -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());
}