增加团体费用统计，两癌筛查统计调整，体检人登记信息修改，增加最大化按钮图标

PEIS/App.config

@@ -6,8 +6,12 @@
 	<appSettings> 
 		<!-- <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"/>  
+		<!-- 188 -->
+		<!--<add value="0293" key="UserCode"/>
+		<add value="罗忠兰" key="UserName"/>-->
 	</appSettings> 
 	<connectionStrings>
 
@@ -15,9 +19,9 @@
 		<!-- <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"/>
+		 <!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/>-->
 		<!-- 盈江妇幼YJFY  -->	
 		 <!--<add name="ConnString" connectionString="10C598E364BCAFCF5A016EA6C7463FAC7D75379F63924F4F82C1749BDA88D9414EC0303E1ECC3E76895E07FCFC13332D1D79643A2AD3AA60507FD3EAF9A41761B30F4FDE900F983F1FE6ED6F0245E5BF8BFCFC5F0A2C03E4"/>--> 
 		<!-- 芒市妇幼MSFY -->
@@ -34,4 +38,3 @@
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
 	</startup>
 </configuration>
- 

PEIS/Entity/TwoCancer.cs

@@ -18,9 +18,22 @@ namespace PEIS.Entity
         public string CardNo { get; set; }
         public DateTime Birthday { get; set; }
         public string Tel1 { get; set; }
+        /// <summary>
+        /// 筛查内容（宫颈癌、乳腺癌）
+        ///（TCT/HPV及乳腺超声）
+        /// </summary>
         public string Flag { get; set; }
+        /// <summary>
+        /// TCT结果
+        /// </summary>
         public string Summary { get; set; }
+        /// <summary>
+        /// HPV结果
+        /// </summary>
         public string Hpv { get; set; }
+        /// <summary>
+        /// 乳腺超声分类
+        /// </summary>
         public string Summary2 { get; set; }
     }
 }

PEIS/Model/Enrollment/EnrollmentOrgModel.cs

@@ -41,7 +41,6 @@ namespace PEIS.Model.Enrollment
             {
                return DAOHelp.GetDataBySQL<EnrollmentOrg>($"Select * from Enrollment_Org Where Name like '%{name}%' or SpellCode like '%{name}%'");
             }
-            
         }
 
         // 发送到科室

PEIS/Model/StatisticalReportModel.cs

@@ -346,7 +346,7 @@ namespace PEIS.Model
         }
 
         // 费用明细统计表
-        public List<EnrollmentFeeItem> GetEFeeItems(DateTime begTime, DateTime endTime, int status, string deptCode="9999")
+        public List<EnrollmentFeeItem> GetEFeeItems(DateTime begTime, DateTime endTime, int status, long oEid, string deptCode="9999")
         {
             var sql = "";
             if(status == 0)
@@ -359,14 +359,15 @@ namespace PEIS.Model
 	                    COUNT ( * ) AS Quantity,
                         CONVERT ( DECIMAL ( 18, 2 ), SUM ( a.Price )) AS TotalPrice,
                         b.Discount,
-	                    Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee	
+	                    Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee
                     FROM
 	                    Enrollment_FeeItem a
                         LEFT JOIN Enrollment_CheckCost b ON a.OrderNo = b.ID 
                         LEFT JOIN Enrollment_Patient c ON a.EID = c.ID
                     WHERE c.SignTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}')
-                    AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL
+                    AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL" +
-                    GROUP BY
+                    (oEid == -1 ? "" : $@" AND c.OEID = {oEid}") + '\r' +
+                    $@"GROUP BY
                         a.FeeItemCode,
 	                    a.DeptName,
 	                    a.FeeItemName,
@@ -388,8 +389,9 @@ namespace PEIS.Model
                         LEFT JOIN Enrollment_Patient c ON a.EID = c.ID
                     WHERE a.DeptCode = '{deptCode}'
                     And c.SignTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}')
-                    AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL
+                    AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL" +
-                    GROUP BY
+                    (oEid == -1 ? "" : $@" AND c.OEID = {oEid}") + '\r' +
+                    $@"GROUP BY
                         a.FeeItemCode,
 	                    a.DeptName,
 	                    a.FeeItemName,
@@ -450,7 +452,7 @@ namespace PEIS.Model
             else
             {
                 sql = deptCode == "9999"
-                        ? $@"SELECT
+                ? $@"SELECT
 	                    a.DeptName,
 	                    a.FeeItemName,
 	                    a.Price,
@@ -472,7 +474,7 @@ namespace PEIS.Model
 	                    b.Discount, 
                         a.DeptCode
                         ORDER BY a.DeptCode,a.FeeItemCode "
-                                : $@"SELECT
+                : $@"SELECT
 	                    a.DeptName,
 	                    a.FeeItemName,
 	                    a.Price,
@@ -597,5 +599,38 @@ namespace PEIS.Model
         {
             return DAOHelp.GetDataBySQL<TwoCancer>($@"SELECT * FROM v_TwoCancer2 WHERE ExamDate Between '{begDate:yyyy-MM-dd}' and  DateAdd(day, 1,'{endDate:yyyy-MM-dd}')");
         }
+
+        // 获取团体费用数据
+        public List<EnrollmentFeeItem> GetOrgCostFeeData(long oEid)
+        {
+            string sql = $@"select 
+	                            t.DeptName,
+	                            t.DeptCode,
+	                            sum(t.TotalPrice) as TotalPrice,
+	                            sum(t.Fee) as Fee
+                            from (SELECT
+				                      a.DeptName,
+				                      a.DeptCode,
+	                                  a.Price,
+	                                  COUNT ( * ) AS Quantity,
+                                      CONVERT ( DECIMAL ( 18, 2 ), SUM ( a.Price )) AS TotalPrice,
+                                      b.Discount,
+	                                  Convert(decimal(18,2),SUM ( a.Price ) * b.Discount / 10) AS Fee
+                                  FROM 
+                                    Enrollment_FeeItem a
+                                    LEFT JOIN Enrollment_CheckCost b ON a.OrderNo = b.ID 
+                                    LEFT JOIN Enrollment_Patient c ON a.EID = c.ID
+                                  WHERE a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL
+                                    AND c.OEID = {oEid}
+                                    GROUP BY
+					                  a.DeptName,
+					                  a.Price,
+					                  b.Discount,
+                                      a.DeptCode) as t
+                            where t.TotalPrice > 0
+                            group by t.DeptName, t.DeptCode
+                            order by t.DeptCode;";
+            return DAOHelp.GetDataBySQL<EnrollmentFeeItem>(sql);
+        }
     }
 }

PEIS/PEIS.csproj

@@ -204,6 +204,7 @@
     <Compile Include="Entity\ExamResultIsm.cs" />
     <Compile Include="Entity\DictHTypeFItem.cs" />
     <Compile Include="Entity\Log.cs" />
+    <Compile Include="Entity\TwoCancer.cs" />
     <Compile Include="Model\Exam\CareerHisInqModel.cs" />
     <Compile Include="Model\Exam\HistoryModel.cs" />
     <Compile Include="Model\Setting\DictionaryModel.cs" />
@@ -757,6 +758,9 @@
     <None Include="ReportFiles\Health.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ReportFiles\OrgCostFeeCount.frx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ReportFiles\OrgExcel.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -764,6 +768,9 @@
     <None Include="ReportFiles\Teacher.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ReportFiles\TwoCancerCount.frx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ReportFiles\Work.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -780,6 +787,7 @@
     </Content>
     <None Include="Resources\update.png" />
     <None Include="Resources\wechatlogo.png" />
+    <Content Include="Resources\Max.png" />
     <Content Include="Resources\shang.png" />
     <Content Include="Resources\xia.png" />
     <Content Include="Update\Update.exe">

PEIS/Presenter/StatisticalReportPresenter.cs

@@ -19,6 +19,7 @@
 
 using PEIS.Base;
 using PEIS.Model;
+using PEIS.Model.Enrollment;
 using PEIS.Utils;
 using PEIS.View.Statistics;
 
@@ -38,7 +39,7 @@ namespace PEIS.Presenter
             };
             View.GetEFeeItems += (send, args) =>
             {
-                View.ShowEFeeItems(new StatisticalReportModel().GetEFeeItems(args.Item.begDate, args.Item.endDate, args.Item.status, args.Item.deptCode));
+                View.ShowEFeeItems(new StatisticalReportModel().GetEFeeItems(args.Item.begDate, args.Item.endDate, args.Item.status, args.Item.oEid, args.Item.deptCode));
             };
             View.GetDeptList += (send, args) =>
             {
@@ -48,6 +49,18 @@ namespace PEIS.Presenter
             {
                 View.ShowCheckCost(new StatisticalReportModel().GetCheckCosts(args.Item.begDate, args.Item.endDate, args.Item.dateType, args.Item.status));
             };
+            View.GetTwoCancerData += (send, args) =>
+            {
+                View.ShowTwoCancerData(new StatisticalReportModel().GetTwoCancerData(args.Item.begDate, args.Item.endDate));
+            };
+            View.GetOrgData += (send, args) =>
+            {
+                View.ShowOrgData(new EnrollmentOrgModel().GetByDate(args.Item.begDate, args.Item.endDate, args.Item.teamText));
+            };
+            View.GetOrgCostFeeData += (send, args) =>
+            {
+                View.ShowOrgCostFeeData(new StatisticalReportModel().GetOrgCostFeeData(args.Item.oEid));
+            };
         }
     }
 }

