新增操作日志功能，图标调整更换，部分删除增加确认弹框

PEIS/App.config

@@ -7,11 +7,11 @@
 		<!-- <add value="1.0.3" key="Version"/> --> 
 		<!-- <add value="http://200.200.200.71:5200/version/download" key="DownloadUrl"/> -->  
 		<!-- 德宏中医 -->
-		<add value="0513" key="UserCode"/> 
-		<add value="赵翠回" key="UserName"/>  
+		<!--<add value="0513" key="UserCode"/> 
+		<add value="赵翠回" key="UserName"/>-->  
 		<!-- 188 -->
-		<!--<add value="0293" key="UserCode"/>
-		<add value="罗忠兰" key="UserName"/>-->
+		<add value="0293" key="UserCode"/>
+		<add value="罗忠兰" key="UserName"/>
 	</appSettings> 
 	<connectionStrings>
 
@@ -19,14 +19,15 @@
 		<!-- <add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A2922569235322E2342030D4AE0170168D8F1BC9B44D56F367DE9614CDCCBB6CDAEF20B4992B3758AD9FF39A400D08CC48"/> -->
 
 		<!-- 德宏州中医院 peisdb-->
-		 <add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A27810AC34D6EDC4F6ABFC4BE6027BB990824DB7092BFDA15709314FEBC2C3C9E312752DFBDF33BC1BF3C0FC84EAA83A4F"/> 
+		 <!--<add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A27810AC34D6EDC4F6ABFC4BE6027BB990824DB7092BFDA15709314FEBC2C3C9E312752DFBDF33BC1BF3C0FC84EAA83A4F"/>--> 
 		<!-- 192.168.12.188 -->
 		 <!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/>-->
 		<!-- 盈江妇幼YJFY  -->	
 		 <!--<add name="ConnString" connectionString="10C598E364BCAFCF5A016EA6C7463FAC7D75379F63924F4F82C1749BDA88D9414EC0303E1ECC3E76895E07FCFC13332D1D79643A2AD3AA60507FD3EAF9A41761B30F4FDE900F983F1FE6ED6F0245E5BF8BFCFC5F0A2C03E4"/>--> 
 		<!-- 芒市妇幼MSFY -->
 		 <!-- <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C71974C5748654F280FDC48E754851202242B4E7B1AA07112A874114ABFCB682AC3D64541EBBF807FEB54E514CC3815F4A0521AC62245D6E0B29E34ADCAE07492C51045002E903C53C8DC45FF6FC4A547A"/>  -->
-
+		<!-- 德宏州妇幼-->
+		<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C763905B6860F9682000563332FCAB5C73858C4F5055412BEEA4250C4B7F818B1131EA88AF653A3B4CEF4C8709AEC4870673F567CE7499A1B68594877CCF22BD0DBB127636E607D7B6"/>
 	</connectionStrings>
 	<entityFramework>
 		<providers>

PEIS/Entity/DictHazardTypecs.cs

@@ -37,8 +37,6 @@ namespace PEIS.Entity
         /// </summary>
         public string Describe { get; set; }
 
-
-
         #region Other
 
         [RefFlag(true)]

PEIS/Entity/EnrollmentFeeItem.cs

@@ -63,5 +63,9 @@ namespace PEIS.Entity
         //是否治疗费
         [RefFlag(true)]
         public Boolean IsHide { get; set; }
+
+        // 科室注意事项
+        [RefFlag(true)]
+        public String DeptTips { get; set; }
     }
 }

PEIS/Model/Enrollment/EnrollmentOrgModel.cs

@@ -33,6 +33,7 @@ namespace PEIS.Model.Enrollment
 
         public List<EnrollmentOrg> GetByDate(DateTime begTime, DateTime endTime, String name)
         {
+            // EnrollmentPatient c = DAOHelp.GetById(new EnrollmentPatient { ID = 12671 }) as EnrollmentPatient;
             if (String.IsNullOrEmpty(name))
             {
                return DAOHelp.GetDataBySQL<EnrollmentOrg>($"Select * from Enrollment_Org Where ExamDate Between '{begTime}' And  DateAdd(day, 1,'{endTime}')");
@@ -60,7 +61,11 @@ namespace PEIS.Model.Enrollment
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
             var nResult = DAOHelp.ExecuteSql(normal);
+
+            if (Global._hospital.Name == "德宏州中医医院")
+            {
                 var dResult = DAOHelp.ExecuteSql(dept);
+            }
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }
@@ -92,7 +97,17 @@ namespace PEIS.Model.Enrollment
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
 
-            return cResult > 0 && eResult > 0 && fResult > 0;
+            if (cResult > 0 && eResult > 0 && fResult > 0)
+            {
+                var enPatients = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"select Name, OEID from Enrollment_Patient where Id = {EId}");
+                if (enPatients != null && enPatients.Count > 0)
+                {
+                    new Entity.Log($@"撤回发送到科室：体检号={EId},体检者={enPatients[0].Name},OEID={enPatients[0].OEID}", "3").Save();
+                }
+                return true;
+            }
+
+            return false;
         }
 
         public List<EnrollmentPatient> GetExcelList(Int64 oeID)

PEIS/Model/Enrollment/EnrollmentPatientModel.cs

@@ -129,7 +129,11 @@ namespace PEIS.Model.Enrollment
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
             var nResult = DAOHelp.ExecuteSql(normal);
+
+            if (Global._hospital.Name == "德宏州中医医院")
+            {
                 var dResult = DAOHelp.ExecuteSql(dept);
+            }
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }
@@ -137,15 +141,35 @@ namespace PEIS.Model.Enrollment
         // 取消登记
         public bool CancelRegInfo(Int64 EId)
         {
+            List<EnrollmentPatient> _patients = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"Select * From Enrollment_Patient where ID = {EId}");
+            if (_patients == null || _patients.Count == 0) return false;
+
+            // 删除项目信息
             var feeItem = $@"DELETE FROM Enrollment_FeeItem WHERE EID = {EId}";
+            // 删除体检号
             var enrollmentPatient = $@"DELETE FROM Enrollment_Patient WHERE ID = {EId}";
+            // 删除收费订单
             var checkCost = $@"UPDATE Enrollment_CheckCost SET DeleteTime = GETDATE(), Deleter = '{Global.currentUser.Name}' WHERE EID = {EId} AND DeleteTime IS NULL";
 
             var fResult = DAOHelp.ExecuteSql(feeItem, false);
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var cResult = DAOHelp.ExecuteSql(checkCost, false);
 
-            return fResult > 0 && eResult > 0;
+            string _logStr = "删除体检者：";
+            if (fResult > 0 && eResult > 0)
+            {
+                EnrollmentPatient orgPatient = _patients[0];
+                if (orgPatient.OEID != null)
+                {
+                    // 剔除分组
+                    var enrollmentOrgPatient = $@"delete from Enrollment_OrgPatient where GroupID = {orgPatient.GroupID} and PID = {orgPatient.PID} and OID = {orgPatient.OEID}";
+                    var oResulr = DAOHelp.ExecuteSql(enrollmentOrgPatient, false);
+                    _logStr = "删除团体成员：";
+                }
+                new Entity.Log($@"{_logStr}PID={orgPatient.PID},EID={orgPatient.ID},Name={orgPatient.Name}", "3").Save();
+                return true;
+            }
+            return false;
         }
 
         // 删除订单
@@ -156,18 +180,33 @@ namespace PEIS.Model.Enrollment
 
             var cResult = DAOHelp.ExecuteSql(checkCost, false);
             var fResult = DAOHelp.ExecuteSql(feeItem, false);
-
-            return cResult > 0 && fResult > 0;
+            if (cResult > 0 && fResult > 0)
+            {
+                var costs = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"Select a.Id, a.EID, a.OEID, b.Name From Enrollment_CheckCost a left join Enrollment_Patient b on a.Eid = b.Id WHERE a.Id = {id}");
+                if (costs != null && costs.Count > 0)
+                {
+                    new Entity.Log($@"删除体检订单：体检号={costs[0].EID},体检者={costs[0].Name},订单号={costs[0].ID},OEID={costs[0].OEID}", "3").Save();
+                }
+                return true;
+            }
+            return false;
         }
 
         // 取消记账
         public bool CancelCharge(Int64 id)
         {
             var sql = $@"UPDATE Enrollment_CheckCost SET ChargeTime = null, ChargerCode = null, Charger = null WHERE ID = {id}";
-            return DAOHelp.ExecuteSql(sql, false) > 0;
+            if (DAOHelp.ExecuteSql(sql, false) > 0)
+            {
+                var costs = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"Select a.Id, a.EID, a.OEID, b.Name From Enrollment_CheckCost a left join Enrollment_Patient b on a.Eid = b.Id WHERE a.Id = {id}");
+                if (costs != null && costs.Count > 0)
+                {
+                    new Entity.Log($@"体检订单取消记账：体检号={costs[0].EID},体检者={costs[0].Name},订单号={costs[0].ID},OEID={costs[0].OEID}", "3").Save();
+                }
+                return true;
+            }
+            return false;
         }
-
-        
 
         public List<FeeItem> GetItemsByPack(Int64 id) // 从套餐获取收费项目
         {
@@ -179,6 +218,7 @@ namespace PEIS.Model.Enrollment
             return DAOHelp.GetDataBySQL<FeeItem>("Select * From vi_FeeItem ORDER BY ItemClass, UnitName, DeptCode, FeeItemCode");
         }
 
+        // 撤回发送到科室
         public bool RecallDept(Int64 EId) // 撤回发送科室
         {
             var checkCost = $@"UPDATE Enrollment_CheckCost SET SendTime = null, SenderCode = null, Sender = null WHERE EID = {EId} AND SendTime is not null AND DeleteTime is null AND WeChatCostTime is null";
@@ -189,7 +229,17 @@ namespace PEIS.Model.Enrollment
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
 
-            return cResult > 0 && eResult > 0 && fResult > 0;
+            if (cResult > 0 && eResult > 0 && fResult > 0)
+            {
+
+                var enPatients = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"select Name, OEID from Enrollment_Patient where Id = {EId}");
+                if (enPatients != null && enPatients.Count > 0)
+                {
+                    new Entity.Log($@"撤回发送到科室：体检号={EId},体检者={enPatients[0].Name},OEID={enPatients[0].OEID}", "3").Save();
+                }
+                return true;
+            }
+            return false;
         }
 
         public List<EnrollmentPatient> GetEnrollmentPatientRegItems(string begDate, string endDate, string name) // 获取个人体检人员列表
@@ -262,7 +312,8 @@ namespace PEIS.Model.Enrollment
             return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT
 	                                                             a.*,
 	                                                             b.IsHide,
-                                                                 c.Address	
+                                                                 c.Address,
+                                                                 c.DeptTips
                                                               FROM
 	                                                             [dbo].[Enrollment_FeeItem] a
 	                                                             LEFT JOIN Dict_FeeItem b ON a.KeyNo = b.KeyNo 

PEIS/Model/LogModel.cs

@@ -0,0 +1,33 @@
+using PEIS.Entity;
+using PEIS.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace PEIS.Model
+{
+    public class LogModel : IModel<Log>
+    {
+        public List<Log> GetItems()
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<Log> GetLogData(DateTime beg, DateTime end, List<string> types)
+        {
+            string sql = $@"select * from Log where Time between '{beg:yyyy-MM-dd}' and '{end.AddDays(1):yyyy-MM-dd}' ";
+            if (types != null && types.Count > 0)
+            {
+                sql += "and Type in (";
+                foreach(string type in types)
+                {
+                    sql += "'" + type + "'" + ",";
+                }
+                sql = sql.Substring(0, sql.Length - 1) + ") ";
+            }
+            sql += "order by Time desc";
+            return DAOHelp.GetDataBySQL<Log>(sql);
+        }
+    }
+}

PEIS/PEIS.csproj

@@ -207,6 +207,7 @@
     <Compile Include="Entity\TwoCancer.cs" />
     <Compile Include="Model\Exam\CareerHisInqModel.cs" />
     <Compile Include="Model\Exam\HistoryModel.cs" />
+    <Compile Include="Model\LogModel.cs" />
     <Compile Include="Model\Setting\DictionaryModel.cs" />
     <Compile Include="Model\Setting\HazardTypeModel.cs" />
     <Compile Include="Presenter\CareerHisInqPresenter.cs" />
@@ -214,6 +215,7 @@
     <Compile Include="Presenter\HazardTypePresenter.cs" />
     <Compile Include="Presenter\NewBasePatientPresenter.cs" />
     <Compile Include="Presenter\NewEnrollmentPersonPresenter.cs" />
+    <Compile Include="Presenter\OperationLogPresenter.cs" />
     <Compile Include="Presenter\Setting\DictionaryPresenter.cs" />
     <Compile Include="Utils\ColorHelper.cs" />
     <Compile Include="Utils\Common.cs" />
@@ -424,6 +426,13 @@
     <Compile Include="View\Exam\PartForm.Designer.cs">
       <DependentUpon>PartForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="View\OperationLog\ILogView.cs" />
+    <Compile Include="View\OperationLog\LogForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="View\OperationLog\LogForm.Designer.cs">
+      <DependentUpon>LogForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="View\Setting\DictionaryDEditFrom.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -650,6 +659,9 @@
       <DependentUpon>PartForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\OperationLog\LogForm.resx">
+      <DependentUpon>LogForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\Setting\DictionaryDEditFrom.resx">
       <DependentUpon>DictionaryDEditFrom.cs</DependentUpon>
     </EmbeddedResource>
@@ -790,6 +802,13 @@
     <Content Include="Resources\Max.png" />
     <Content Include="Resources\shang.png" />
     <Content Include="Resources\xia.png" />
+    <None Include="Resources\预览.png" />
+    <None Include="Resources\操作日志.png" />
+    <None Include="Resources\操作日志1.png" />
+    <None Include="Resources\取消4.png" />
+    <None Include="Resources\团队报告.png" />
+    <None Include="Resources\删除1.png" />
+    <None Include="Resources\刷新 %281%29.png" />
     <Content Include="Update\Update.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

PEIS/Presenter/OperationLogPresenter.cs

@@ -0,0 +1,26 @@
+using PEIS.Base;
+using PEIS.Model;
+using PEIS.View.OperationLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace PEIS.Presenter
+{
+    internal class OperationLogPresenter : Presenter<ILogView>
+    {
+
+        public OperationLogPresenter(ILogView view): base (view) {
+
+        }
+
+        protected override void OnViewSet()
+        {
+            View.GetLogData += (send, orgs) =>
+            {
+                View.ShowLogData(new LogModel().GetLogData(orgs.Item.begDate, orgs.Item.endDate, orgs.Item.types));
+            };
+        }
+    }
+}

PEIS/Properties/Resources.Designer.cs

