diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj
index 629c3a5..d85fbd2 100644
--- a/AIMS/AIMS.csproj
+++ b/AIMS/AIMS.csproj
@@ -239,12 +239,6 @@
frmSelectPatientGoodsBill2.cs
-
- Form
-
-
- frmDrugRegister.cs
-
Form
@@ -910,9 +904,6 @@
frmSelectPatientGoodsBill2.cs
-
- frmDrugRegister.cs
-
frmPrescriptionDocument.cs
diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs
index 78e89cc..98a4178 100644
--- a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs
+++ b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs
@@ -1585,6 +1585,10 @@ namespace AIMS.OperationAanesthesia
{
names = namestr.Split('+').ToList();
}
+ else
+ {
+ names.Add(namestr);
+ }
foreach (var name in names)
{
DataTable dt = DBHelper.GetDataTable("select * from Operation where Name ='" + name + "'");
diff --git a/AIMS/OperationAfter/frmOperationCharg2.cs b/AIMS/OperationAfter/frmOperationCharg2.cs
index d8af4e9..6efdc40 100644
--- a/AIMS/OperationAfter/frmOperationCharg2.cs
+++ b/AIMS/OperationAfter/frmOperationCharg2.cs
@@ -155,8 +155,8 @@ namespace AIMS.OperationAfter.UI
{
return;
}
- dgvtEMPOperationInfos.Rows.Clear();
- SetChargDetalie(OpeID );
+ dgvtEMPOperationInfos.Rows.Clear();
+ SetChargDetalie(OpeID);
}
@@ -241,7 +241,7 @@ namespace AIMS.OperationAfter.UI
document.ShowDialog();
dgvtEMPOperationInfos.Rows.Clear();
- SetChargDetalie(drug.OperationRecordId.Value );
+ SetChargDetalie(drug.OperationRecordId.Value);
}
private void checkBoxX1_CheckedChanged(object sender, EventArgs e)
@@ -277,31 +277,16 @@ namespace AIMS.OperationAfter.UI
}
if (list.Count > 0)
{
- frmPrescriptionDocument document = new frmPrescriptionDocument();
- document.RecordIds = list ;
+ frmPrescriptionDocument document = new frmPrescriptionDocument();
+ document.RecordIds = list;
document.ShowDialog();
}
}
private void button3_Click(object sender, EventArgs e)
- {
- List list = new List();
- foreach (DataGridViewRow item in dgvOperation.Rows)
- {
- bool isChoose = bool.Parse(item.Cells[6].EditedFormattedValue.ToString());
- if (isChoose)
- {
- string SelectId = item.Cells[0].Value.ToString();// as string;
- if (SelectId != "")
- list.Add(Convert.ToInt32(SelectId));
- }
- }
- if (list.Count > 0)
- {
- frmDrugRegister document = new frmDrugRegister();
- document.RecordIds = list;
- document.ShowDialog();
- }
+ {
+ frmOperationCharg3 document = new frmOperationCharg3();
+ document.Show();
}
}
}
diff --git a/AIMS/OperationAfter/frmOperationCharg3.designer.cs b/AIMS/OperationAfter/frmOperationCharg3.designer.cs
index 35a2012..9fdfd46 100644
--- a/AIMS/OperationAfter/frmOperationCharg3.designer.cs
+++ b/AIMS/OperationAfter/frmOperationCharg3.designer.cs
@@ -918,6 +918,7 @@
this.Controls.Add(this.panel1);
this.Name = "frmOperationCharg3";
this.Text = "费用药品登记";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.frmOperationDruggCheck_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();