From de9ca8f384a895791a03495099c9c6de5a0f11ae Mon Sep 17 00:00:00 2001
From: leomon <leomon.gg@gmail.com>
Date: Sun, 9 Apr 2023 15:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BA=BB=E9=86=89=E8=8D=AF=E5=93=81=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AIMS/AIMS.csproj                              |  9 ------
 .../frmInstrumentRecord2.cs                   |  4 +++
 AIMS/OperationAfter/frmOperationCharg2.cs     | 31 +++++--------------
 .../frmOperationCharg3.designer.cs            |  1 +
 4 files changed, 13 insertions(+), 32 deletions(-)

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 @@
     <Compile Include="OperationAanesthesia\frmSelectPatientGoodsBill2.Designer.cs">
       <DependentUpon>frmSelectPatientGoodsBill2.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperationAanesthesia\oldSystemCode\frmDrugRegister.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="OperationAanesthesia\oldSystemCode\frmDrugRegister.Designer.cs">
-      <DependentUpon>frmDrugRegister.cs</DependentUpon>
-    </Compile>
     <Compile Include="OperationAanesthesia\oldSystemCode\frmPrescriptionDocument.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -910,9 +904,6 @@
     <EmbeddedResource Include="OperationAanesthesia\frmSelectPatientGoodsBill2.resx">
       <DependentUpon>frmSelectPatientGoodsBill2.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmDrugRegister.resx">
-      <DependentUpon>frmDrugRegister.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmPrescriptionDocument.resx">
       <DependentUpon>frmPrescriptionDocument.cs</DependentUpon>
     </EmbeddedResource>
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<int> list = new List<int>();
-            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();