@@ -250,6 +250,16 @@ namespace PEIS.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 删除1 {
+            get {
+                object obj = ResourceManager.GetObject("删除1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -260,6 +270,16 @@ namespace PEIS.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 刷新__1_ {
+            get {
+                object obj = ResourceManager.GetObject("刷新 (1)", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -280,6 +300,16 @@ namespace PEIS.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 取消4 {
+            get {
+                object obj = ResourceManager.GetObject("取消4", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -300,6 +330,16 @@ namespace PEIS.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 团队报告 {
+            get {
+                object obj = ResourceManager.GetObject("团队报告", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -350,6 +390,26 @@ namespace PEIS.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 操作日志 {
+            get {
+                object obj = ResourceManager.GetObject("操作日志", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 操作日志1 {
+            get {
+                object obj = ResourceManager.GetObject("操作日志1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -410,6 +470,16 @@ namespace PEIS.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap 预览 {
+            get {
+                object obj = ResourceManager.GetObject("预览", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

PEIS/Properties/Resources.resx

@@ -121,6 +121,9 @@
   <data name="取消2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\取消2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="查找" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\查找.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="取消弃检" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\取消弃检.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -130,8 +133,11 @@
   <data name="审核" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\添加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="shang" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\shang.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -139,6 +145,9 @@
   <data name="update" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="完结" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\完结.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Excel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -148,6 +157,9 @@
   <data name="保存" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\保存.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="团队报告" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\团队报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="menuItem" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\menuItem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -160,29 +172,32 @@
   <data name="Report" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="查找" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\查找.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="生成结论" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\生成结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="预览报告" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="体检登记" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\体检登记.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="套餐" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\套餐.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="取消4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\取消4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="取消审核" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="刷新" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\刷新.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="个人信息 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\添加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="操作日志" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\操作日志.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="excelDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\excelDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="套餐" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\套餐.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="预览" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\预览.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="结论" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -190,6 +205,9 @@
   <data name="wechatlogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="操作日志1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\操作日志1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="添加" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\添加1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -199,8 +217,11 @@
   <data name="保存2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\保存2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="完结" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\完结.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="删除1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\删除1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="生成结论" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\生成结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="WeChat" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\WeChat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -211,19 +232,19 @@
   <data name="分检页面" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\分检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="取消审核" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="xia" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\xia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="总检页面" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\总检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="预览报告" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="shang" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\shang.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="个人信息 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="xia" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\xia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="刷新 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\刷新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

PEIS/Properties/licenses.licx

@@ -1,8 +1,11 @@
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

PEIS/ReportFiles/Guide.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/04/2024 16:48:39" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="05/19/2025 16:38:32" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -161,28 +161,30 @@ namespace FastReport
         <TableColumn Name="Column16" Width="141.75"/>
         <TableRow Name="Row5" Height="148.93">
           <TableCell Name="Cell46" Border.Lines="All" Font="宋体, 9pt">
-            <PictureObject Name="Picture2" Left="24.57" Top="9.45" Width="94.5" Height="132.3" BeforePrintEvent="Picture2_BeforePrint"/>
+            <PictureObject Name="Picture2" Left="24.57" Top="9.45" Width="94.5" Height="132.3" BeforePrintEvent="Picture2_BeforePrint" Image=""/>
           </TableCell>
         </TableRow>
       </TableObject>
       <BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/>
     </ReportTitleBand>
-    <DataBand Name="FeeItems" Top="400.41" Width="718.2" Height="66.15" CanGrow="true" CanShrink="true">
-      <TableObject Name="Table2" Width="718.2" Height="66.15">
+    <DataBand Name="FeeItems" Top="400.41" Width="718.2" Height="94.5" CanGrow="true" CanShrink="true">
+      <TableObject Name="Table2" Width="718.2" Height="94.5">
         <TableColumn Name="Column11" Width="143.64"/>
         <TableColumn Name="Column12" Width="143.64"/>
         <TableColumn Name="Column13" Width="143.64"/>
         <TableColumn Name="Column14" Width="143.64"/>
         <TableColumn Name="Column15" Width="143.64"/>
-        <TableRow Name="Row4" Height="66.15" AutoSize="true">
+        <TableRow Name="Row4" Height="94.5" AutoSize="true">
           <TableCell Name="Cell41" Border.Lines="All" Font="宋体, 9pt" ColSpan="5">
             <TextObject Name="Text10" Top="15.12" Width="75.6" Height="18.9" CanBreak="false" Text="参检项目:" Font="微软雅黑, 9pt"/>
-            <TextObject Name="Text11" Left="378" Top="41.58" Width="85.05" Height="18.9" Text="医师签字：" VertAlign="Center" Font="微软雅黑, 9pt"/>
-            <TextObject Name="Text12" Left="548.1" Top="41.58" Width="85.05" Height="18.9" Text="弃检签字：" VertAlign="Center" Font="微软雅黑, 9pt"/>
+            <TextObject Name="Text11" Left="378" Top="69.93" Width="85.05" Height="18.9" Text="医师签字：" VertAlign="Center" Font="微软雅黑, 9pt"/>
+            <TextObject Name="Text12" Left="548.1" Top="69.93" Width="85.05" Height="18.9" Text="弃检签字：" VertAlign="Center" Font="微软雅黑, 9pt"/>
             <TextObject Name="Text13" Left="66.15" Top="15.12" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.FeeItemName]" Font="微软雅黑, 9pt" LineHeight="20"/>
             <TextObject Name="Text9" Width="406.35" Height="18.9" CanGrow="true" CanBreak="false" Text="[F.DeptName]" AutoWidth="true" Font="微软雅黑, 9pt, style=Bold"/>
             <TextObject Name="Text14" Left="406.35" Top="1.89" Width="75.6" Height="18.9" CanBreak="false" Text="科室地址:" Font="微软雅黑, 9pt"/>
             <TextObject Name="Text15" Left="472.5" Top="1.89" Width="245.7" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.Address]" Font="微软雅黑, 9pt"/>
+            <TextObject Name="Text30" Left="66.15" Top="47.25" Width="652.05" Height="18.9" Text="[F.DeptTips]" Font="微软雅黑, 9pt"/>
+            <TextObject Name="Text31" Top="47.25" Width="75.6" Height="18.9" CanBreak="false" Text="注意事项:" Font="微软雅黑, 9pt"/>
           </TableCell>
           <TableCell Name="Cell42" Border.Lines="All" Font="宋体, 9pt"/>
           <TableCell Name="Cell43" Border.Lines="All" Font="宋体, 9pt"/>
@@ -191,24 +193,28 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="468.56" Width="718.2" Height="90.72">
-      <TextObject Name="Text7" Top="62.37" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
-      <TextObject Name="Text8" Left="500.85" Top="62.37" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
+    <PageFooterBand Name="PageFooter1" Top="496.91" Width="718.2">
+      <ChildBand Name="Child1" Top="498.91" Width="718.2" Height="56.7">
+        <TextObject Name="Text26" Top="28.35" Width="47.25" Height="18.9" CanBreak="false" Text="既往史" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
+        <TextObject Name="Text27" Left="47.25" Top="28.35" Width="349.65" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
+        <TextObject Name="Text20" Left="207.9" Width="37.8" Height="18.9" CanBreak="false" Text="血压" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text16" Width="37.8" Height="18.9" CanBreak="false" Text="身高" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text17" Left="37.8" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text18" Left="103.95" Width="37.8" Height="18.9" CanBreak="false" Text="体重" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text19" Left="141.75" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
-      <TextObject Name="Text20" Left="207.9" Width="37.8" Height="18.9" CanBreak="false" Text="血压" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text21" Left="245.7" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text22" Left="311.85" Width="37.8" Height="18.9" CanBreak="false" Text="心率" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text23" Left="349.65" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text24" Left="415.8" Width="37.8" Height="18.9" CanBreak="false" Text="腰围" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text25" Left="453.6" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
-      <TextObject Name="Text26" Top="28.35" Width="47.25" Height="18.9" CanBreak="false" Text="既往史" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
-      <TextObject Name="Text27" Left="47.25" Top="28.35" Width="349.65" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
-      <LineObject Name="Line1" Top="56.7" Width="718.2" Border.Width="4"/>
         <TextObject Name="Text28" Left="519.75" Width="37.8" Height="18.9" CanBreak="false" Text="臀围" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
         <TextObject Name="Text29" Left="557.55" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
+        <ChildBand Name="Child2" Top="557.61" Width="718.2" Height="37.8">
+          <TextObject Name="Text8" Left="500.85" Top="5.67" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
+          <TextObject Name="Text7" Top="5.67" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
+          <LineObject Name="Line1" Width="718.2" Border.Width="4"/>
+        </ChildBand>
+      </ChildBand>
     </PageFooterBand>
   </ReportPage>
 </Report>

PEIS/Utils/DAOHelp.cs

@@ -352,7 +352,8 @@ namespace PEIS.Utils
                         }
                         else
                         {
-                            if (string.IsNullOrEmpty(dr[item.Name].ToString()))
+                            // item.IsDefined(typeof(RefFlagAttribute), false)
+                            if (string.IsNullOrEmpty(dr[item.Name]?.ToString()))
                             {
                                 continue;
                             }

PEIS/View/Base/OrgForm.Designer.cs

@@ -713,7 +713,7 @@
             // TsmiPersonDelete
             // 
             this.TsmiPersonDelete.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.TsmiPersonDelete.Image = global::PEIS.Properties.Resources.取消2;
+            this.TsmiPersonDelete.Image = global::PEIS.Properties.Resources.删除1;
             this.TsmiPersonDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TsmiPersonDelete.Name = "TsmiPersonDelete";
             this.TsmiPersonDelete.Size = new System.Drawing.Size(71, 33);

PEIS/View/Base/OrgForm.cs

@@ -8,8 +8,7 @@ using PEIS.Event;
 using PEIS.Presenter;
 using PEIS.Utils;
 using System.Drawing;
-using DevExpress.XtraGrid.Columns;
-using DevExpress.XtraGrid.Views.Grid;
+using System.Windows.Forms;
 
 namespace PEIS.View.Base
 {
@@ -131,7 +130,12 @@ namespace PEIS.View.Base
         {
             if (DgvOrg.GetSelectedRows().Length == 0) return;
             var oid = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString());
-            _lstOrg.Where(a => a.ID == oid).ToList()[0].Delete();
+            var name = DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString();
+            DialogResult delConfirm = MessageBox.Show($"确定删除团体信息【{name}】?", "删除确认", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            if (delConfirm == DialogResult.Cancel) return;
+            bool _orgDelState = _lstOrg.Where(a => a.ID == oid).ToList()[0].Delete();
+            if (!_orgDelState) return;
+            new Log($"删除团体信息：团体名称={name}", "3").Save();
             _lstPatient.ForEach(item => item.Delete());
             _lstOrg.RemoveAt(_lstOrg.IndexOf(_lstOrg.Where(a => a.ID == Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())).ToList()[0]));
             DgvOrg.RefreshData();
@@ -234,14 +238,24 @@ namespace PEIS.View.Base
         private void MenuPersonDelete_Click(object sender, EventArgs e)
         {
             if (DgvPatient.GetSelectedRows().Length == 0) return;
+            DialogResult delConfirm = MessageBox.Show($"确定删除 {DgvPatient.GetSelectedRows().Length} 条团体成员数据?", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            if (delConfirm == DialogResult.OK)
+            {
                 foreach (var row in DgvPatient.GetSelectedRows())
                 {
                     var id = Convert.ToInt64(DgvPatient.GetRowCellValue(row, "ID").ToString());
-                _lstPatient.Where(a => a.ID == id).ToList()[0].Delete();
+                    bool delState = _lstPatient.Where(a => a.ID == id).ToList()[0].Delete();
+                    if (delState)
+                    {
+                        new Log($@"删除团体成员：PID={DgvPatient.GetRowCellValue(row, "PID")}，姓名={DgvPatient.GetRowCellValue(row, "Name")}", "3").Save();
                         _lstPatient.RemoveAt(_lstPatient.IndexOf(_lstPatient.Where(a => a.ID == id).ToList()[0]));
                     }
+                }
+                ShowOrgPatient(_lstPatient);
+                DgvPatient.ClearSelection();
                 DgvPatient.RefreshData();
             }
+        }
 
         #endregion OpsPerson
 

PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs

@@ -111,6 +111,7 @@
             this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
             this.panel10 = new System.Windows.Forms.Panel();
+            this.DelPatientBtn = new System.Windows.Forms.Button();
             this.ImportBtn = new System.Windows.Forms.Button();
             this.NewBaseBtn = new System.Windows.Forms.Button();
             this.RbFit = new System.Windows.Forms.RadioButton();
@@ -1218,8 +1219,6 @@
             this.gridColumn51.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn51.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn51.OptionsColumn.ReadOnly = true;
-            this.gridColumn51.Visible = true;
-            this.gridColumn51.VisibleIndex = 15;
             this.gridColumn51.Width = 40;
             // 
             // gridColumn52
@@ -1248,17 +1247,17 @@
             this.gridColumn53.FieldName = "PID";
             this.gridColumn53.Name = "gridColumn53";
             this.gridColumn53.Visible = true;
-            this.gridColumn53.VisibleIndex = 16;
+            this.gridColumn53.VisibleIndex = 15;
             // 
             // gridColumn55
             // 
             this.gridColumn55.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.gridColumn55.AppearanceCell.Options.UseFont = true;
-            this.gridColumn55.Caption = "OID";
+            this.gridColumn55.Caption = "OEID";
             this.gridColumn55.FieldName = "OID";
             this.gridColumn55.Name = "gridColumn55";
             this.gridColumn55.Visible = true;
-            this.gridColumn55.VisibleIndex = 17;
+            this.gridColumn55.VisibleIndex = 16;
             // 
             // splitter3
             // 
@@ -1568,6 +1567,7 @@
             // 
             // panel10
             // 
+            this.panel10.Controls.Add(this.DelPatientBtn);
             this.panel10.Controls.Add(this.ImportBtn);
             this.panel10.Controls.Add(this.NewBaseBtn);
             this.panel10.Controls.Add(this.RbFit);
@@ -1578,13 +1578,24 @@
             this.panel10.Size = new System.Drawing.Size(528, 37);
             this.panel10.TabIndex = 132;
             // 
+            // DelPatientBtn
+            // 
+            this.DelPatientBtn.Image = global::PEIS.Properties.Resources.删除1;
+            this.DelPatientBtn.Location = new System.Drawing.Point(368, 3);
+            this.DelPatientBtn.Name = "DelPatientBtn";
+            this.DelPatientBtn.Size = new System.Drawing.Size(100, 39);
+            this.DelPatientBtn.TabIndex = 6;
+            this.DelPatientBtn.Text = "删除";
+            this.DelPatientBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.DelPatientBtn.UseVisualStyleBackColor = true;
+            // 
             // ImportBtn
             // 
             this.ImportBtn.AutoSize = true;
             this.ImportBtn.Image = ((System.Drawing.Image)(resources.GetObject("ImportBtn.Image")));
-            this.ImportBtn.Location = new System.Drawing.Point(406, 2);
+            this.ImportBtn.Location = new System.Drawing.Point(414, 3);
             this.ImportBtn.Name = "ImportBtn";
-            this.ImportBtn.Size = new System.Drawing.Size(143, 39);
+            this.ImportBtn.Size = new System.Drawing.Size(89, 39);
             this.ImportBtn.TabIndex = 5;
             this.ImportBtn.Text = "全部导入";
             this.ImportBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
@@ -1595,9 +1606,9 @@
             // 
             this.NewBaseBtn.AutoSize = true;
             this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加;
-            this.NewBaseBtn.Location = new System.Drawing.Point(284, 2);
+            this.NewBaseBtn.Location = new System.Drawing.Point(271, 3);
             this.NewBaseBtn.Name = "NewBaseBtn";
-            this.NewBaseBtn.Size = new System.Drawing.Size(145, 39);
+            this.NewBaseBtn.Size = new System.Drawing.Size(100, 39);
             this.NewBaseBtn.TabIndex = 4;
             this.NewBaseBtn.Text = "新增成员";
             this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
@@ -5735,5 +5746,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn JobStatusCol2;
         private DevExpress.XtraGrid.Columns.GridColumn HazardFactorsCol2;
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit RiCmbHazardFactors;
+        private System.Windows.Forms.Button DelPatientBtn;
     }
 }

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -1,7 +1,4 @@
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraEditors.Repository;
-using DevExpress.XtraGrid.Columns;
-using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using DevExpress.XtraPrinting.Native;
 using FastReport;
@@ -96,6 +93,7 @@ namespace PEIS.View.Enrollment
             RbAll.Click += RbAll_Click;
             RbFit.Click += RbAll_Click;
             NewBaseBtn.Click += NewBaseBtn_Click;
+            DelPatientBtn.Click += DelPatientBtn_Click;
             ImportBtn.Click += ImportBtn_Click;
 
             DgvGroupPatient.MouseDown += DgvGroupPatient_MouseDown;
@@ -848,12 +846,14 @@ namespace PEIS.View.Enrollment
             {
                 RbFit.Checked = false;
                 ImportBtn.Visible = false;
+                DelPatientBtn.Visible = true;
                 DgcPatient.DataSource = _lstPatient;
             }
             else
             {
                 RbAll.Checked = false;
                 ImportBtn.Visible = true;
+                DelPatientBtn.Visible = false;
                 DgcPatient.DataSource = _lstPatient.Where(a => (DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "Marriage").ToString() == "所有" ? true : a?.Marriage == DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "Marriage").ToString())
                 && (DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "Sex").ToString().Contains(a?.Sex))
                 && (CalculateAge(a?.Birthday?.ToShortDateString()) > Convert.ToInt16(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "AgeMin").ToString()))
@@ -868,6 +868,34 @@ namespace PEIS.View.Enrollment
             selectPatientForm.ShowDialog();
         }
 
+        /// <summary>
+        /// 删除成员信息
+        /// </summary>
+        private void DelPatientBtn_Click(object sender, EventArgs e)
+        {
+            int[] selectedRows = DgvPatient.GetSelectedRows();
+            if (selectedRows.Length == 0) return;
+            BaseOrgPatient baseOrgPatient = (BaseOrgPatient)DgvPatient.GetRow(selectedRows[0]);
+            if (baseOrgPatient == null) return;
+            DialogResult delConfirm = MessageBox.Show($"确定删除成员【{baseOrgPatient.Name}】?", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            if (delConfirm == DialogResult.OK)
+            {
+                bool delState = baseOrgPatient.Delete();
+                if (delState)
+                {
+                    _lstPatient.Remove(baseOrgPatient);
+                    ShowOrgPatient(_lstPatient);
+                    DgvPatient.ClearSelection();
+                    DgvPatient.RefreshData();
+                    new Log($@"删除团体成员：PID={baseOrgPatient.PID}，Name={baseOrgPatient.Name}", "3").Save();
+                }
+                else
+                {
+                    Global.Msg("info", "成员删除失败！");
+                }
+            }
+        }
+
         public void SelectPerson(BasePatient item)
         {
             if (item.ID == 0)
@@ -1113,8 +1141,18 @@ namespace PEIS.View.Enrollment
         private void FastDelete_Click(object sender, EventArgs e) // 删除未签到成员
         {
             EnrollmentPatient item = DgvEnrollment.GetRow(DgvEnrollment.GetSelectedRows()[0]) as EnrollmentPatient;
-            if (item.Signer != null) return;
+            if (item.Signer != null)
+            {
+                Global.Msg("info", $"成员【{item.Name}】的订单已发送到科室，无法继续删除！");
+                return;
+            }
+            DialogResult delConfirm = MessageBox.Show($"确定删除成员【{item.Name}】的收费项目信息并剔除分组?", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            if(delConfirm == DialogResult.OK)
+            {
                 OnCancelRegInfo(item.ID);
+                OnGetOrgPatient();
+                OnGetGroupPatient(Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "OID").ToString()));
+            }
         }
 
         private void DgvEnrollment_RowCellClick(object sender, RowCellClickEventArgs e)
@@ -1158,8 +1196,6 @@ namespace PEIS.View.Enrollment
                 DgcEnrollmentFeeItem.DataSource = null;
             }));
             //OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID);
-
-
         }
 
         private void FastGroup_Click(object sender, EventArgs e) // 组合缴费
@@ -1959,6 +1995,7 @@ namespace PEIS.View.Enrollment
             _lstPatient = items;
             DgcPatient.DataSource = _lstPatient;
             DgvPatient.BestFitColumns();
+            RbAll_Click(RbAll, new EventArgs());
         }
 
         public void ShowGroupPatient(List<EnrollmentOrgPatient> items)

PEIS/View/Enrollment/EnrollmentOrgForm.resx

@@ -120,18 +120,15 @@
   <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>510, 16</value>
   </metadata>
-  <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>510, 16</value>
-  </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1597, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ImportBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAF5JREFUSEtj
-        YBgFQwqYhVxuQBcDAbOQq6HoYiQDkOFmIVf+m4VejUIVvxoKFg+5sgpZnCQANxzNECTD/5Pti1HDsYKh
-        azgI0NwCEBi1hCQwDC2hRWEHAzQtrkcBzQAAtlLL7bkHJToAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAGVJREFUSEtj
+        GAVDC5iFXG6AMlGAWcjVUCiTfAAy3Czkyn+z0KtRUCEwABkOFg+5sgoqRDqAG45mCJLhQEymL0YNxwqG
+        ruEgQHMLQGDUEpLAMLSEFoUdDIAsgTJRAMWuHwU0BAwMALZSy+0cd7O8AAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="PersonCostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -139,68 +136,70 @@
   </metadata>
   <data name="PFastCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft
-        V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G
-        qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/
-        COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9
-        aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe
-        kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4
-        TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm
-        Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G
-        pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV
-        gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1
-        ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf
-        11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ
-        2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo
-        VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX
-        LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY
-        x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv
-        jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl
-        mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/
-        364njv2rTroAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft
+        V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp
+        Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E
+        JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/
+        h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan
+        nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt
+        dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY
+        A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1
+        tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB
+        m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh
+        1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ
+        KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/
+        VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB
+        tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA
+        bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R
+        rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB
+        Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb
+        OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt
+        LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="PFastAllCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft
-        V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G
-        qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/
-        COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9
-        aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe
-        kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4
-        TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm
-        Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G
-        pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV
-        gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1
-        ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf
-        11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ
-        2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo
-        VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX
-        LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY
-        x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv
-        jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl
-        mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/
-        364njv2rTroAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft
+        V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp
+        Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E
+        JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/
+        h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan
+        nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt
+        dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY
+        A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1
+        tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB
+        m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh
+        1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ
+        KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/
+        VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB
+        tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA
+        bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R
+        rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB
+        Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb
+        OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt
+        LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="PFastDeleteCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYRJREFUSEvt
-        lTFLA0EQhVOrf8BCtLQWsbbQX2ChbZoQbt7iFWkVWxFBsExhYSNiLVbmJwgWtsFCEQuF5GaTTpllF44x
-        d1lyBi3ywUAeu/ve7mSXq9Vm/BV9YHNc6TWVsECHga+imkpgWf164NTQrapa2v8HekHV0v7/i3Ah3lqt
-        eT02ijCfgXU9FkVG1HOtSdNF0eFphBup28bAo2ibJEt5n2gYeBaDHrAqOiLwRfRrozGX94mGgQe3Y2M2
-        RJcFvifJAgPDShclI7oXg4xoW3RZ4CfRspsLfGifaCxw404I7HhdGMhEa14/aZ9o2Ji2mAyAuuiywKEx
-        W35zHe0TjQVOfEtTrwsDLbDrW3qlfaJh4MCZEh2KLgtkIPH6XPtEY4F9t2tjTr0uC3Sb6wNH2ieaDKg7
-        U2PaovXHNv87A85krjUG2icauZ3+FNd6TGOBSxdItKfHopH35wPv8qcbVQzcuvb7NzsxTNQN/9XYIurq
-        9RORAcfhS1BUTHQxaDZX9NoZU+cb8Ss8F83+y7EAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYVJREFUSEvt
+        U7FKA0EQvVr9AQvR0lrE2kK/IIW2aUK4ncUr0iq2QQTB0sLCRsRarPQTBAtbsVDEQiEml3T63jInQe42
+        3iZRizwYbt/czHu3c7vRBH+Gd5HVQaGlo0Eqct0R+SiKsRj6YuSGY0PeuIYJlS1GXtMwobL/FNmBeG40
+        pjXlRVaPnS1rqhzaxrTcaJJkllzFvq7A97FhfUuexvGcpsoBzQ8UaIkskv/A8JH8qVab0lQ5oPmGAqm1
+        K+Q+w5c4nsG6l/EgYKRXFMBzndxn+GbMvKsVeSUPAgzOKYJnRXmhYceYJeV35EHoWHtEka5Ildxn2LN2
+        jWvWkAcBzXsUwUgT5YWGeLfhakVOyYMAgW0naswOuc8Qz1j5IXkQYLBFkba1+8p9hu7j8G6XPAgYT9WJ
+        4l+S0yiLfs41ag9Yiysk5EHAjirOUORMU4VA7YkzNGZTU+XB+6eGl/27ywvUXLA2u7PBwIG5V9PBgVpt
+        Gw74P00eGF/A7Lhbry9oywS/hSj6BPErPBdI/H2zAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="PFastCancelCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt
-        lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan
-        6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF
-        xgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt
+        lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k
+        iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo
+        4OWtCNeHAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="TeamCostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -208,223 +207,223 @@
   </metadata>
   <data name="TFastCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft
-        V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G
-        qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/
-        COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9
-        aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe
-        kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4
-        TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm
-        Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G
-        pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV
-        gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1
-        ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf
-        11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ
-        2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo
-        VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX
-        LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY
-        x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv
-        jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl
-        mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/
-        364njv2rTroAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft
+        V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp
+        Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E
+        JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/
+        h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan
+        nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt
+        dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY
+        A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1
+        tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB
+        m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh
+        1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ
+        KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/
+        VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB
+        tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA
+        bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R
+        rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB
+        Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb
+        OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt
+        LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="TFastAllCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft
-        V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G
-        qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/
-        COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9
-        aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe
-        kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4
-        TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm
-        Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G
-        pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV
-        gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1
-        ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf
-        11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ
-        2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo
-        VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX
-        LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY
-        x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv
-        jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl
-        mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/
-        364njv2rTroAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft
+        V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp
+        Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E
+        JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/
+        h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan
+        nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt
+        dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY
+        A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1
+        tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB
+        m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh
+        1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ
+        KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/
+        VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB
+        tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA
+        bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R
+        rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB
+        Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb
+        OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt
+        LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="TFastDeleteCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYRJREFUSEvt
-        lTFLA0EQhVOrf8BCtLQWsbbQX2ChbZoQbt7iFWkVWxFBsExhYSNiLVbmJwgWtsFCEQuF5GaTTpllF44x
-        d1lyBi3ywUAeu/ve7mSXq9Vm/BV9YHNc6TWVsECHga+imkpgWf164NTQrapa2v8HekHV0v7/i3Ah3lqt
-        eT02ijCfgXU9FkVG1HOtSdNF0eFphBup28bAo2ibJEt5n2gYeBaDHrAqOiLwRfRrozGX94mGgQe3Y2M2
-        RJcFvifJAgPDShclI7oXg4xoW3RZ4CfRspsLfGifaCxw404I7HhdGMhEa14/aZ9o2Ji2mAyAuuiywKEx
-        W35zHe0TjQVOfEtTrwsDLbDrW3qlfaJh4MCZEh2KLgtkIPH6XPtEY4F9t2tjTr0uC3Sb6wNH2ieaDKg7
-        U2PaovXHNv87A85krjUG2icauZ3+FNd6TGOBSxdItKfHopH35wPv8qcbVQzcuvb7NzsxTNQN/9XYIurq
-        9RORAcfhS1BUTHQxaDZX9NoZU+cb8Ss8F83+y7EAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYVJREFUSEvt
+        U7FKA0EQvVr9AQvR0lrE2kK/IIW2aUK4ncUr0iq2QQTB0sLCRsRarPQTBAtbsVDEQiEml3T63jInQe42
+        3iZRizwYbt/czHu3c7vRBH+Gd5HVQaGlo0Eqct0R+SiKsRj6YuSGY0PeuIYJlS1GXtMwobL/FNmBeG40
+        pjXlRVaPnS1rqhzaxrTcaJJkllzFvq7A97FhfUuexvGcpsoBzQ8UaIkskv/A8JH8qVab0lQ5oPmGAqm1
+        K+Q+w5c4nsG6l/EgYKRXFMBzndxn+GbMvKsVeSUPAgzOKYJnRXmhYceYJeV35EHoWHtEka5Ildxn2LN2
+        jWvWkAcBzXsUwUgT5YWGeLfhakVOyYMAgW0naswOuc8Qz1j5IXkQYLBFkba1+8p9hu7j8G6XPAgYT9WJ
+        4l+S0yiLfs41ag9Yiysk5EHAjirOUORMU4VA7YkzNGZTU+XB+6eGl/27ywvUXLA2u7PBwIG5V9PBgVpt
+        Gw74P00eGF/A7Lhbry9oywS/hSj6BPErPBdI/H2zAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="TFastCancelCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt
-        lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan
-        6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF
-        xgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt
+        lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k
+        iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo
+        4OWtCNeHAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1914, 17</value>
   </metadata>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1914, 17</value>
-  </metadata>
   <data name="TsmiCheckOrg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAT5JREFUSEvd
-        ljFOw0AURHMUqhScYTfKGdLiv6KkpqPjCLkAF+AStCno4A7I3uUMoHHyN/bHnjhWWCSetJI98zOTrFaO
-        F4u/xIW4dFVcX3SFuLQ9GS9p5yV+XXalne3JYADfyupzQRYyrZ6h5kxoJjVnQjPHTFfVj76Kr1ZX4GHG
-        6mBMbxkrBF7Ss5f0vpK0UQ3X0OD1pyfCCoELaeukefPSNFi4hmbnJnOqUFnfflxhWX0If/N5bbXM1MJz
-        wJZbLfM7hSSTmfuHws8T157gE5+zWoaZXpoHW6plLsT7/vQRlsnN1q/vtDSXVXWwc11oJjMPBS+HpQ/n
-        9n5oqxWWSU0c7+Pfzv4X6j07+iyTmx200OpD0ExmriQ9dbayt+DZeYVlUvP/b2mX4oXnQDOpOROaCbPw
-        S1Th18TiL8Il+AZpisHcOrZ0mAAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAATVJREFUSEvd
+        lr1xwkAQhVWKIwLXcMdQg1PrNITEZGSUQANuwE04VUAGPTD6cQ3mnnhnY6+8QgfIhm9mZ3b3nfYJ6eZQ
+        8qeYrBqZtJpcNPxMjpdYV+fWVR+XjTrneAkW4K5Yng1mYSZLiSpGchuGJi2WNq3WLAXQsIblN37rN2h3
+        41/+q4/t2NVPbCXI0YPGVj+6HqnJ6pVx5ca6skQgR49yf059h5Pp7gHBUsU+vz8ylZxq2Ac8cqaS6xgq
+        MzURWtuOa3Zwx3VMJfqF5eKnaTDz5+WcLUG0IbCumAXTT7O0yCi3Em1IgzdGOJybGhqXCbCOqUQTsb2/
+        /nYOvzDU2taPNjwmGLJUiTb0x9gL9LaAxmUC6Ewlmnj/j/SYwQ378P8MsQlYnk2zoXTDgT8TB/8Qvj5J
+        sgdpisHcZQhdPAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiCheckPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAcCAYAAAB2+A+pAAAABGdBTUEAALGPC/xhBQAAAtNJREFUSEu1
-        lktoFEEQhoPgAxUv6sGgIPgkNw0ouluzA4KYi6AQTNyuTiIaPJibil4koKDkoKCIeBDxGryIb1QiCDlF
-        9KAHEclBMW5XbxTFmzjSM92b6crsy2w+aBbqr6p/q6enmba2DADpMSBFLVlSD/H+mXR0v19kiz4D0tgc
-        VwSoPnKPTAJBJ02B+eVas4DUT02vnKAtXJsFoJ40yWZyrjVLTqouO/VVrnmAoO3xtJIecc2wF78t6xqK
-        FvM4FMsdPOYApN+mJ497AOrbJikv1D6uhf1T6wHVQ5B0DwZ+rXZxYwqo3wHSFb8iIUB9IR6mj/ZzrYLd
-        Fs3jjrwoDduDN7a778eGlGmUR9XN8w3BQHmdPTOZu9gWCC1tg4tcS5Myf13P1AFIL01e2Pt1FdeMGB//
-        sFheyzVDXlAISAWzUuaxaRL/XjA5vM4ASD1Jfum0JxizWJD6uSekSJtVW9WMDYD0Z9Y77ZoGsnzIE1KY
-        nPSyZmN+vIax1NfimmIpNxNM3t2fXmYdnDGPVyOQals8HOpbccA+O3ev7uAFDjsluw79K7LWxAGqM86n
-        Epy5YSgKhdroVVjm8owB6Xilf+9P/2QHWDroxNwRavfEDGxu3a0GnLYnmqKwX2/lekwgSkWb9HeP/LKS
-        62kaMU7vZEEo4LoHCDpqkynsVsu57qhnXJDlXZVHIPUBrmcCUp+wRR86BycWct3gXiEeN0BxqsOZAtIx
-        rtcEJJ1KCvU412qR66F2QJq2tWe53hCAdC5uIOkB17LoHIyWAtInO+llrjcFCBoxjQJUd7jGAUET1vQG
-        1/6LQKjriTnd5JoDkJ7FB6mBP9gUpmEyzezPGEA9ap/pKNdaAqC+GxsIGnExswt2e+/72S1keDhaAKie
-        JFuqzwdSXbKmL3huy9lZLK8ApFcz76keD/snl/C8eQEErckLegOo3lb7Ypk3gsNqU17SZh5vlH86DnLk
-        KGtGXgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
-        VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
-        K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD
-        i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz
-        CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9
-        WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL
-        M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K
-        FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAcCAYAAAB2+A+pAAAABGdBTUEAALGPC/xhBQAAAuhJREFUSEu1
+        lk1o1EAUxxfBD1S8qAeLguAnvWlB0U2yAUHsRVBYbE0y3YoWD/amohdZUFA8KCgiPYh4LV7Eb1RWEHqq
+        6EEPItKDYt3MbJVKb2J8M/mnm5iP/ejuD4Z2/vPe++dNJsnmktAd/pSG15HBxCjKZtNb/LgESV9pVBY4
+        qI77GaWzMWx+WibIv5Dahrp9Lmvlbb4NUjq6I6ZksOwcUtvkmduPrm9ASka3+U7VLeNPIEXY7/xY0T/q
+        LcV0Ht2q9eLfGFRvTtbENBnq9q4M0mz3AKR5zNL0RrryxzrjD/Th32shK1PK+0B51yFFMBxxSTUzxA9C
+        iiMDqLjANIZmV8t+DK/sHfq1KWTqaY5bRFgEY7i2QRnbybtIh0owFLgMKZGQ+dtGpgEU81rGmYPf10Cq
+        Qwvq+JtWbT2kCJrNTVovyBEyV6a+/pN0biI8Aq0P+PHVs5B8pJlaYOIlpBhhs7SRZiyh9T+xZzooarDa
+        EUgxZEx4wKwS1TOMmbipcqxqHpK8GvXszmLaFIExpg0xmLtD5tApv6ME3Dt/u5jYpcQE0OV/r8PInLpP
+        79hw3HPIqT/T9TcMHS7b3Qw5Qmh7U0fG4ToZxJiDs9GTbTjVw8Fi/hjvgZwKYhtute7M4ESTaUlshxzF
+        sKsWgv7uY99WQ04EcZnG4Z0s2K4OORl6Xx9HMDeL7krIMRCTalxgtT2I8TQmDkHOhg7ZKSR96huZXAw5
+        QvAIYRpBt6bpVeqb0jgBuTnoY3DGTxQTkJoiP8B7KG8GuechtwYlX1AFGH8EKZO+EW85xX/xTfk1yO1B
+        9/yqLETP4T1IqVDsJExvQ1oYhu3e8s35GKQYtP5CxtBHo+EFtoQs6HcT/xlD93LcXxPjkDoLFb6vDGj7
+        IdGLh4/5pvwhpM5TLnuLqONn0khzxEV68V+B6SuEdI/dVm0VGb2BodzeCbM0tQzL3YW2eh19EN5R9+/T
+        frF0DeOou0VjfCumLZLL/QM6DnLkln25BAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
-        VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
-        K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD
-        i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz
-        CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9
-        WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL
-        M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K
-        FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
+        VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
+        DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX
+        xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA
+        O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N
+        DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr
+        GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK
+        E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
-        VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
-        K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD
-        i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz
-        CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9
-        WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL
-        M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K
-        FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
+        VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
+        DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX
+        xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA
+        O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N
+        DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr
+        GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK
+        E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
-        VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
-        K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD
-        i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz
-        CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9
-        WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL
-        M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K
-        FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
+        VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
+        DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX
+        xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA
+        O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N
+        DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr
+        GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK
+        E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
+        VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
+        DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX
+        xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA
+        O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N
+        DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr
+        GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK
+        E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiFee.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft
-        V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G
-        qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/
-        COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9
-        aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe
-        kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4
-        TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm
-        Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G
-        pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV
-        gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1
-        ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf
-        11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ
-        2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo
-        VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX
-        LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY
-        x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv
-        jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl
-        mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/
-        364njv2rTroAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft
+        V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp
+        Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E
+        JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/
+        h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan
+        nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt
+        dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY
+        A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1
+        tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB
+        m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh
+        1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ
+        KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/
+        VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB
+        tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA
+        bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R
+        rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB
+        Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb
+        OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt
+        LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <data name="TsmiSend.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAi5JREFUWEft
-        lj1rFFEUhtNppWClhT9AC0HEj+A9d7dQxI82GNx7xmjAThtBAjb5CSJ2ChYRBMkPsItlkBSxi1j7Mffc
-        EfwBsnJmd+LcM2eyd4aQKg+8xc55z3vOzszOztzcIfuMcfkqZPk5efzAAKQxOPpu0C/I2oFQLjCVxfBc
-        1pMYLvmTV0e/rhhHQ02XR8Ux2VNRX2B6Ntbml/+ckL5WAP3LRshEnweuuC79EqWPtT3I8nnpbQCOtmpN
-        XwBpg2UxrNR99kFxmq9xecNh+AAYNgH9N0AqlOFThb82Kx7WcyJMRncq82AULso6Mx242QxPl3H+hcwt
-        MUhPJ6bwVtYYQHovw/qK7yOZP/12XMxXZW3vU9tNBv0rmV/StgAgvZMhfWUwPKlnR2gLwKg4K0NKOdpi
-        n3H0iO8dc58ugKNTZY/0TvTDor8VDZRoC1j0y2LwGmQ/L8WdMcrwTxbDGelroC0AGNarIJv5u3GHTn24
-        QXozXBof5ePy0jbQFyifA/zLeBa729lduPYYnlyu/gt8vfl4fCR2t8P9NqN79c8yV0Uz8gIzG2eg5apo
-        xvIMOLodO7uh5apoRsDw8drC7+OxsxtaropmnNmUgJarohkB8xuxqztaropm3OvFIxUtVyXZ2JHk3GRj
-        R5Jzk40dSc7lVyw2smzmz8t6Hzinykx6TQeknaoBHL3mrfuK+3ezkHbkrFb+/wHtmzbkjJkA0qJFvyK/
-        VRdxP+fI7EMk/wC6TCb5sn2T7wAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAh5JREFUWEft
+        ls9K3FAUxmenK4Wu7MIHsItCKbYdTDKzqIi1W7E4uXGs0F27EUToZh6hiDsFFy0I4gN0Z5ciLupO6bp/
+        kntT6APIeM6dLzZxbiaZuYOr+cEHk3PP+fJN5iaTyohh4/hhyw3Cxzi8f1wh264vfzoiWkbpftEBIE+o
+        jyj3R70ZTc01/rxwfFk36XkjnkBrF+kAWr78XN349wDLxbgi2uky6eis5sfzaMvFMMf6XgvCKlryobTn
+        qaEL0gmLLuU2WjTeejzNv7HecEIdkU4p+A/qjTFrkLr2gvgtLLpxAvk6aa411CzKGXBCOtld8/Jy/OgT
+        7LI4Qm52mtQBShlo7TBtZCPeR7D9T+fb8WLYQukWqve4tP2Jfrpd2GbJC0C1L2kDGzlCfYBtN6YAbiN+
+        dNdEizYr99GlfMd7x1mTT6n2UM+Y+oX85YnolTbNwxSAhjYyRnRPu8HvZ1g2kunv6BvdRTNYzsd4BYQ6
+        Toy8IFpBuSdJv/YScr/ebI9zPe1rxBxAPwfITG2hVEhy8vRjmD1tAlwtvm+PoVQIz3uBXMWh0ddIXoDC
+        wQKsA9DGW8LhQFgGUF9fLv+dxOFAWAUoHCqBVQBXhAv4ODBWAXq9eJTFKsAwGAUoH4BesbiRRc/9Jyhb
+        wT6JZ6nXdGq8TAboAbTHqQcVz996kS9OUQw14w9oaDqBdXlo6A29C2ybvllZ8Tz7wHJEDpXKDbpMJvlM
+        sZ3hAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="TsmiPrintGuide.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAWhJREFUWEft
-        lT1OxDAQhfcINAhxBapFbJyWihqBXewVaDkAewnOwxG2sA0FhwGZxcR+8ST+pfInvSLjeOZp4nE2m07n
-        n9hxeTtw9Tpw9ZYm+TwIvcV8RWzvj2eMqyPj6itHI1cf1+LzHPNmwx7V3iafd2BZzr4nzJsN4/JgE+Pa
-        GlOn5AHXomFci5MJV1NiWvplHgvvM2cS6wZx29xaphbW99gJzXBTa41c3qGPP9wWm5a21GRq4Wy5hnCt
-        NlmGxr28sM83D++X+H4JeYaEvrLPtW/bLEMG+839N8vJNmQxpmr+y4oMtfiXTesZhlr8y8oMEfEYqMJU
-        3IMqTMVjoApTcQ+qMBWPgSpMxT2owhj/nbjZeXFlrwqqMBX3CB3en3jA0JQwLMrQ2mH3wPFeMoQdQS0Z
-        srHQdTADL0ATQ0MphAydFL4wo6hpqArd0Bqh6YuVs4+eplRw+lIVNU2p4PTFq2CaOp0MvgESpOXoqidz
-        oAAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAV1JREFUWEft
+        l09OAyEUxucI3RjTK7hqY8tsXbk2FRa9glsP0F7C83iELhjqwsPoUN/nUAojMGC64Jd8SXnte3yh/G0q
+        lf9ixeXDmndvvd7jJF/XQi2oTB4WT4cZ492h11eKWt59LMXnDZWbDnvutijuHgW/jLwXKjcdxuUehSkU
+        DPJ0DQrFw7gSPyZMDYX9UrvLmDtPz0nqbhxzmEtL90XdulkJxVyJJdVy+UjdX2IOsR7SkhpMjcwt0xCF
+        ipFkqN3KW7TvN8f56UeZQN04Q0LdoZ17t0XdKEMa/OfUzEayIaBN9cs021k2yVCJs2z4PsFQibMM8TRD
+        nngIyLM79sXPqIYc8TNCDdGKc84ZCFsF8tIMOSbvKe4whLZPPkOoi3j/2X9xs5f3mCEU9mnMEGJBV1vq
+        7HcD1DHbUAzIs0do0uU/p6EsVEN/cXXPoKt7KGrs1ReuAk/pSsVL03wDEqTl6G2XZ9cAAAAASUVORK5C
+        YII=
 </value>
   </data>
   <data name="TsmiOpenFeeItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAaBJREFUSEvt
-        lr1KA0EQx9Nr7wtYCVZiI7vrgZA3SCG3c1EEuzRiHyvBzsZOsLWx8QUs7KwDPkEgt7MpRNBSGe92bzO5
-        hFzuIhb+Ych+zN5vd+bmsq1WAxI6veBjjUpoPA3akQT8ot+y+cqi3YcnoDYBiv40MOsveWoJ+ETm+o0A
-        s4fYATmuxuxgYgMywaE7ycoswWEBzHbiw9a0cqhPwz+wpbS5kYD3rp+/qTP9uZYAYkw+KrHXQmM/97/i
-        frNUGUhy9UcmwDzw+XmqBBRgOg7EjUI95a8x4kVfCUhynzeXO9+Ox1tlvj9RmPzyVAM6LfKy1AaGueNW
-        HtK6wC7uhOH81ZBKsHdkfDyUK5tGgIvobwOzGqprRQ6dTQEF4G0OXZkRwwMj/bYpE9tjBf6Rn7ofjhd9
-        Pu7W2RdaOzGW2B4xPLBMCsyJ3928+0ku0R0fS8BP8qe1fH4hKZ3u+btOgkMF+MhPlP11+fvQu+qO2/w5
-        lRR1zLpI8EyCeeZ5CfLzKsFeqni0zdfXUhtGa/ux3ZVgjpTGcxWn7YPDdIP7/Sl9AyHwy8Ak/n1mAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAbtJREFUSEvt
+        VrtKxEAUTa+9P2AlWImNJOOCsH+wheSximBnI/a7lWBnYyfY2tj4AxZ21gt+gbDJZAsRtNR7NmdmX9FN
+        dhPYwgOHzL1z7z3zSjJOFXCDuMtmPXADfcom2g0v1N940jXRXxoY/fgM0IYAzVzBzF5w1pL8BNKsRjAr
+        kvYQWA/T3sQAvEi/ScdwJrVRNCiXLQGcNCsHRe02/As6KkhupP+epjmphQeIWGjQLCKofcSoKL2W499h
+        /BW75wK1kUNzviBg3j/QDZMHugsBtZFH829BKd5i/wyx1AyzwAdg+qWX2HIzRAFDxNm2P9hiiAVjpr88
+        5ZcUMII0c7G0oCmQx/wlXVawrXdQxMwOtHbdSyof4TuQZi5EaPjaVCJYBKstiKDlOdpDwxlBN9S3FK2N
+        0KCc4zSC900vSs/M6eMoP4WYdWfcP7Kn/RnlUL0gd8IntaFBuXyoMDmxo5Mkun+F2x4cS+wX4pFLdzmo
+        IN6zdx25IqhQP46PHMx+XfY+9KHagybTF0Ojlay7kT73wuSZRWco+/MqopfK728zrRo0w/7avp/uiviR
+        /CMvlB83Dw7jDXavIhznByHwy8BScOvDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="TsmiBatchCtrl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAANVJREFUWEft
-        l1sKgzAQRV1KN6H10z0kQj+7sy6li3BKP7OUygQiZZo2k8dA0TlwCT4yngQNpuuUAvr5ca3NeHmeaN1i
-        BgNusPCqyWiXidYt5n+FDDicenbsMokK9Rbu9NovYkJBlt6bRUuhcHw2cKP3s1GhFIcSwtbXN+Bo/69I
-        CmFNf06FVCiCCqVQoRTHE8IWC3Cz9RMTqkhToW20FWkq1BIRIRwt3XdxIyLk/2Ei70lO9i30sf8qSKjV
-        RCgGfSA3IkLvK3Jx9i2EUx/5xHMSFk4llxXA7hOfWT0/MAAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAANJJREFUWEft
+        l18KwjAMh3sUL7G5R++wCj56M4/iIaz46FG0Kc1ACDRLGpAtH/woLV32tfsDDY6E4fy8ajNdXodaTs84
+        p/cY00eTKT5OtZye/xXKLWw9O1nCVGiI6V6HWFBCKFsmSOkphP3jnG5lkgQXarErIWhL/Rzos7AUgppl
+        zIVciMCFWrhQi/0JQQsFuFmuy7ERUqSr0LJaRboK9cRECFZLnb04MRGCYlhYmm0L/Zy9hKml7F5q6qac
+        mAjBS46PQpxtC8HWE5/4muCP01lHCF/A7hOfW+9fQwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="InfoFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -432,136 +431,138 @@
   </metadata>
   <data name="FastCamera.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAQBJREFUSEvt
-        VLsKwkAQzKdYWfgDdt4dEUs7CzsFsbMSrG39AMvbQ7ASLEU7f8DGLxrZmIO40cglPgodmCJ7szPZu0ui
-        6OegCcciSn0wNAFFlPrPQTvUlMVSjhxMizl7SX8OcOmY+aYwgr2kvz+8ynvoX1LWnwa0LDrKYWIIY01o
-        y3WPUgHaYiBvC++11DGCAwxhljGdKsLCPyuHntQHB2jCieuG0PS1eIV6EmBxvlWXC7jbEKovakgmiAkN
-        X3vtBPzhXO/2ns9AE0aKsEsCCMOcPjSAoR3WaWOWB6ljlApgvPU7CMHDgPRHlyxWJJ/NVvpHxqLrb0xF
-        bhShL/3/+B4uOIr69HXlzckAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAARhJREFUSEvt
+        VLEOwVAU7aeYDH7Apm2I0WawkYjNJDFbfYCxbSQmiVHY/IDFF13nvhx9RFVfEQMnuWnfufee09v3Wu/3
+        EMRyyAuWlQdEJC9Y9gUEiVT8SBZ4iszRC0ckM9WirAXIBAU6ZnZj8RDVoqzFJcllaRgDaHFp8cygEUnb
+        T2QcxjJCXYv0HUoZ4L322WgD75rpGzBf3ABPPGWTik78WOaXNSbqsiwFc8UNwB2Vh1GdlNdcSlU5nLoT
+        qRTKI5wMMhtc6/MazATNWGqk3jyBfjjalMhO9wD3Q+zDVjlcByxLYWpdDBQQX7HxOvZM34A5NwPFR78D
+        Fzw04I/OJF8M3ZsNZS3CSDpImhPzYqxh0KPsH1+H550BOIr69OqcMmkAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="FastDelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAVNJREFUSEvt
-        k7FKA0EQhmMpdmJnOluxsRZ8AgsfwM5A2H9OFlLYmVqs7C0tA3Z2ChYiFlYKNmKrldHsrMRmZY47iUNu
-        N0e0ywcDszcz/+zMco3GjGkZAJseuBxnA6Cr82vz7w3+FLkRA2Eai04lQb2GusbAgdYdi+xeTH/XlHmT
-        5P7CA18M3IhfCHQL+/El5ow5ktW4dntNa0Rh4MUTPYovouV+R32JOWNO5OytXdYaURh4YOBV/FgDBnpy
-        DtbOa40oHrjyRMPQ6SzEGjhjLuSs65OwMWf56ETNWAMG7hh40/VJmCjf7TDLVqMNjHlm4EnXJ/FEhyL0
-        SbRR1SCEMOeAPhPd6vokDtgXIQa2qhq8W7uY5xCd6/okTLRbTLBT9R/0iVYkxwGnuj6JJ9rOHxnY07ES
-        zrL1YspjHUui1lJpow9eGw9cFzeM2f1Hq7Wka2dMzDeVmc4pCQ9DHQAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAVxJREFUSEvt
+        UrFKA0EQPUuxEzvT2YqNteAXWPgBdgbC7p4spLAztVjZW1oG7OwULEQsrBRsxFYro96dxGZ9b5kTxdyy
+        a7TLg4GZ23nz3gyXTTA2XrVerbQ+HRV460nb7/HvAn8KOiq1duNEcCs+jjpFSkBkR8aFwdszpGxE3RfT
+        +w1w8w43F8xlQE/iM+dbodQeT1N0OkusowHSQ2XMLXMOre/7NecbBA5YV9bOs44GSDeIR+YhAeR91s7a
+        adbRwInOsMHQdbszIQFscMLak1JQKnVEIkRaIQHkV4gnT0pBaYy/7TDPF4MCSt2jvvOkFMD5Lge9GbPS
+        JOCcmyq0HsDMpdDiAeI2ByHWmgSerZ31PcYcCy0eIG2SjA02OFSGe4E6HxizwB6YORRaPHCidZLxN23J
+        px8o83zZb6D1vnyKB52SXLttirpHaGmA+3NxGIrrl3Z7TigTpCLLPgCVmc4p5cU+VwAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
   <data name="新建NToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAENSURBVDhPrZHbSgJRGEZ9KX2HfI18I9ELkS5KCREMDBSN
-        VLRA0xDREQ+FTJai47mm8TDOF7NlhulHNwO14LvarHXxb4fjv4jnW6CLZRqIpKoI3Zbw3HwDdX6hC6cI
-        RnNwuT38yE1WoJ6JL5RC+rFxiAji8Uj0rkY9E+9lksnGqMu4TlSoZ7JT9yxihKjLuIoXqcfQNA2yssVo
-        KrOA8+z8eOAiVqAuY7NVMVsqEIdLfiAQyVAX6l7DSt5gIH2hI874AX84TX0o6x2k+Td6HwvUuxI/oD9a
-        0Q+3+FyjP1qh1ZuiLAztB6yHe+nPUWuP8VB9tx+wHk54naBUH+D+SbQXMP771LgB/dHOqPsnfgDYzPbD
-        7s5C8AAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
+        0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j
+        LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei
+        ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3
+        mS9gn2bY4UY/UzQ7E9TqfeTFtnuB+XAfzSHKr11kSl/uBebDiZ89ZCst3OUkdwL28sIVsE83ock+EIQV
+        2Mz2wxeg6/UAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="打开OToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJGSURBVDhPxZJdSJNhGIa/gw46ssiKQiiwPPBkEBRRHYQU
-        USiKZRYkaULNHyqMhTl/2tR0c3Nz6le6rG26pk4ryyjsRyoUiZimjjRTs6KwFDNDJf+ucAN1KdVZN9wH
-        L89zX8/zvryC8I9SGmxcUFvIFu38XvuromSiRyjdYHOdI2WFCB/73lBt1S9yR8uTP04Ki88lJDYPYba5
-        q83M+HCVyz+HbEwOmLBbculofbok5FCcjpAYA0HSAoSqUh1jQ+Ue4en+IiadCZRfV1NWnIWpMB1jXhpX
-        tHIKVIme0AqzhrGv5rnwTH8RdMnBKV3SiwA3SlT8+GycC9dVa1x+YM+h1qbidlkWdlMGNqMSi3iRa4YU
-        inVyRE2SG1ZmzGLkfb5r7d4GBTXlOqZ7ldCX6el3SuhJhk4ZvI6ntTIc61U9gknM4Hu3Gj5ouVORS9ND
-        rbtp4eqvIsERxlRjIOOPAnhbKkEmDXVfpcSg4FuHkr7GVGpsWmZ6FNAe4w62RoPjKFNNwYzX72Pk/i4G
-        q7egjPXDIsrdgCJdKoNtSdy0amh+robOBGg/Cc0RzLwIZeLZAUbrdjNUs5UvFf44Lq3kWKDv/EOKOXLa
-        69O4Zc2B7jRoiYSXh5loCGL0cQDDtdsZsEv4ZN6MU+uNQrqJ07HH5wH52YlUWdQ478bh0AtzbtIuo161
-        nHvpK6hMWYMp0YfL5zYSsXD6rPSZ59ErTpGdFEXymSOcjQ7mRPheDu7fwZ6dErZJ/PD39WHD+tWsXeXF
-        Om+vJX/n/9MvF8beaWm1d4MAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
+        olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4
+        4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm
+        YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl
+        5Kni3aFlFg2j3y1z5mnRTJccnNIltQhwq0jFry+mOXNtpWZWDx1Z1NhV3C3JwGFOw25SYjVe5oYhiUKd
+        HKMmwQUrMWUw/CF3NnZvvYKqUh1TvUroS3fXe7HXkwidMngTS2t5KLbregSzMY2f3Wr4qKW6LJvGR1rX
+        0MLor8OhKYTJBn/GHvvxrliCTBrsOqXIoOBHh5K+hmSq7FqmexTQHuUytkaKxuNMNgYyVneA4Qd7GKjc
+        hjLaRzxH7gIU6JIZaEvgtk1D8wsxSWecCDgNzWFMvwxm/PkhRmr3Mli1nW9lvjRdWc0Jf+/5jzRmyWmv
+        S+GOLQu6U6BFjPvqKOP1AYw88WOoZif9DgmfLVtxaj1RSLdwNvrkPCA3M54KqxrnvRia9MKcGrUrqFOt
+        5H7qKsqT1mGO9+Lqhc2ELdw+U/r0i+gVZ8hMiCDx3DHORwZyKnQ/hw/uYt9uCTskPvh6e7Fp41rWr/Fg
+        g6eHO+A/lyD8ARfG3mk9fv1YAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="保存SToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAInSURBVDhPrZLfS5NhFMfff8H7boIuuq2pMZyL6eAt11BW
-        DcOK6NcbaZamyzRJsTKN9qYbaFOcOmm12ohNNPIHmCIlokwlKzNXtMShpthEMPjGeaT3YbvYRXTgXH4+
-        5znf5wjC/6jeniioA/4N+LzreOpeRWdHBC2ORdht3yFbQ7hfO4/qqk+oKH+P0pJpXLsahCIgcHAAsDVu
-        IVFtbm3DkDuIE7kvWSsC74s1Jqiv+xnPKEVwZHUTB02voFJJMB/3cIH7yQoTVFf9iOdY/YW/hNeQbAyg
-        /OYCjpq6uMDZtsQENyyf49kYeGougr2iF8VFs8jJdnJBc1OYCQqvTCeER4Nh7NK5IUnjMBodXNDY8I0J
-        pIvjCeGBsa9ISuvAyVNvkJVl54IH9Qvo7wN6e4Az597BfHqEpU2B0c70bJq8Aw/hmPk1RFHmgjs1c+gO
-        AD4v0OX6Ddn6C7X3llmoFBjtXJAfVOAjOX7o9XVccKtiFp5nQLtzG3ZbFIa8opg2nbUg73LlDpzth/6w
-        BzpdDRdYSmfQ7gQaHkXZZIIEQUCyRsTExyXMzC9DKrmLTIOPwZoMF7TaSi6gs3Q8hvJsEhB8qewhPoRW
-        EFpcx/XbMlJ0LmgyOpGS3gpNWhkXFORPQrZuMHiP3oPd+0U87x5GoG8U/UNjGHk7gUNGM1TaNqSmt2Kf
-        uhlqdTEXUF04P8zOky6MjoT+mb6K0qbAaGeaSk3wgdTCWMG/1h9OtDjF55RJfQAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
+        DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3
+        8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ
+        1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH
+        4AJizD4UXJrCAUuzEDgbZrjgou2DiohshIcnQtgme5GTPYbkJKcQ1N8OckHW2REVi+RXuM8fxGaDG4oy
+        ALPZIQQ11Z+5QDk1oKJ/hjv7P2FTfCMOH3mFxMQ6IbhROYWOdrCnBI4dfwPr0V4+bRoY9UzXppMjcDdS
+        rC8hy3YhuFI2gTYf2A4Aza4f7N2/o/zaLB8qDYx6zszwr8P7k1thNFYIweXCMXgeAfedq2xxwjClZUeV
+        Jd2GtDNFETiJwfs8MBjKhMCWN8pgoLoqzE8miH1GjE7G4PsZjE7OQsm9ij2mFg7rdrug1xcJAa2l4w7W
+        r00Cgk/n38S7wBwC04u4UGxHrMHF4CbEJtyDLj5fCDIzhljfSxzeavRgyw4Zj9t64GvvQ0d3P3pfD2Kv
+        2QqNvgFxDN6urYdWmyMElJMnevh60obRktA701PRtGlg1DOdSkXwzrisaMG/RZLWAE60OMW5fNhvAAAA
+        AElFTkSuQmCC
 </value>
   </data>
   <data name="打印PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIfSURBVDhPtZH/S9NRGEb9p6QIioICTWdlRrNEp6GU1kIb
-        M10p2jJyhcuaUCt0ljCL2ZcpuoZZI5fNJE1Fl4LTRKetqdvUzW2e8LNUnApB9MD70+Wc5773xsT8j9gd
-        szS9G9h1DO39RDMbWYM7bCNEJ7ASYnxqjhetXYgkxbsLGk1fWfYH+en2YOkeEuaV2YbeaKV7YII0aQWn
-        L5TtLPjUN4a1d2xb84LXz+CoE4PJRmJGEUazdbvANe9Da7ASCq8yMe3a0t5q+Yatf5zUXCUp2aXc0b7m
-        fn3rpqRvyCHA7Tb7Rut687TLh93h4pHeLOxeWtXAE0MnokxFRDD4fYLq+jZ0xi88bLTw9M1nqnUmyu41
-        kl+uRVKg4limgvg0OWcu3kRd24xMqeVo+tWI4G7dWzw+/5a91xMMhVnyB4WbzLqXmJzxoqjUkVNYhSjz
-        z08oa5owvu/lpbkbXVMHD+pbqNA8p7iyFmmJhqwrKsS55RzPUhB3VsalEg2peTc4mCKNCErU+ujijXgW
-        A4xPL9AzPMvHPifN1kkk+bdJTC8kNv5cRFCsehbNsRKCX94gwz8W6Rx0k1CzF/2HGeHlT2Zf50By3qZA
-        fquOQBAWA+D2rTI1v8qoM0zXyDItPV4aLHOoY2PRtM0LgiPi/E14LTLlY0acYeHwb2YLvJ7knFKSsq6R
-        kFFEXJqcw+ICDp26zP4TeexLOs+ehGwB3BH+1/wGAdgvSbBSrMQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
+        jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
+        X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
+        J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
+        I5DjtuYV7uksRYhr2kebhx2eP6nrycFIEh5fBA/1Nvru8q5+PDaOovK0rABwfwugWzcErfkzHhjsePL6
+        E7q1VrTdNUDcrgGvSYlDZHN5XTNOnL8BVe8AJAoNDtZfLgDu9L1BPJmikzcrk81hlRwodZJwdBXziwnI
+        OrVoaOkiT8C8hKLHBPO7CbywOaE1jeC+bhAd6meQdvZC1KoG/5IS3MZ2HObLUHZSggvkWq3wOvbWiAqA
+        VpWeyStVfCUNf3AZ4zNhfHCFMEDMgye+hYr6FrDLzxQAUuVTpr0ocn74mchg5vsKRt1RcHp2Qv9+kZ78
+        UcE17KkWFgHNN/uQzgBkGKLJPBZiecyGchjzrmFwPIF++xJUbDbUQzEacIArLpopSRSP4CUN1Obf1Abz
+        uqob5KjiXwWH/GVl5HPt5zZh37GL2H1EiF1VZ7GDI6CNW5r/TSzWbwHYL0mKJ5czAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="打印预览VToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF+SURBVDhPnZLNSwJBHIb9F7x26VbQuTp1KPCQQbfuEUZE
-        kOFNErp2iTpEkSkFqZgoht+thbZaUGlIZB+HDqFkkRCEleXHvjEju7SjG9ILL8vAPA+/mR2VP3EHtt5Y
-        Fi4uA3vgDBc3Oaj+CgGUYnUfoU+rgzOQUJbsxa9ZTsqanUP0JNuQ+PnWEvfBJctJWd2JoH9kUirL0jjD
-        aZaTUq3VqUQUsSyNzX/KcjS5xyI4PgXLbpDWHU4gXyg2S7a8SZalGwnse6/C89SoI12gktv7vFyy6Yqx
-        PBwhnsIv9cb6GXUqESeRCdYdUZbHsi0kCcSSNZnCaFqRC8gF/Q65OCI4/ALOhQZMvkSgipcwN7+oLBAE
-        AR/lCj3CbOaTSkhF2GQNQj8zrSz4rtTw+lZG6uoBvkiSSggowgbDOLaN6tYC8X+LXbL4sB87psfRL5gx
-        OjYF3qoByma5hGwmT7Wdanu7UeI6qMSkG2h+E+1kYriLSsgU/5b0dKqhGRwC59nAD0DfQkh848odAAAA
-        AElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
+        cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl
+        YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6
+        E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt
+        IVarY/FFaPmlwp+fUaESYRNW5Vm3BPmpBpZNvppACDmTLbS6FbGAPFAj5OGI4PALOK/yZfIlAlk4j7n5
+        xdaCarWKj0KRXmE2+UklJEJZZ/RCPTPdWvBdLOP1rYD41QNcgRiVkKJQ1mjGsa2VNxeQb2OWDC7sh47p
+        ddQLeoyOTSFiVAAFvVhChsmv2k6Uvd3Icx1UolMNiDdpl4nhLiohW/xb0tMph2JwCJxjAz9A30JI8zYA
+        tAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="剪切TToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGASURBVDhPrZFLSwIBFIX9NYGbFoUlFElU1EJQUCYhCLNI
-        yyhbREpkBTqCaSZJO1toCDVGD5AwKkohsyijskWv8YFpCUbrghOOILlwmMBvcy+Xc77N5fFqzU38Gb7t
-        A/y9vaayWKcCFbeqvOcLsK16K8LU3iEiFzFugiIuN4WDkyhTyH0UoNbNIplIcBdsBU5hX/UinckhFImh
-        VzmGt7cMd8FR+AqLLg82d4LQLyyhTznCvVwkmc5ian4JQxNzIPpHYbLY/icootXbQCgnQWgsCJ3HuQtS
-        Hz+w+r+gIJMwe54gMVxDbryHY4NG9D7PLqJz3xhwfkJhekGHygPpiBtyQxiSmTi6tEEse0ufqYrVXwBB
-        ZtA+vIOWXid05m1Ipi/LJSHhZBcoyHQ50CyzM7vM+MBMKniH+o4xdgFhoplAIExDICWZfdxxizbVJvit
-        g6jjN7ALdCuPEKkoNEqtEIlLvz+MpiDs0ULQqYJ//5pdcHyZgVi9hqZuDXy7Z+zhWvELqqrf48XNh8IA
-        AAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
+        LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb
+        QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk
+        EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C
+        1NsXzN4PKIxJLLgeIJ2MoXvmFraNBKK3eXZRIveJPvs7FIYniEkXZENOdE+GIZ2Ko10TwLK7tJmKmL0F
+        EEYarYM+NMnt0C1sQzpx/lcSEnZ2gcKY/gs0dlmZuWvmjjmpwA1qxVp2AWFIMAF/OAGBzMjMI7ZrtJCb
+        4Df3o4Zfxy7QrdxDRFKol5khkpR2H4qmIOzUQNBGwrsXYxccnNOQqNbQ0KGGZ+eEPVwdeLxvqqrf4wGh
+        TNAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="复制CToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHbSURBVDhPvZHfT5JRAIb9U1LHnHXtH9BcWa0222xe1EVb
-        P9YVF3rVVctmW65ho00MaRYWDrAPpbUUlw6TSDNIpAyYZM5goYwPSQQ/8GkclgQ1vGjr3Z6rc97n3dmp
-        qfnX2Gc+U0Ca9gvM4x6G7G8Jr32n8u5fUyhXxjjm5mrXUwIrawdLbFP+snIuv0efaRKHy8/5jt6DJeYJ
-        ryg6giB9AF9Y5r7xJdKsjHUmgcWZ4NFEAu1oXBBYz5YLh+zu/fXsbg55K0MklhKCynQPb9B0xYU3lCxJ
-        DFanOBx07aIZl7kpfaPzcRjTq83KPh36GPY5mSPtY7xfjhclOtOkePd2WmEjkWY1kuRTeBPDi6go9Ug5
-        gS+U5KImyuH25zS2jdDQ+qQoKLx3J6PsL6sNQa7pPnLPslq2Lv9QCK3v4FraQi8toDrzsCSQUxmWv8Tw
-        BiK4fV+ZfrdC12Dxe28Mp1Droly4G+TsrUWBXppHdaq/JGg6eekPOrWLQqDk94glFJbC20x5ZGyv4zwY
-        cVPfoq3+vZe754Tg9+Vf9FvfUHdMU11w7rqTdDaPYdTDgG0B/bN5sVwo68yz1DbfqS5oUTtobLMIGlqN
-        qE4PUH+ij7rjvdQ293Do6O3qgv+Wnx0A5wx1nQIbAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
+        Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++
+        79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S
+        +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO
+        rpQkVqdXfOz0bWAcVLghfaXxkUz3y2VxvpMGSwL3uMKh+gHezSSLEnNhX23vtYzKUirDfGyFj/Iy1mdx
+        UWqR8iKhwtQLxjgH659y4EwvVXWPiwJt3/Ws+muywRrlqvkDdx3zQrCN8l1ldnEd3/QqFmkS/akHJYGS
+        zjLzOUEwEsMf+sLI2zmaOou/93pPGoM5zvk7UU7fnBKxSBPoT7SXBNW1F/9Io2lKCNTCeomUyrS8xnBA
+        wfUqyf1eP5U1ptJD/o1LzeNCsHPydtqdr6k4aiwvOHvNSya3ibU/QIdrEkvfhJislc32MfYfuV1eUGPw
+        FF7bIVJVZ0N/soPK421UHGstlFvYd/hWecF/Qqf7CR0A5wwgSQA2AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="粘贴PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPtZJbSJNhGMcHXdhN0YG66qoguokiguoiozAL
-        04xFYkarRcxJyZRluZGaM0WXp6VpW+RhqM1DJYpK0RASR2cNZ3SQSI1cy9q3eZhm8YvvkyUzIbroD3/e
-        i+f9/57nfXhlsv+hrtYc7LcNNFfqmF9bUE01RQRcWXAMj6uWcdcNhvrzOa8KpyhbyzWjHlN2yp9AMeQX
-        Gpn2NuD31GEt1zIxWk1BZiKvulO5eDaSVOVWXF0nGG1fi0ZxMBgiAsTwtNdGWc5xehz5CB9LGOnX895x
-        ihZLNPFxodSmreF5kYyEoweCAQ3VBbMA4RbGNAUZ2lj0iTFcSJCjVUWTpIxEHRdGsWadBIiNCA0G1FUY
-        mRLqmXKbmRjOxf0yEWf1Ssl9VSvoKV/CE1OIFBYdtmNzMMBqzmHSXcnkYBYTr88w/uIwQutSCqvayTU3
-        c+lqPalGK0kGC/E6E4rkvGBARamBsSET4/0qxp5G4nu4hc93V0nhgKZnfuDx+hkc8RCjziTqpH4OYilM
-        R3iThe9xOL7OjXg7VjNUJZM6i6q40yXZbLPTN+CSwve7neyTK2chpXk6vvaew2vfgNC2HHdjCAM3ZdLY
-        32d+8s3nZ/CTh753Lhy9H4iISyJcrmTP/kOE7tyFrPhyCu5HaoS2ZXxpWsxwzSKcZTI0Bos0dmCC6zY7
-        JdYOWjqd0il6+6b1yK5kJEsfJLDlgFU6U1DnB463UrjxXg+29mdzAFGF6afRKKJRyvcStXubVBC3Lb45
-        0G0h/wYspCPqTOnC3zw/98/6BU747y3xaXaDAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
+        FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA
+        Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR
+        KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB
+        S1kwkeG+1CSv4mmBQPThfd6Ahqq8GYB4A11yBKmaMLQxoZyLDkGjDiZOFUhUuB+FsWsUQFiArzegtlzH
+        pFjPpMPA2GA2jucx2KqWK7ZWLqO7dBGP9D5KWLbfto3eAKMhi3FHBeP9GYy9PMXos4OIrYvJrzSRbWjm
+        wuV6EnVG4tLLiEzSExGf4w0oL05nZEDPaK+akceBuO9v4uPtFUrYo6npbzhdE/QPOQmNSiPouHYOUpaf
+        gvgqA/dDf9wd63G1r2SgUlAqyyq/1anYUGfG2mdXwne7bOwJUc1AinOS+NxzBpd5HWLbUhyNPvRdF5S2
+        v05/54tbqvzBifWNHUvPOwLC4/CXwrv2HsB3+w6EwosJOB5ESeElfGpayGD1AmwlArHSm+W2PR1clToo
+        MrbT0mFTVtlbN6xFuJQar3wQz5Q9VksD+7XyPctrJdx4p5s605M5gKz8lJPSDwtGFbKboJ1blAN52vKb
+        PdXm80/AfDokTVu+8DfPXv9XCcIPTvjvLQ8YoakAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs

@@ -929,20 +929,20 @@
             this.FastCancelCharge,
             this.FastRefreshCost});
             this.CostFastMenu.Name = "CostFastMenu";
-            this.CostFastMenu.Size = new System.Drawing.Size(137, 174);
+            this.CostFastMenu.Size = new System.Drawing.Size(193, 196);
             // 
             // FastCharge
             // 
             this.FastCharge.Image = ((System.Drawing.Image)(resources.GetObject("FastCharge.Image")));
             this.FastCharge.Name = "FastCharge";
-            this.FastCharge.Size = new System.Drawing.Size(136, 34);
+            this.FastCharge.Size = new System.Drawing.Size(192, 34);
             this.FastCharge.Text = "记账";
             // 
             // FastAllCharge
             // 
             this.FastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("FastAllCharge.Image")));
             this.FastAllCharge.Name = "FastAllCharge";
-            this.FastAllCharge.Size = new System.Drawing.Size(136, 34);
+            this.FastAllCharge.Size = new System.Drawing.Size(192, 34);
             this.FastAllCharge.Text = "全部记账";
             // 
             // FastDeleteCost
@@ -950,7 +950,7 @@
             this.FastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("FastDeleteCost.Image")));
             this.FastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FastDeleteCost.Name = "FastDeleteCost";
-            this.FastDeleteCost.Size = new System.Drawing.Size(136, 34);
+            this.FastDeleteCost.Size = new System.Drawing.Size(192, 34);
             this.FastDeleteCost.Text = "删除订单";
             // 
             // FastCancelCharge
@@ -958,7 +958,7 @@
             this.FastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("FastCancelCharge.Image")));
             this.FastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FastCancelCharge.Name = "FastCancelCharge";
-            this.FastCancelCharge.Size = new System.Drawing.Size(136, 34);
+            this.FastCancelCharge.Size = new System.Drawing.Size(192, 34);
             this.FastCancelCharge.Text = "取消记账";
             // 
             // FastRefreshCost
@@ -966,7 +966,7 @@
             this.FastRefreshCost.Image = global::PEIS.Properties.Resources.刷新;
             this.FastRefreshCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FastRefreshCost.Name = "FastRefreshCost";
-            this.FastRefreshCost.Size = new System.Drawing.Size(136, 34);
+            this.FastRefreshCost.Size = new System.Drawing.Size(192, 34);
             this.FastRefreshCost.Text = "刷新订单";
             this.FastRefreshCost.Visible = false;
             // 
@@ -1231,10 +1231,10 @@
             // 
             // TsmiRegCancel
             // 
-            this.TsmiRegCancel.Image = global::PEIS.Properties.Resources.取消2;
+            this.TsmiRegCancel.Image = global::PEIS.Properties.Resources.取消4;
             this.TsmiRegCancel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TsmiRegCancel.Name = "TsmiRegCancel";
-            this.TsmiRegCancel.Size = new System.Drawing.Size(90, 40);
+            this.TsmiRegCancel.Size = new System.Drawing.Size(98, 40);
             this.TsmiRegCancel.Text = "取消登记";
             // 
             // panel1

PEIS/View/Enrollment/EnrollmentPersonForm.cs

@@ -15,8 +15,6 @@ using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
 using System.Net;
-using DevExpress.XtraGrid;
-using DevExpress.Utils;
 
 namespace PEIS.View.Enrollment
 {
@@ -513,7 +511,6 @@ namespace PEIS.View.Enrollment
 
         private void TsmiProjectPrintGuide_Click(object sender, EventArgs e)
         {
-            Console.WriteLine("123");
             if (_lstCheckCost == null || _lstCheckCost.Count == 0)
             {
                 Global.Msg("info", "暂无订单！");
@@ -535,7 +532,8 @@ namespace PEIS.View.Enrollment
                     {
                         DeptName = dept.FirstOrDefault()?.DeptName,
                         FeeItemName = string.Join(@"、", dept.Select(s => s.FeeItemName).ToList()),
-                        Address = dept.FirstOrDefault()?.Address
+                        Address = dept.FirstOrDefault()?.Address,
+                        DeptTips = dept.FirstOrDefault()?.DeptTips
                     };
                     items.Add(item);
                 });

PEIS/View/Exam/PartForm.Designer.cs

@@ -229,6 +229,7 @@
             this.tsmiReview = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiConclusion = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiSave = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmiOccupation = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiPick = new System.Windows.Forms.ToolStripMenuItem();
             this.strip1 = new System.Windows.Forms.ToolStripMenuItem();
             this.stripTxtEid = new System.Windows.Forms.ToolStripTextBox();
@@ -240,7 +241,6 @@
             this.colRptExtTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.colRptExtDesc = new DevExpress.XtraGrid.Columns.GridColumn();
             this.superTabControl1 = new FastReport.DevComponents.DotNetBar.SuperTabControl();
-            this.tsmiOccupation = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerBase)).BeginInit();
             this.splitContainerBase.Panel1.SuspendLayout();
             this.splitContainerBase.Panel2.SuspendLayout();
@@ -974,34 +974,34 @@
             this.menuGiveUp3,
             this.menuGiveUp4});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(157, 100);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(149, 92);
             // 
             // menuGiveUp1
             // 
             this.menuGiveUp1.Image = global::PEIS.Properties.Resources.弃检;
             this.menuGiveUp1.Name = "menuGiveUp1";
