1、分组项目为空允许应用，2、总检结论词添加一键删除

PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs

@@ -58,8 +58,15 @@ namespace PEIS.Model.Enrollment
                                     $"LEFT JOIN dbo.Enrollment_OrgGroup d ON b.GroupID = d.ID " +
                                     $"WHERE c.ID = {oeID} AND d.ID = {groupID}" +
                                     $"AND a.ID NOT IN (SELECT PID FROM Enrollment_Patient WHERE OEID = {oeID})");
-            // 个人收费项目信息
+
-            DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo FROM Enrollment_patient a LEFT JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND a.ID NOT IN ( SELECT EID FROM Enrollment_FeeItem )");
+            var groupFeeItem = DAOHelp.GetDataBySQL<EnrollmentOrgFeeItem>($@"SELECT *  FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID}");
+
+            if (groupFeeItem.Count != 0)
+            {
+                // 个人收费项目信息
+                DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo FROM Enrollment_patient a LEFT JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND a.ID NOT IN ( SELECT EID FROM Enrollment_FeeItem )");
+            }
+
             // 更新应用时间
             DAOHelp.ExecuteSql($"UPDATE dbo.Enrollment_OrgGroup SET Checker = '{Global.currentUser.Name}', CheckerCode = '{Global.currentUser.Code}', CheckTime = GETDATE() WHERE OID = {oeID} AND ID = {groupID}");
         }

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -412,7 +412,7 @@ namespace PEIS.View.Enrollment
         {
             if (!DgvGroup2.GetSelectedRows().Any()) return;
 
-            if (!DgvGroupFeeItem.GetSelectedRows().Any()) return;
+            //if (!DgvGroupFeeItem.GetSelectedRows().Any()) return;
 
             if (!DgvGroupPatient.GetSelectedRows().Any())
             {

PEIS/View/Exam/TotalForm.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TotalForm));
             this.splitContainerBase = new System.Windows.Forms.SplitContainer();
             this.panelLeftBase = new System.Windows.Forms.Panel();
@@ -225,7 +226,7 @@
             this.toolStripTxtStatus = new System.Windows.Forms.ToolStripTextBox();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager();
+            this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
             this.linqInstantFeedbackSource1 = new DevExpress.Data.Linq.LinqInstantFeedbackSource();
             this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -1007,7 +1008,7 @@
             this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn15.OptionsFilter.AllowFilter = false;
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 1;
+            this.gridColumn15.VisibleIndex = 0;
             this.gridColumn15.Width = 198;
             // 
             // gridColumn18
@@ -1040,7 +1041,7 @@
             this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn19.OptionsFilter.AllowFilter = false;
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 3;
+            this.gridColumn19.VisibleIndex = 2;
             this.gridColumn19.Width = 62;
             // 
             // gridColumn31
@@ -1054,7 +1055,7 @@
             this.gridColumn31.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn31.OptionsFilter.AllowFilter = false;
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 4;
+            this.gridColumn31.VisibleIndex = 3;
             this.gridColumn31.Width = 107;
             // 
             // gridColumn32
@@ -1068,7 +1069,7 @@
             this.gridColumn32.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn32.OptionsFilter.AllowFilter = false;
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 5;
+            this.gridColumn32.VisibleIndex = 4;
             this.gridColumn32.Width = 111;
             // 
             // txtSummary

PEIS/View/Exam/TotalForm.cs

@@ -92,6 +92,7 @@ namespace PEIS.View.Exam
             OpsConclusion.TsmiRefresh.Image = Properties.Resources.shang;
             OpsConclusion.TsmiAdd.Text = "下移"; 
             OpsConclusion.TsmiAdd.Image = Properties.Resources.xia;
+            OpsConclusion.TsmiAllDelete.Visible = true;
             //结论-排序
             OpsConclusion.TsmiRefresh.Click += (s, e) =>
              {
@@ -105,6 +106,8 @@ namespace PEIS.View.Exam
             OpsConclusion.TsmiDelete.Click += ConclusionDelete_Click;
             //结论-保存
             OpsConclusion.TsmiSave.Click += ConclusionSave_Click;
+            //结论-一键删除
+            OpsConclusion.TsmiAllDelete.Click += ConclusionAllDelete_Click;
             // 切换Tab页加载数据
             TabPart.SelectedPageChanged += TabPart_SelectedPageChanged;
             //完结
@@ -835,6 +838,31 @@ namespace PEIS.View.Exam
             //MessageBox.Show(@"保存成功！"); 
         }
 
+        /// <summary>
+        /// 一键删除结论
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ConclusionAllDelete_Click(object sender, EventArgs e)
+        {
+            if (!_isPeidDeptUser)
+            {
+                MessageBox.Show(@"权限不足！");
+                return;
+            }
+
+            if (_patient.FinishTime != null)
+            {
+                return;
+            }
+
+            if (DgvExamConclusion.GetSelectedRows().Length == 0) return;
+            if (!Global.MsgDelete()) return;
+
+            DAOHelp.ExecuteSql($@"DELETE FROM Exam_Conclusion WHERE EID = {_patient.ID}");
+            GetExamConclusion?.Invoke(this, new Args<object>(_patient.ID));
+        }
+
         #endregion 页面控件事件
 
         #region PACS

PEIS/View/Exam/TotalForm.resx

@@ -117,12 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>377, 55</value>
-  </metadata>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>497, 55</value>
-  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>497, 55</value>
   </metadata>

PEIS/View/UControl/OpMenuSimple.Designer.cs

@@ -31,6 +31,7 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OpMenuSimple));
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.TsmiSave = new System.Windows.Forms.ToolStripMenuItem();
+            this.TsmiAllDelete = new System.Windows.Forms.ToolStripMenuItem();
             this.TsmiDelete = new System.Windows.Forms.ToolStripMenuItem();
             this.TsmiAdd = new System.Windows.Forms.ToolStripMenuItem();
             this.TsmiRefresh = new System.Windows.Forms.ToolStripMenuItem();
@@ -46,6 +47,7 @@
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.TsmiSave,
+            this.TsmiAllDelete,
             this.TsmiDelete,
             this.TsmiAdd,
             this.TsmiRefresh});
@@ -66,6 +68,16 @@
             this.TsmiSave.Size = new System.Drawing.Size(71, 34);
             this.TsmiSave.Text = "保存";
             // 
+            // TsmiAllDelete
+            // 
+            this.TsmiAllDelete.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.TsmiAllDelete.Image = global::PEIS.Properties.Resources.取消2;
+            this.TsmiAllDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.TsmiAllDelete.Name = "TsmiAllDelete";
+            this.TsmiAllDelete.Size = new System.Drawing.Size(99, 34);
+            this.TsmiAllDelete.Text = "全部删除";
+            this.TsmiAllDelete.Visible = false;
+            // 
             // TsmiDelete
             // 
             this.TsmiDelete.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -116,5 +128,6 @@
         public System.Windows.Forms.ToolStripMenuItem TsmiDelete;
         public System.Windows.Forms.ToolStripMenuItem TsmiAdd;
         public System.Windows.Forms.ToolStripMenuItem TsmiRefresh;
+        public System.Windows.Forms.ToolStripMenuItem TsmiAllDelete;
     }
 }