PEIS/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace PEIS.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -47,8 +47,8 @@ namespace PEIS.Properties {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性，对
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {

PEIS/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace PEIS.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

PEIS/Properties/licenses.licx

@@ -1,2 +1,8 @@
+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.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

PEIS/ReportFiles/OrgCostFeeCount.frx

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/27/2023 14:18:39" ReportInfo.Modified="04/16/2025 17:34:40" ReportInfo.CreatorVersion="2022.1.0.0">
+  <ScriptText>using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+  public class ReportScript
+  {    
+  }
+}
+</ScriptText>
+  <Dictionary>
+    <Parameter Name="HospitalName" DataType="System.String"/>
+    <Parameter Name="DateBetween" DataType="System.String"/>
+    <Parameter Name="Type" DataType="System.String"/>
+  </Dictionary>
+  <ReportPage Name="Page1" RawPaperSize="9" Guides="189,378,718.2" Watermark.Font="宋体, 60pt">
+    <PageHeaderBand Name="PageHeader1" Width="718.2" Height="75.6">
+      <TextObject Name="Text1" Width="725.76" Height="56.7" Text="团体费用统计表" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 26pt, style=Bold"/>
+      <TextObject Name="Text2" Top="56.7" Width="66.15" Height="18.9" Text="统计单位:" HorzAlign="Right" VertAlign="Center" Font="微软雅黑, 9pt"/>
+      <TextObject Name="Text3" Left="66.15" Top="56.7" Width="264.6" Height="18.9" CanBreak="false" Text="[HospitalName]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
+      <TextObject Name="Text9" Left="425.25" Top="56.7" Width="37.8" Height="18.9" Text="团体:" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 9pt"/>
+      <TextObject Name="Text10" Left="463.05" Top="56.7" Width="255.15" Height="18.9" CanBreak="false" Text="[OrgName]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
+    </PageHeaderBand>
+    <DataBand Name="OrgCostFeeCount" Top="121.4" Width="718.2" Height="45.36" CanGrow="true" CanShrink="true" KeepTogether="true" KeepDetail="true">
+      <TableObject Name="Table2" Width="719.71" Height="45.36">
+        <TableColumn Name="Column15" Width="252.88"/>
+        <TableColumn Name="Column17" Width="244.94"/>
+        <TableColumn Name="Column18" Width="221.89"/>
+        <TableRow Name="Row2" MinHeight="28.35" Height="45.36" AutoSize="true">
+          <TableCell Name="Cell35" Border.Lines="All" Text="[P.DeptName]" Format="Date" Format.Format="d" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell37" Border.Lines="All" Text="[P.TotalPrice]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell38" Border.Lines="All" VertAlign="Center" Font="微软雅黑, 8pt"/>
+        </TableRow>
+      </TableObject>
+      <DataHeaderBand Name="DataHeader1" Top="79.6" Width="718.2" Height="37.8" CanGrow="true" CanShrink="true" KeepWithData="true" RepeatOnEveryPage="true">
+        <TableObject Name="Table1" Width="719.65" Height="37.8">
+          <TableColumn Name="Column1" Width="252.79"/>
+          <TableColumn Name="Column3" Width="244.88"/>
+          <TableColumn Name="Column4" Width="221.98"/>
+          <TableRow Name="Row1" MinHeight="37.8" Height="37.8" AutoSize="true">
+            <TableCell Name="Cell1" Border.Lines="All" Text="科室名称" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell3" Border.Lines="All" Text="费用总额" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell4" Border.Lines="All" Text="备注" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+          </TableRow>
+        </TableObject>
+      </DataHeaderBand>
+    </DataBand>
+    <PageFooterBand Name="PageFooter1" Top="170.76" Width="718.2" Height="37.8">
+      <TextObject Name="Text8" Width="1047.06" Height="37.8" Text="第[Page#]页，共[TotalPages#]页" HorzAlign="Center" Font="微软雅黑, 10pt"/>
+    </PageFooterBand>
+  </ReportPage>
+</Report>

PEIS/ReportFiles/TwoCancerCount.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="06/27/2023 14:18:39" ReportInfo.Modified="04/03/2025 12:02:11" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/27/2023 14:18:39" ReportInfo.Modified="04/16/2025 14:50:01" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -59,8 +59,6 @@ namespace FastReport
       <TextObject Name="Text3" Left="66.15" Top="56.7" Width="179.55" Height="18.9" CanBreak="false" Text="[HospitalName]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
       <TextObject Name="Text4" Left="245.7" Top="56.7" Width="66.15" Height="18.9" Text="统计日期:" HorzAlign="Right" VertAlign="Center" Font="微软雅黑, 9pt"/>
       <TextObject Name="Text5" Left="311.85" Top="56.7" Width="226.8" Height="18.9" CanBreak="false" Text="[DateBetween]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
-      <TextObject Name="Text6" Left="538.65" Top="56.7" Width="66.15" Height="18.9" Text="统计类型:" HorzAlign="Right" VertAlign="Center" Font="微软雅黑, 9pt"/>
-      <TextObject Name="Text7" Left="604.8" Top="56.7" Width="113.4" Height="18.9" CanBreak="false" Text="[Type]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
     </PageHeaderBand>
     <DataBand Name="TwoCancerCount" Top="121.4" Width="1047.06" Height="45.36" CanGrow="true" CanShrink="true" KeepTogether="true" KeepDetail="true">
       <TableObject Name="Table2" Width="1058.09" Height="45.36">

PEIS/Utils/ReportHelper.cs

@@ -209,7 +209,7 @@ namespace PEIS.Utils
         public static FastReport.Report GetStatisticalReportIncome(DateTime beg, DateTime end,
             string fileName = "CostCount")
         {
-            var data = new StatisticalReportModel().GetEFeeItems(beg, end, 0,"9999");
+            var data = new StatisticalReportModel().GetEFeeItems(beg, end, 0, -1, "9999");
             //new StatisticalReportModel().GetEFeeItems(beg,end);
             var rpt = new FastReport.Report(); //实例化一个Report报表
             try

PEIS/View/Base/PersonForm.Designer.cs

@@ -65,14 +65,12 @@
             // DgcPatient
             // 
             this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.DgcPatient.Location = new System.Drawing.Point(0, 41);
-            this.DgcPatient.Location = new System.Drawing.Point(0, 75);
             this.DgcPatient.MainView = this.DgvPatient;
-            this.DgcPatient.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.DgcPatient.Name = "DgcPatient";
             this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemImageEdit1});
-            this.DgcPatient.Size = new System.Drawing.Size(1866, 1087);
+            this.DgcPatient.Size = new System.Drawing.Size(933, 596);
             this.DgcPatient.TabIndex = 130;
             this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvPatient});
@@ -117,7 +115,7 @@
             this.DgvPatient.OptionsSelection.MultiSelect = true;
             this.DgvPatient.OptionsView.ColumnAutoWidth = false;
             this.DgvPatient.OptionsView.ShowGroupPanel = false;
-            this.DgvPatient.RowHeight = 45;
+            this.DgvPatient.RowHeight = 50;
             // 
             // gridColumn1
             // 
@@ -496,9 +494,8 @@
             this.panel6.Controls.Add(this.label2);
             this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel6.Location = new System.Drawing.Point(0, 0);
-            this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(1866, 75);
+            this.panel6.Size = new System.Drawing.Size(933, 41);
             this.panel6.TabIndex = 129;
             // 
             // OpsPatient
@@ -506,10 +503,10 @@
             this.OpsPatient.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill;
             this.OpsPatient.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OpsPatient.Location = new System.Drawing.Point(272, 0);
+            this.OpsPatient.Location = new System.Drawing.Point(136, 0);
-            this.OpsPatient.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7);
+            this.OpsPatient.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.OpsPatient.Name = "OpsPatient";
-            this.OpsPatient.Size = new System.Drawing.Size(1594, 75);
+            this.OpsPatient.Size = new System.Drawing.Size(797, 41);
             this.OpsPatient.TabIndex = 1;
             // 
             // label2
@@ -517,21 +514,20 @@
             this.label2.Dock = System.Windows.Forms.DockStyle.Left;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Location = new System.Drawing.Point(0, 0);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(272, 75);
+            this.label2.Size = new System.Drawing.Size(136, 41);
             this.label2.TabIndex = 0;
             this.label2.Text = "人员基础信息库";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // PersonForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1866, 1162);
+            this.ClientSize = new System.Drawing.Size(933, 637);
             this.Controls.Add(this.DgcPatient);
             this.Controls.Add(this.panel6);