-            this.menuGiveUp1.Size = new System.Drawing.Size(156, 24);
+            this.menuGiveUp1.Size = new System.Drawing.Size(148, 22);
             this.menuGiveUp1.Text = "项目弃检";
             // 
             // menuGiveUp2
             // 
             this.menuGiveUp2.Image = global::PEIS.Properties.Resources.取消弃检;
             this.menuGiveUp2.Name = "menuGiveUp2";
-            this.menuGiveUp2.Size = new System.Drawing.Size(156, 24);
+            this.menuGiveUp2.Size = new System.Drawing.Size(148, 22);
             this.menuGiveUp2.Text = "取消项目弃检";
             // 
             // menuGiveUp3
             // 
             this.menuGiveUp3.Image = global::PEIS.Properties.Resources.弃检;
             this.menuGiveUp3.Name = "menuGiveUp3";
-            this.menuGiveUp3.Size = new System.Drawing.Size(156, 24);
+            this.menuGiveUp3.Size = new System.Drawing.Size(148, 22);
             this.menuGiveUp3.Text = "科室弃检";
             // 
             // menuGiveUp4
             // 
             this.menuGiveUp4.Image = global::PEIS.Properties.Resources.取消弃检;
             this.menuGiveUp4.Name = "menuGiveUp4";
