From 8211248a74af0990fed615dc8ad7f8cf8a9b304f Mon Sep 17 00:00:00 2001 From: lsm Date: Tue, 27 Aug 2024 11:06:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9B=A2=E4=BD=93=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C2=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E5=87=BA?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=9F=E3=80=81=E5=A9=9A=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Enrollment/EnrollmentOrgModel.cs | 23 ++++++ .../Enrollment/EnrollmentPatientModel.cs | 2 +- PEIS/Presenter/EnrollmentOrgPresenter.cs | 4 + .../Enrollment/EnrollmentOrgForm.Designer.cs | 73 ++++++++++++------- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 35 +++++++-- PEIS/View/Enrollment/EnrollmentOrgForm.resx | 20 +++-- PEIS/View/Enrollment/IEnrollmentOrgView.cs | 2 + 7 files changed, 119 insertions(+), 40 deletions(-) diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index acc56b6..bed5a73 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -100,5 +100,28 @@ namespace PEIS.Model.Enrollment return cResult > 0 && eResult > 0 && fResult > 0; } + + public List GetExcelList(Int64 oeID) + { + return DAOHelp.GetDataBySQL($@"SELECT + a.ID, + a.Name, + CASE WHEN a.Sex = 1 THEN '男' ELSE '女' END AS 'Sex', + b.Marriage, + CONVERT ( VARCHAR, a.Age ) + a.AgeClass AS 'AgeClass', + a.CardNo, + a.Tel1, + c.DeptName, + a.SignTime, + d.Fee + FROM + Enrollment_Patient a + LEFT JOIN Base_Patient b ON a.PID = b.ID + LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID + LEFT JOIN Enrollment_CheckCost d ON a.ID = d.EID AND a.OEID = d.OEID + WHERE + a.OEID = {oeID} AND d.DeleteTime IS NULL + ORDER BY a.SignTime"); + } } } \ No newline at end of file diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index d45f521..380b770 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -59,7 +59,7 @@ namespace PEIS.Model.Enrollment SpellCode = '{item.SpellCode}' WHERE ID = {item.ID}"; - var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}' where ID = {item.PID}"; + var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}' where ID = {item.PID}"; DAOHelp.ExecuteSql(baseStr, false); return DAOHelp.ExecuteSql(sql, false) > 0; diff --git a/PEIS/Presenter/EnrollmentOrgPresenter.cs b/PEIS/Presenter/EnrollmentOrgPresenter.cs index f0e4905..bb099bd 100644 --- a/PEIS/Presenter/EnrollmentOrgPresenter.cs +++ b/PEIS/Presenter/EnrollmentOrgPresenter.cs @@ -159,6 +159,10 @@ namespace PEIS.Presenter { new EnrollmentCheckCostModel().CancelGroupTag(args.EnrollmentOID, args.IdList); }; + View.GetExcelList += (send, args) => + { + View.ShowExcelList(new EnrollmentOrgModel().GetExcelList(args.EnrollmentOID)); + }; } } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 4a08f60..57e8eb8 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(); @@ -344,6 +344,7 @@ this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn(); this.PatientSearch = new System.Windows.Forms.TextBox(); this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn(); this.新建NToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -560,7 +561,11 @@ this.gridColumn21}); this.DgvOrg.FixedLineWidth = 1; this.DgvOrg.GridControl = this.DgcOrg; +<<<<<<< HEAD this.DgvOrg.IndicatorWidth = 40; +======= + this.DgvOrg.IndicatorWidth = 50; +>>>>>>> eb90ebe (1、团体快捷导出，2、编辑信息可以修改出生日期、婚况) this.DgvOrg.Name = "DgvOrg"; this.DgvOrg.OptionsMenu.EnableColumnMenu = false; this.DgvOrg.OptionsSelection.MultiSelect = true; @@ -974,7 +979,7 @@ this.gridColumn55}); this.DgvGroupPatient.FixedLineWidth = 1; this.DgvGroupPatient.GridControl = this.DgcGroupPatient; - this.DgvGroupPatient.IndicatorWidth = 70; + this.DgvGroupPatient.IndicatorWidth = 50; this.DgvGroupPatient.Name = "DgvGroupPatient"; this.DgvGroupPatient.OptionsSelection.MultiSelect = true; this.DgvGroupPatient.OptionsView.ColumnAutoWidth = false; @@ -1320,7 +1325,7 @@ this.gridColumn56}); this.DgvPatient.FixedLineWidth = 1; this.DgvPatient.GridControl = this.DgcPatient; - this.DgvPatient.IndicatorWidth = 70; + this.DgvPatient.IndicatorWidth = 50; this.DgvPatient.Name = "DgvPatient"; this.DgvPatient.OptionsSelection.MultiSelect = true; this.DgvPatient.OptionsView.ColumnAutoWidth = false; @@ -2933,15 +2938,15 @@ this.gridColumn100, this.gridColumn99}); this.DgvCheckCost2.FixedLineWidth = 1; - 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); + 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); this.DgvCheckCost2.GridControl = this.DgcCheckCost2; this.DgvCheckCost2.GroupFormat = "{0}"; this.DgvCheckCost2.IndicatorWidth = 40; @@ -3379,15 +3384,15 @@ this.gridColumn101, this.gridColumn102}); this.DgvCheckCost.FixedLineWidth = 1; - 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); + 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); this.DgvCheckCost.GridControl = this.DgcCheckCost; this.DgvCheckCost.GroupCount = 1; this.DgvCheckCost.GroupFormat = ""; @@ -4649,11 +4654,12 @@ this.gridColumn96, this.gridColumn105, this.gridColumn104, - this.gridColumn92}); + this.gridColumn92, + this.gridColumn106}); this.DgvEnrollment.GridControl = this.DgcEnrollment; this.DgvEnrollment.GroupCount = 1; this.DgvEnrollment.GroupFormat = ""; - this.DgvEnrollment.IndicatorWidth = 70; + this.DgvEnrollment.IndicatorWidth = 55; this.DgvEnrollment.Name = "DgvEnrollment"; this.DgvEnrollment.OptionsFilter.AllowFilterEditor = false; this.DgvEnrollment.OptionsMenu.EnableColumnMenu = false; @@ -4816,7 +4822,6 @@ this.gridColumn93.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.gridColumn93.OptionsColumn.AllowMove = false; this.gridColumn93.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn93.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn93.OptionsColumn.ReadOnly = true; this.gridColumn93.OptionsFilter.AllowFilter = false; this.gridColumn93.Visible = true; @@ -4935,11 +4940,29 @@ this.gridColumn92.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.gridColumn92.OptionsColumn.AllowMove = false; this.gridColumn92.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn92.OptionsColumn.ReadOnly = true; this.gridColumn92.OptionsFilter.AllowFilter = false; this.gridColumn92.Visible = true; this.gridColumn92.VisibleIndex = 10; // + // gridColumn106 + // + this.gridColumn106.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn106.AppearanceCell.Options.UseFont = true; + this.gridColumn106.Caption = "体检费用"; + this.gridColumn106.FieldName = "Fee"; + 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.ReadOnly = true; + this.gridColumn106.OptionsFilter.AllowFilter = false; + this.gridColumn106.Visible = true; + this.gridColumn106.VisibleIndex = 13; + // // PatientSearch // this.PatientSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 8976544..4452ff5 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -40,6 +40,7 @@ namespace PEIS.View.Enrollment private List _lstCheckCost = new List(); private List _lstCheckCost2 = new List(); private List _lstEnrollmentPatient = new List(); + private List _lstExcelEPatient = new List(); private List _lstEnrollmentFeeItem = new List(); private List _lstGroupFeeItem = new List(); private List _lstGroupPatient = new List(); @@ -201,7 +202,7 @@ namespace PEIS.View.Enrollment private void EnrollmentOrgForm_Shown(object sender, EventArgs e) { - DtpBegDate.Value = DateTime.Now.AddDays(-3); + DtpBegDate.Value = DateTime.Now.AddDays(-30); DtpEndDate.Value = DateTime.Now; RiCmbExamType.Items.Add("已婚/未婚"); RiCmbExamType.Items.AddRange(Global._lstConfig.Where(a => a.Key.Equals("ExamType")).ToList().Select(a => a.Value).ToList()); @@ -853,8 +854,11 @@ namespace PEIS.View.Enrollment private void FastExport_Click(object sender, EventArgs e) // 导出所有团体成员 { - if (_lstEnrollmentPatient.Count != 0) + OnGetExcelList(); + + if (_lstExcelEPatient.Count != 0) { + DgcEnrollment.DataSource = _lstExcelEPatient; SaveFileDialog saveFileDialog = new SaveFileDialog(); saveFileDialog.Title = "导出Excel"; saveFileDialog.FileName = "团体名单"; @@ -879,7 +883,7 @@ namespace PEIS.View.Enrollment // 将列添加到GridView的Columns集合中 DgvEnrollment.Columns.Add(newColumn); - for (int i = 0; i < _lstEnrollmentPatient.Count(); i++) + for (int i = 0; i < _lstExcelEPatient.Count(); i++) { // 使用GetRowCellValue方法获取当前行的序号列的值 int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄 @@ -890,10 +894,13 @@ namespace PEIS.View.Enrollment DgvEnrollment.Columns.Remove(newColumn); } } + ShowEnrollmentPatient(_lstEnrollmentPatient); } private void FastExportTime_Click(object sender, EventArgs e) // 导出指定时间范围成员 { + OnGetExcelList(); + DateTime currentDate = DateTime.Now; Form dateForm = new Form(); @@ -924,8 +931,9 @@ namespace PEIS.View.Enrollment confirmBtn.AutoSize = true; confirmBtn.Click += delegate (object a, EventArgs b) { - if (_lstEnrollmentPatient.Count != 0) + if (_lstExcelEPatient.Count != 0) { + DgcEnrollment.DataSource = _lstExcelEPatient; SaveFileDialog saveFileDialog = new SaveFileDialog(); saveFileDialog.Title = "导出Excel"; saveFileDialog.FileName = "团体名单"; @@ -951,8 +959,8 @@ namespace PEIS.View.Enrollment DgvEnrollment.Columns.Add(newColumn); - DgcEnrollment.DataSource = _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date); - for (int i = 0; i < _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date).Count(); i++) + DgcEnrollment.DataSource = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date); + for (int i = 0; i < _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date).Count(); i++) { // 使用GetRowCellValue方法获取当前行的序号列的值 int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄 @@ -1597,6 +1605,8 @@ namespace PEIS.View.Enrollment public event EventHandler> CancelGroupTag; + public event EventHandler> GetExcelList; + protected virtual void OnCancelGroupTag(Int64 oeID, List idList) { CancelGroupTag?.Invoke(this, new Args { EnrollmentOID = oeID, IdList = idList }); @@ -1754,6 +1764,17 @@ namespace PEIS.View.Enrollment }); } + protected virtual void OnGetExcelList() + { + var oeID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()); + GetExcelList?.Invoke(this, new Args { EnrollmentOID = oeID }); + } + + public void ShowExcelList(List items) + { + _lstExcelEPatient = items; + } + public void ShowCancelRegInfo(bool status) { OnGetEnrollmentPatient(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); @@ -1833,7 +1854,7 @@ namespace PEIS.View.Enrollment public void ShowEnrollmentPatient(List items) { - items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : ""); + items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : a.Sex); _lstEnrollmentPatient = items; diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.resx b/PEIS/View/Enrollment/EnrollmentOrgForm.resx index debec70..ab5bfdc 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.resx +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.resx @@ -120,6 +120,15 @@ 510, 16 + + 510, 16 + + + 1914, 17 + + + 1358, 18 + 1597, 17 @@ -305,7 +314,7 @@ frF0DeOou0VjfCumLZLL/QM6DnLkln25BAAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G @@ -317,7 +326,7 @@ E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G @@ -329,7 +338,7 @@ E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G @@ -341,7 +350,7 @@ E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G @@ -426,9 +435,6 @@ mAjBS46PQpxtC8HWE5/4muCP01lHCF/A7hOfW+9fQwAAAABJRU5ErkJggg== - - 1358, 18 - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAARhJREFUSEvt diff --git a/PEIS/View/Enrollment/IEnrollmentOrgView.cs b/PEIS/View/Enrollment/IEnrollmentOrgView.cs index 94c7c9e..0aca34a 100644 --- a/PEIS/View/Enrollment/IEnrollmentOrgView.cs +++ b/PEIS/View/Enrollment/IEnrollmentOrgView.cs @@ -58,6 +58,7 @@ namespace PEIS.View.Enrollment event EventHandler> ChangeCost; event EventHandler> GroupTag; event EventHandler> CancelGroupTag; + event EventHandler> GetExcelList; void ShowEnrollmentOrg(List items); void ShowEnrollmentOrgGroup(List items); @@ -78,6 +79,7 @@ namespace PEIS.View.Enrollment void ShowRegInfo(EnrollmentPatient item); void ShowRecallDept(bool status); void ShowCancelRegInfo(bool status); + void ShowExcelList(List items); } }