From c59e8919d1940fbb061a2cd46e0f9f3ddbe80f37 Mon Sep 17 00:00:00 2001 From: zdnpc <9670595+zdbanality@user.noreply.gitee.com> Date: Mon, 21 Apr 2025 10:49:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=A2=E4=BD=93=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=BB=9F=E8=AE=A1=EF=BC=8C=E4=B8=A4=E7=99=8C=E7=AD=9B?= =?UTF-8?q?=E6=9F=A5=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BD=93?= =?UTF-8?q?=E6=A3=80=E4=BA=BA=E7=99=BB=E8=AE=B0=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=A4=A7=E5=8C=96?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/App.config | 9 +- PEIS/Entity/TwoCancer.cs | 13 ++ PEIS/Model/Enrollment/EnrollmentOrgModel.cs | 1 - PEIS/Model/StatisticalReportModel.cs | 51 +++++- PEIS/PEIS.csproj | 8 + PEIS/Presenter/StatisticalReportPresenter.cs | 15 +- PEIS/Properties/Resources.Designer.cs | 6 +- PEIS/Properties/Settings.Designer.cs | 2 +- PEIS/Properties/licenses.licx | 6 + PEIS/ReportFiles/OrgCostFeeCount.frx | 65 +++++++ PEIS/ReportFiles/TwoCancerCount.frx | 4 +- PEIS/Resources/Max.png | Bin 0 -> 272 bytes PEIS/Utils/ReportHelper.cs | 2 +- PEIS/View/Base/PersonForm.Designer.cs | 26 ++- .../NewEnrollmentPersonForm.Designer.cs | 4 - .../Enrollment/NewEnrollmentPersonForm.cs | 36 ++-- .../Enrollment/NewEnrollmentPersonForm.resx | 60 +++---- PEIS/View/MainForm.Designer.cs | 168 ++++++++++-------- PEIS/View/MainForm.cs | 21 ++- PEIS/View/MainForm.resx | 128 ++++++------- .../View/statistics/IStatisticalReportView.cs | 8 + .../StatisticalReportForm.Designer.cs | 138 +++++++++++++- PEIS/View/statistics/StatisticalReportForm.cs | 120 ++++++++++++- 23 files changed, 661 insertions(+), 230 deletions(-) create mode 100644 PEIS/ReportFiles/OrgCostFeeCount.frx create mode 100644 PEIS/Resources/Max.png diff --git a/PEIS/App.config b/PEIS/App.config index 49b5930..ecf7946 100644 --- a/PEIS/App.config +++ b/PEIS/App.config @@ -6,8 +6,12 @@ + + + @@ -15,9 +19,9 @@ - + - + @@ -34,4 +38,3 @@ - \ No newline at end of file diff --git a/PEIS/Entity/TwoCancer.cs b/PEIS/Entity/TwoCancer.cs index e99f1e4..056e21d 100644 --- a/PEIS/Entity/TwoCancer.cs +++ b/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; } + /// + /// 筛查内容（宫颈癌、乳腺癌） + ///（TCT/HPV及乳腺超声） + /// public string Flag { get; set; } + /// + /// TCT结果 + /// public string Summary { get; set; } + /// + /// HPV结果 + /// public string Hpv { get; set; } + /// + /// 乳腺超声分类 + /// public string Summary2 { get; set; } } } diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index 5d2dfdd..a7d5cc7 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -41,7 +41,6 @@ namespace PEIS.Model.Enrollment { return DAOHelp.GetDataBySQL($"Select * from Enrollment_Org Where Name like '%{name}%' or SpellCode like '%{name}%'"); } - } // 发送到科室 diff --git a/PEIS/Model/StatisticalReportModel.cs b/PEIS/Model/StatisticalReportModel.cs index 88d1e65..93c34db 100644 --- a/PEIS/Model/StatisticalReportModel.cs +++ b/PEIS/Model/StatisticalReportModel.cs @@ -346,7 +346,7 @@ namespace PEIS.Model } // 费用明细统计表 - public List GetEFeeItems(DateTime begTime, DateTime endTime, int status, string deptCode="9999") + public List 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 - GROUP BY + AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL" + + (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 - GROUP BY + AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL" + + (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($@"SELECT * FROM v_TwoCancer2 WHERE ExamDate Between '{begDate:yyyy-MM-dd}' and DateAdd(day, 1,'{endDate:yyyy-MM-dd}')"); } + + // 获取团体费用数据 + public List 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(sql); + } } } diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index d3777e8..27382d5 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -204,6 +204,7 @@ + @@ -757,6 +758,9 @@ Always + + Always + Always @@ -764,6 +768,9 @@ Always + + Always + Always @@ -780,6 +787,7 @@ + diff --git a/PEIS/Presenter/StatisticalReportPresenter.cs b/PEIS/Presenter/StatisticalReportPresenter.cs index dfaa835..86ad8b8 100644 --- a/PEIS/Presenter/StatisticalReportPresenter.cs +++ b/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)); + }; } } } \ No newline at end of file diff --git a/PEIS/Properties/Resources.Designer.cs b/PEIS/Properties/Resources.Designer.cs index 797f1ab..f142d85 100644 --- a/PEIS/Properties/Resources.Designer.cs +++ b/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 { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/PEIS/Properties/Settings.Designer.cs b/PEIS/Properties/Settings.Designer.cs index 80fd4d3..14641a7 100644 --- a/PEIS/Properties/Settings.Designer.cs +++ b/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()))); diff --git a/PEIS/Properties/licenses.licx b/PEIS/Properties/licenses.licx index d70af29..afaa6e0 100644 --- a/PEIS/Properties/licenses.licx +++ b/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 diff --git a/PEIS/ReportFiles/OrgCostFeeCount.frx b/PEIS/ReportFiles/OrgCostFeeCount.frx new file mode 100644 index 0000000..98da847 --- /dev/null +++ b/PEIS/ReportFiles/OrgCostFeeCount.frx @@ -0,0 +1,65 @@ + + + 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 + { + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PEIS/ReportFiles/TwoCancerCount.frx b/PEIS/ReportFiles/TwoCancerCount.frx index 63f88b5..62e71bb 100644 --- a/PEIS/ReportFiles/TwoCancerCount.frx +++ b/PEIS/ReportFiles/TwoCancerCount.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -59,8 +59,6 @@ namespace FastReport - - diff --git a/PEIS/Resources/Max.png b/PEIS/Resources/Max.png new file mode 100644 index 0000000000000000000000000000000000000000..78a42a5c4214d396e7c89327539b885d6add6f3e GIT binary patch literal 272 zcmV+r0q_2aP)Px#%1J~)R7gwhmdy==Fbsv?V+)Hz=_Yg&7^RbxP0A*v2gn$%jQXPpI1pJ}np|@7 z`{ef&JH$bU2XT-=$xcVsg%Fx#rDfp&U=R_ze;G~F^Z-yff@Ud_XM@chStqJ`Q`Kux z6ulFyGEI`Lh;$K%|36Uk=NIuUWnD1>0v-7{!+Y}vZq zmVFBT$GZ7(0dRS&Z~JT$R5m|t2z>X^IF2@H>*P>Y3RSf)%d(C3ktbkHD}PRs9ex1? WYTg^Q!wua40000 - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt - lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan - 6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF - xgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt + lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k + iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo + 4OWtCNeHAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPhJREFUSEvt - jyFLg1EUhodgEBYEg0EwDBbMsiCMnYvbX1hYMBhEDAsGg2Fsv2BVZOwcVseCYcFgWDAYBIM/6BHn3Yce - +FB3F78HLlzOc+/73lsqFRT8BzHafrYxROkEBTFq3iUjxtlneFDeGyOOvE9ClPMY/tYwqt4nIcZFDH+t - KxXvkxDlKoa/tCYcep9LGDPwM48Y3WX4mOfTOw68zyUol/Fiboko1/Hli+aIfe9/JSjTvBIxbqJ7ak7Y - 8/7PZCVGfzUT5Ta+/DEYuz9vrMH3n4jRi/t5mFL2Z9cmK/laDydDdvyZZJYlxuz4nm3vNseALT8qKMj4 - AJBYlx7zXbLXAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPJJREFUSEtj + GAWjgCRgP/9/KJRJfWA/73+kw7z//4GWmEKFqAeAhsaCDAfiy3az/2tChakDgC5PhBp+3m7+f1WoMHUA + 0OWpUMPP2Mz7rwQVpg4AujwTavgJl4X/5aDChIHD3P8NUCZOAHR5Ltjwuf+POE3/Lw0VJgyAmtKhGnFa + AnR5IdTlB5xn/xeHChMPgBpX4bIE6PJSqNwe54X/haHCpAO4JfP/10OFQC6vBIvN+78DKC4AFSYfwC0B + +gTo8looe4vDqv88UCWUA7glELzBsu8/J1SKegBsyfz/a4xn/meFCtEANPxngrJGwShABwwMAJBYlx6C + WXdWAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAALlJREFUSEvt - lMENwjAMRTMBBxbCPVXMwAYs0V6ZAZpe2COjfdSUVsV1FEemgkO/9KW0if1kO4pzu/5G9QNH6nChDq3F - lUd9fuLA87uqx5U88A2fPG48vyOPEA/cQSaPkMDzz4C4FkofzGMk6QBTNZ9eBwlKnhUAYVF2/OYxksyA - Vc8XfseqAWKLhP/SfgYgDHgaMvVoolP7GoBFKsA8g0KXAniPc9YDLMoC+NUrdgqw+WO3+XO962d6AYJV - bPcLpuzLAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMVJREFUSEvt + lM0NwjAMhTMBBxYiPVXMwAYsAVdmANILe2Q0U7sOSVVHcRQqOPRJn5T678ltFbPpf9Q/YG+fcBq5ttA5 + 6I8v2PHYqG6As3UA3+Dg4MZjo8aEp4I72CYmE89jo4IBnYXVESosSGcQtpmzbBKUrcUgJpOzT9amZyos + CGeItTykaPCJCXCv2iC8msBksIwH0nzBQPjACOUGuBC5vMagRSoDPlfDvWoDLKxBb9CiooH0+1WRM1j9 + slv9ut70IxnzBoJVbPdrwLwAAAAAAElFTkSuQmCC - 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= - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAbJJREFUSEvl - lLFrVEEQh1MpiJYWWgWVCBaCpDO5vNmEGOxCIKCFIghWKVKksMuRVlAIWITczl7usEkjSZEiTQrRXhBs - BAv/h1h+8pbdsAyn712wET+YZn+zM29+zNuJif+COc8DUTYk8F4Cb6oeT6Z3uGTzzoUoQ1EYEd/metyz - +WMhyqtU7MO8cl/ecnm+z03xdHOjzpBr9l4rKuVxXcApr61WI7tIbBI4tForRNmXwGlHuWq1TJ7E9Zm2 - WiPi+SGBL/a8pJjyhdUaEeW7C3y25yUusBJt8jyzWiMuMBDlVIbcslomW7Swx12rNSKe52lTjqxWIz2W - k/7Jaq2pPAfR48DA9ZmZ8VxZ2GNKlLW8ps5z294bi7JYGZXyUQKTNv9cOGUp+h04rJSd2r7VfS7YvLER - z0vneXqn+xeKWaTHo2zHoue61UvidHXsIlYbiXhmRfkZvQ50rG45e5vaNJhVbojytc0PFN+jOooGOWxu - 5OE2F0U5Tqu5ZXWLKCd2u9KHdW1uRDzraQXfWW0UEtg88z8VzmFzI+U73xQj7/3OmhLn2U6j/zHKO6nB - SasG/xy/ANvLiZmkPPdDAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAb5JREFUSEvl + lL1LA0EQxVMpiJYWWomKgoUg6czXXkTFTgRBC0UQrCwsLOwMtoKCYBHM3UWDTRrRwsImhWgvCDaChf9D + LJ9v1zm5y8d5SWzEHwzk3r6Z2Z3bS+x/kLYxpxzsKhdXjONMAWvxPHpkuTNYuMRAg3hNFzAltvZgkUMp + dp91MK1O0ZstYkTZyImOVAkDYm+NjINVXcBycCRSAHUGZZq4uBGpNZhcZnI15aBfpDq8k1hFxEWKDpPf + 2eBZHhviO+WWSNFh4pvl4kkeG8L1JTMmGxsiRYfJF0yuqhJGRarDG9HMOSZFig6TN83uHNyKFEAVsCjr + jyK1TsbGtS6iT8MXmUjY6ONux6htS3FYNsbF3h7+Yv7gC37gJRgSW2fwlsybefPOs3Bej2+5jC5Zbh8W + 2uMI1idyv1CsFr7EFW8cszYGRW6IOZ0Oft0ihUNzkoU/zKxdpERuiimuNxOlQdLBMM0vJuGHD8j8H+nw + NfBCLEEWTtBN450282oeiNwU+iqmcG2woViCcGFHG3hTLkUKhbdq3+zeO4H3O6TBlzFCSIrhO6/ZaPzw + Wp7QrI8eGmI3SINKpAZ/jFjsE9vLiZmE0xwHAAAAAElFTkSuQmCC diff --git a/PEIS/View/MainForm.Designer.cs b/PEIS/View/MainForm.Designer.cs index 645b2d9..0a16677 100644 --- a/PEIS/View/MainForm.Designer.cs +++ b/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; } } diff --git a/PEIS/View/MainForm.cs b/PEIS/View/MainForm.cs index 0b4b0d5..1b36ee4 100644 --- a/PEIS/View/MainForm.cs +++ b/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); diff --git a/PEIS/View/MainForm.resx b/PEIS/View/MainForm.resx index b39e7a1..24dd82c 100644 --- a/PEIS/View/MainForm.resx +++ b/PEIS/View/MainForm.resx @@ -225,12 +225,20 @@ vAMAAB2Z/avvhpP16jlgAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAJZJREFUWEft lVEKhDAQQ3sJ/zyMN9ObeJQ9Wk0kLLMg0qlFWMiDUMdOhlCFFmOM+QtqrRO0DNCskTlgHIZG5pB3UdkF /BuHqMxBI3gvgJo/QSTWrdo1Mh3galiPyHlyWNMBNpVdwM+/njiAAzjAD9q+B31DTyCo7TJC4/BPkAKm M0CDVik+x3ekKwDNDPFU37vAGHNNKQcaabW7KXKmgQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAIJJREFUSEtj + GAWjACt4/vx5AhWxAxArQI1GgGfPnt0H4v/UxiiWgVwAEnz69GkD1CXUwGAzQTTUGoRFUAUKVMK4LaIF + xmoRMOjmg4KPSng+TouAtANUiGIAMmvUIrLAqEVkg5FjEVgQiPdTEYNrAwzHQ4sMkCTVMMhMqPGjYNAD + BgYA3VMYOGhI6BAAAAAASUVORK5CYII= @@ -323,65 +331,6 @@ eK0VDd2jOIOUJjBEt4J80Qr6dPWQ/qMFhRwGc3HuYrJ8OUB/d0V4+aIukP5WkIx/QboJunuEly/qAtF3 BfGBcJLq6KegrKhiBV+oxer9DHUBe/uDyOUA+tiztSLvPTKFHvxvUK6D+NPpP8MLMjJMP3kZuqKG9W0v EH3MIDresyvYJyODa03QX1P/wu5lWbbexyJUP7qx7MMQ3e5QAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj - oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg - hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY - oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA - gVq/Q20bmn0AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABsAAAAaCAYAAABGiCfwAAAABGdBTUEAALGPC/xhBQAAAWdJREFUSEtj - sE56zWsb82q1bezr/7TENnGvfRhsYl5HggViXjYB6UY4jnk9DUgfsI19dcAu7nUDNgzUW4+E94Nx7KtV - aOL1IPPtYl/PZAABIKcfiPcjY6Bh70EYyP4PpM+jy2PBIHVg9WjiQPxmFdgiXACkCOYqIO0AFcYJQOqA - 2B5EQ4WIB3S3DIg7QZrpZNmb+UPbMtu4l3ogA5ExNAVuB2m2jn5dgC6PjkHqbGJe5UNoTHmIRbGv+2zj - Xj8F0tBkCsE2sa/vgJNy3JtXQPmT6PJY8CuIekyzYBjsfbCtNAajlmEAYMGdY5x2hhXKJQqQb1ns6+dW - 8S+VoVyiwOC1zCrqlQEMA6udN5bA+gnG1wq9ygZVhhMQbZld3CtDYP12C45jX/+xjXt1H8YHZuZEqFKc - gCSfIQOgnmEUZ8iAvpZFv9WCMokGZFtGDhgIy95cgfJpCkBVD7Dd+LIBWgeBaloa4td9APBZNaRicy5v - AAAAAElFTkSuQmCC - - - - - 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= - - - - - iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj - oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg - hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY - oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA - gVq/Q20bmn0AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj - oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg - hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY - oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA - gVq/Q20bmn0AAAAASUVORK5CYII= @@ -496,6 +445,65 @@ lPVNqM1T/O7hTD/C85foE/9zzQuW6rEkUHG/TcmBCt5xet0HYl5UvCE31wDrvEZpxNlofT/ebe3KrLGZ OFt7nlIJzFY2WbOz7sT5kaJT85JSBdX9cXh4pCg1A2byDJ/EE2zWMryC2dxztFq/AeyqBenl+b8bAAAA AElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj + oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg + hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY + oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA + gVq/Q20bmn0AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABsAAAAaCAYAAABGiCfwAAAABGdBTUEAALGPC/xhBQAAAWdJREFUSEtj + sE56zWsb82q1bezr/7TENnGvfRhsYl5HggViXjYB6UY4jnk9DUgfsI19dcAu7nUDNgzUW4+E94Nx7KtV + aOL1IPPtYl/PZAABIKcfiPcjY6Bh70EYyP4PpM+jy2PBIHVg9WjiQPxmFdgiXACkCOYqIO0AFcYJQOqA + 2B5EQ4WIB3S3DIg7QZrpZNmb+UPbMtu4l3ogA5ExNAVuB2m2jn5dgC6PjkHqbGJe5UNoTHmIRbGv+2zj + Xj8F0tBkCsE2sa/vgJNy3JtXQPmT6PJY8CuIekyzYBjsfbCtNAajlmEAYMGdY5x2hhXKJQqQb1ns6+dW + 8S+VoVyiwOC1zCrqlQEMA6udN5bA+gnG1wq9ygZVhhMQbZld3CtDYP12C45jX/+xjXt1H8YHZuZEqFKc + gCSfIQOgnmEUZ8iAvpZFv9WCMokGZFtGDhgIy95cgfJpCkBVD7Dd+LIBWgeBaloa4td9APBZNaRicy5v + AAAAAElFTkSuQmCC + + + + + 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= + + + + + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj + oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg + hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY + oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA + gVq/Q20bmn0AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj + oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg + hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY + oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA + gVq/Q20bmn0AAAAASUVORK5CYII= diff --git a/PEIS/View/statistics/IStatisticalReportView.cs b/PEIS/View/statistics/IStatisticalReportView.cs index 43ae3af..5a8b1bb 100644 --- a/PEIS/View/statistics/IStatisticalReportView.cs +++ b/PEIS/View/statistics/IStatisticalReportView.cs @@ -44,5 +44,13 @@ namespace PEIS.View.Statistics // 两癌筛查统计表 event EventHandler> GetTwoCancerData; void ShowTwoCancerData(List items); + + // 体检团体筛查 + event EventHandler> GetOrgData; + void ShowOrgData(List items); + + // 团体费用统计 + event EventHandler> GetOrgCostFeeData; + void ShowOrgCostFeeData(List items); } } diff --git a/PEIS/View/statistics/StatisticalReportForm.Designer.cs b/PEIS/View/statistics/StatisticalReportForm.Designer.cs index af57577..32c9ff5 100644 --- a/PEIS/View/statistics/StatisticalReportForm.Designer.cs +++ b/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; } } \ No newline at end of file diff --git a/PEIS/View/statistics/StatisticalReportForm.cs b/PEIS/View/statistics/StatisticalReportForm.cs index 09f7787..2331ad2 100644 --- a/PEIS/View/statistics/StatisticalReportForm.cs +++ b/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 _peopleCount = new List(); public List _eFeeItems = new List(); + public List _orgCostFeeData = new List(); public List _checkCost = new List(); public List _twoCancerData = new List(); + 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{ Item = paramsData }); } @@ -345,6 +413,46 @@ namespace PEIS.View.Statistics HandleReport(); } + // 体检团体筛查 + public event EventHandler> 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 { Item = paramsData }); + } + public void ShowOrgData(List 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> GetOrgCostFeeData; + protected virtual void OnGetOrgCostFeeData() + { + dynamic paramsData = new ExpandoObject(); + paramsData.oEid = _org == null || !TeamRadio.Checked ? -1 : _org.ID; + + GetOrgCostFeeData?.Invoke(this, new Args { Item = paramsData }); + } + public void ShowOrgCostFeeData(List items) + { + Invoke(new Action(() => _orgCostFeeData = items)); + HandleReport(); + } + #endregion #region 树形菜单