-            this.menuGiveUp4.Size = new System.Drawing.Size(156, 24);
+            this.menuGiveUp4.Size = new System.Drawing.Size(148, 22);
             this.menuGiveUp4.Text = "取消科室弃检";
             // 
             // DgvExamResult
@@ -2905,13 +2905,23 @@
             this.tsmiSave.Size = new System.Drawing.Size(73, 40);
             this.tsmiSave.Text = "保存";
             // 
+            // tsmiOccupation
+            // 
+            this.tsmiOccupation.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.tsmiOccupation.Image = global::PEIS.Properties.Resources.个人信息__1_;
+            this.tsmiOccupation.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsmiOccupation.Name = "tsmiOccupation";
+            this.tsmiOccupation.Size = new System.Drawing.Size(105, 40);
+            this.tsmiOccupation.Text = "职业问诊";
+            this.tsmiOccupation.Visible = false;
+            // 
             // tsmiPick
             // 
             this.tsmiPick.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.tsmiPick.Image = global::PEIS.Properties.Resources.刷新;
+            this.tsmiPick.Image = ((System.Drawing.Image)(resources.GetObject("tsmiPick.Image")));
             this.tsmiPick.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.tsmiPick.Name = "tsmiPick";
-            this.tsmiPick.Size = new System.Drawing.Size(131, 40);
+            this.tsmiPick.Size = new System.Drawing.Size(137, 40);
             this.tsmiPick.Text = "重新提取结果";
             this.tsmiPick.Visible = false;
             // 