-            this.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "PersonForm";
             this.Text = "人员基本信息";
             ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).EndInit();

PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs

@@ -105,7 +105,6 @@
             this.IDCard.Location = new System.Drawing.Point(85, 166);
             this.IDCard.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.IDCard.Name = "IDCard";
-            this.IDCard.ReadOnly = true;
             this.IDCard.Size = new System.Drawing.Size(176, 23);
             this.IDCard.TabIndex = 100;
             // 
@@ -331,7 +330,6 @@
             // 
             this.BirthdayDateTimePicker.CalendarFont = new System.Drawing.Font("微软雅黑", 9F);
             this.BirthdayDateTimePicker.CustomFormat = " yyyy 年 MM 月 dd 日";
-            this.BirthdayDateTimePicker.Enabled = false;
             this.BirthdayDateTimePicker.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.BirthdayDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
             this.BirthdayDateTimePicker.Location = new System.Drawing.Point(85, 205);
@@ -345,7 +343,6 @@
             // 
             this.SexGroupBox.Controls.Add(this.Female);
             this.SexGroupBox.Controls.Add(this.Male);
-            this.SexGroupBox.Enabled = false;
             this.SexGroupBox.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SexGroupBox.Location = new System.Drawing.Point(16, 57);
             this.SexGroupBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
@@ -561,7 +558,6 @@
             // 
             // CardTypeComboBox
             // 
-            this.CardTypeComboBox.Enabled = false;
             this.CardTypeComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.CardTypeComboBox.FormattingEnabled = true;
             this.CardTypeComboBox.Location = new System.Drawing.Point(89, 125);

PEIS/View/Enrollment/NewEnrollmentPersonForm.cs

@@ -36,7 +36,7 @@ namespace PEIS.View.Enrollment
             _editStatus = editStatus;
             ReadIDCard.Enabled = !editStatus;
             NewBaseBtn.Enabled = !editStatus;
-            NameTextBox.Enabled = !editStatus;
+            //NameTextBox.Enabled = !editStatus;
             Text = editStatus ? "编辑登记信息" : "新增登记信息";
             
 
@@ -62,14 +62,14 @@ namespace PEIS.View.Enrollment
             JobStatusComboBox.SelectedIndexChanged += JobStatusComboBox_SelectedIndexChanged;
 
 
-            if (editStatus && Global.currentUser.Code == Global._hospital.DoctCode)
+            //if (editStatus && Global.currentUser.Code == Global._hospital.DoctCode)
-            {
+            //{
-                NameTextBox.Enabled = true;
+            //    NameTextBox.Enabled = true;
-                SexGroupBox.Enabled = true;
+            //    SexGroupBox.Enabled = true;
-                IDCard.ReadOnly = false;
+            //    IDCard.ReadOnly = false;
-                BirthdayDateTimePicker.Enabled = true;
+            //    BirthdayDateTimePicker.Enabled = true;
-                CardTypeComboBox.Enabled = true;
+            //    CardTypeComboBox.Enabled = true;
-            }
+            //}
         }
 
         private void JobStatusComboBox_SelectedIndexChanged(object sender, EventArgs e)
@@ -157,7 +157,10 @@ namespace PEIS.View.Enrollment
             {
                 return;
             }
-            OnGetBaseInfoByName();
+            if(!_editStatus)
+            {
+                OnGetBaseInfoByName();
+            }
         }
 
         private void NewEnrollmentPersonForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -340,6 +343,12 @@ namespace PEIS.View.Enrollment
                 }
             }
 
