diff --git a/PEIS/Entity/TwoCancer.cs b/PEIS/Entity/TwoCancer.cs new file mode 100644 index 0000000..e99f1e4 --- /dev/null +++ b/PEIS/Entity/TwoCancer.cs @@ -0,0 +1,26 @@ +using PEIS.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace PEIS.Entity +{ + public partial class TwoCancer : ObjectData + { + public override String TableName => "v_TwoCancer"; + public Int64 ID { get; set; } + public DateTime ExamDate { get; set; } + public string Name { get; set; } + public string Sex { get; set; } + public string Age { get; set; } + public string Nation { get; set; } + public string CardNo { get; set; } + public DateTime Birthday { get; set; } + public string Tel1 { get; set; } + public string Flag { get; set; } + public string Summary { get; set; } + public string Hpv { get; set; } + public string Summary2 { get; set; } + } +} diff --git a/PEIS/Model/StatisticalReportModel.cs b/PEIS/Model/StatisticalReportModel.cs index 3813291..88d1e65 100644 --- a/PEIS/Model/StatisticalReportModel.cs +++ b/PEIS/Model/StatisticalReportModel.cs @@ -591,5 +591,11 @@ namespace PEIS.Model { return DAOHelp.GetDataBySQL("SELECT DeptCode,DeptName FROM Enrollment_FeeItem GROUP BY DeptCode,DeptName"); } + + // 获取两癌筛查数据 + public List GetTwoCancerData(DateTime begDate, DateTime endDate) + { + return DAOHelp.GetDataBySQL($@"SELECT * FROM v_TwoCancer2 WHERE ExamDate Between '{begDate:yyyy-MM-dd}' and DateAdd(day, 1,'{endDate:yyyy-MM-dd}')"); + } } } diff --git a/PEIS/ReportFiles/TwoCancerCount.frx b/PEIS/ReportFiles/TwoCancerCount.frx new file mode 100644 index 0000000..63f88b5 --- /dev/null +++ b/PEIS/ReportFiles/TwoCancerCount.frx @@ -0,0 +1,129 @@ + + + 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 + { + public double totalSum = 0; + public double totalHisSum = 0; + + private void OrderCount_AfterData(object sender, EventArgs e) + { +// DataSourceBase rowData = Report.GetDataSource("P"); +//// Cell37.Text = rowData["CreateTime"] == null ? "" : rowData["CreateTime"].ToString().Substring(0,16); +//// Cell46.Text = rowData["ChargeTime"] == null ? "" : rowData["ChargeTime"].ToString().Substring(0,16); +//// Cell48.Text = rowData["CostTime"] == null ? "" : rowData["CostTime"].ToString().Substring(0,16); +// +// +// totalSum += Convert.ToDouble(rowData["Sum"].ToString()); +// totalHisSum += Convert.ToDouble(rowData["Fee"].ToString()); +// Cell50.Text = totalSum.ToString(); +// Cell51.Text = totalHisSum.ToString(); +// +// int total = rowData.CurrentRowNo + 1; +// Cell49.Text = "-总计- " + total.ToString() +"笔订单"; + } + + private void Cell43_AfterData(object sender, EventArgs e) + { + if (Cell43.Text != null && Cell43.Text.Length > 0 && Cell43.Text.Substring(0,1).Equals("、")) { + Cell43.Text = Cell43.Text.Substring(1); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PEIS/View/Base/OrgForm.cs b/PEIS/View/Base/OrgForm.cs index 9c90671..f401bab 100644 --- a/PEIS/View/Base/OrgForm.cs +++ b/PEIS/View/Base/OrgForm.cs @@ -21,7 +21,7 @@ namespace PEIS.View.Base public OrgForm() { InitializeComponent(); - Shown += OrgForm_Shown; + Shown += OrgForm_Shown; MenuOrg.TsmiRefresh.Click += (s, e) => { OnGetOrg(); @@ -62,7 +62,7 @@ namespace PEIS.View.Base } private void OrgForm_Shown(object sender, EventArgs e) - { + { OnGetOrg(); } @@ -176,7 +176,7 @@ namespace PEIS.View.Base { var search = TxtSearchPerson.Text.Trim(); if (search == @"输入条件查询") return; - DgcPatient.SetDataSource(string.IsNullOrEmpty(search) ? _lstPatient : _lstPatient.Where(a => a?.Name?.Contains(search)==true || a?.CardNo?.Contains(search)==true).ToList()); + DgcPatient.SetDataSource(string.IsNullOrEmpty(search) ? _lstPatient : _lstPatient.Where(a => a?.Name?.Contains(search) == true || a?.CardNo?.Contains(search) == true).ToList()); } /// /// 点击导入按钮，打开Excel导入界面 @@ -200,7 +200,7 @@ namespace PEIS.View.Base OnGetOrgPatient(); foreach (var item in patients) { - if (_lstPatient.All(p => p.CardNo != item.CardNo)) + if (_lstPatient.All(p => p.CardNo != item.CardNo)) _lstPatient.Add(item); } _lstPatient = _lstPatient.Distinct().ToList(); diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 30f0938..22f6170 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -30,10 +30,10 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm)); - DevExpress.XtraGrid.GridFormatRule gridFormatRule3 = new DevExpress.XtraGrid.GridFormatRule(); - DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression3 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); + DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule(); + DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); @@ -944,13 +944,13 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FastGroupMove}); this.contextMenuStrip1.Name = "CostFastMenu"; - this.contextMenuStrip1.Size = new System.Drawing.Size(131, 28); + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 26); // // FastGroupMove // this.FastGroupMove.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastGroupMove.Name = "FastGroupMove"; - this.FastGroupMove.Size = new System.Drawing.Size(130, 24); + this.FastGroupMove.Size = new System.Drawing.Size(124, 22); this.FastGroupMove.Text = "批量移除"; // // DgvGroupPatient @@ -2948,20 +2948,20 @@ this.toolStripMenuItem15, this.PFastRefreshCost}); this.PersonCostFastMenu.Name = "CostFastMenu"; - this.PersonCostFastMenu.Size = new System.Drawing.Size(169, 276); + this.PersonCostFastMenu.Size = new System.Drawing.Size(161, 276); // // PFastCharge // this.PFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCharge.Image"))); this.PFastCharge.Name = "PFastCharge"; - this.PFastCharge.Size = new System.Drawing.Size(168, 34); + this.PFastCharge.Size = new System.Drawing.Size(160, 34); this.PFastCharge.Text = "记账"; // // PFastAllCharge // this.PFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastAllCharge.Image"))); this.PFastAllCharge.Name = "PFastAllCharge"; - this.PFastAllCharge.Size = new System.Drawing.Size(168, 34); + this.PFastAllCharge.Size = new System.Drawing.Size(160, 34); this.PFastAllCharge.Text = "全部记账"; // // PFastDeleteCost @@ -2969,7 +2969,7 @@ this.PFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("PFastDeleteCost.Image"))); this.PFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastDeleteCost.Name = "PFastDeleteCost"; - this.PFastDeleteCost.Size = new System.Drawing.Size(168, 34); + this.PFastDeleteCost.Size = new System.Drawing.Size(160, 34); this.PFastDeleteCost.Text = "删除订单"; // // PFastCancelCharge @@ -2977,7 +2977,7 @@ this.PFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCancelCharge.Image"))); this.PFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastCancelCharge.Name = "PFastCancelCharge"; - this.PFastCancelCharge.Size = new System.Drawing.Size(168, 34); + this.PFastCancelCharge.Size = new System.Drawing.Size(160, 34); this.PFastCancelCharge.Text = "取消记账"; // // PFastChangeCost @@ -2985,20 +2985,20 @@ this.PFastChangeCost.Image = global::PEIS.Properties.Resources.刷新; this.PFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastChangeCost.Name = "PFastChangeCost"; - this.PFastChangeCost.Size = new System.Drawing.Size(168, 34); + this.PFastChangeCost.Size = new System.Drawing.Size(160, 34); this.PFastChangeCost.Text = "订单转换"; // // toolStripMenuItem14 // this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(168, 34); + this.toolStripMenuItem14.Size = new System.Drawing.Size(160, 34); this.toolStripMenuItem14.Text = "全部删除订单"; this.toolStripMenuItem14.Visible = false; // // toolStripMenuItem15 // this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(168, 34); + this.toolStripMenuItem15.Size = new System.Drawing.Size(160, 34); this.toolStripMenuItem15.Text = "全部取消记账"; this.toolStripMenuItem15.Visible = false; // @@ -3007,7 +3007,7 @@ this.PFastRefreshCost.Image = global::PEIS.Properties.Resources.刷新; this.PFastRefreshCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastRefreshCost.Name = "PFastRefreshCost"; - this.PFastRefreshCost.Size = new System.Drawing.Size(168, 34); + this.PFastRefreshCost.Size = new System.Drawing.Size(160, 34); this.PFastRefreshCost.Text = "刷新订单"; this.PFastRefreshCost.Visible = false; // @@ -3039,15 +3039,15 @@ this.gridColumn100, this.gridColumn99}); this.DgvCheckCost2.FixedLineWidth = 1; - gridFormatRule3.ApplyToRow = true; - gridFormatRule3.Column = this.gridColumn99; - gridFormatRule3.Name = "Format0"; - formatConditionRuleExpression3.Appearance.ForeColor = System.Drawing.Color.Gray; - formatConditionRuleExpression3.Appearance.Options.UseForeColor = true; - formatConditionRuleExpression3.Expression = "[CancelTime] Is Not Null"; - formatConditionRuleExpression3.PredefinedName = "Strikeout Text"; - gridFormatRule3.Rule = formatConditionRuleExpression3; - this.DgvCheckCost2.FormatRules.Add(gridFormatRule3); + gridFormatRule1.ApplyToRow = true; + gridFormatRule1.Column = this.gridColumn99; + gridFormatRule1.Name = "Format0"; + formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray; + formatConditionRuleExpression1.Appearance.Options.UseForeColor = true; + formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null"; + formatConditionRuleExpression1.PredefinedName = "Strikeout Text"; + gridFormatRule1.Rule = formatConditionRuleExpression1; + this.DgvCheckCost2.FormatRules.Add(gridFormatRule1); this.DgvCheckCost2.GridControl = this.DgcCheckCost2; this.DgvCheckCost2.GroupFormat = "{0}"; this.DgvCheckCost2.IndicatorWidth = 65; @@ -3402,20 +3402,20 @@ this.TFastAllDeleteCost, this.TFastAllCancelCharge}); this.TeamCostFastMenu.Name = "CostFastMenu"; - this.TeamCostFastMenu.Size = new System.Drawing.Size(169, 242); + this.TeamCostFastMenu.Size = new System.Drawing.Size(161, 242); // // TFastCharge // this.TFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCharge.Image"))); this.TFastCharge.Name = "TFastCharge"; - this.TFastCharge.Size = new System.Drawing.Size(168, 34); + this.TFastCharge.Size = new System.Drawing.Size(160, 34); this.TFastCharge.Text = "记账"; // // TFastAllCharge // this.TFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastAllCharge.Image"))); this.TFastAllCharge.Name = "TFastAllCharge"; - this.TFastAllCharge.Size = new System.Drawing.Size(168, 34); + this.TFastAllCharge.Size = new System.Drawing.Size(160, 34); this.TFastAllCharge.Text = "全部记账"; // // TFastDeleteCost @@ -3423,7 +3423,7 @@ this.TFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("TFastDeleteCost.Image"))); this.TFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastDeleteCost.Name = "TFastDeleteCost"; - this.TFastDeleteCost.Size = new System.Drawing.Size(168, 34); + this.TFastDeleteCost.Size = new System.Drawing.Size(160, 34); this.TFastDeleteCost.Text = "删除订单"; // // TFastCancelCharge @@ -3431,7 +3431,7 @@ this.TFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCancelCharge.Image"))); this.TFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastCancelCharge.Name = "TFastCancelCharge"; - this.TFastCancelCharge.Size = new System.Drawing.Size(168, 34); + this.TFastCancelCharge.Size = new System.Drawing.Size(160, 34); this.TFastCancelCharge.Text = "取消记账"; // // TFastChangeCost @@ -3439,20 +3439,20 @@ this.TFastChangeCost.Image = global::PEIS.Properties.Resources.刷新; this.TFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastChangeCost.Name = "TFastChangeCost"; - this.TFastChangeCost.Size = new System.Drawing.Size(168, 34); + this.TFastChangeCost.Size = new System.Drawing.Size(160, 34); this.TFastChangeCost.Text = "订单转换"; // // TFastAllDeleteCost // this.TFastAllDeleteCost.Name = "TFastAllDeleteCost"; - this.TFastAllDeleteCost.Size = new System.Drawing.Size(168, 34); + this.TFastAllDeleteCost.Size = new System.Drawing.Size(160, 34); this.TFastAllDeleteCost.Text = "全部删除订单"; this.TFastAllDeleteCost.Visible = false; // // TFastAllCancelCharge // this.TFastAllCancelCharge.Name = "TFastAllCancelCharge"; - this.TFastAllCancelCharge.Size = new System.Drawing.Size(168, 34); + this.TFastAllCancelCharge.Size = new System.Drawing.Size(160, 34); this.TFastAllCancelCharge.Text = "全部取消记账"; this.TFastAllCancelCharge.Visible = false; // @@ -3485,15 +3485,15 @@ this.gridColumn101, this.gridColumn102}); this.DgvCheckCost.FixedLineWidth = 1; - gridFormatRule1.ApplyToRow = true; - gridFormatRule1.Column = this.gridColumn102; - gridFormatRule1.Name = "Format0"; - formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray; - formatConditionRuleExpression1.Appearance.Options.UseForeColor = true; - formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null"; - formatConditionRuleExpression1.PredefinedName = "Strikeout Text"; - gridFormatRule1.Rule = formatConditionRuleExpression1; - this.DgvCheckCost.FormatRules.Add(gridFormatRule1); + gridFormatRule2.ApplyToRow = true; + gridFormatRule2.Column = this.gridColumn102; + gridFormatRule2.Name = "Format0"; + formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Gray; + formatConditionRuleExpression2.Appearance.Options.UseForeColor = true; + formatConditionRuleExpression2.Expression = "[CancelTime] Is Not Null"; + formatConditionRuleExpression2.PredefinedName = "Strikeout Text"; + gridFormatRule2.Rule = formatConditionRuleExpression2; + this.DgvCheckCost.FormatRules.Add(gridFormatRule2); this.DgvCheckCost.GridControl = this.DgcCheckCost; this.DgvCheckCost.GroupCount = 1; this.DgvCheckCost.GroupFormat = ""; @@ -4497,7 +4497,7 @@ this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(828, 44); + this.menuStrip1.Size = new System.Drawing.Size(789, 44); this.menuStrip1.TabIndex = 129; this.menuStrip1.Text = "menuStrip1"; // @@ -4506,7 +4506,7 @@ this.TsmiCheckOrg.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckOrg.Image"))); this.TsmiCheckOrg.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiCheckOrg.Name = "TsmiCheckOrg"; - this.TsmiCheckOrg.Size = new System.Drawing.Size(127, 40); + this.TsmiCheckOrg.Size = new System.Drawing.Size(120, 40); this.TsmiCheckOrg.Text = "生成团体订单"; // // toolStripMenuItem1 @@ -4519,7 +4519,7 @@ this.TsmiCheckPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckPerson.Image"))); this.TsmiCheckPerson.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiCheckPerson.Name = "TsmiCheckPerson"; - this.TsmiCheckPerson.Size = new System.Drawing.Size(129, 40); + this.TsmiCheckPerson.Size = new System.Drawing.Size(122, 40); this.TsmiCheckPerson.Text = "生成个人订单"; // // toolStripMenuItem7 @@ -4536,28 +4536,28 @@ this.TsmiPrintCost.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintCost.Image"))); this.TsmiPrintCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPrintCost.Name = "TsmiPrintCost"; - this.TsmiPrintCost.Size = new System.Drawing.Size(122, 40); + this.TsmiPrintCost.Size = new System.Drawing.Size(116, 40); this.TsmiPrintCost.Text = "打印收费单"; // // TsmiPrintPerson // this.TsmiPrintPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintPerson.Image"))); this.TsmiPrintPerson.Name = "TsmiPrintPerson"; - this.TsmiPrintPerson.Size = new System.Drawing.Size(199, 26); + this.TsmiPrintPerson.Size = new System.Drawing.Size(188, 26); this.TsmiPrintPerson.Text = "打印个人收费单"; // // TsmiPrintTeam // this.TsmiPrintTeam.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintTeam.Image"))); this.TsmiPrintTeam.Name = "TsmiPrintTeam"; - this.TsmiPrintTeam.Size = new System.Drawing.Size(199, 26); + this.TsmiPrintTeam.Size = new System.Drawing.Size(188, 26); this.TsmiPrintTeam.Text = "打印团体收费单"; // // TsmiPrintGroup // this.TsmiPrintGroup.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGroup.Image"))); this.TsmiPrintGroup.Name = "TsmiPrintGroup"; - this.TsmiPrintGroup.Size = new System.Drawing.Size(199, 26); + this.TsmiPrintGroup.Size = new System.Drawing.Size(188, 26); this.TsmiPrintGroup.Text = "打印团体分组收费单"; // // toolStripMenuItem3 @@ -4571,7 +4571,7 @@ this.TsmiFee.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFee.Image"))); this.TsmiFee.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiFee.Name = "TsmiFee"; - this.TsmiFee.Size = new System.Drawing.Size(83, 40); + this.TsmiFee.Size = new System.Drawing.Size(80, 40); this.TsmiFee.Text = "记账"; this.TsmiFee.Visible = false; // @@ -4585,7 +4585,7 @@ this.TsmiSend.Image = ((System.Drawing.Image)(resources.GetObject("TsmiSend.Image"))); this.TsmiSend.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiSend.Name = "TsmiSend"; - this.TsmiSend.Size = new System.Drawing.Size(118, 40); + this.TsmiSend.Size = new System.Drawing.Size(112, 40); this.TsmiSend.Text = "发送到科室"; // // toolStripMenuItem4 @@ -4598,7 +4598,7 @@ this.TsmiPrintGuide.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGuide.Image"))); this.TsmiPrintGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPrintGuide.Name = "TsmiPrintGuide"; - this.TsmiPrintGuide.Size = new System.Drawing.Size(122, 40); + this.TsmiPrintGuide.Size = new System.Drawing.Size(116, 40); this.TsmiPrintGuide.Text = "打印导检单"; // // toolStripMenuItem5 @@ -4611,7 +4611,7 @@ this.TsmiOpenFeeItem.Image = ((System.Drawing.Image)(resources.GetObject("TsmiOpenFeeItem.Image"))); this.TsmiOpenFeeItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiOpenFeeItem.Name = "TsmiOpenFeeItem"; - this.TsmiOpenFeeItem.Size = new System.Drawing.Size(127, 40); + this.TsmiOpenFeeItem.Size = new System.Drawing.Size(120, 40); this.TsmiOpenFeeItem.Text = "打开收费项目"; // // toolStripMenuItem6 @@ -4624,7 +4624,7 @@ this.TsmiBatchCtrl.Image = ((System.Drawing.Image)(resources.GetObject("TsmiBatchCtrl.Image"))); this.TsmiBatchCtrl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiBatchCtrl.Name = "TsmiBatchCtrl"; - this.TsmiBatchCtrl.Size = new System.Drawing.Size(109, 40); + this.TsmiBatchCtrl.Size = new System.Drawing.Size(104, 40); this.TsmiBatchCtrl.Text = "批量操作"; this.TsmiBatchCtrl.Visible = false; // @@ -4676,14 +4676,14 @@ this.FastGroup, this.FastCancelGroup}); this.InfoFastMenu.Name = "CostFastMenu"; - this.InfoFastMenu.Size = new System.Drawing.Size(217, 214); + this.InfoFastMenu.Size = new System.Drawing.Size(205, 214); // // FastCamera // this.FastCamera.Image = ((System.Drawing.Image)(resources.GetObject("FastCamera.Image"))); this.FastCamera.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastCamera.Name = "FastCamera"; - this.FastCamera.Size = new System.Drawing.Size(216, 30); + this.FastCamera.Size = new System.Drawing.Size(204, 30); this.FastCamera.Text = "拍照"; // // FastDelete @@ -4691,41 +4691,41 @@ this.FastDelete.Image = ((System.Drawing.Image)(resources.GetObject("FastDelete.Image"))); this.FastDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDelete.Name = "FastDelete"; - this.FastDelete.Size = new System.Drawing.Size(216, 30); + this.FastDelete.Size = new System.Drawing.Size(204, 30); this.FastDelete.Text = "删除成员"; // // FastExport // this.FastExport.Image = global::PEIS.Properties.Resources.Excel; this.FastExport.Name = "FastExport"; - this.FastExport.Size = new System.Drawing.Size(216, 30); + this.FastExport.Size = new System.Drawing.Size(204, 30); this.FastExport.Text = "导出所有成员"; // // FastExportTime // this.FastExportTime.Image = global::PEIS.Properties.Resources.Excel; this.FastExportTime.Name = "FastExportTime"; - this.FastExportTime.Size = new System.Drawing.Size(216, 30); + this.FastExportTime.Size = new System.Drawing.Size(204, 30); this.FastExportTime.Text = "导出指定时间范围成员"; // // FastRecall // this.FastRecall.Image = global::PEIS.Properties.Resources.取消弃检; this.FastRecall.Name = "FastRecall"; - this.FastRecall.Size = new System.Drawing.Size(216, 30); + this.FastRecall.Size = new System.Drawing.Size(204, 30); this.FastRecall.Text = "撤回发送"; // // FastGroup // this.FastGroup.Name = "FastGroup"; - this.FastGroup.Size = new System.Drawing.Size(216, 30); + this.FastGroup.Size = new System.Drawing.Size(204, 30); this.FastGroup.Text = "组合缴费"; this.FastGroup.Visible = false; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; - this.FastCancelGroup.Size = new System.Drawing.Size(216, 30); + this.FastCancelGroup.Size = new System.Drawing.Size(204, 30); this.FastCancelGroup.Text = "取消组合缴费"; this.FastCancelGroup.Visible = false; // diff --git a/PEIS/View/statistics/IStatisticalReportView.cs b/PEIS/View/statistics/IStatisticalReportView.cs index 95a1e19..43ae3af 100644 --- a/PEIS/View/statistics/IStatisticalReportView.cs +++ b/PEIS/View/statistics/IStatisticalReportView.cs @@ -40,5 +40,9 @@ namespace PEIS.View.Statistics // 订单统计表 event EventHandler> GetCheckCost; void ShowCheckCost(List items); + + // 两癌筛查统计表 + event EventHandler> GetTwoCancerData; + void ShowTwoCancerData(List items); } } diff --git a/PEIS/View/statistics/StatisticalReportForm.Designer.cs b/PEIS/View/statistics/StatisticalReportForm.Designer.cs index 4352f6b..af57577 100644 --- a/PEIS/View/statistics/StatisticalReportForm.Designer.cs +++ b/PEIS/View/statistics/StatisticalReportForm.Designer.cs @@ -31,6 +31,7 @@ this.ReportTree = new DevExpress.XtraTreeList.TreeList(); this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl(); this.panel1 = new System.Windows.Forms.Panel(); + this.AllRadio = new System.Windows.Forms.RadioButton(); this.PersonRadio = new System.Windows.Forms.RadioButton(); this.TeamRadio = new System.Windows.Forms.RadioButton(); this.label4 = new System.Windows.Forms.Label(); @@ -42,7 +43,6 @@ this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.ReportPreview = new FastReport.Preview.PreviewControl(); - this.AllRadio = new System.Windows.Forms.RadioButton(); ((System.ComponentModel.ISupportInitialize)(this.ReportTree)).BeginInit(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -53,7 +53,7 @@ this.ReportTree.ColumnPanelRowHeight = 30; this.ReportTree.Dock = System.Windows.Forms.DockStyle.Left; this.ReportTree.Location = new System.Drawing.Point(0, 0); - this.ReportTree.Margin = new System.Windows.Forms.Padding(5); + this.ReportTree.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.ReportTree.Name = "ReportTree"; this.ReportTree.OptionsBehavior.AutoNodeHeight = false; this.ReportTree.OptionsMenu.EnableColumnMenu = false; @@ -62,17 +62,17 @@ this.ReportTree.OptionsPrint.AutoRowHeight = false; this.ReportTree.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.False; this.ReportTree.RowHeight = 30; - this.ReportTree.Size = new System.Drawing.Size(342, 1161); + this.ReportTree.Size = new System.Drawing.Size(171, 637); this.ReportTree.TabIndex = 7; // // splitterControl1 // this.splitterControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitterControl1.Appearance.Options.UseBackColor = true; - this.splitterControl1.Location = new System.Drawing.Point(342, 0); - this.splitterControl1.Margin = new System.Windows.Forms.Padding(5); + this.splitterControl1.Location = new System.Drawing.Point(171, 0); + this.splitterControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitterControl1.Name = "splitterControl1"; - this.splitterControl1.Size = new System.Drawing.Size(10, 1161); + this.splitterControl1.Size = new System.Drawing.Size(5, 637); this.splitterControl1.TabIndex = 8; this.splitterControl1.TabStop = false; // @@ -91,18 +91,30 @@ this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(352, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(5); + this.panel1.Location = new System.Drawing.Point(176, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1748, 126); + this.panel1.Size = new System.Drawing.Size(874, 69); this.panel1.TabIndex = 9; // + // 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.Name = "AllRadio"; + this.AllRadio.Size = new System.Drawing.Size(74, 21); + this.AllRadio.TabIndex = 11; + this.AllRadio.Text = "全部统计"; + this.AllRadio.UseVisualStyleBackColor = true; + // // PersonRadio // this.PersonRadio.AutoSize = true; - this.PersonRadio.Location = new System.Drawing.Point(751, 75); + this.PersonRadio.Location = new System.Drawing.Point(376, 41); + this.PersonRadio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.PersonRadio.Name = "PersonRadio"; - this.PersonRadio.Size = new System.Drawing.Size(141, 35); + this.PersonRadio.Size = new System.Drawing.Size(74, 21); this.PersonRadio.TabIndex = 10; this.PersonRadio.Text = "个人统计"; this.PersonRadio.UseVisualStyleBackColor = true; @@ -111,9 +123,10 @@ // this.TeamRadio.AutoSize = true; this.TeamRadio.Checked = true; - this.TeamRadio.Location = new System.Drawing.Point(592, 75); + this.TeamRadio.Location = new System.Drawing.Point(296, 41); + this.TeamRadio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.TeamRadio.Name = "TeamRadio"; - this.TeamRadio.Size = new System.Drawing.Size(141, 35); + this.TeamRadio.Size = new System.Drawing.Size(74, 21); this.TeamRadio.TabIndex = 9; this.TeamRadio.TabStop = true; this.TeamRadio.Text = "团体统计"; @@ -122,20 +135,20 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(474, 76); - this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Location = new System.Drawing.Point(237, 42); + this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(110, 31); + this.label4.Size = new System.Drawing.Size(56, 17); this.label4.TabIndex = 8; this.label4.Text = "执行科室"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(9, 76); - this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label3.Location = new System.Drawing.Point(4, 42); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(110, 31); + this.label3.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 7; this.label3.Text = "执行科室"; // @@ -145,19 +158,19 @@ this.DeptComboBox.Enabled = false; this.DeptComboBox.FormattingEnabled = true; this.DeptComboBox.IntegralHeight = false; - this.DeptComboBox.Location = new System.Drawing.Point(126, 71); - this.DeptComboBox.Margin = new System.Windows.Forms.Padding(5); + this.DeptComboBox.Location = new System.Drawing.Point(63, 39); + this.DeptComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DeptComboBox.Name = "DeptComboBox"; - this.DeptComboBox.Size = new System.Drawing.Size(301, 39); + this.DeptComboBox.Size = new System.Drawing.Size(152, 25); this.DeptComboBox.TabIndex = 6; // // refreshBtn // this.refreshBtn.Image = global::PEIS.Properties.Resources.刷新; - this.refreshBtn.Location = new System.Drawing.Point(963, 8); - this.refreshBtn.Margin = new System.Windows.Forms.Padding(5); + this.refreshBtn.Location = new System.Drawing.Point(482, 4); + this.refreshBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.refreshBtn.Name = "refreshBtn"; - this.refreshBtn.Size = new System.Drawing.Size(135, 59); + this.refreshBtn.Size = new System.Drawing.Size(68, 32); this.refreshBtn.TabIndex = 5; this.refreshBtn.Text = "刷新"; this.refreshBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -168,39 +181,39 @@ // this.EndDate.CustomFormat = " yyyy 年 MM 月 dd 日"; this.EndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.EndDate.Location = new System.Drawing.Point(591, 14); - this.EndDate.Margin = new System.Windows.Forms.Padding(5); + this.EndDate.Location = new System.Drawing.Point(296, 8); + this.EndDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.EndDate.Name = "EndDate"; - this.EndDate.Size = new System.Drawing.Size(301, 39); + this.EndDate.Size = new System.Drawing.Size(152, 23); this.EndDate.TabIndex = 4; // // BegDate // this.BegDate.CustomFormat = " yyyy 年 MM 月 dd 日"; this.BegDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.BegDate.Location = new System.Drawing.Point(126, 14); - this.BegDate.Margin = new System.Windows.Forms.Padding(5); + this.BegDate.Location = new System.Drawing.Point(63, 8); + this.BegDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.BegDate.Name = "BegDate"; - this.BegDate.Size = new System.Drawing.Size(301, 39); + this.BegDate.Size = new System.Drawing.Size(152, 23); this.BegDate.TabIndex = 3; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(474, 20); - this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label2.Location = new System.Drawing.Point(237, 11); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(110, 31); + this.label2.Size = new System.Drawing.Size(56, 17); this.label2.TabIndex = 2; this.label2.Text = "终止日期"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 22); - this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Location = new System.Drawing.Point(4, 12); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(110, 31); + this.label1.Size = new System.Drawing.Size(56, 17); this.label1.TabIndex = 1; this.label1.Text = "起始日期"; // @@ -211,35 +224,24 @@ | FastReport.PreviewButtons.Navigator))); this.ReportPreview.Dock = System.Windows.Forms.DockStyle.Fill; this.ReportPreview.Font = new System.Drawing.Font("宋体", 9F); - this.ReportPreview.Location = new System.Drawing.Point(352, 126); - this.ReportPreview.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.ReportPreview.Location = new System.Drawing.Point(176, 69); this.ReportPreview.Name = "ReportPreview"; this.ReportPreview.PageOffset = new System.Drawing.Point(10, 10); this.ReportPreview.RightToLeft = System.Windows.Forms.RightToLeft.No; this.ReportPreview.SaveInitialDirectory = null; - this.ReportPreview.Size = new System.Drawing.Size(1748, 1035); + this.ReportPreview.Size = new System.Drawing.Size(874, 568); this.ReportPreview.TabIndex = 10; // - // AllRadio - // - this.AllRadio.AutoSize = true; - this.AllRadio.Location = new System.Drawing.Point(910, 75); - this.AllRadio.Name = "AllRadio"; - this.AllRadio.Size = new System.Drawing.Size(141, 35); - this.AllRadio.TabIndex = 11; - this.AllRadio.Text = "全部统计"; - this.AllRadio.UseVisualStyleBackColor = true; - // // StatisticalReportForm // - 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(2100, 1161); + this.ClientSize = new System.Drawing.Size(1050, 637); this.Controls.Add(this.ReportPreview); this.Controls.Add(this.panel1); this.Controls.Add(this.splitterControl1); this.Controls.Add(this.ReportTree); - this.Margin = new System.Windows.Forms.Padding(5); + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Name = "StatisticalReportForm"; this.Text = "PeopleCountForm"; ((System.ComponentModel.ISupportInitialize)(this.ReportTree)).EndInit(); diff --git a/PEIS/View/statistics/StatisticalReportForm.cs b/PEIS/View/statistics/StatisticalReportForm.cs index b26228e..09f7787 100644 --- a/PEIS/View/statistics/StatisticalReportForm.cs +++ b/PEIS/View/statistics/StatisticalReportForm.cs @@ -25,6 +25,7 @@ namespace PEIS.View.Statistics public List _peopleCount = new List(); public List _eFeeItems = new List(); public List _checkCost = new List(); + public List _twoCancerData = new List(); public StatisticalReportForm() { @@ -64,6 +65,16 @@ namespace PEIS.View.Statistics RefreshBtn_Click(sender, e); HandleReport(); break; + case "两癌筛查统计": + _parentNode = "TwoCancerCount"; + TeamRadio.Enabled = false; + TeamRadio.Checked = false; + PersonRadio.Enabled = false; + PersonRadio.Checked = false; + AllRadio.Checked = true; + RefreshBtn_Click(sender, e); + HandleReport(); + break; } } else @@ -108,8 +119,6 @@ namespace PEIS.View.Statistics RefreshBtn_Click(sender, e); HandleReport(); } - - } private void RefreshBtn_Click(object sender, EventArgs e) @@ -135,6 +144,9 @@ namespace PEIS.View.Statistics case "CostCount": OnGetEFeeItems(); break; + case "TwoCancerCount": + OnGetTwoCancerData(); + break; default: Global.Msg("info","请选择统计表!"); break; @@ -171,6 +183,10 @@ namespace PEIS.View.Statistics sReport.SetParameterValue("TotalFee", _eFeeItems.Sum(s => s.Fee)); sReport.SetParameterValue("DeptName", (DeptComboBox.SelectedItem as User)?.DeptName); break; + case "TwoCancerCount": + sReport.SetParameterValue("TotalCount", _twoCancerData.Count); + sReport.RegisterData(_twoCancerData, "p"); + break; } DataBand dataBand = sReport.Report.FindObject(_parentNode) as DataBand; @@ -206,7 +222,10 @@ namespace PEIS.View.Statistics new StatisticalTree() { Id = 10, ParentId = 6, Name = "按发送日期统计"}, // 费用明细统计表 - new StatisticalTree() { Id = 11, ParentId = 11, Name = "费用明细统计表",} + new StatisticalTree() { Id = 11, ParentId = 11, Name = "费用明细统计表",}, + + // 两癌筛查统计 + new StatisticalTree() { Id = 12, ParentId = 12, Name = "两癌筛查统计",} }; ImageList imageList = new ImageList(); @@ -302,7 +321,7 @@ namespace PEIS.View.Statistics } protected virtual void OnGetCheckCost() { - dynamic paramsData = new ExpandoObject(); + dynamic paramsData = new ExpandoObject(); paramsData.dateType = _reportType; paramsData.begDate = BegDate.Value; paramsData.endDate = EndDate.Value; @@ -311,6 +330,21 @@ namespace PEIS.View.Statistics GetCheckCost?.Invoke(this, new Args{ Item = paramsData }); } + // 两癌筛查统计表 + public event EventHandler> GetTwoCancerData; + protected virtual void OnGetTwoCancerData() + { + dynamic paramsData = new ExpandoObject(); + paramsData.begDate = BegDate.Value; + paramsData.endDate = EndDate.Value; + GetTwoCancerData?.Invoke(this, new Args { Item = paramsData }); + } + public void ShowTwoCancerData(List items) + { + Invoke(new Action(() => _twoCancerData = items)); + HandleReport(); + } + #endregion #region 树形菜单