@@ -2994,6 +3004,7 @@
             // 
             // superTabControl1
             // 
+            this.superTabControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(239)))), ((int)(((byte)(242)))));
             // 
             // 
             // 
@@ -3009,22 +3020,13 @@
             this.superTabControl1.ControlBox.SubItems.AddRange(new FastReport.DevComponents.DotNetBar.BaseItem[] {
             this.superTabControl1.ControlBox.MenuBox,
             this.superTabControl1.ControlBox.CloseBox});
+            this.superTabControl1.ForeColor = System.Drawing.Color.Black;
             this.superTabControl1.Location = new System.Drawing.Point(0, 0);
             this.superTabControl1.Name = "superTabControl1";
             this.superTabControl1.ReorderTabsEnabled = true;
             this.superTabControl1.SelectedTabIndex = -1;
             this.superTabControl1.TabIndex = 0;
             // 
-            // tsmiOccupation
-            // 
-            this.tsmiOccupation.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.tsmiOccupation.Image = global::PEIS.Properties.Resources.个人信息__1_;
-            this.tsmiOccupation.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsmiOccupation.Name = "tsmiOccupation";
-            this.tsmiOccupation.Size = new System.Drawing.Size(105, 40);
-            this.tsmiOccupation.Text = "职业问诊";
-            this.tsmiOccupation.Visible = false;
-            // 
             // PartForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);

PEIS/View/Exam/PartForm.resx

@@ -118,61 +118,97 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>485, 17</value>
+    <value>460, 17</value>
   </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>184, 17</value>
+    <value>175, 17</value>
   </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>359, 17</value>
+    <value>340, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="tsmiCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYlJREFUWEdj
-        YBgFZACzkCsTzEKu/EfDk9DVUR2wc8sKYrEYBbNzy4qh66MKYGYT4EK2CF0eWY6ZTYAbXZ5iADPcOupm
-        JrocDEioxifgciDRQMWirwhdTN9zRxXE4Mt/0OXQgVnIlV8gtQZeO9vQ5QgCBaOGPGw+wCaGD5CqHgUg
-        xyW6ODIfH8CmnySAyxHEAkr0wgG5jmBlF2QkRx9WQI4jYOoNvHdFosuRBUhxhEXYtbXEqiUJEOMIFDWM
-        zIzo8hQDfI7AJ0dVgMsibGI0A/gcgcynKcDlCLoAFjYBVmQH0NUR7Nyy/DBL5fRKTOjqCDRfP8EmjqqD
-        QmDoudvOLOTKN/TgllBLMEZXi8sRULFv+p67vJDF8QI1y34ddEtBWMthkSe6WmRAwBFgDDIbWQ4rQGi4
-        fEZUIVASXR4fwO2Iy2ewiWMFRCvEAXA7AlMMK0A2gBoY3WxkPlaAbgA1MLodBAHZGtEA2Y5A9wG1MLo9
-        OIFZyOUf6JqpgZWxNPnpBjTtF1ahiw0KAADY1TLo5sk70gAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAZRJREFUWEdj
+        GAXkALOQKxOA+D8angSVph1g55YVxGIxCgaqEYMqpy5gZhPgQrYIKgwHyHJAtdxQYeoBmOHWUTczoUIY
+        QEI1PgGmDipEOlCx6CuCMuFA33NHFcTgy3+gQjgBUN0vkFoDr51tUCHigYJRQx42H2ATwwdIVY8CYJrR
+        DSDFQGz6SQIwA8g1hGIHgAC5jmBlF2SkigNAgBxHwNQbeO+KhApRBkhxhEXYtbXEqiUJEOMIFDWMzIxQ
+        YeoBFAvQAD45qgJcFtHFchjA5wgok/YAlyPoAljYBFiRHUBXRwDren6YpXJ6JSZ0dQSyZUD8BCpMu+gw
+        9NxtBzT0G7IFICyhlmAMVQIHyPJQITCAin3T99zlBRUiDNQs+3WQDYRhLYdFnlAlWAGyWqgQGCCLg8yG
+        CuMGCA2Xz4gqBEpChYkCyJZBhcAAZBY2cayAaIU4AEw/uhlEm4tsADUw1FgwQOdjBegGUANDjSYekK0R
+        DZDtCGSN1MRQ4wkDYKr9gc0ASrEyliY/3YCm/cIqKHMwAQYGANjVMugX06zuAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsmiReview.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAUdJREFUWEft
-        lE9Kw0AYxVukSRqiIIlpKZQQcCcuUuvQpRvBCiWbobtewGNIl3oJT+E+R2i8hTcoqIx2SnlNmpnMJ3SR
-        H7zN9973Jwmk1WpoqAHjqy/G828U5si5mWVPuBQ1mmUv2EfCaTA6l0usbniCvu322tL3/GSIvjGqr1k1
-        p83f4NUa6wjj+ee/HRCPlwusI/F4eSuyyfR9gp4RmwNesY6II0X26u7tEj0jVL+tak4b1cGqOW08P+lX
-        DZe+5ycxeiRsD2jv/QZ+qTrQmCBKrzdLntFj849H4QVReo8eKWVPWVY3gvF8LQejCrJ7GSnLCW3MH8R2
-        +9v/epEsd3CBPR0ndDC3q063d4Y9pcgmrNdFe552QwXa87QbKtCeJxssdxBRqPYB1MI9Bwmi9IFSOP+4
-        YTzP8PURKMM9pRQ0kwj3NDQIfgBDQqYmbR+fXgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAArZJREFUWEfl
+        l02ITWEYx++EBYmSEglRIktJY8bcc+5FKKyuhWky875nrmmyZYexs6CGUsSGjQgbsRnJKF/FwsbG2seC
+        WDofef3fe/7vuXPvOafTuffcSfnV05n5P+/z8X6cj1vKy+C42mxJ7wRs2hLeDK5PbeFdxt8T2sdhxbO9
+        rhbZ0ruKQn9wVUmmfY3GLLWQYcXQX1OLUWC2reAHzPy5NhR9jatrfPj/BRpewvDusaR7LyosvLtDY/4u
+        uiL6pVoB/+2oCeE+pKs7bCc4GBXHFlBOBdtw0YwvS2+Ecudgxi+Z8B2lTDD2rY7Byn2i1Bm762o1i+t9
+        dShnYgv3qImrHFebKOfHln7VJBpy1FbKmcxtvCyCA5Tzo4NNooERtY5yJlVHrYoakMEhyvmxx91tUSLH
+        30s5E8vxLRNnjaotlPNTq6kFSPKrkUi4FyhngvNygw18o9Q5UTLhfbfqaiXlVDDjDeahhNhpyp1TkWo9
+        kv3mjGYpp4KVus+Gg0GhNlLuDszkJBuA+VXKMcqj3g4zriz8M5SLQPXh3v7MmV2iGMOW7nk28EO/vCgX
+        Ax6xd3RyXF9RigHfs8YYvDsoFQeW/iwb+EkpBvb/azjGP0cpL6qvIvx92L9TSDbVZo90cm1py2v8GPuk
+        LXYKEzhtSX+/rsHhrewcVsv08pokaYbl/ciQGDgf75NiWkx4b/bU1XKGNMFJv5YY0GYYl/pSwiE8lhQT
+        M+FdZ0gTzOyLdmIVZgr/pALhU9V9zBqt54ifXI3uCvmISMEeC46YOgNCraFcKuk9MQ4cmGHKhWOL4HBU
+        x1FrKf8DDeg7wDiwTw/m3j7FWvgwizVgTaqlzQbmx1rOgAbd3Uwa2BMT3q3UB9L/i346wRo/tebBrrBs
+        CH9WJe9Xj0wffJYPwSGcSOi0J4ZaMqxaKv0FgfrLRUqqk9sAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsmiConclusion.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAWxJREFUWEft
-        lrFKA0EQhgPGFKksDgSbQzCghYnVolZCQK4QUrh9Kl8iD5GrUwmx1+4aba1T3L2A+ga+gLKYDXf/7YR/
-        zivzwUB25pt/97p0OjsEjC1+2izM3wout1V4T5BRki3XCx84a4qx+ZfLHCbZI85qqF6rgM6lRSV0riTu
-        dfviDAk57K4o+r6rbu9gH+cOY4s3Y4vV2ltFx/dxaRbMrSGJrje4Sm+luaP8SFcnl/MHnFU3AoRE3+v1
-        jw4H1+mZ+31x93pedsrgvu+F+jVQPL1ZLvDL0GGgd1DEM/TfsS8h5dRAUVoyNv+WZiEwV4QWldC5tKiE
-        zqVFJXQuLSqhc1H0Z6FeqtsymCuCYuDSTQ2T7Lm6LYO5IrSohM6lRSV0LorGFjNji7RhzaRcERT9uWlh
-        zuYiCRSjeDKO4sm0YY2lXBFaVELn0qISOneUZE9/cv6Js6a4LJdJ/S13+Ne2XXjPVnD5v4X5Ozy/+eJ+
-        sxJcPFYAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAxxJREFUWEe9
+        V0uLE0EQDogioqig4kEUD6LsZQ8q6K6bmQkqngTFeBAWMj1DlFVBPPkXFFz0IOJVT77wJPjAN/hC9+TF
+        kyAIioIoizg10farnppkJzPJ7ia9flAk/XVV9dfvnlKKck1v8AIadwO65yl6bMNcFd1BvnOcW5opRsWP
+        K3AkCNBzYZzbDWNXmssDal+K8ysniKrsbMM8FR1E4xMi4oU0lwcETLLTiK9XCmUN5VCvN51T9E2oPKT3
+        WorWkawHui/FPOZawLRoF8BT4QbRLVbexR44YbxLQvpDuwBHxdtTrqspOishTQyP6rVeEN3GAvwEn9/4
+        /x7/z1Srep645JEmlKIBkg8WrezUnFo8MlDVC8TdAPO8BXE/mgKnGHbBU7emF4prFqmTFHsCki/DwfMx
+        yRWdHvGjAXdML/b82AH3xIhQdFHcs7AhwPOpnjQSXReqiUQc/eT6YaWXCN2CFQEBXUgE0BGhMgD/kOvL
+        fjwkVAtWBCi6ZAQEdFioDCDgGddjgXtCtdAuAEO2CQHfU76D/XEUHZcQbuAo8/jNzfPmul6EOuwI0jsO
+        6eVCtyAJmwI8pTfORAB6e0xCSk6Ntgr/TqgmPNXYy3XwfyRUFhLY1xTwPsc0mDtlaFSvEtoAu+KmtDEm
+        VBY2BDCwA25wHoxeTaiSW9cr0HMyht0gdBa2BCCHMrkUXRWK18YJIwpHu1B52BLAd4hpTNGv9JSEmLeG
+        8xsHjFMRbAlgIM8bzuWoxr4pb4FJ7IT54pJHrwK4l0h+HrGf0xzTGUbnL9bDBO8MSZMX0OEcyOx7hqfi
+        k20+MzdFDTfUa5JEQpoC0OEcyOx7BrjLXOeq+JRQ04JHDblfm7gg3mNIaWDWU8AXD8fxQ1aoGSEX16sA
+        DGN6/l8pejMUWUXFuyHgA8fx50CSqFcBYWN/GjtrU/RlZ10vTRIJaQqzBK9mHDLXkLDo3ZgzzD9fy+OV
+        QK+TFP0JsALM4VcWgO23Wqj/C7xa7xoBip7zCVa0eHoxDPmgNNEd/Azn2yqdCpvmhrRNmukOPnwQYPfz
+        HDdg9+/NUukf7uUu0P7LbjwAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsmiSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAASZJREFUWEft
-        kTFuwkAURFkhkQIaJIRCQyQkU/gAS0XDBUikhZaz0dDkBKk5gpcqdS6BBESO2MLjMYxXUETyk37xZ+fP
-        /7JbrYYGgnX+ZJ2/1K3Z6vCFWbWxLjsb0wbNXwpCBaNkM78e84NvMmwZ026RLrbvf4es/Ce+3YUtY5pC
-        +DWv080C3yphy4I2nHz08b+HwpmcoFuX7ao8JZiRaQqFOdM21vljwcBgy5imgHPYU5gpaC+9cRc/Pdbg
-        bZniXFVPYSamKeAc9hRmYpoCzmFPYSamKeAc9hRmsi7zuV63Rsm6U8wpZ5eQTJFI2ZIpEilbMkUiZVvn
-        v1F7FNIBz+R/HGCd36P2KNQD7psikbIlUyRStmSKRMqWTJHI2bnxGYV7GhpyfgHn5TItNb88UQAAAABJ
-        RU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAblJREFUWEft
+        l79Lw0AUgCOIi4tOLoKDm+DipKD2UsHB3UVQ27vgpH+Dbuqu/4SDo06CmyBu/sZJUBxdRLiL9Xzv5VVt
+        mjaJ9KSFfvCGe728+/p6Sa4eIpS+8ZWxLQ1p3mZLepwWSMOX+houqsBFp9UQ0rxD/vl3rlnAl3jghaOx
+        NJ9C6hcR2GFepjHUATDmIeErfQ8F93mYSkGaDRTwPNuDYxBQOAaJ2+klO0iTGuFCAIHFt0lCmbOxRdvH
+        6XryCoiSHRBBKAoynOJUogACtQ9IQurD+Gff5BWAhX0sCnvkiVONBYTthdonNF/pXU7X4lIAmV+2/bAn
+        Lumaslnj9A+uBZC5wA5BzUeYU/GDjwVOR/yHAFJctaPQiVe8xWfKZoLTsBg+B+ICUt/BxD0e1pC0CWGn
+        r0cCzRGBmaQuKHPBqfwdSCJLB6pgB2DuFQ/bVSD6Cc7h/t3KGEeRQDp5OlD/kkmJlnXAJV2BzhDA0ww+
+        bFoRRWVHuCyRSQByxzApcafnDSHDTS5LdEYHXNIVyLYJpd6BXN3x+4+xwmWJzhBwSVeg/QToUBr7c+o0
+        okNprAMJz3DHAQKe9wXEcOpOuDllbAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="tsmiPick.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAu5JREFUWEft
+        Vz1oFEEUPv9FQVAQRC0EU0hEg4oaNXs7e0IgjY1co0R3Zy6C+AMSFS3EkMJOooIiaqNgp+Jfp4WVdicW
+        xhMV1ELENP4VmdnE8Zvdt3c5d8N52SUo5IPH3X3v7Zv33rx9M5ebwn+FDfv0rAL3O5lQBx2uzjIh7zIu
+        H+D3Zcb9Ezb3HdjMI/Ps0HVIz4HzU4yrL45QuoEM28I/yZieSY+nQwdXbcjyO7KsLoLvZUfIM+D7UInz
+        qMT9P4MDN2i7aiO5mThQ2l7j0BZKOVz2F/bqlaSKwSrJtSYgyE8KZJQJ/yipJwZTSmS6u93VK4hqiMIe
+        vQxVel6rhiqRavJgmhHb8iiqhOOpzaQaH6bLUebKNq6XEpUKzNVzkf0zCuJFsahnkCoZ6PRjZHyDqNTI
+        u3IN+dQ2Vz1Ex9GxSy9E83yLjC1PrSdVapiEAr9cviQqDhhcjBY3gv17SqrUYCXVHvlNTIwJ3YLsR8YG
+        EAgf2UEmqYFeGDI+bU/tJ6oGM05jiwciX6eZaKykl5thRVJBVdEHslzl0KS5zm49H9k/MQLyIz6/QioR
+        Z3mylfw1jdaino19f5eUHNa6Q2Y1mMMlMODqAlGpgW3cGVscUxXZxwcblJcCAy5vEZUJTEPXBcDVAKnq
+        4Qj/eGgk3xOVCUznVwPAq75F6EWkqkdeqHWRoTlYiM4E8HnT+MWhdoSoZKA84bHK1RWiMoEZ79jaV2bc
+        E5WMaBwjkF9Oj1xNdCYwFxv6Oj5MhHgb3gRB4OJhXiVSTR4soTZhcZ+24nquT08n1V+jpUsvwNDpR2Nv
+        J6o5YAsOBAGElXhseXoxqRoCQbfh/P9Azw4R3Tzg5DCcjJKjH8Fl09VLSB0DdKtgd9X0Dz7DPuLD6ZrZ
+        dn0Lc+FtVI0wGDkI7jYWOYdFBjBu74H7VGdjxrrn2+QmHYKbUjikPo9dJEkQVBnvendm1/J66Gl5z9+K
+        m/JpZH4NWT6ERH9MehPn+xT+beRyvwH8HkhK5OH+tQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="superTabControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>70</value>
   </metadata>