+            var _photo = ImageToBase64();
+            if (string.IsNullOrEmpty(_photo) && !string.IsNullOrEmpty(_regInfo.Photo))
+            {
+                _photo = _regInfo.Photo;
+            }
+
             EnrollmentPatient item = new EnrollmentPatient()
             {
                 Name = NameTextBox.Text.Trim(),
@@ -355,11 +364,11 @@ namespace PEIS.View.Enrollment
                 Education = EducationComboBox.SelectedValue?.ToString(),
                 ExamDate = ExamDate.Value.Date,
                 Type = ExamTypeComboBox.SelectedValue?.ToString(),
-                Contactor1 = NameTextBox.Text.Trim(),
+                Contactor1 = Contactor1.Text.Trim(),
                 Contactor2 = Contactor2.Text.Trim(),
                 Tel1 = Tel1.Text.Trim(),
                 Tel2 = Tel2.Text.Trim(),
-                Photo = ImageToBase64(),
+                Photo = _photo,
                 Address1 = Address1.Text.Trim(),
                 Company = Company.Text.Trim(),
                 Description = Description.Text.Trim(),
@@ -627,11 +636,11 @@ namespace PEIS.View.Enrollment
             {
                 return null;
             }
-
             try
             {
                 using (MemoryStream ms = new MemoryStream())
                 {
+                    
                     Photo.Image.Save(ms, ImageFormat.Png);
                     byte[] imageBytes = ms.ToArray();
                     return Convert.ToBase64String(imageBytes);
@@ -711,7 +720,6 @@ namespace PEIS.View.Enrollment
             {
                 case 0:
                     Global.Msg("info", "没有匹配记录，请新建体检信息！");
-                   
                     NewPersonForm personForm = new NewPersonForm(action);
                     personForm.ShowDialog();
                     break;

PEIS/View/Enrollment/NewEnrollmentPersonForm.resx

@@ -120,52 +120,52 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="CancelBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt
-        lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan
+        lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k
-        6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF
+        iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo
-        xgAAAABJRU5ErkJggg==
+        4OWtCNeHAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ConfirmBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPhJREFUSEvt
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPJJREFUSEtj
-        jyFLg1EUhodgEBYEg0EwDBbMsiCMnYvbX1hYMBhEDAsGg2Fsv2BVZOwcVseCYcFgWDAYBIM/6BHn3Yce
+        GAWjgCRgP/9/KJRJfWA/73+kw7z//4GWmEKFqAeAhsaCDAfiy3az/2tChakDgC5PhBp+3m7+f1WoMHUA
-        +FB3F78HLlzOc+/73lsqFRT8BzHafrYxROkEBTFq3iUjxtlneFDeGyOOvE9ClPMY/tYwqt4nIcZFDH+t
+        0OWpUMPP2Mz7rwQVpg4AujwTavgJl4X/5aDChIHD3P8NUCZOAHR5Ltjwuf+POE3/Lw0VJgyAmtKhGnFa
-        KxXvkxDlKoa/tCYcep9LGDPwM48Y3WX4mOfTOw68zyUol/Fiboko1/Hli+aIfe9/JSjTvBIxbqJ7ak7Y
+        AnR5IdTlB5xn/xeHChMPgBpX4bIE6PJSqNwe54X/haHCpAO4JfP/10OFQC6vBIvN+78DKC4AFSYfwC0B
-        8/7PZCVGfzUT5Ta+/DEYuz9vrMH3n4jRi/t5mFL2Z9cmK/laDydDdvyZZJYlxuz4nm3vNseALT8qKMj4
+        +gTo8looe4vDqv88UCWUA7glELzBsu8/J1SKegBsyfz/a4xn/meFCtEANPxngrJGwShABwwMAJBYlx6C
-        AJBYlx7zXbLXAAAAAElFTkSuQmCC
+        WXdWAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ReadIDCard.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAALlJREFUSEvt
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMVJREFUSEvt
-        lMENwjAMRTMBBxbCPVXMwAYs0V6ZAZpe2COjfdSUVsV1FEemgkO/9KW0if1kO4pzu/5G9QNH6nChDq3F
+        lM0NwjAMhTMBBxYiPVXMwAYsAVdmANILe2Q0U7sOSVVHcRQqOPRJn5T678ltFbPpf9Q/YG+fcBq5ttA5
-        lUd9fuLA87uqx5U88A2fPG48vyOPEA/cQSaPkMDzz4C4FkofzGMk6QBTNZ9eBwlKnhUAYVF2/OYxksyA
+        6I8v2PHYqG6As3UA3+Dg4MZjo8aEp4I72CYmE89jo4IBnYXVESosSGcQtpmzbBKUrcUgJpOzT9amZyos
-        Vc8XfseqAWKLhP/SfgYgDHgaMvVoolP7GoBFKsA8g0KXAniPc9YDLMoC+NUrdgqw+WO3+XO962d6AYJV
+        CGeItTykaPCJCXCv2iC8msBksIwH0nzBQPjACOUGuBC5vMagRSoDPlfDvWoDLKxBb9CiooH0+1WRM1j9
-        bPcLpuzLAAAAAElFTkSuQmCC
+        slv9ut70IxnzBoJVbPdrwLwAAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="TakePhotoBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAQBJREFUSEvt
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAARhJREFUSEvt
-        VLsKwkAQzKdYWfgDdt4dEUs7CzsFsbMSrG39AMvbQ7ASLEU7f8DGLxrZmIO40cglPgodmCJ7szPZu0ui
+        VLEOwVAU7aeYDH7Apm2I0WawkYjNJDFbfYCxbSQmiVHY/IDFF13nvhx9RFVfEQMnuWnfufee09v3Wu/3
-        6OegCcciSn0wNAFFlPrPQTvUlMVSjhxMizl7SX8OcOmY+aYwgr2kvz+8ynvoX1LWnwa0LDrKYWIIY01o
+        EMRyyAuWlQdEJC9Y9gUEiVT8SBZ4iszRC0ckM9WirAXIBAU6ZnZj8RDVoqzFJcllaRgDaHFp8cygEUnb
-        y3WPUgHaYiBvC++11DGCAwxhljGdKsLCPyuHntQHB2jCieuG0PS1eIV6EmBxvlWXC7jbEKovakgmiAkN
+        T2QcxjJCXYv0HUoZ4L322WgD75rpGzBf3ABPPGWTik78WOaXNSbqsiwFc8UNwB2Vh1GdlNdcSlU5nLoT
-        X3vtBPzhXO/2ns9AE0aKsEsCCMOcPjSAoR3WaWOWB6ljlApgvPU7CMHDgPRHlyxWJJ/NVvpHxqLrb0xF
+        qRTKI5wMMhtc6/MazATNWGqk3jyBfjjalMhO9wD3Q+zDVjlcByxLYWpdDBQQX7HxOvZM34A5NwPFR78D
-        bhShL/3/+B4uOIr69HXlzckAAAAASUVORK5CYII=
+        Fzw04I/OJF8M3ZsNZS3CSDpImhPzYqxh0KPsH1+H550BOIr69OqcMmkAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="NewBaseBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAbJJREFUSEvl
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAb5JREFUSEvl
-        lLFrVEEQh1MpiJYWWgWVCBaCpDO5vNmEGOxCIKCFIghWKVKksMuRVlAIWITczl7usEkjSZEiTQrRXhBs
+        lL1LA0EQxVMpiJYWWomKgoUg6czXXkTFTgRBC0UQrCwsLOwMtoKCYBHM3UWDTRrRwsImhWgvCDaChf9D
-        BAv/h1h+8pbdsAyn712wET+YZn+zM29+zNuJif+COc8DUTYk8F4Cb6oeT6Z3uGTzzoUoQ1EYEd/metyz
+        LJ9v1zm5y8d5SWzEHwzk3r6Z2Z3bS+x/kLYxpxzsKhdXjONMAWvxPHpkuTNYuMRAg3hNFzAltvZgkUMp
-        +WMhyqtU7MO8cl/ecnm+z03xdHOjzpBr9l4rKuVxXcApr61WI7tIbBI4tForRNmXwGlHuWq1TJ7E9Zm2
+        dp91MK1O0ZstYkTZyImOVAkDYm+NjINVXcBycCRSAHUGZZq4uBGpNZhcZnI15aBfpDq8k1hFxEWKDpPf
-        WiPi+SGBL/a8pJjyhdUaEeW7C3y25yUusBJt8jyzWiMuMBDlVIbcslomW7Swx12rNSKe52lTjqxWIz2W
+        2eBZHhviO+WWSNFh4pvl4kkeG8L1JTMmGxsiRYfJF0yuqhJGRarDG9HMOSZFig6TN83uHNyKFEAVsCjr
-        k/7Jaq2pPAfR48DA9ZmZ8VxZ2GNKlLW8ps5z294bi7JYGZXyUQKTNv9cOGUp+h04rJSd2r7VfS7YvLER
+        jyK1TsbGtS6iT8MXmUjY6ONux6htS3FYNsbF3h7+Yv7gC37gJRgSW2fwlsybefPOs3Bej2+5jC5Zbh8W
-        z0vneXqn+xeKWaTHo2zHoue61UvidHXsIlYbiXhmRfkZvQ50rG45e5vaNJhVbojytc0PFN+jOooGOWxu
+        2uMI1idyv1CsFr7EFW8cszYGRW6IOZ0Oft0ihUNzkoU/zKxdpERuiimuNxOlQdLBMM0vJuGHD8j8H+nw
-        5OE2F0U5Tqu5ZXWLKCd2u9KHdW1uRDzraQXfWW0UEtg88z8VzmFzI+U73xQj7/3OmhLn2U6j/zHKO6nB
+        NfBCLEEWTtBN450282oeiNwU+iqmcG2woViCcGFHG3hTLkUKhbdq3+zeO4H3O6TBlzFCSIrhO6/ZaPzw
-        SasG/xy/ANvLiZmkPPdDAAAAAElFTkSuQmCC
+        Wp7QrI8eGmI3SINKpAZ/jFjsE9vLiZmE0xwHAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="HazardFactorsComboBox.EditValue" mimetype="application/x-microsoft.net.object.binary.base64">

PEIS/View/MainForm.Designer.cs

@@ -42,6 +42,7 @@ namespace PEIS.View
             this.LblTitle = new System.Windows.Forms.Label();
             this.LblLogo = new System.Windows.Forms.Label();
             this.PbMin = new System.Windows.Forms.PictureBox();
+            this.PbSmall = new System.Windows.Forms.PictureBox();
             this.PbMax = new System.Windows.Forms.PictureBox();
             this.PbClose = new System.Windows.Forms.PictureBox();
             this.XtmmMain = new DevExpress.XtraTabbedMdi.XtraTabbedMdiManager(this.components);
@@ -51,15 +52,6 @@ namespace PEIS.View
             this.lblStep = new System.Windows.Forms.Label();
             this.lblHospital = new System.Windows.Forms.Label();
             this.NbcMain = new DevExpress.XtraNavBar.NavBarControl();
-            this.NbgSetting = new DevExpress.XtraNavBar.NavBarGroup();
-            this.NbiFeeItem = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiPackage = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiConclusion = new DevExpress.XtraNavBar.NavBarItem();
-            this.navBarItem16 = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiDept = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiPermission = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiDictionary = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiHazardType = new DevExpress.XtraNavBar.NavBarItem();
             this.NbgReg = new DevExpress.XtraNavBar.NavBarGroup();
             this.NbiEnrollmentSearch = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentPerson = new DevExpress.XtraNavBar.NavBarItem();
@@ -76,10 +68,20 @@ namespace PEIS.View
             this.navBarItem12 = new DevExpress.XtraNavBar.NavBarItem();
             this.navBarItem13 = new DevExpress.XtraNavBar.NavBarItem();
             this.navBarItem14 = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbgSetting = new DevExpress.XtraNavBar.NavBarGroup();
+            this.NbiFeeItem = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiPackage = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiConclusion = new DevExpress.XtraNavBar.NavBarItem();
+            this.navBarItem16 = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiDept = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiPermission = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiDictionary = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiHazardType = new DevExpress.XtraNavBar.NavBarItem();
             this.NbgNull = new DevExpress.XtraNavBar.NavBarGroup();
             this.navBarItem8 = new DevExpress.XtraNavBar.NavBarItem();
             this.PnlButton.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PbMin)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PbSmall)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PbMax)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PbClose)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.XtmmMain)).BeginInit();
@@ -100,6 +102,7 @@ namespace PEIS.View
             this.PnlButton.Controls.Add(this.LblTitle);
             this.PnlButton.Controls.Add(this.LblLogo);
             this.PnlButton.Controls.Add(this.PbMin);
+            this.PnlButton.Controls.Add(this.PbSmall);
             this.PnlButton.Controls.Add(this.PbMax);
             this.PnlButton.Controls.Add(this.PbClose);
             this.PnlButton.Dock = System.Windows.Forms.DockStyle.Top;
@@ -246,13 +249,24 @@ namespace PEIS.View
             // 
             this.PbMin.Dock = System.Windows.Forms.DockStyle.Right;
             this.PbMin.Image = ((System.Drawing.Image)(resources.GetObject("PbMin.Image")));
-            this.PbMin.Location = new System.Drawing.Point(1342, 0);
+            this.PbMin.Location = new System.Drawing.Point(1310, 0);
             this.PbMin.Name = "PbMin";
             this.PbMin.Size = new System.Drawing.Size(32, 45);
             this.PbMin.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.PbMin.TabIndex = 2;
             this.PbMin.TabStop = false;
             // 
+            // PbSmall
+            // 
+            this.PbSmall.Dock = System.Windows.Forms.DockStyle.Right;
+            this.PbSmall.Image = ((System.Drawing.Image)(resources.GetObject("PbSmall.Image")));
+            this.PbSmall.Location = new System.Drawing.Point(1342, 0);
+            this.PbSmall.Name = "PbSmall";
+            this.PbSmall.Size = new System.Drawing.Size(32, 45);
+            this.PbSmall.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.PbSmall.TabIndex = 1;
+            this.PbSmall.TabStop = false;
+            // 
             // PbMax
             // 
             this.PbMax.Dock = System.Windows.Forms.DockStyle.Right;
