From 8f8d43c2f2720486d5db8753496574d490fa1196 Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 29 Aug 2024 10:52:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C2=E3=80=81=E5=9B=A2=E4=BD=93=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD=E5=85=B3?= =?UTF-8?q?=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/StatisticalReportModel.cs | 15 ++++- PEIS/ReportFiles/OrderCount.frx | 48 ++++++++------ PEIS/ReportFiles/PeopleCount.frx | 32 +++++----- .../Enrollment/EnrollmentOrgForm.Designer.cs | 62 +++++++++---------- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 20 +++--- 5 files changed, 99 insertions(+), 78 deletions(-) diff --git a/PEIS/Model/StatisticalReportModel.cs b/PEIS/Model/StatisticalReportModel.cs index f0c677a..3813291 100644 --- a/PEIS/Model/StatisticalReportModel.cs +++ b/PEIS/Model/StatisticalReportModel.cs @@ -98,6 +98,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -125,6 +126,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -151,6 +153,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -183,6 +186,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -210,6 +214,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -236,6 +241,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -268,6 +274,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -295,6 +302,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -321,6 +329,7 @@ namespace PEIS.Model a.SignTime, a.CreateTime, a.FinishTime, + a.Signer, a.CardNo FROM Enrollment_Patient a @@ -512,7 +521,11 @@ namespace PEIS.Model a.Coster, CASE WHEN a.CostTime IS NOT NULL THEN CONVERT ( datetime, a.CostTime, 20 ) - END AS CostTime + END AS CostTime, + a.Sender, + CASE WHEN a.SendTime IS NOT NULL + THEN CONVERT ( datetime, a.SendTime, 20 ) + END AS SendTime FROM Enrollment_CheckCost a LEFT JOIN Enrollment_Patient b ON a.EID = b.ID LEFT JOIN Enrollment_Org c ON a.OEID = c.ID"; diff --git a/PEIS/ReportFiles/OrderCount.frx b/PEIS/ReportFiles/OrderCount.frx index 6333bee..d8e427a 100644 --- a/PEIS/ReportFiles/OrderCount.frx +++ b/PEIS/ReportFiles/OrderCount.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -55,23 +55,25 @@ namespace FastReport - + - + - + - + - - + + + + @@ -84,27 +86,31 @@ namespace FastReport - - + + + + - + - + - + - + - - + + + + @@ -117,17 +123,19 @@ namespace FastReport - - + + + + - + - + @@ -135,7 +143,7 @@ namespace FastReport - + diff --git a/PEIS/ReportFiles/PeopleCount.frx b/PEIS/ReportFiles/PeopleCount.frx index 82e88a3..d83ca37 100644 --- a/PEIS/ReportFiles/PeopleCount.frx +++ b/PEIS/ReportFiles/PeopleCount.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -71,43 +71,46 @@ namespace FastReport - + - + - + + - + - + - - - - - + + + + + + - + - + - + + @@ -120,6 +123,7 @@ namespace FastReport + diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 37099ba..e99350c 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -94,7 +94,7 @@ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.DgcPatient = new DevExpress.XtraGrid.GridControl(); this.DgvPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -1303,7 +1303,7 @@ this.DgvPatient.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DgvPatient.Appearance.Row.Options.UseFont = true; this.DgvPatient.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn106, + this.gridColumn29, this.gridColumn20, this.gridColumn22, this.gridColumn26, @@ -1326,23 +1326,20 @@ this.DgvPatient.OptionsView.ShowGroupPanel = false; this.DgvPatient.RowHeight = 40; // - // gridColumn106 - // - this.gridColumn106.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn106.AppearanceCell.Options.UseFont = true; - this.gridColumn106.Caption = "部门"; - this.gridColumn106.FieldName = "DeptName"; - this.gridColumn106.Name = "gridColumn106"; - this.gridColumn106.OptionsColumn.AllowEdit = false; - this.gridColumn106.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn106.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn106.OptionsColumn.AllowMove = false; - this.gridColumn106.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn106.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn106.OptionsColumn.ReadOnly = true; - this.gridColumn106.OptionsFilter.AllowFilter = false; - this.gridColumn106.Visible = true; - this.gridColumn106.VisibleIndex = 0; + // gridColumn29 + // + this.gridColumn29.Caption = "部门"; + this.gridColumn29.FieldName = "DeptName"; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.OptionsColumn.AllowEdit = false; + this.gridColumn29.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn29.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn29.OptionsColumn.AllowMove = false; + this.gridColumn29.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn29.OptionsColumn.ReadOnly = true; + this.gridColumn29.OptionsFilter.AllowFilter = false; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 0; // // gridColumn20 // @@ -4678,8 +4675,6 @@ this.gridColumn97.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn97.OptionsColumn.ReadOnly = true; this.gridColumn97.OptionsFilter.AllowFilter = false; - this.gridColumn97.Visible = true; - this.gridColumn97.VisibleIndex = 0; // // repositoryItemCheckEdit3 // @@ -4722,7 +4717,7 @@ this.gridColumn103.OptionsColumn.ReadOnly = true; this.gridColumn103.OptionsFilter.AllowFilter = false; this.gridColumn103.Visible = true; - this.gridColumn103.VisibleIndex = 1; + this.gridColumn103.VisibleIndex = 0; this.gridColumn103.Width = 82; // // gridColumn89 @@ -4742,7 +4737,7 @@ this.gridColumn89.OptionsColumn.ReadOnly = true; this.gridColumn89.OptionsFilter.AllowFilter = false; this.gridColumn89.Visible = true; - this.gridColumn89.VisibleIndex = 2; + this.gridColumn89.VisibleIndex = 1; this.gridColumn89.Width = 60; // // gridColumn90 @@ -4762,7 +4757,7 @@ this.gridColumn90.OptionsColumn.ReadOnly = true; this.gridColumn90.OptionsFilter.AllowFilter = false; this.gridColumn90.Visible = true; - this.gridColumn90.VisibleIndex = 3; + this.gridColumn90.VisibleIndex = 2; this.gridColumn90.Width = 40; // // gridColumn108 @@ -4782,7 +4777,7 @@ this.gridColumn108.OptionsColumn.ReadOnly = true; this.gridColumn108.OptionsFilter.AllowFilter = false; this.gridColumn108.Visible = true; - this.gridColumn108.VisibleIndex = 4; + this.gridColumn108.VisibleIndex = 3; this.gridColumn108.Width = 30; // // gridColumn91 @@ -4799,7 +4794,7 @@ this.gridColumn91.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn91.OptionsColumn.ReadOnly = true; this.gridColumn91.Visible = true; - this.gridColumn91.VisibleIndex = 5; + this.gridColumn91.VisibleIndex = 4; // // gridColumn93 // @@ -4818,7 +4813,7 @@ this.gridColumn93.OptionsColumn.ReadOnly = true; this.gridColumn93.OptionsFilter.AllowFilter = false; this.gridColumn93.Visible = true; - this.gridColumn93.VisibleIndex = 6; + this.gridColumn93.VisibleIndex = 5; this.gridColumn93.Width = 60; // // gridColumn94 @@ -4841,7 +4836,7 @@ this.gridColumn94.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")}); this.gridColumn94.Visible = true; - this.gridColumn94.VisibleIndex = 7; + this.gridColumn94.VisibleIndex = 6; this.gridColumn94.Width = 100; // // gridColumn95 @@ -4862,7 +4857,7 @@ this.gridColumn95.OptionsColumn.ReadOnly = true; this.gridColumn95.OptionsFilter.AllowFilter = false; this.gridColumn95.Visible = true; - this.gridColumn95.VisibleIndex = 8; + this.gridColumn95.VisibleIndex = 7; this.gridColumn95.Width = 80; // // gridColumn96 @@ -4882,7 +4877,7 @@ this.gridColumn96.OptionsColumn.ReadOnly = true; this.gridColumn96.OptionsFilter.AllowFilter = false; this.gridColumn96.Visible = true; - this.gridColumn96.VisibleIndex = 9; + this.gridColumn96.VisibleIndex = 8; this.gridColumn96.Width = 160; // // gridColumn105 @@ -4900,7 +4895,7 @@ this.gridColumn105.OptionsColumn.ReadOnly = true; this.gridColumn105.OptionsFilter.AllowFilter = false; this.gridColumn105.Visible = true; - this.gridColumn105.VisibleIndex = 11; + this.gridColumn105.VisibleIndex = 10; // // gridColumn104 // @@ -4919,7 +4914,7 @@ this.gridColumn104.OptionsColumn.ReadOnly = true; this.gridColumn104.OptionsFilter.AllowFilter = false; this.gridColumn104.Visible = true; - this.gridColumn104.VisibleIndex = 12; + this.gridColumn104.VisibleIndex = 11; // // gridColumn92 // @@ -4937,7 +4932,7 @@ this.gridColumn92.OptionsColumn.ReadOnly = true; this.gridColumn92.OptionsFilter.AllowFilter = false; this.gridColumn92.Visible = true; - this.gridColumn92.VisibleIndex = 10; + this.gridColumn92.VisibleIndex = 9; // // PatientSearch // @@ -5619,5 +5614,6 @@ private System.Windows.Forms.ToolStripMenuItem FastExportTime; private DevExpress.XtraGrid.Columns.GridColumn gridColumn104; private DevExpress.XtraGrid.Columns.GridColumn gridColumn105; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 5e1c278..5c783e7 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1409,17 +1409,17 @@ namespace PEIS.View.Enrollment if (!DgvEnrollmentFeeItem.GetSelectedRows().Any()) return; if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return; - //if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) - //{ - // Global.Msg("info", "没有要处理的收费项目！"); - // return; - //} + if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) + { + Global.Msg("info", "没有要处理的收费项目！"); + return; + } - //if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) - //{ - // Global.Msg("info", "未处理体检项目无团体项目，请选择个人收费！"); - // return; - //} + if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) + { + Global.Msg("info", "未处理体检项目无团体项目，请选择个人收费！"); + return; + } if (Global.Msg("warn", "确定生成缴费订单吗？") == System.Windows.Forms.DialogResult.No) return; CheckCostForm checkCostForm = new CheckCostForm(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), 0);