PEIS/View/Exam/TotalForm.Designer.cs

@@ -900,7 +900,7 @@
             // 
             this.splitExamPart.Panel2.Controls.Add(this.txtSummary);
             this.splitExamPart.Size = new System.Drawing.Size(25, 302);
-            this.splitExamPart.SplitterDistance = 665;
+            this.splitExamPart.SplitterDistance = 25;
             this.splitExamPart.TabIndex = 0;
             // 
             // panel5
@@ -911,7 +911,7 @@
             this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel5.Location = new System.Drawing.Point(0, 0);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(332, 700);
+            this.panel5.Size = new System.Drawing.Size(25, 302);
             this.panel5.TabIndex = 0;
             // 
             // DgcExamResultData
@@ -924,7 +924,7 @@
             this.DgcExamResultData.Name = "DgcExamResultData";
             this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemMemoEdit4});
-            this.DgcExamResultData.Size = new System.Drawing.Size(600, 683);
+            this.DgcExamResultData.Size = new System.Drawing.Size(600, 285);
             this.DgcExamResultData.TabIndex = 0;
             this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvExamResultData});
@@ -1086,7 +1086,7 @@
             this.txtSummary.Name = "txtSummary";
             this.txtSummary.ReadOnly = true;
             this.txtSummary.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.txtSummary.Size = new System.Drawing.Size(420, 700);
+            this.txtSummary.Size = new System.Drawing.Size(25, 302);
             this.txtSummary.TabIndex = 4;
             this.txtSummary.Text = "科室小结";
             // 
@@ -1141,7 +1141,7 @@
             this.tabPageConslusion.Controls.Add(this.panelAllConclusion);
             this.tabPageConslusion.Controls.Add(this.panelConclussionMenu);
             this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu;
-            this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2);
             this.tabPageConslusion.Name = "tabPageConslusion";
             this.tabPageConslusion.Size = new System.Drawing.Size(448, 263);
             this.tabPageConslusion.Text = "结论词";
@@ -1489,9 +1489,9 @@
             this.tabPageExam.Appearance.PageClient.Options.UseForeColor = true;
             this.tabPageExam.Controls.Add(this.DgcExamResult);
             this.tabPageExam.Image = global::PEIS.Properties.Resources.menu;
-            this.tabPageExam.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPageExam.Margin = new System.Windows.Forms.Padding(2);
             this.tabPageExam.Name = "tabPageExam";
-            this.tabPageExam.Size = new System.Drawing.Size(554, 661);
+            this.tabPageExam.Size = new System.Drawing.Size(448, 263);
             this.tabPageExam.Text = "一般项目";
             // 
             // DgcExamResult
@@ -1502,7 +1502,7 @@
             this.DgcExamResult.Name = "DgcExamResult";
             this.DgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemMemoEdit3});
-            this.DgcExamResult.Size = new System.Drawing.Size(554, 661);
+            this.DgcExamResult.Size = new System.Drawing.Size(448, 263);
             this.DgcExamResult.TabIndex = 140;
             this.DgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvExamResult});
@@ -1688,9 +1688,9 @@
             // 
             this.tabPageSummary.Controls.Add(this.panelDeptSummary);
             this.tabPageSummary.Image = global::PEIS.Properties.Resources.menu;
-            this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2);
             this.tabPageSummary.Name = "tabPageSummary";
-            this.tabPageSummary.Size = new System.Drawing.Size(554, 661);
+            this.tabPageSummary.Size = new System.Drawing.Size(448, 263);
             this.tabPageSummary.Text = "科室小结";
             // 
             // panelDeptSummary
@@ -1700,7 +1700,7 @@
             this.panelDeptSummary.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelDeptSummary.Location = new System.Drawing.Point(0, 0);
             this.panelDeptSummary.Name = "panelDeptSummary";
-            this.panelDeptSummary.Size = new System.Drawing.Size(554, 661);
+            this.panelDeptSummary.Size = new System.Drawing.Size(448, 263);
             this.panelDeptSummary.TabIndex = 61;
             // 
             // DgcSummary
@@ -1713,7 +1713,7 @@
             this.repositoryItemRichTextEdit1,
             this.repositoryItemTextEdit1,
             this.repositoryItemMemoEdit1});
-            this.DgcSummary.Size = new System.Drawing.Size(554, 661);
+            this.DgcSummary.Size = new System.Drawing.Size(448, 263);
             this.DgcSummary.TabIndex = 0;
             this.DgcSummary.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvSummary});
@@ -1775,9 +1775,9 @@
             // 
             this.tabPageLis.Controls.Add(this.DgcLisReport);
             this.tabPageLis.Image = global::PEIS.Properties.Resources.menu;
-            this.tabPageLis.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPageLis.Margin = new System.Windows.Forms.Padding(2);
             this.tabPageLis.Name = "tabPageLis";
-            this.tabPageLis.Size = new System.Drawing.Size(554, 661);
+            this.tabPageLis.Size = new System.Drawing.Size(448, 263);
             this.tabPageLis.Text = "检验报告";
             // 
             // DgcLisReport
@@ -1786,7 +1786,7 @@
             this.DgcLisReport.Location = new System.Drawing.Point(0, 0);
             this.DgcLisReport.MainView = this.DgvLisReport;
             this.DgcLisReport.Name = "DgcLisReport";
-            this.DgcLisReport.Size = new System.Drawing.Size(554, 661);
+            this.DgcLisReport.Size = new System.Drawing.Size(448, 263);
             this.DgcLisReport.TabIndex = 1;
             this.DgcLisReport.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvLisReport});
@@ -1895,9 +1895,9 @@
             // 
             this.tabPagePacs.Controls.Add(this.panelPacsBase);
             this.tabPagePacs.Image = global::PEIS.Properties.Resources.menu;
-            this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2);
             this.tabPagePacs.Name = "tabPagePacs";
-            this.tabPagePacs.Size = new System.Drawing.Size(554, 661);
+            this.tabPagePacs.Size = new System.Drawing.Size(448, 263);
             this.tabPagePacs.Text = "检查报告";
             // 
             // panelPacsBase
@@ -1907,7 +1907,7 @@
             this.panelPacsBase.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelPacsBase.Location = new System.Drawing.Point(0, 0);
             this.panelPacsBase.Name = "panelPacsBase";
-            this.panelPacsBase.Size = new System.Drawing.Size(554, 661);
+            this.panelPacsBase.Size = new System.Drawing.Size(448, 263);
             this.panelPacsBase.TabIndex = 1;
             // 
             // xtraTabControl1
@@ -1918,7 +1918,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(260, 0);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabPacsRpt;
-            this.xtraTabControl1.Size = new System.Drawing.Size(294, 661);
+            this.xtraTabControl1.Size = new System.Drawing.Size(188, 263);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabPacsRpt,
@@ -1928,7 +1928,7 @@
             // 
             this.tabPacsRpt.Controls.Add(this.panelPacsRpt);
             this.tabPacsRpt.Name = "tabPacsRpt";
-            this.tabPacsRpt.Size = new System.Drawing.Size(250, 655);
+            this.tabPacsRpt.Size = new System.Drawing.Size(144, 257);
             this.tabPacsRpt.Text = "报告";
             // 
             // panelPacsRpt
@@ -1939,7 +1939,7 @@
             this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelPacsRpt.Location = new System.Drawing.Point(0, 0);
             this.panelPacsRpt.Name = "panelPacsRpt";
-            this.panelPacsRpt.Size = new System.Drawing.Size(250, 655);
+            this.panelPacsRpt.Size = new System.Drawing.Size(144, 257);
             this.panelPacsRpt.TabIndex = 3;
             // 
             // pictureBoxPacsRpt
@@ -1957,7 +1957,7 @@
             // 
             this.tabPacsImg.Controls.Add(this.panel12);
             this.tabPacsImg.Name = "tabPacsImg";
-            this.tabPacsImg.Size = new System.Drawing.Size(807, 661);
+            this.tabPacsImg.Size = new System.Drawing.Size(144, 257);
             this.tabPacsImg.Text = "图片";
             // 
             // panel12
@@ -1966,7 +1966,7 @@
             this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel12.Location = new System.Drawing.Point(0, 0);
             this.panel12.Name = "panel12";
-            this.panel12.Size = new System.Drawing.Size(807, 661);
+            this.panel12.Size = new System.Drawing.Size(144, 257);
             this.panel12.TabIndex = 3;
             // 
             // panel13
@@ -1976,7 +1976,7 @@
             this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel13.Location = new System.Drawing.Point(0, 0);
             this.panel13.Name = "panel13";
-            this.panel13.Size = new System.Drawing.Size(807, 661);
+            this.panel13.Size = new System.Drawing.Size(144, 257);
             this.panel13.TabIndex = 6;
             // 
             // panel15
@@ -1985,7 +1985,7 @@
             this.panel15.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel15.Location = new System.Drawing.Point(0, 0);
             this.panel15.Name = "panel15";
-            this.panel15.Size = new System.Drawing.Size(807, 661);
+            this.panel15.Size = new System.Drawing.Size(144, 257);
             this.panel15.TabIndex = 4;
             // 
             // panelPacsImg
@@ -1995,7 +1995,7 @@
             this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelPacsImg.Location = new System.Drawing.Point(0, 0);
             this.panelPacsImg.Name = "panelPacsImg";
-            this.panelPacsImg.Size = new System.Drawing.Size(807, 661);
+            this.panelPacsImg.Size = new System.Drawing.Size(144, 257);
             this.panelPacsImg.TabIndex = 5;
             // 
             // flowLayoutPanelPacsImg
@@ -2005,7 +2005,7 @@
             this.flowLayoutPanelPacsImg.Location = new System.Drawing.Point(0, 0);
             this.flowLayoutPanelPacsImg.Margin = new System.Windows.Forms.Padding(0);
             this.flowLayoutPanelPacsImg.Name = "flowLayoutPanelPacsImg";
-            this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(807, 661);
+            this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(144, 257);
             this.flowLayoutPanelPacsImg.TabIndex = 0;
             // 
             // panelPacsRptList
@@ -2014,7 +2014,7 @@
             this.panelPacsRptList.Dock = System.Windows.Forms.DockStyle.Left;
             this.panelPacsRptList.Location = new System.Drawing.Point(0, 0);
             this.panelPacsRptList.Name = "panelPacsRptList";
-            this.panelPacsRptList.Size = new System.Drawing.Size(260, 661);
+            this.panelPacsRptList.Size = new System.Drawing.Size(260, 263);
             this.panelPacsRptList.TabIndex = 0;
             // 
             // DgcRptPacs
@@ -2023,7 +2023,7 @@
             this.DgcRptPacs.Location = new System.Drawing.Point(0, 0);
             this.DgcRptPacs.MainView = this.DgvRptPacs;
             this.DgcRptPacs.Name = "DgcRptPacs";
-            this.DgcRptPacs.Size = new System.Drawing.Size(260, 661);
+            this.DgcRptPacs.Size = new System.Drawing.Size(260, 263);
             this.DgcRptPacs.TabIndex = 1;
             this.DgcRptPacs.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvRptPacs});
@@ -2088,9 +2088,9 @@
             // 
             this.tabPageReport.Controls.Add(this.panelReportBase);
             this.tabPageReport.Image = global::PEIS.Properties.Resources.menu;
-            this.tabPageReport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPageReport.Margin = new System.Windows.Forms.Padding(2);
             this.tabPageReport.Name = "tabPageReport";
-            this.tabPageReport.Size = new System.Drawing.Size(554, 661);
+            this.tabPageReport.Size = new System.Drawing.Size(448, 263);
             this.tabPageReport.Text = "其他报告";
             // 
             // panelReportBase
@@ -2100,7 +2100,7 @@
             this.panelReportBase.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelReportBase.Location = new System.Drawing.Point(0, 0);
             this.panelReportBase.Name = "panelReportBase";
-            this.panelReportBase.Size = new System.Drawing.Size(554, 661);
+            this.panelReportBase.Size = new System.Drawing.Size(448, 263);
             this.panelReportBase.TabIndex = 0;
             // 
             // panelReport
@@ -2111,7 +2111,7 @@
             this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelReport.Location = new System.Drawing.Point(260, 0);
             this.panelReport.Name = "panelReport";
-            this.panelReport.Size = new System.Drawing.Size(294, 661);
+            this.panelReport.Size = new System.Drawing.Size(188, 263);
             this.panelReport.TabIndex = 2;
             // 
             // PictureBoxReportExt
@@ -2131,7 +2131,7 @@
             this.DgcRptExt.Location = new System.Drawing.Point(0, 0);
             this.DgcRptExt.MainView = this.DgvRptExt;
             this.DgcRptExt.Name = "DgcRptExt";
-            this.DgcRptExt.Size = new System.Drawing.Size(260, 661);
+            this.DgcRptExt.Size = new System.Drawing.Size(260, 263);
             this.DgcRptExt.TabIndex = 1;
             this.DgcRptExt.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvRptExt});
@@ -2184,9 +2184,9 @@
             // 
             // tabPageHistory
             // 
-            this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2);
             this.tabPageHistory.Name = "tabPageHistory";
-            this.tabPageHistory.Size = new System.Drawing.Size(554, 661);
+            this.tabPageHistory.Size = new System.Drawing.Size(448, 263);
             this.tabPageHistory.Text = "历史结果";
             // 
             // panelPatientInfo
@@ -2197,7 +2197,7 @@
             this.panelPatientInfo.Location = new System.Drawing.Point(0, 45);
             this.panelPatientInfo.Margin = new System.Windows.Forms.Padding(0);
             this.panelPatientInfo.Name = "panelPatientInfo";
-            this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1, 1, 1, 1);
+            this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1);
             this.panelPatientInfo.Size = new System.Drawing.Size(483, 136);
             this.panelPatientInfo.TabIndex = 59;
             // 
@@ -2263,7 +2263,7 @@
             this.tableLayoutPanel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tableLayoutPanel1.Location = new System.Drawing.Point(125, 0);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5);
             this.tableLayoutPanel1.RowCount = 4;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
@@ -2729,7 +2729,7 @@
             this.panel4.Location = new System.Drawing.Point(0, 0);
             this.panel4.Margin = new System.Windows.Forms.Padding(0);
             this.panel4.Name = "panel4";
-            this.panel4.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.panel4.Padding = new System.Windows.Forms.Padding(5);
             this.panel4.Size = new System.Drawing.Size(125, 134);
             this.panel4.TabIndex = 68;
             // 

PEIS/View/Exam/TotalForm.resx