@@ -261,7 +275,7 @@ namespace PEIS.View
             this.PbMax.Name = "PbMax";
             this.PbMax.Size = new System.Drawing.Size(32, 45);
             this.PbMax.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-            this.PbMax.TabIndex = 1;
+            this.PbMax.TabIndex = 58;
             this.PbMax.TabStop = false;
             // 
             // PbClose
@@ -414,70 +428,6 @@ namespace PEIS.View
             this.NbcMain.Text = "navBarControl1";
             this.NbcMain.View = new DevExpress.XtraNavBar.ViewInfo.Office3ViewInfoRegistrator();
             // 
-            // NbgSetting
-            // 
-            this.NbgSetting.Caption = "系统设置";
-            this.NbgSetting.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiFeeItem),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPackage),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiConclusion),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem16),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiDept),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPermission),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiDictionary),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiHazardType)});
-            this.NbgSetting.Name = "NbgSetting";
-            // 
-            // NbiFeeItem
-            // 
-            this.NbiFeeItem.Caption = "收费项目";
-            this.NbiFeeItem.LargeImage = global::PEIS.Properties.Resources.收费项目;
-            this.NbiFeeItem.Name = "NbiFeeItem";
-            // 
-            // NbiPackage
-            // 
-            this.NbiPackage.Caption = "体检套餐";
-            this.NbiPackage.LargeImage = global::PEIS.Properties.Resources.套餐;
-            this.NbiPackage.Name = "NbiPackage";
-            // 
-            // NbiConclusion
-            // 
-            this.NbiConclusion.Caption = "结论词";
-            this.NbiConclusion.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiConclusion.LargeImage")));
-            this.NbiConclusion.Name = "NbiConclusion";
-            // 
-            // navBarItem16
-            // 
-            this.navBarItem16.Caption = "团体结论词";
-            this.navBarItem16.LargeImage = global::PEIS.Properties.Resources.结论;
-            this.navBarItem16.Name = "navBarItem16";
-            this.navBarItem16.Visible = false;
-            // 
-            // NbiDept
-            // 
-            this.NbiDept.Caption = "科室管理";
-            this.NbiDept.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiDept.LargeImage")));
-            this.NbiDept.Name = "NbiDept";
-            // 
-            // NbiPermission
-            // 
-            this.NbiPermission.Caption = "权限管理";
-            this.NbiPermission.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiPermission.LargeImage")));
-            this.NbiPermission.Name = "NbiPermission";
-            // 
-            // NbiDictionary
-            // 
-            this.NbiDictionary.Caption = "字典管理";
-            this.NbiDictionary.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiDictionary.LargeImage")));
-            this.NbiDictionary.Name = "NbiDictionary";
-            this.NbiDictionary.Visible = false;
-            // 
-            // NbiHazardType
-            // 
-            this.NbiHazardType.Caption = "接害类型";
-            this.NbiHazardType.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiHazardType.LargeImage")));
-            this.NbiHazardType.Name = "NbiHazardType";
-            // 
             // NbgReg
             // 
             this.NbgReg.Caption = "检前登记";
@@ -591,6 +541,70 @@ namespace PEIS.View
             this.navBarItem14.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem14.LargeImage")));
             this.navBarItem14.Name = "navBarItem14";
             // 
+            // NbgSetting
+            // 
+            this.NbgSetting.Caption = "系统设置";
+            this.NbgSetting.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiFeeItem),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPackage),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiConclusion),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem16),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiDept),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPermission),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiDictionary),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiHazardType)});
+            this.NbgSetting.Name = "NbgSetting";
+            // 
+            // NbiFeeItem
+            // 
+            this.NbiFeeItem.Caption = "收费项目";
+            this.NbiFeeItem.LargeImage = global::PEIS.Properties.Resources.收费项目;
+            this.NbiFeeItem.Name = "NbiFeeItem";
+            // 
+            // NbiPackage
+            // 
+            this.NbiPackage.Caption = "体检套餐";
+            this.NbiPackage.LargeImage = global::PEIS.Properties.Resources.套餐;
+            this.NbiPackage.Name = "NbiPackage";
+            // 
+            // NbiConclusion
+            // 
+            this.NbiConclusion.Caption = "结论词";
+            this.NbiConclusion.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiConclusion.LargeImage")));
+            this.NbiConclusion.Name = "NbiConclusion";
+            // 
+            // navBarItem16
+            // 
+            this.navBarItem16.Caption = "团体结论词";
+            this.navBarItem16.LargeImage = global::PEIS.Properties.Resources.结论;
+            this.navBarItem16.Name = "navBarItem16";
+            this.navBarItem16.Visible = false;
+            // 
+            // NbiDept
+            // 
+            this.NbiDept.Caption = "科室管理";
+            this.NbiDept.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiDept.LargeImage")));
+            this.NbiDept.Name = "NbiDept";
+            // 
+            // NbiPermission
+            // 
+            this.NbiPermission.Caption = "权限管理";
+            this.NbiPermission.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiPermission.LargeImage")));
+            this.NbiPermission.Name = "NbiPermission";
+            // 
+            // NbiDictionary
+            // 
+            this.NbiDictionary.Caption = "字典管理";
+            this.NbiDictionary.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiDictionary.LargeImage")));
+            this.NbiDictionary.Name = "NbiDictionary";
+            this.NbiDictionary.Visible = false;
+            // 
+            // NbiHazardType
+            // 
+            this.NbiHazardType.Caption = "接害类型";
+            this.NbiHazardType.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiHazardType.LargeImage")));
+            this.NbiHazardType.Name = "NbiHazardType";
+            // 
             // NbgNull
             // 
             this.NbgNull.Caption = "NbgNull";
@@ -621,6 +635,7 @@ namespace PEIS.View
             this.Text = "健康体检系统";
             this.PnlButton.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.PbMin)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PbSmall)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PbMax)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PbClose)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.XtmmMain)).EndInit();
@@ -644,7 +659,7 @@ namespace PEIS.View
         private System.Windows.Forms.Label LblTitle;
         private System.Windows.Forms.Label LblLogo;
         private System.Windows.Forms.PictureBox PbMin;
-        private System.Windows.Forms.PictureBox PbMax;
+        private System.Windows.Forms.PictureBox PbSmall;
         private System.Windows.Forms.PictureBox PbClose;
         private DevExpress.XtraTabbedMdi.XtraTabbedMdiManager XtmmMain;
         private System.Windows.Forms.Panel panelFooter;
@@ -680,6 +695,7 @@ namespace PEIS.View
         private StepViewer stepViewer2;
         private DevExpress.XtraNavBar.NavBarItem NbiDictionary;
         private DevExpress.XtraNavBar.NavBarItem NbiHazardType;
+        private System.Windows.Forms.PictureBox PbMax;
     }
 }
 

PEIS/View/MainForm.cs

@@ -37,6 +37,7 @@ namespace PEIS.View
             LblTitle.MouseDown += PnlButton_MouseDown;
 
             PnlButton.DoubleClick += PbMax_Click;
+            PbSmall.Click += PbSmall_Click;
             PbMax.Click += PbMax_Click;
 
             PbMin.Click += (s, e) => WindowState = FormWindowState.Minimized;
@@ -100,7 +101,12 @@ namespace PEIS.View
         }
         private void PbMax_Click(object sender, EventArgs e)
         {
-            this.WindowState = this.WindowState == FormWindowState.Maximized ? FormWindowState.Normal : FormWindowState.Maximized;
+            this.WindowState = FormWindowState.Maximized;
+        }
+
+        private void PbSmall_Click(object sender, EventArgs e)
+        {
+            this.WindowState = FormWindowState.Normal;
         }
 
         private const int HtLeft = 10;
@@ -145,6 +151,19 @@ namespace PEIS.View
                     m.WParam = new IntPtr(2);//鼠标放在标题栏内
                     base.WndProc(ref m);
                     break;
+                case 0x0005: // 窗体最大化、最小化
+                    if(this.WindowState == FormWindowState.Maximized)
+                    {
+                        PbSmall.Visible = true;
+                        PbMax.Visible = false;
+                    }
+                    else
+                    {
+                        PbSmall.Visible = false;
+                        PbMax.Visible = true;
+                    }
+                    base.WndProc(ref m);
+                    break;
 
                 default:
                     base.WndProc(ref m);

PEIS/View/MainForm.resx

@@ -225,12 +225,20 @@
         vAMAAB2Z/avvhpP16jlgAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="PbMax.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="PbSmall.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAJZJREFUWEft
         lVEKhDAQQ3sJ/zyMN9ObeJQ9Wk0kLLMg0qlFWMiDUMdOhlCFFmOM+QtqrRO0DNCskTlgHIZG5pB3UdkF
         /BuHqMxBI3gvgJo/QSTWrdo1Mh3galiPyHlyWNMBNpVdwM+/njiAAzjAD9q+B31DTyCo7TJC4/BPkAKm
         M0CDVik+x3ekKwDNDPFU37vAGHNNKQcaabW7KXKmgQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="PbMax.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAIJJREFUSEtj
+        GAWjACt4/vx5AhWxAxArQI1GgGfPnt0H4v/UxiiWgVwAEnz69GkD1CXUwGAzQTTUGoRFUAUKVMK4LaIF
+        xmoRMOjmg4KPSng+TouAtANUiGIAMmvUIrLAqEVkg5FjEVgQiPdTEYNrAwzHQ4sMkCTVMMhMqPGjYNAD
+        BgYA3VMYOGhI6BAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="PbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -323,65 +331,6 @@
         eK0VDd2jOIOUJjBEt4J80Qr6dPWQ/qMFhRwGc3HuYrJ8OUB/d0V4+aIukP5WkIx/QboJunuEly/qAtF3
         BfGBcJLq6KegrKhiBV+oxer9DHUBe/uDyOUA+tiztSLvPTKFHvxvUK6D+NPpP8MLMjJMP3kZuqKG9W0v
         EH3MIDresyvYJyODa03QX1P/wu5lWbbexyJUP7qx7MMQ3e5QAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="NbiConclusion.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
-        gVq/Q20bmn0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="NbiDept.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABsAAAAaCAYAAABGiCfwAAAABGdBTUEAALGPC/xhBQAAAWdJREFUSEtj
-        sE56zWsb82q1bezr/7TENnGvfRhsYl5HggViXjYB6UY4jnk9DUgfsI19dcAu7nUDNgzUW4+E94Nx7KtV
-        aOL1IPPtYl/PZAABIKcfiPcjY6Bh70EYyP4PpM+jy2PBIHVg9WjiQPxmFdgiXACkCOYqIO0AFcYJQOqA
-        2B5EQ4WIB3S3DIg7QZrpZNmb+UPbMtu4l3ogA5ExNAVuB2m2jn5dgC6PjkHqbGJe5UNoTHmIRbGv+2zj
-        Xj8F0tBkCsE2sa/vgJNy3JtXQPmT6PJY8CuIekyzYBjsfbCtNAajlmEAYMGdY5x2hhXKJQqQb1ns6+dW
-        8S+VoVyiwOC1zCrqlQEMA6udN5bA+gnG1wq9ygZVhhMQbZld3CtDYP12C45jX/+xjXt1H8YHZuZEqFKc
-        gCSfIQOgnmEUZ8iAvpZFv9WCMokGZFtGDhgIy95cgfJpCkBVD7Dd+LIBWgeBaloa4td9APBZNaRicy5v
-        AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="NbiPermission.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAA0BJREFUWEft
-        l0to1FAUhguiiCvBKoi40ApCQVAqqDNJHCqCgoiKg7aT3D7QCq7cKd3ophVBwYUPBEELrlzophUqQsHH
-        plikqFQQLYiWTm6GTqelFTfjf5J/SsdOJ/NypR9ckvz3nHPPvTnJTer+Uw6G7R6ylHfTdNwB0/HGTUdn
-        cT6K4yPDTl6h2d8BA94NBvRbxnD0GI5DaF9MpX/6utI/LMc7QZfageDXOEC/pXQr5QUizswG00ldwGp8
-        FrtIq7uTXdWDGTVLUMz4Zax9fDXlgkSVe1hs4fOcUvVgVm8QdDZq6+2UiiK14Ceh3FOUqgPBptCGeRmK
-        obzjkoDhuLcoVY7Rmd4qwVCADyiFEmlLNgQ+epRS5ZiJZNQPprweSqE0xj+uYgLzlCpH7rsEQwHepxSK
-        1ZHaTJ8xSpUTa5moD1ZA91MKJero3YGPN0ipOvxgjv7Gy1Ck+sXHctw+StWBmbyQgIYzuYdSUfDY9gZJ
-        e72UqsO03W4/gRLf9bAfFPv9KrmPUnUYbbopmJGeNhOpRsoFwWrZnP1jSrXBcvQ9Bn4aa59aSzmPaGJy
-        LzeorKH0Ecq1QWaOwT9IcGxG70xbb2SXj2knj6FvPkhSn6VcWxYn8Wc9QJNtGbp7kVJu1UZQlC78xvGK
-        Pm92zKxnd3nEWjL1pkqdRIH1FEtAznMvr8LNG27qyq70ncKQZcZyn4PjAM7TiwMVSwAvrde0m5OPk2bl
-        bUJtXKdW2iaFAW/AePGgs2jDCNhX6HGU2yM6/M7kfNi1gCST6zugMuso5yPLJx8egSHundJ35DuQ3aEY
-        tr4svpjlVUp5BPWAQk5M7qCUT+5xs2z3dqQt3UC5ZEpNYNn3id+J+8nLspHnnzGWvQWY5HdKS8En9xMY
-        ZWL29DZKZYM6eMskyi9Cw/aUGFm2fobljFEuC/gelVnmBizUELuL5ksxlNsJoxkaD2FbvYTjaWyzu5q6
-        JtbQrCiWk94SrKb/4pqWODIhM5HbK9CU103zpVh2MmLa3sOFoslvCOj/FY3wmf+EpqWP7kWBHf4fgliU
-        licez66I2smD8lRgUPk8x2+Y+5WJzaH9QpvAfX2P4yu6hQL7uDRe/tPU1f0GMOxpxjaDCnUAAAAASUVO
-        RK5CYII=
-</value>
-  </data>
-  <data name="NbiDictionary.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
-        gVq/Q20bmn0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="NbiHazardType.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
-        gVq/Q20bmn0AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="NbiPReport.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -496,6 +445,65 @@
         lPVNqM1T/O7hTD/C85foE/9zzQuW6rEkUHG/TcmBCt5xet0HYl5UvCE31wDrvEZpxNlofT/ebe3KrLGZ
         OFt7nlIJzFY2WbOz7sT5kaJT85JSBdX9cXh4pCg1A2byDJ/EE2zWMryC2dxztFq/AeyqBenl+b8bAAAA
         AElFTkSuQmCC
+</value>
+  </data>
+  <data name="NbiConclusion.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        gVq/Q20bmn0AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="NbiDept.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABsAAAAaCAYAAABGiCfwAAAABGdBTUEAALGPC/xhBQAAAWdJREFUSEtj
+        sE56zWsb82q1bezr/7TENnGvfRhsYl5HggViXjYB6UY4jnk9DUgfsI19dcAu7nUDNgzUW4+E94Nx7KtV
+        aOL1IPPtYl/PZAABIKcfiPcjY6Bh70EYyP4PpM+jy2PBIHVg9WjiQPxmFdgiXACkCOYqIO0AFcYJQOqA
+        2B5EQ4WIB3S3DIg7QZrpZNmb+UPbMtu4l3ogA5ExNAVuB2m2jn5dgC6PjkHqbGJe5UNoTHmIRbGv+2zj
+        Xj8F0tBkCsE2sa/vgJNy3JtXQPmT6PJY8CuIekyzYBjsfbCtNAajlmEAYMGdY5x2hhXKJQqQb1ns6+dW
+        8S+VoVyiwOC1zCrqlQEMA6udN5bA+gnG1wq9ygZVhhMQbZld3CtDYP12C45jX/+xjXt1H8YHZuZEqFKc
+        gCSfIQOgnmEUZ8iAvpZFv9WCMokGZFtGDhgIy95cgfJpCkBVD7Dd+LIBWgeBaloa4td9APBZNaRicy5v
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="NbiPermission.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAA0BJREFUWEft
+        l0to1FAUhguiiCvBKoi40ApCQVAqqDNJHCqCgoiKg7aT3D7QCq7cKd3ophVBwYUPBEELrlzophUqQsHH
+        plikqFQQLYiWTm6GTqelFTfjf5J/SsdOJ/NypR9ckvz3nHPPvTnJTer+Uw6G7R6ylHfTdNwB0/HGTUdn
+        cT6K4yPDTl6h2d8BA94NBvRbxnD0GI5DaF9MpX/6utI/LMc7QZfageDXOEC/pXQr5QUizswG00ldwGp8
+        FrtIq7uTXdWDGTVLUMz4Zax9fDXlgkSVe1hs4fOcUvVgVm8QdDZq6+2UiiK14Ceh3FOUqgPBptCGeRmK
+        obzjkoDhuLcoVY7Rmd4qwVCADyiFEmlLNgQ+epRS5ZiJZNQPprweSqE0xj+uYgLzlCpH7rsEQwHepxSK
+        1ZHaTJ8xSpUTa5moD1ZA91MKJero3YGPN0ipOvxgjv7Gy1Ck+sXHctw+StWBmbyQgIYzuYdSUfDY9gZJ
+        e72UqsO03W4/gRLf9bAfFPv9KrmPUnUYbbopmJGeNhOpRsoFwWrZnP1jSrXBcvQ9Bn4aa59aSzmPaGJy
+        LzeorKH0Ecq1QWaOwT9IcGxG70xbb2SXj2knj6FvPkhSn6VcWxYn8Wc9QJNtGbp7kVJu1UZQlC78xvGK
+        Pm92zKxnd3nEWjL1pkqdRIH1FEtAznMvr8LNG27qyq70ncKQZcZyn4PjAM7TiwMVSwAvrde0m5OPk2bl
+        bUJtXKdW2iaFAW/AePGgs2jDCNhX6HGU2yM6/M7kfNi1gCST6zugMuso5yPLJx8egSHundJ35DuQ3aEY
+        tr4svpjlVUp5BPWAQk5M7qCUT+5xs2z3dqQt3UC5ZEpNYNn3id+J+8nLspHnnzGWvQWY5HdKS8En9xMY
+        ZWL29DZKZYM6eMskyi9Cw/aUGFm2fobljFEuC/gelVnmBizUELuL5ksxlNsJoxkaD2FbvYTjaWyzu5q6
+        JtbQrCiWk94SrKb/4pqWODIhM5HbK9CU103zpVh2MmLa3sOFoslvCOj/FY3wmf+EpqWP7kWBHf4fgliU
+        licez66I2smD8lRgUPk8x2+Y+5WJzaH9QpvAfX2P4yu6hQL7uDRe/tPU1f0GMOxpxjaDCnUAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="NbiDictionary.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        gVq/Q20bmn0AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="NbiHazardType.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        gVq/Q20bmn0AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PEIS/View/statistics/IStatisticalReportView.cs