@@ -126,39 +126,48 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TsmiAbandoned.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAZFJREFUWEdj
-        YGBgYDALufKfXhhkHwZAV0RLjG43GIAk9D13rEAXpyYYdcCoA8hygIi8vwdMIykY3RwQwCeH0wHs3LIi
-        IEeQitHNAQGyHEBNMOqAoekAQWlXfQPPnctJxejmgABZDhjwbEhNMOoAujiAjUtKkI1LSh6KBZHlaOYA
-        s5DLF2CG48GnyHIA/lxweS8y38j/SAG6fkWjhix0fehqwIA8B4Ad8RNdDy6A1xG4HIAN4DQEzRJCajAE
-        iXGAWciVnSC1zGwCPFjkYBZ/Nwu58gqrRVAAkbt8F0WASAfgNdQ87OpGGF9CNd4RJMYrYsSOqhKccP+i
-        mEMtByibtqigi4nI+xsgi4GAvufO2zRxALIcOh8ZYMgR6wAQwNAMBSoWfREwORjW89i2Dl2dWciVFyA5
-        ZZNKDmRBoh2g7bTEFZcjQMAs5PIJs5DL19HFQQCmzzzkcjtWCWIxK6c4HxL/C4phWIBZyJW3MPWSqvHm
-        6PJkA7OQKx/QHYcHE11okQwUTVpisVgIxoomzWXo6pEBAJWv3n1jU/VkAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAbNJREFUWEft
+        lL9LQlEUxx9E2m8ShH4RIuoUpIhpa4Ggk4tES7g3NQVtQUJbf0VQU9ASObg1RFPwioZojyBoCKIh6p7n
+        97zejfde99pTCN4HvtA533PO/YKaQRTrN5/9kvXgT9wGeyU8KUNGtnp+jLInhAHCAF0FiCdqFV7UEdYl
+        /DzPANHR+TiF0BXWJboKECRhgP8ZIDZXzuaqrSNdYV2iqwD0jeZFHWFdws/zDBAkYYC+BIiMzMaEElAM
+        bYueBSjWzWs+7qMr/htrMmS4BfD/FZhtZ52vXWxhzSaZ3910zpBgyZChH4BkvmP0V5x7aH1DTdWPwPOI
+        gD2VGZQdqKESQMy1aHYgMjmGlg0fFnoTeuIatkTHMx9QagXwPVpauz1FaUxnGivUG4/no2jZiMc/pDtU
+        BBEgtdRMo7Sgnvge5VDaZKute+kOFUEEcHo6s8oBCK/D6eWDdfZYi5WzE9g2ov9IXqqwM4SWXoCF1cMy
+        P4CWhPh8L4XuUErwXqlu7qPVgQ1VDQ5PTTjqV5zxRMw88/xMplFC+++Igy98WEHK/7S0SRaaGy4PWkoW
+        9rYx5oJhfAGVr959DZrS8gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiFinishCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAXZJREFUWEft
-        k0FKw0AUhosIQqcgrQq6jD2DpHSl4inahRfwBEKJREsqFWeYWUwGFM/gwr2X8A5u3LkQFJWoI5O/kyaT
-        Ytzkg4Hm/e+9/yeZNho1NY4woT6Sg/VK0Ob/EsA0rzwAmlcaAE0rDYDmZi3d+QfYzLGeHCrkUbvdWTZ7
-        FibLHDU8lKt77Hdmnjmy4/c2qZDRTBAW32BvIVzMbTCunn53cPWO+lwWNTcptUsPrK1vdFArg3MIyuW5
-        HmgS0kS9DHofFeoBNStmCNTK4rxvMmVCDxHLmzBfLZwXQsgS9k8u2O23Hj+jlokZAu+ExXjm7O4d7Ntm
-        zFouWXciaxnlMsQgWmNcvSXPvt9vpadysN0JfEYIaa2YIU7PpsNRMB4kvymP77A/F7wTeQE0J2EkdS8V
-        6rronBUzhMsib7u7WmbOivk5XBZ5Xjf1SVB3wnYnihCE0fHXHFePqDkzCsaXTv/pHxhXr4Ph4RXWK8Xv
-        9bewVlPzCXxqxfADZJ9UAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYBJREFUWEft
+        lM9KwzAcx4sIwjqQTQU91j2DdOyk4lNsB1/AJxBkUpVOJqakhzag+AwevPsSvoMXbx4ERU3mNyWGdDat
+        dJd+4AfJ9/eXNKnT0GBLFLMvYdjWi2y+kAHU5rUPoDevdQC9aa0D6M0FtQ1gai5QdWEkTo46ne4y3P+D
+        2gBShurTjVD2iLDyqAUh5bLj9zf5CYRqjjASpXcIsUMtAsmKiLKXrAZln5CLUbW5SqlaMmFtfaMLqRLW
+        QxCaXMqEluu2IFdC1iMxe4I0H3UISJWxrjeZRrFMcg0nIX0Ge+PxSwjLmFxF9z/+9BXS36hD6HdC6vNs
+        d+9gH+EzpI5tMfLuRF4xHh9Inx7Dn+SH2Pv+oA2pGKY7oe91XLe9ImOEnZ1PRyfji6FYE5o+IKw4+p2Q
+        a7hzOQ3CRMbyV3BbNM+IOoRNIW+7t1omz4j6OWwKeV7v1yeBXI6y/4lxEB7P8ih7hlQefqGurd404M3f
+        h6PDG2wXg98fbGHZ0AAc5xt8asXwHSUE5wAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="TsmiFinish.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAdFJREFUWEft
-        l79OAkEQxjEEzpwSEAyJRCu0wA5DNlhh5RNs4nvYaW+loeIFeBNK+r2E0oYHsLCx8E8GGG753F12D+j4
-        JVsw3+zMsLc7e5fL7fGkGDcKQia/PoN8cX5mSqc3ESQYF6LKAfqRjTTdt1zv5NEvCCETxcGq5/cx6jbI
-        VytEoe5FGkC9oeYLzeU4qDnhSc3O0yFqoVCMoCKEVJNtJWfSItQEtRXSDadeUdsUikmxKQdqS4KWKgPO
-        +HzOQ3Z7KHw6jH3CWV1GTDFNNl0Yoz0rtkTcrNA+m1CITv51uCwIqX5s8chmLQBtWbD9cx2jbjQGwsnz
-        xcoxajrGXEZjGvQd7Qgnv+q+XKKGGHMZjdTFuv3HRfAP1Bgh1Sf5NLv9O9RMGHOR0bRpiOvesD0vQn2h
-        RqtDWqs3fEbNhHMTuo5hqzc442Vmm5DJiH7fPkwGq952nMfQKGhERxd19tPGCP1cWPMU48bsIvJpxUKq
-        b/Itxo0qai60Vmy+kKzVbYm18Uu1dnnutMPruNYuo7aCkMmUHHfzQpJMUTPCS7WNIoJfyRietMnj4GUP
-        Ts7w46DhczoYeC33W3Yb6cZcDu8Pk7UbLoRo0Sd8Bvni/D02/gCV+oXkt0KAYAAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACEAAAAgCAYAAACcuBHKAAAABGdBTUEAALGPC/xhBQAAA35JREFUWEft
+        V0loFEEUnYj7DnoQBRFykYiKBA2aZKY7kYgiKkoIKInT1WNcQIggGFyCRAXFg4oexIN4FC9eRQ3uRiSB
+        4IoGQRHEQyREDFrVreX71X+SSaYHMpkGCfjgM1Wv6v//fi3dPTFCwlF7LaFe2EJJ21U6EhPKt135zhbe
+        4dhxPc4kyoWEqw6EBonQLFee5XThwIRunnjCSurZTBcMa5+enlFgP9PhsFzlYel6YjFdxFSksIV8bYpM
+        6nlMZSNQKj9x16CkVk9MJL1KK+VZ+draRj2LwxigyHbKUV6vFzKVjTARlusdDfj8DUmvcxiDUYtYv19P
+        +ucrESX+i0hjbIvAI3wP+N/BWJ4m1AUOYzBqEZWOLIHzbQS8n69VCa+GwxiMue34yN3IQEmtlKyzhPcU
+        QnpL63QxD2UjypXA+2GyJeRpvAy/BHEzDJ8JtMWVKbmMpw8iKhF2yt9AcTjpKxzuS0iasoW/yXa9Fgi7
+        CSE++D80VrZDz2TXcBF0uODQlj5suQxJ7mK5K2zH38zJf6HfnOsjBj7LSSDP7RiYFxBDRUB5NRxGJKLC
+        8Tei3QPzE0m1kkPkRGmjnoCVuEN5Lcc7YsgwEfkAZ+BWEMNrYSo3UDld/3Kh50N0H4rw7JQqLUgE3QBT
+        EYLRm5fpUJhDi5VjwdVoXzRtoa4WJMJ2vHUc6An14463pqpBLzCDGVhdq6dgThsLbseWTMWB3ca+zwoS
+        gb1tCgLJVvoaQ7ufrieqXsxTYjX1ehrmPUonpG9P4qsb9Bzm+kJF5LodqOJa5rdoQnjHAn8lqA8xp7j/
+        Le6qFZQQ7cfEwfchCTKODMTsoysbKgIDSUzA/wYTcNCE/JApwnL9LcQjwXmmwMmThhPqO3472PcBbQlP
+        MRg4T0K9LGw7knpROglTBvhGPcg8Cbw3XAAho4DLBYkgoJJexPhd6apVTBkg5naMnQsVYOnxGHtucgvV
+        EIEIrzmoSH7GyozozxPynTE+Qr6nm0KH4wftH51unpMndBGW1Nx/COm2HVXGA1mgg4l8V3gFpL1LLjED
+        6HQGpGwdaSXDYTXquYjTFVSHFxQ9iFL+1qqduhhPxxlx14uDb6LVCsQqhb+I9exu9jRpRBRoCEwCekhE
+        2HjaIORNPCmXcvpBIMBuVDLkmTBag4gu/HZajnyL9lfYT9N35Q3cmkPZ2x6L/QUit4OiXtqkkAAAAABJ
+        RU5ErkJggg==
 </value>
   </data>
   <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

PEIS/View/MainForm.Designer.cs

@@ -33,6 +33,7 @@ namespace PEIS.View
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.PnlButton = new System.Windows.Forms.Panel();
+            this.BtnLog = new System.Windows.Forms.Button();
             this.BtnSetting = new System.Windows.Forms.Button();
             this.BtnStatistics = new System.Windows.Forms.Button();
             this.BtnReport = new System.Windows.Forms.Button();
@@ -52,15 +53,15 @@ namespace PEIS.View
             this.lblStep = new System.Windows.Forms.Label();
             this.lblHospital = new System.Windows.Forms.Label();
             this.NbcMain = new DevExpress.XtraNavBar.NavBarControl();
+            this.NbgReport = new DevExpress.XtraNavBar.NavBarGroup();
+            this.NbiPReport = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiTReport = new DevExpress.XtraNavBar.NavBarItem();
             this.NbgReg = new DevExpress.XtraNavBar.NavBarGroup();
             this.NbiEnrollmentSearch = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentPerson = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentOrg = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiBasePerson = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiBaseOrg = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbgReport = new DevExpress.XtraNavBar.NavBarGroup();
-            this.NbiPReport = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiTReport = new DevExpress.XtraNavBar.NavBarItem();
             this.NbgQuery = new DevExpress.XtraNavBar.NavBarGroup();
             this.NbiPeopleCount = new DevExpress.XtraNavBar.NavBarItem();
             this.navBarItem10 = new DevExpress.XtraNavBar.NavBarItem();
@@ -93,6 +94,7 @@ namespace PEIS.View
             // PnlButton
             // 
             this.PnlButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(117)))), ((int)(((byte)(230)))));
+            this.PnlButton.Controls.Add(this.BtnLog);
             this.PnlButton.Controls.Add(this.BtnSetting);
             this.PnlButton.Controls.Add(this.BtnStatistics);
             this.PnlButton.Controls.Add(this.BtnReport);
@@ -111,6 +113,23 @@ namespace PEIS.View
             this.PnlButton.Size = new System.Drawing.Size(1438, 45);
             this.PnlButton.TabIndex = 6;
             // 
+            // BtnLog
+            // 
+            this.BtnLog.Dock = System.Windows.Forms.DockStyle.Left;
+            this.BtnLog.FlatAppearance.BorderSize = 0;
+            this.BtnLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.BtnLog.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BtnLog.ForeColor = System.Drawing.Color.White;
+            this.BtnLog.Image = global::PEIS.Properties.Resources.操作日志1;
+            this.BtnLog.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.BtnLog.Location = new System.Drawing.Point(1140, 0);
+            this.BtnLog.Name = "BtnLog";
+            this.BtnLog.Size = new System.Drawing.Size(133, 45);
+            this.BtnLog.TabIndex = 59;
+            this.BtnLog.Text = "7-操作日志";
+            this.BtnLog.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.BtnLog.UseVisualStyleBackColor = true;
+            // 
             // BtnSetting
             // 
             this.BtnSetting.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
@@ -121,7 +140,7 @@ namespace PEIS.View
             this.BtnSetting.ForeColor = System.Drawing.Color.White;
             this.BtnSetting.Image = ((System.Drawing.Image)(resources.GetObject("BtnSetting.Image")));
             this.BtnSetting.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.BtnSetting.Location = new System.Drawing.Point(1030, 0);
+            this.BtnSetting.Location = new System.Drawing.Point(1007, 0);
             this.BtnSetting.Name = "BtnSetting";
             this.BtnSetting.Size = new System.Drawing.Size(133, 45);
             this.BtnSetting.TabIndex = 57;
@@ -140,7 +159,7 @@ namespace PEIS.View
             this.BtnStatistics.ForeColor = System.Drawing.Color.White;
             this.BtnStatistics.Image = ((System.Drawing.Image)(resources.GetObject("BtnStatistics.Image")));
             this.BtnStatistics.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.BtnStatistics.Location = new System.Drawing.Point(897, 0);
+            this.BtnStatistics.Location = new System.Drawing.Point(874, 0);
             this.BtnStatistics.Name = "BtnStatistics";
             this.BtnStatistics.Size = new System.Drawing.Size(133, 45);
             this.BtnStatistics.TabIndex = 56;
@@ -159,7 +178,7 @@ namespace PEIS.View
             this.BtnReport.ForeColor = System.Drawing.Color.White;
             this.BtnReport.Image = ((System.Drawing.Image)(resources.GetObject("BtnReport.Image")));
             this.BtnReport.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.BtnReport.Location = new System.Drawing.Point(764, 0);
+            this.BtnReport.Location = new System.Drawing.Point(741, 0);
             this.BtnReport.Name = "BtnReport";
             this.BtnReport.Size = new System.Drawing.Size(133, 45);
             this.BtnReport.TabIndex = 55;
@@ -177,7 +196,7 @@ namespace PEIS.View
             this.BtnTotal.ForeColor = System.Drawing.Color.White;
             this.BtnTotal.Image = ((System.Drawing.Image)(resources.GetObject("BtnTotal.Image")));
             this.BtnTotal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.BtnTotal.Location = new System.Drawing.Point(631, 0);
+            this.BtnTotal.Location = new System.Drawing.Point(608, 0);
             this.BtnTotal.Name = "BtnTotal";
             this.BtnTotal.Size = new System.Drawing.Size(133, 45);
             this.BtnTotal.TabIndex = 54;
@@ -195,7 +214,7 @@ namespace PEIS.View
             this.BtnPart.ForeColor = System.Drawing.Color.White;
             this.BtnPart.Image = ((System.Drawing.Image)(resources.GetObject("BtnPart.Image")));
             this.BtnPart.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.BtnPart.Location = new System.Drawing.Point(498, 0);
+            this.BtnPart.Location = new System.Drawing.Point(475, 0);
             this.BtnPart.Name = "BtnPart";
             this.BtnPart.Size = new System.Drawing.Size(133, 45);
             this.BtnPart.TabIndex = 53;
@@ -213,7 +232,7 @@ namespace PEIS.View
             this.BtnReg.ForeColor = System.Drawing.Color.White;
             this.BtnReg.Image = ((System.Drawing.Image)(resources.GetObject("BtnReg.Image")));
             this.BtnReg.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.BtnReg.Location = new System.Drawing.Point(365, 0);
+            this.BtnReg.Location = new System.Drawing.Point(342, 0);
             this.BtnReg.Name = "BtnReg";
             this.BtnReg.Size = new System.Drawing.Size(133, 45);
             this.BtnReg.TabIndex = 52;
@@ -228,7 +247,7 @@ namespace PEIS.View
             this.LblTitle.ForeColor = System.Drawing.Color.White;
             this.LblTitle.Location = new System.Drawing.Point(89, 0);
             this.LblTitle.Name = "LblTitle";
-            this.LblTitle.Size = new System.Drawing.Size(276, 45);
+            this.LblTitle.Size = new System.Drawing.Size(253, 45);
             this.LblTitle.TabIndex = 6;
             this.LblTitle.Text = "• 健康体检系统 V2.0";
             this.LblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -428,6 +447,26 @@ namespace PEIS.View
             this.NbcMain.Text = "navBarControl1";
             this.NbcMain.View = new DevExpress.XtraNavBar.ViewInfo.Office3ViewInfoRegistrator();
             // 
+            // NbgReport
+            // 
+            this.NbgReport.Caption = "体检报告";
+            this.NbgReport.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPReport),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiTReport)});
+            this.NbgReport.Name = "NbgReport";
+            // 
+            // NbiPReport
+            // 
+            this.NbiPReport.Caption = "个人报告";
+            this.NbiPReport.LargeImage = global::PEIS.Properties.Resources.预览;
+            this.NbiPReport.Name = "NbiPReport";
+            // 
+            // NbiTReport
+            // 
+            this.NbiTReport.Caption = "团体报告";
+            this.NbiTReport.LargeImage = global::PEIS.Properties.Resources.团队报告;
+            this.NbiTReport.Name = "NbiTReport";
+            // 
             // NbgReg
             // 
             this.NbgReg.Caption = "检前登记";
@@ -472,26 +511,6 @@ namespace PEIS.View
             this.NbiBaseOrg.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiBaseOrg.LargeImage")));
             this.NbiBaseOrg.Name = "NbiBaseOrg";
             // 
-            // NbgReport
-            // 
-            this.NbgReport.Caption = "体检报告";
-            this.NbgReport.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPReport),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiTReport)});
-            this.NbgReport.Name = "NbgReport";
-            // 
-            // NbiPReport
-            // 
-            this.NbiPReport.Caption = "个人报告";
-            this.NbiPReport.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiPReport.LargeImage")));
-            this.NbiPReport.Name = "NbiPReport";
-            // 
-            // NbiTReport
-            // 
-            this.NbiTReport.Caption = "团体报告";
-            this.NbiTReport.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiTReport.LargeImage")));
-            this.NbiTReport.Name = "NbiTReport";
-            // 
             // NbgQuery
             // 
             this.NbgQuery.Caption = "查询统计";
@@ -696,6 +715,7 @@ namespace PEIS.View
         private DevExpress.XtraNavBar.NavBarItem NbiDictionary;
         private DevExpress.XtraNavBar.NavBarItem NbiHazardType;
         private System.Windows.Forms.PictureBox PbMax;
+        private System.Windows.Forms.Button BtnLog;
     }
 }
 

PEIS/View/MainForm.cs

@@ -4,6 +4,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using DevExpress.XtraNavBar;
+using DevExpress.XtraTabbedMdi;
 using PEIS.Base;
 using PEIS.Model;
 using PEIS.Properties;
@@ -12,6 +13,7 @@ using PEIS.View.Base;
 using PEIS.View.Enrollment;
 using PEIS.View.EReport;
 using PEIS.View.Exam;
+using PEIS.View.OperationLog;
 using PEIS.View.Setting;
 using PEIS.View.Statistics;
 
@@ -49,6 +51,7 @@ namespace PEIS.View
             BtnReport.Click += BtnReport_Click;
             BtnStatistics.Click += BtnStatistics_Click;
             BtnSetting.Click += BtnSetting_Click;
+            BtnLog.Click += BtnLog_Click;
             // 子页面切换隐藏左侧导航菜单
             XtmmMain.SelectedPageChanged += XtmmMain_SelectedPageChanged;
             // 体检登记子菜单
@@ -220,10 +223,14 @@ namespace PEIS.View
         }
 
         private void PbClose_Click(object sender, EventArgs e)