@@ -44,5 +44,13 @@ namespace PEIS.View.Statistics
         // 两癌筛查统计表
         event EventHandler<Args<dynamic>> GetTwoCancerData;
         void ShowTwoCancerData(List<TwoCancer> items);
+
+        // 体检团体筛查
+        event EventHandler<Args<dynamic>> GetOrgData;
+        void ShowOrgData(List<EnrollmentOrg> items);
+
+        // 团体费用统计
+        event EventHandler<Args<dynamic>> GetOrgCostFeeData;
+        void ShowOrgCostFeeData(List<EnrollmentFeeItem> items);
     }
 }

PEIS/View/statistics/StatisticalReportForm.Designer.cs

@@ -31,6 +31,16 @@
             this.ReportTree = new DevExpress.XtraTreeList.TreeList();
             this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.OrgTextEdit = new DevExpress.XtraEditors.PopupContainerEdit();
+            this.OrgDataControl = new DevExpress.XtraEditors.PopupContainerControl();
+            this.OrgData = new DevExpress.XtraGrid.GridControl();
+            this.OrgGridView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.团体名称 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.体检日期 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.label5 = new System.Windows.Forms.Label();
             this.AllRadio = new System.Windows.Forms.RadioButton();
             this.PersonRadio = new System.Windows.Forms.RadioButton();
             this.TeamRadio = new System.Windows.Forms.RadioButton();
@@ -45,6 +55,11 @@
             this.ReportPreview = new FastReport.Preview.PreviewControl();
             ((System.ComponentModel.ISupportInitialize)(this.ReportTree)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgTextEdit.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgDataControl)).BeginInit();
+            this.OrgDataControl.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgData)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgGridView)).BeginInit();
             this.SuspendLayout();
             // 
             // ReportTree
@@ -79,6 +94,8 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.OrgTextEdit);
+            this.panel1.Controls.Add(this.label5);
             this.panel1.Controls.Add(this.AllRadio);
             this.panel1.Controls.Add(this.PersonRadio);
             this.panel1.Controls.Add(this.TeamRadio);
@@ -97,11 +114,110 @@
             this.panel1.Size = new System.Drawing.Size(874, 69);
             this.panel1.TabIndex = 9;
             // 
+            // OrgTextEdit
+            // 
+            this.OrgTextEdit.EditValue = "";
+            this.OrgTextEdit.Location = new System.Drawing.Point(598, 37);
+            this.OrgTextEdit.Name = "OrgTextEdit";
+            this.OrgTextEdit.Properties.AutoHeight = false;
+            this.OrgTextEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.OrgTextEdit.Properties.CloseOnLostFocus = false;
+            this.OrgTextEdit.Properties.PopupControl = this.OrgDataControl;
+            this.OrgTextEdit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.OrgTextEdit.Size = new System.Drawing.Size(201, 25);
+            this.OrgTextEdit.TabIndex = 13;
+            // 
+            // OrgDataControl
+            // 
+            this.OrgDataControl.Controls.Add(this.OrgData);
+            this.OrgDataControl.Location = new System.Drawing.Point(775, 69);
+            this.OrgDataControl.Name = "OrgDataControl";
+            this.OrgDataControl.Size = new System.Drawing.Size(251, 242);
+            this.OrgDataControl.TabIndex = 11;
+            // 
+            // OrgData
+            // 
+            this.OrgData.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OrgData.Location = new System.Drawing.Point(0, 0);
+            this.OrgData.MainView = this.OrgGridView;
+            this.OrgData.Name = "OrgData";
+            this.OrgData.Size = new System.Drawing.Size(251, 242);
+            this.OrgData.TabIndex = 0;
+            this.OrgData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.OrgGridView});
+            // 
+            // OrgGridView
+            // 
+            this.OrgGridView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.团体名称,
+            this.体检日期,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3});
+            this.OrgGridView.GridControl = this.OrgData;
+            this.OrgGridView.Name = "OrgGridView";
+            this.OrgGridView.OptionsBehavior.Editable = false;
+            this.OrgGridView.OptionsView.ColumnAutoWidth = false;
+            this.OrgGridView.OptionsView.ShowGroupPanel = false;
+            this.OrgGridView.RowHeight = 30;
+            // 
+            // 团体名称
+            // 
+            this.团体名称.Caption = "团体名称";
+            this.团体名称.FieldName = "Name";
+            this.团体名称.Name = "团体名称";
+            this.团体名称.Visible = true;
+            this.团体名称.VisibleIndex = 0;
+            this.团体名称.Width = 170;
+            // 
+            // 体检日期
+            // 
+            this.体检日期.Caption = "体检日期";
+            this.体检日期.FieldName = "ExamDate";
+            this.体检日期.Name = "体检日期";
+            this.体检日期.Visible = true;
+            this.体检日期.VisibleIndex = 1;
+            this.体检日期.Width = 72;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "拼音码";
+            this.gridColumn1.FieldName = "SpellCode";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 3;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "地址";
+            this.gridColumn2.FieldName = "Address";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 4;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "创建日期";
+            this.gridColumn3.FieldName = "CreateTime";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 2;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(560, 42);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(32, 17);
+            this.label5.TabIndex = 12;
+            this.label5.Text = "团体";
+            // 
             // AllRadio
             // 
             this.AllRadio.AutoSize = true;
             this.AllRadio.Location = new System.Drawing.Point(455, 41);
-            this.AllRadio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.AllRadio.Margin = new System.Windows.Forms.Padding(2);
             this.AllRadio.Name = "AllRadio";
             this.AllRadio.Size = new System.Drawing.Size(74, 21);
             this.AllRadio.TabIndex = 11;
@@ -112,7 +228,7 @@
             // 
             this.PersonRadio.AutoSize = true;
             this.PersonRadio.Location = new System.Drawing.Point(376, 41);
-            this.PersonRadio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.PersonRadio.Margin = new System.Windows.Forms.Padding(2);
             this.PersonRadio.Name = "PersonRadio";
             this.PersonRadio.Size = new System.Drawing.Size(74, 21);
             this.PersonRadio.TabIndex = 10;
@@ -124,7 +240,7 @@
             this.TeamRadio.AutoSize = true;
             this.TeamRadio.Checked = true;
             this.TeamRadio.Location = new System.Drawing.Point(296, 41);
-            this.TeamRadio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.TeamRadio.Margin = new System.Windows.Forms.Padding(2);
             this.TeamRadio.Name = "TeamRadio";
             this.TeamRadio.Size = new System.Drawing.Size(74, 21);
             this.TeamRadio.TabIndex = 9;
@@ -237,6 +353,7 @@
             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.OrgDataControl);
             this.Controls.Add(this.ReportPreview);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.splitterControl1);
@@ -247,6 +364,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.ReportTree)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgTextEdit.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgDataControl)).EndInit();
+            this.OrgDataControl.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.OrgData)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.OrgGridView)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -267,5 +389,15 @@
         private System.Windows.Forms.RadioButton TeamRadio;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.RadioButton AllRadio;
+        private DevExpress.XtraEditors.PopupContainerEdit OrgTextEdit;
+        private System.Windows.Forms.Label label5;
+        private DevExpress.XtraEditors.PopupContainerControl OrgDataControl;
+        private DevExpress.XtraGrid.GridControl OrgData;
+        private DevExpress.XtraGrid.Views.Grid.GridView OrgGridView;
+        private DevExpress.XtraGrid.Columns.GridColumn 团体名称;
+        private DevExpress.XtraGrid.Columns.GridColumn 体检日期;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
     }
 }

PEIS/View/statistics/StatisticalReportForm.cs

@@ -1,4 +1,5 @@
-using DevExpress.XtraTreeList;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraTreeList;
 using DevExpress.XtraTreeList.Nodes;
 using FastReport;
 using PEIS.Base;
@@ -24,8 +25,10 @@ namespace PEIS.View.Statistics
         private FastReport.Report sReport;
         public List<EnrollmentPatient> _peopleCount = new List<EnrollmentPatient>();
         public List<EnrollmentFeeItem> _eFeeItems = new List<EnrollmentFeeItem>();
+        public List<EnrollmentFeeItem> _orgCostFeeData = new List<EnrollmentFeeItem>();
         public List<EnrollmentCheckCost> _checkCost = new List<EnrollmentCheckCost>();
         public List<TwoCancer> _twoCancerData = new List<TwoCancer>();
+        public EnrollmentOrg _org = new EnrollmentOrg();
 
         public StatisticalReportForm()
         {
@@ -38,6 +41,29 @@ namespace PEIS.View.Statistics
             //ReportTree.NodeMouseClick += ReportTree_NodeMouseClick;
             //ReportTree.DrawMode = TreeViewDrawMode.OwnerDrawText;
             //ReportTree.DrawNode += new DrawTreeNodeEventHandler(ReportTree_DrawNode);
+
+            OrgTextEdit.KeyUp += OrgTextEdit_KeyUp;
+            OrgGridView.RowClick += OrgGridView_RowClick;
+
+            // 控制团体选择的显示
+            TeamRadio.CheckedChanged += (object sender, EventArgs e) =>
+            {
+                if (TeamRadio.Checked && _parentNode == "CostCount")
+                {
+                    OrgTextEdit.Enabled = true;
+                }
+                else
+                {
+                    OrgTextEdit.Enabled = false;
+                }
+            };
+
+            _org = new EnrollmentOrg
+            {
+                Name = "全部团体",
+                ID = -1
+            };
+            OrgTextEdit.Text = "全部团体";
         }
 
         private void StatisticalReportForm_Shown(object sender, EventArgs e)
@@ -48,7 +74,13 @@ namespace PEIS.View.Statistics
         private void ReportTree_FocusedNodeChanged(object sender, FocusedNodeChangedEventArgs e)
         {
             string nodeText = e.Node.GetDisplayText(0).ToString();
-            DeptComboBox.Enabled = false;
+            DeptComboBox.Enabled = true;
+            TeamRadio.Enabled = true;
+            PersonRadio.Enabled = true;
+            AllRadio.Enabled = true;
+            OrgTextEdit.Enabled = false;
+            BegDate.Enabled = true;
+            EndDate.Enabled = true;
             if (e.Node.ParentNode == null)
             {
                 switch (nodeText)
@@ -61,7 +93,7 @@ namespace PEIS.View.Statistics
                         break;
                     case "费用明细统计表":
                         _parentNode = "CostCount";
-                        DeptComboBox.Enabled = true;
+                        OrgTextEdit.Enabled = TeamRadio.Checked;
                         RefreshBtn_Click(sender, e);
                         HandleReport();
                         break;
@@ -75,6 +107,17 @@ namespace PEIS.View.Statistics
                         RefreshBtn_Click(sender, e);
                         HandleReport();
                         break;
+                    case "团体费用统计":
+                        _parentNode = "OrgCostFeeCount";
+                        BegDate.Enabled = false;
+                        EndDate.Enabled = false;
+                        DeptComboBox.Enabled = false;
+                        PersonRadio.Enabled = false;
+                        AllRadio.Enabled = false;
+                        OrgTextEdit.Enabled = TeamRadio.Checked = true;
+                        RefreshBtn_Click(sender, e);
+                        HandleReport();
+                        break;
                 }
             }
             else
@@ -142,11 +185,14 @@ namespace PEIS.View.Statistics
                     OnGetCheckCost();
                     break;
                 case "CostCount":
-                    OnGetEFeeItems(); 
+                    OnGetEFeeItems();
                     break;
                 case "TwoCancerCount":
                     OnGetTwoCancerData();
                     break;
+                case "OrgCostFeeCount":
+                    OnGetOrgCostFeeData();
+                    break;
                 default:
                     Global.Msg("info","请选择统计表!");
                     break;
@@ -167,7 +213,6 @@ namespace PEIS.View.Statistics
                 sReport.SetParameterValue("HospitalName",Global._hospital.Name);
                 sReport.SetParameterValue("DateBetween", BegDate.Value.ToShortDateString() + "--" + EndDate.Value.ToShortDateString());
                 sReport.SetParameterValue("Type", _reportName);
-                
 
                 switch (_parentNode)
                 {
@@ -182,11 +227,16 @@ namespace PEIS.View.Statistics
                         sReport.RegisterData(_eFeeItems, "p");
                         sReport.SetParameterValue("TotalFee", _eFeeItems.Sum(s => s.Fee));
                         sReport.SetParameterValue("DeptName", (DeptComboBox.SelectedItem as User)?.DeptName);
+                        sReport.SetParameterValue("TeamName", TeamRadio.Checked && _org != null? _org.Name : "");
                         break;
                     case "TwoCancerCount":
                         sReport.SetParameterValue("TotalCount", _twoCancerData.Count);
                         sReport.RegisterData(_twoCancerData, "p");
                         break;
+                    case "OrgCostFeeCount":
+                        sReport.SetParameterValue("OrgName", _org != null && _org.ID != -1? _org.Name : "");
+                        sReport.RegisterData(_orgCostFeeData, "p");
+                        break;
                 }
 
                 DataBand dataBand = sReport.Report.FindObject(_parentNode) as DataBand;
@@ -225,7 +275,10 @@ namespace PEIS.View.Statistics
                 new StatisticalTree() { Id = 11, ParentId = 11, Name = "费用明细统计表",},
 
                 // 两癌筛查统计
-                new StatisticalTree() { Id = 12, ParentId = 12, Name = "两癌筛查统计",}
+                new StatisticalTree() { Id = 12, ParentId = 12, Name = "两癌筛查统计",},
+
+                // 团体总费用统计
+                new StatisticalTree() { Id = 13, ParentId = 13, Name = "团体费用统计" }
             };
 
             ImageList imageList = new ImageList();
@@ -256,6 +309,20 @@ namespace PEIS.View.Statistics
             ReportTree.ExpandAll();
         }
 
+        private void OrgTextEdit_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                OnGetOrgData();
+            }
+        }
+        private void OrgGridView_RowClick(object sender, RowClickEventArgs e)
+        {
+            _org = OrgGridView.GetRow(e.RowHandle) as EnrollmentOrg;
+            OrgTextEdit.Text = _org.Name;
+            OrgTextEdit.ClosePopup();
+        }
+
         #region 接口事件
 
         // 体检人次统计表
@@ -291,6 +358,7 @@ namespace PEIS.View.Statistics
             paramsData.endDate = EndDate.Value;
             paramsData.deptCode = DeptComboBox.SelectedValue.ToString();
             paramsData.status = TeamRadio.Checked ? 0 : PersonRadio.Checked ? 1 : 2;
+            paramsData.oEid = _org == null || !TeamRadio.Checked ? -1 : _org.ID;
 
             GetEFeeItems?.Invoke(this, new Args<dynamic>{ Item = paramsData });
         }
@@ -345,6 +413,46 @@ namespace PEIS.View.Statistics
             HandleReport();
         }
 
+        // 体检团体筛查
+        public event EventHandler<Args<dynamic>> GetOrgData;
+        protected virtual void OnGetOrgData()
+        {
+            dynamic paramsData = new ExpandoObject();
+            paramsData.begDate = BegDate.Value;
+            paramsData.endDate = EndDate.Value;
+            paramsData.teamText = OrgTextEdit.Text;
+            GetOrgData?.Invoke(this, new Args<dynamic> { Item = paramsData });
+        }
+        public void ShowOrgData(List<EnrollmentOrg> items)
+        {
+            if (BegDate.Value != null && EndDate.Value != null && _parentNode == "CostCount")
+            {
+                items = items.Where(p => p.ExamDate >= BegDate.Value && p.ExamDate <= EndDate.Value)?.OrderByDescending(p => p.ExamDate).ToList();
+            }
+            items.Insert(0, new EnrollmentOrg
+            {
+                Name = "全部团体",
+                ID = -1
+            });
+            OrgTextEdit.ShowPopup();
+            Invoke(new Action(() => OrgData.DataSource = items));
+        }
+
+        // 体检团体总费用
+        public event EventHandler<Args<dynamic>> GetOrgCostFeeData;
+        protected virtual void OnGetOrgCostFeeData()
+        {
+            dynamic paramsData = new ExpandoObject();
+            paramsData.oEid = _org == null || !TeamRadio.Checked ? -1 : _org.ID;
+
+            GetOrgCostFeeData?.Invoke(this, new Args<dynamic> { Item = paramsData });
+        }
+        public void ShowOrgCostFeeData(List<EnrollmentFeeItem> items)
+        {
+            Invoke(new Action(() => _orgCostFeeData = items));
+            HandleReport();
+        }
+
         #endregion
 
         #region 树形菜单