+        {
+            DialogResult _closeConfirm = MessageBox.Show("确定关闭体检应用程序并退出？", "关闭确认", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+            if (_closeConfirm == DialogResult.OK)
             {
                 _isCloseMainForm = true;
                 Close();
             }
+        }
 
         private void TipsFormClosing(object sender, FormClosingEventArgs e)
         {
@@ -244,7 +251,7 @@ namespace PEIS.View
         private void AddTab(string flag, NavBarItem item)
         {
             var tabForm = CreateFormByFlag(flag);
-            if (tabForm == null) return;
+            if (tabForm == null || TabControlCheckHave(item.Caption)) return;
             tabForm.MdiParent = this;
             tabForm.Text = item.Caption;
             tabForm.FormClosing += TipsFormClosing;
@@ -254,6 +261,24 @@ namespace PEIS.View
             tabForm.Show();
         }
 
+        /// <summary>
+        /// 防止标签页重复产生
+        /// </summary>
+        /// <param name="tabName"></param>
+        /// <returns></returns>
+        private bool TabControlCheckHave(string tabName)
+        {
+            foreach (XtraMdiTabPage item in XtmmMain.Pages)
+            {
+                if (item.Text == tabName)
+                {
+                    XtmmMain.SelectedPage = item;
+                    return true;
+                }
+            }
+            return false;
+        }
+
         private ViewBase CreateFormByFlag(string flag)
         {
             switch (flag)
@@ -299,10 +324,13 @@ namespace PEIS.View
 
                 case "NbiPermission":
                     return new PermissionForm();
+
                 case "NbiDictionary":
                     return new DictionaryForm();
+
                 case "NbiHazardType":
                     return new HazardTypeForm();
+
                 default:
                     return null;
             }
@@ -319,10 +347,12 @@ namespace PEIS.View
         {
             //隐藏左侧导航菜单
             NbcMain.Visible = false;
+            string tabText = @"科室分检";
+            if (TabControlCheckHave(tabText)) return;
             var form = new PartForm
             {
                 MdiParent = this,
-                Text = @"科室分检"
+                Text = tabText
             };
             isNeedShowPanelFooter = true;
             panelFooter.Visible = true;
@@ -340,10 +370,12 @@ namespace PEIS.View
         {
             //隐藏左侧导航菜单
             NbcMain.Visible = false;
+            string tabText = @"总检管理";
+            if (TabControlCheckHave(tabText)) return;
             var form = new TotalForm
             {
                 MdiParent = this,
-                Text = @"总检管理"
+                Text = tabText
             };
             isNeedShowPanelFooter = true;
             panelFooter.Visible = true;
@@ -362,7 +394,7 @@ namespace PEIS.View
             // 获取当前选定的页面
             if (XtmmMain.SelectedPage == null) return;
             var currentTabPage = XtmmMain.SelectedPage;
-            NbcMain.Visible = (currentTabPage.Text != "科室分检" && currentTabPage.Text != "总检管理" && currentTabPage.Text != "查询统计");
+            NbcMain.Visible = (currentTabPage.Text != "科室分检" && currentTabPage.Text != "总检管理" && currentTabPage.Text != "查询统计" && currentTabPage.Text != "操作日志");
         }
 
         #endregion Exam
@@ -373,10 +405,12 @@ namespace PEIS.View
         {
             //隐藏左侧导航菜单
             NbcMain.Visible = false;
+            string tabText = @"查询统计";
+            if (TabControlCheckHave(tabText)) return;
             var form = new StatisticalReportForm()
             {
                 MdiParent = this,
-                Text = @"查询统计"
+                Text = tabText
             };
             XtmmMain.Pages[form].Image = Resources.体检登记;
             form.Show();
@@ -397,5 +431,25 @@ namespace PEIS.View
             if (panelFooter.Visible)
                 panelFooter.Visible = false;
         }
+
+        /// <summary>
+        /// 操作日志
+        /// </summary>
+        private void BtnLog_Click(object sender, EventArgs e)
+        {
+            //隐藏左侧导航菜单
+            NbcMain.Visible = false;
+            string tabText = @"操作日志";
+            if (TabControlCheckHave(tabText)) return;
+            var form = new LogForm
+            {
+                MdiParent = this,
+                Text = tabText
+            };
+            isNeedShowPanelFooter = false;
+            panelFooter.Visible = false;
+            XtmmMain.Pages[form].Image = Resources.操作日志;
+            form.Show();
+        }
     }
 }

PEIS/View/MainForm.resx

@@ -331,32 +331,6 @@
         eK0VDd2jOIOUJjBEt4J80Qr6dPWQ/qMFhRwGc3HuYrJ8OUB/d0V4+aIukP5WkIx/QboJunuEly/qAtF3
         BfGBcJLq6KegrKhiBV+oxer9DHUBe/uDyOUA+tiztSLvPTKFHvxvUK6D+NPpP8MLMjJMP3kZuqKG9W0v
         EH3MIDresyvYJyODa03QX1P/wu5lWbbexyJUP7qx7MMQ3e5QAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="NbiPReport.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAbZJREFUWEft
-        k71Kw1AUx9OiFelHkiI4CDqIi5PioNCtIA7i0AewS3F26AsIHZSOQu4TCG6CrsWPRewLiDWZHUXBQZz0
-        nPackGuT9CamBSE/+NOez/uHe6MhZeF8T0r9A3/j1zgu0ZEyWCi1bs8pHAupgdRALAO5rVqFB6OIxiXC
-        aoEGsnOLRTQRVTQuEctAkqQG/qeB6bWdVcxHFY1LxDKAL5oHo4jGJcJqgQaSJDUwEQPZ8kIRtGSIpwr8
-        6pTuMzYDpmXf8fJg2V3+T2MyWPAzEPYVmOL5yhvr7YdDGhuQm80Yotf09qCoKoOFqAZY1DqS0BlMql5B
-        4BKAayo9FA7AhIoBuO9L7M3kjRKlXHgx3PenKewXjqksgXmj3X2kUN3AqKXwLq4p1Ayrt4u5qeUN6WtA
-        hvZgkISBfP14hcI+mMtt1tYpdNFbN460B4MkDHhrUXqVDSBBiwuN0z2usfSjzgWVXUzhvA/NY0LVQKF5
-        ts0HUEoCHmEHHuE9hRI8BxKUGuApKCljzJfc2LI/aE0g8PW8cv9MtVGl9N+Bw99cI6Nk2V80ljz5/ZO6
-        76EgqB1Qmw+a9gOf+QzFRYB8YAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="NbiTReport.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAbZJREFUWEft
-        k71Kw1AUx9OiFelHkiI4CDqIi5PioNCtIA7i0AewS3F26AsIHZSOQu4TCG6CrsWPRewLiDWZHUXBQZz0
-        nPackGuT9CamBSE/+NOez/uHe6MhZeF8T0r9A3/j1zgu0ZEyWCi1bs8pHAupgdRALAO5rVqFB6OIxiXC
-        aoEGsnOLRTQRVTQuEctAkqQG/qeB6bWdVcxHFY1LxDKAL5oHo4jGJcJqgQaSJDUwEQPZ8kIRtGSIpwr8
-        6pTuMzYDpmXf8fJg2V3+T2MyWPAzEPYVmOL5yhvr7YdDGhuQm80Yotf09qCoKoOFqAZY1DqS0BlMql5B
-        4BKAayo9FA7AhIoBuO9L7M3kjRKlXHgx3PenKewXjqksgXmj3X2kUN3AqKXwLq4p1Ayrt4u5qeUN6WtA
-        hvZgkISBfP14hcI+mMtt1tYpdNFbN460B4MkDHhrUXqVDSBBiwuN0z2usfSjzgWVXUzhvA/NY0LVQKF5
-        ts0HUEoCHmEHHuE9hRI8BxKUGuApKCljzJfc2LI/aE0g8PW8cv9MtVGl9N+Bw99cI6Nk2V80ljz5/ZO6
-        76EgqB1Qmw+a9gOf+QzFRYB8YAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="NbiPeopleCount.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PEIS/View/OperationLog/ILogView.cs

@@ -0,0 +1,18 @@
+using PEIS.Base;
+using PEIS.Entity;
+using PEIS.Event;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace PEIS.View.OperationLog
+{
+    interface ILogView : IViewBase
+    {
+        // 获取日志数据
+        event EventHandler<Args<dynamic>> GetLogData;
+
+        void ShowLogData(List<Log> items);
+    }
+}

PEIS/View/OperationLog/LogForm.Designer.cs

@@ -0,0 +1,261 @@
+
+using DevExpress.XtraEditors.Repository;
+
+namespace PEIS.View.OperationLog
+{
+    partial class LogForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
+            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.EndDate = new System.Windows.Forms.DateTimePicker();
+            this.BegDate = new System.Windows.Forms.DateTimePicker();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.refreshBtn = new System.Windows.Forms.Button();
+            this.LogGridControl = new DevExpress.XtraGrid.GridControl();
+            this.LogGridView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repoMemo = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panel1 = new System.Windows.Forms.Panel();
+            ((System.ComponentModel.ISupportInitialize)(this.LogGridControl)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LogGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repoMemo)).BeginInit();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "日志类型";
+            this.gridColumn5.FieldName = "Type";
+            this.gridColumn5.MaxWidth = 75;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.AllowEdit = false;
+            this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            // 
+            // EndDate
+            // 
+            this.EndDate.CustomFormat = " yyyy 年 MM 月 dd 日";
+            this.EndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.EndDate.Location = new System.Drawing.Point(296, 7);
+            this.EndDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.EndDate.Name = "EndDate";
+            this.EndDate.Size = new System.Drawing.Size(152, 23);
+            this.EndDate.TabIndex = 8;
+            // 
+            // BegDate
+            // 
+            this.BegDate.CustomFormat = " yyyy 年 MM 月 dd 日";
+            this.BegDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.BegDate.Location = new System.Drawing.Point(63, 7);
+            this.BegDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.BegDate.Name = "BegDate";
+            this.BegDate.Size = new System.Drawing.Size(152, 23);
+            this.BegDate.TabIndex = 7;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(237, 10);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(56, 17);
+            this.label2.TabIndex = 6;
+            this.label2.Text = "终止日期";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(4, 11);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(56, 17);
+            this.label1.TabIndex = 5;
+            this.label1.Text = "起始日期";
+            // 
+            // refreshBtn
+            // 
+            this.refreshBtn.Image = global::PEIS.Properties.Resources.刷新;
+            this.refreshBtn.Location = new System.Drawing.Point(477, 2);
+            this.refreshBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.refreshBtn.Name = "refreshBtn";
+            this.refreshBtn.Size = new System.Drawing.Size(68, 32);
+            this.refreshBtn.TabIndex = 9;
+            this.refreshBtn.Text = "刷新";
+            this.refreshBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.refreshBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.refreshBtn.UseVisualStyleBackColor = true;
+            // 
+            // LogGridControl
+            // 
+            this.LogGridControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.LogGridControl.Location = new System.Drawing.Point(0, 37);
+            this.LogGridControl.MainView = this.LogGridView;
+            this.LogGridControl.Name = "LogGridControl";
+            this.LogGridControl.Size = new System.Drawing.Size(1050, 600);
+            this.LogGridControl.TabIndex = 10;
+            this.LogGridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.LogGridView});
+            // 
+            // LogGridView
+            // 
+            this.LogGridView.AutoFillColumn = this.gridColumn4;
+            this.LogGridView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn1});
+            gridFormatRule1.Column = this.gridColumn5;
+            gridFormatRule1.ColumnApplyTo = this.gridColumn5;
+            gridFormatRule1.Name = "Format0";
+            formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
+            formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
+            formatConditionRuleExpression1.Expression = "[Type] = \'DELETE\'";
+            gridFormatRule1.Rule = formatConditionRuleExpression1;
+            this.LogGridView.FormatRules.Add(gridFormatRule1);
+            this.LogGridView.GridControl = this.LogGridControl;
+            this.LogGridView.IndicatorWidth = 50;
+            this.LogGridView.Name = "LogGridView";
+            this.LogGridView.OptionsCustomization.AllowFilter = false;
+            this.LogGridView.OptionsCustomization.AllowSort = false;
+            this.LogGridView.OptionsView.RowAutoHeight = true;
+            this.LogGridView.OptionsView.ShowGroupPanel = false;
+            this.LogGridView.RowHeight = 40;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "日志内容";
+            this.gridColumn4.ColumnEdit = this.repoMemo;
+            this.gridColumn4.FieldName = "Content";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.AllowEdit = false;
+            this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 582;
+            // 
+            // repoMemo
+            // 
+            this.repoMemo.Name = "repoMemo";
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "操作时间";
+            this.gridColumn2.FieldName = "Time";
+            this.gridColumn2.GroupFormat.FormatString = "yyyy-MM-dd HH:mm";
+            this.gridColumn2.GroupFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn2.MaxWidth = 150;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 0;
+            this.gridColumn2.Width = 150;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "操作人";
+            this.gridColumn3.FieldName = "Operator";
+            this.gridColumn3.MaxWidth = 150;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            this.gridColumn3.Width = 150;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "id";
+            this.gridColumn1.FieldName = "ID";
+            this.gridColumn1.MaxWidth = 75;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 4;
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.EndDate);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.refreshBtn);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.BegDate);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1050, 37);
+            this.panel1.TabIndex = 11;
+            // 
+            // LogForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1050, 637);
+            this.Controls.Add(this.LogGridControl);
+            this.Controls.Add(this.panel1);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "LogForm";
+            this.Text = "logForm";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            ((System.ComponentModel.ISupportInitialize)(this.LogGridControl)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LogGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repoMemo)).EndInit();
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DateTimePicker EndDate;
+        private System.Windows.Forms.DateTimePicker BegDate;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button refreshBtn;
+        private DevExpress.XtraGrid.GridControl LogGridControl;
+        private DevExpress.XtraGrid.Views.Grid.GridView LogGridView;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private System.Windows.Forms.Panel panel1;
+        private RepositoryItemMemoEdit repoMemo;
+    }
+}

PEIS/View/OperationLog/LogForm.cs

@@ -0,0 +1,68 @@
+using DevExpress.XtraGrid.Views.Grid;
+using PEIS.Base;
+using PEIS.Entity;
+using PEIS.Event;
+using PEIS.Presenter;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Dynamic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace PEIS.View.OperationLog
+{
+    /// <summary>
+    /// 操作日志
+    /// </summary>
+    public partial class LogForm : ViewBase, ILogView
+    {
+        private List<Log> _logData = new List<Log>();
+
+        /// <summary>
+        /// 窗口初始化
+        /// </summary>
+        public LogForm()
+        {
+            InitializeComponent();
+
+            // 刷新
+            refreshBtn.Click += (object sender, EventArgs e) => OnGetLogData();
+            LogGridView.CustomDrawRowIndicator += LogGridView_CustomDrawRowIndicator;
+        }
+
+        protected override object CreatePresenter()
+        {
+            return new OperationLogPresenter(this);
+        }
+
+        public event EventHandler<Args<dynamic>> GetLogData;
+        protected virtual void OnGetLogData()
+        {
+            dynamic paramsData = new ExpandoObject();
+            paramsData.begDate = BegDate.Value;
+            paramsData.endDate = EndDate.Value;
+            List<string> types = new List<string>
+            {
+                "DELETE"
+            };
+            paramsData.types = types;
+            GetLogData?.Invoke(this, new Args<dynamic> { Item = paramsData });
+        }
+
+        public void ShowLogData(List<Log> items)
+        {
+            _logData = items;
+            Invoke(new Action(() => LogGridControl.DataSource = items));
+        }
+
+        private void LogGridView_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
+        {
+            if (e.RowHandle >= 0)
+                e.Info.DisplayText = (e.RowHandle + 1).ToString();
+        }
+    }
+}

PEIS/View/OperationLog/LogForm.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

PEIS/View/Setting/DictionaryForm.Designer.cs

@@ -180,7 +180,7 @@
             // BtnTypeDelete
             // 
             this.BtnTypeDelete.ForeColor = System.Drawing.Color.Black;
-            this.BtnTypeDelete.Image = global::PEIS.Properties.Resources.删除;
+            this.BtnTypeDelete.Image = global::PEIS.Properties.Resources.删除1;
             this.BtnTypeDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.BtnTypeDelete.Location = new System.Drawing.Point(169, 8);
             this.BtnTypeDelete.Margin = new System.Windows.Forms.Padding(0);
@@ -350,7 +350,7 @@
             // button1
             // 
             this.button1.ForeColor = System.Drawing.Color.Black;
-            this.button1.Image = global::PEIS.Properties.Resources.删除;
+            this.button1.Image = global::PEIS.Properties.Resources.删除1;
             this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.button1.Location = new System.Drawing.Point(398, 8);
             this.button1.Margin = new System.Windows.Forms.Padding(0);

PEIS/View/Setting/PermissionForm.Designer.cs

@@ -224,7 +224,7 @@
             // BtnDelete
             // 
             this.BtnDelete.ForeColor = System.Drawing.Color.Black;
-            this.BtnDelete.Image = global::PEIS.Properties.Resources.删除;
+            this.BtnDelete.Image = global::PEIS.Properties.Resources.删除1;
             this.BtnDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.BtnDelete.Location = new System.Drawing.Point(653, 4);
             this.BtnDelete.Margin = new System.Windows.Forms.Padding(0);

PEIS/View/UControl/OpMenu.Designer.cs

@@ -82,7 +82,7 @@
             // TsmiDelete
             // 
             this.TsmiDelete.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.TsmiDelete.Image = global::PEIS.Properties.Resources.取消2;
+            this.TsmiDelete.Image = global::PEIS.Properties.Resources.删除1;
             this.TsmiDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TsmiDelete.Name = "TsmiDelete";
             this.TsmiDelete.Size = new System.Drawing.Size(71, 51);

PEIS/View/UControl/OpMenuSimple.Designer.cs

@@ -34,8 +34,8 @@
             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();
             this.TsmiUp = new System.Windows.Forms.ToolStripMenuItem();
+            this.TsmiRefresh = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -73,7 +73,7 @@
             // TsmiAllDelete
             // 
             this.TsmiAllDelete.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.TsmiAllDelete.Image = global::PEIS.Properties.Resources.取消2;
+            this.TsmiAllDelete.Image = global::PEIS.Properties.Resources.删除1;
             this.TsmiAllDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TsmiAllDelete.Name = "TsmiAllDelete";
             this.TsmiAllDelete.Size = new System.Drawing.Size(99, 34);
@@ -83,7 +83,7 @@
             // TsmiDelete
             // 
             this.TsmiDelete.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.TsmiDelete.Image = global::PEIS.Properties.Resources.取消2;
+            this.TsmiDelete.Image = global::PEIS.Properties.Resources.删除1;
             this.TsmiDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TsmiDelete.Name = "TsmiDelete";
             this.TsmiDelete.Size = new System.Drawing.Size(71, 34);
@@ -98,6 +98,16 @@
             this.TsmiAdd.Size = new System.Drawing.Size(75, 34);
             this.TsmiAdd.Text = "添加";
             // 
+            // TsmiUp
+            // 
+            this.TsmiUp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.TsmiUp.Image = global::PEIS.Properties.Resources.shang;
+            this.TsmiUp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.TsmiUp.Name = "TsmiUp";
+            this.TsmiUp.Size = new System.Drawing.Size(69, 34);
+            this.TsmiUp.Text = "上移";
+            this.TsmiUp.Visible = false;
+            // 
             // TsmiRefresh
             // 
             this.TsmiRefresh.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -109,16 +119,6 @@
             this.TsmiRefresh.Size = new System.Drawing.Size(75, 34);
             this.TsmiRefresh.Text = "刷新";
             // 
-            // TsmiUp
-            // 
-            this.TsmiUp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.TsmiUp.Image = global::PEIS.Properties.Resources.shang;
-            this.TsmiUp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.TsmiUp.Name = "TsmiUp";
-            this.TsmiUp.Size = new System.Drawing.Size(69, 34);
-            this.TsmiUp.Text = "上移";
-            this.TsmiUp.Visible = false;
-            // 
             // OpMenuSimple
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

PEIS/View/UControl/StepViewer.cs

@@ -193,6 +193,7 @@ namespace PEIS.View.UControl
                 SELECT DISTINCT A.ID AS EID,A.Name as PatientName,A.SignTime ,A.FinishTime ,a.PrintTime
                 FROM Enrollment_Patient A
                 WHERE A.ID={eid}").FirstOrDefault();
+            if (data == null) return GetDefaultDataList();
             if (data.SignTime == null)
             {
                 list.Add(new StepModel("签到", $"进行中", $"体检者：{eid}，{data.PatientName}", true));

PEIS/View/statistics/StatisticalReportForm.Designer.cs

@@ -111,7 +111,7 @@
             this.panel1.Location = new System.Drawing.Point(176, 0);
             this.panel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(874, 69);
+            this.panel1.Size = new System.Drawing.Size(874, 70);
             this.panel1.TabIndex = 9;
             // 
             // OrgTextEdit
@@ -340,12 +340,12 @@
             | FastReport.PreviewButtons.Navigator)));
             this.ReportPreview.Dock = System.Windows.Forms.DockStyle.Fill;
             this.ReportPreview.Font = new System.Drawing.Font("宋体", 9F);
-            this.ReportPreview.Location = new System.Drawing.Point(176, 69);
+            this.ReportPreview.Location = new System.Drawing.Point(176, 70);
             this.ReportPreview.Name = "ReportPreview";
             this.ReportPreview.PageOffset = new System.Drawing.Point(10, 10);
             this.ReportPreview.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.ReportPreview.SaveInitialDirectory = null;
-            this.ReportPreview.Size = new System.Drawing.Size(874, 568);
+            this.ReportPreview.Size = new System.Drawing.Size(874, 567);
             this.ReportPreview.TabIndex = 10;
             // 
             // StatisticalReportForm

PEIS/View/statistics/StatisticalReportForm.cs

@@ -109,8 +109,6 @@ namespace PEIS.View.Statistics
                         break;
                     case "团体费用统计":
                         _parentNode = "OrgCostFeeCount";
-                        BegDate.Enabled = false;
-                        EndDate.Enabled = false;
                         DeptComboBox.Enabled = false;
                         PersonRadio.Enabled = false;
                         AllRadio.Enabled = false;