From a9987b8f02fec2eeca9d3f43f5b39036d3232ba3 Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 15 Aug 2024 16:20:51 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enrollment/EnrollmentPatientModel.cs | 24 +- PEIS/PEIS.csproj | 11 + PEIS/Presenter/EnrollmentSearchPresenter.cs | 22 ++ .../EnrollmentSearchForm.Designer.cs | 323 ++++++++++++++++++ PEIS/View/Enrollment/EnrollmentSearchForm.cs | 63 ++++ .../View/Enrollment/EnrollmentSearchForm.resx | 120 +++++++ PEIS/View/Enrollment/IEnrollmentSearchView.cs | 15 + PEIS/View/MainForm.Designer.cs | 17 +- PEIS/View/MainForm.cs | 5 +- PEIS/View/MainForm.resx | 2 +- 10 files changed, 590 insertions(+), 12 deletions(-) create mode 100644 PEIS/Presenter/EnrollmentSearchPresenter.cs create mode 100644 PEIS/View/Enrollment/EnrollmentSearchForm.Designer.cs create mode 100644 PEIS/View/Enrollment/EnrollmentSearchForm.cs create mode 100644 PEIS/View/Enrollment/EnrollmentSearchForm.resx create mode 100644 PEIS/View/Enrollment/IEnrollmentSearchView.cs diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index d644716..a6f4fde 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -191,7 +191,6 @@ namespace PEIS.Model.Enrollment return cResult > 0 && eResult > 0 && fResult > 0; } - public List GetEnrollmentPatientRegItems(string begDate, string endDate, string name) // 获取个人体检人员列表 { if (String.IsNullOrEmpty(name)) @@ -274,5 +273,28 @@ namespace PEIS.Model.Enrollment var item = DAOHelp.GetDataBySQL($@"Select * From Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON a.PID = c.PID AND c.OID = a.OID WHERE a.ID = {EId}"); return item.Count != 0 ? item[0] : null; } + + public List GetEnrollmentPatients(string name) // 全局搜索登记信息 + { + return DAOHelp.GetDataBySQL($@"SELECT + CASE WHEN OEID IS NOT NULL THEN '1' ELSE NULL END AS Tel2, + ID, + NAME, + SEX, + CAST(AGE AS VARCHAR) + AgeClass AS AgeClass, + CardNo, + CreateTime, + SignTime, + OEID, + OrgName + FROM + Enrollment_Patient + WHERE + ( Name like '%{name}%' or id like '%{name}%') + AND PID IS NOT NULL + AND WeChatStatus IN ( 0, 1 ) + ORDER BY + CreateTime DESC"); + } } } \ No newline at end of file diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index 7204228..89cc22d 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -197,6 +197,7 @@ + @@ -361,7 +362,14 @@ CheckCostForm.cs + + Form + + + EnrollmentSearchForm.cs + + Form @@ -554,6 +562,9 @@ CheckCostForm.cs + + EnrollmentSearchForm.cs + NewEnrollmentPersonForm.cs diff --git a/PEIS/Presenter/EnrollmentSearchPresenter.cs b/PEIS/Presenter/EnrollmentSearchPresenter.cs new file mode 100644 index 0000000..a4afd43 --- /dev/null +++ b/PEIS/Presenter/EnrollmentSearchPresenter.cs @@ -0,0 +1,22 @@ +using PEIS.Base; +using PEIS.Model.Enrollment; +using PEIS.View.Enrollment; + +namespace PEIS.Presenter +{ + internal class EnrollmentSearchPresenter : Presenter + { + public EnrollmentSearchPresenter(IEnrollmentSearchView view) : base(view) + { + } + + protected override void OnViewSet() + { + // 全局搜索 + View.GetRegItems += (send, args) => + { + View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatients(args.Name)); + }; + } + } +} diff --git a/PEIS/View/Enrollment/EnrollmentSearchForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentSearchForm.Designer.cs new file mode 100644 index 0000000..261b426 --- /dev/null +++ b/PEIS/View/Enrollment/EnrollmentSearchForm.Designer.cs @@ -0,0 +1,323 @@ +namespace PEIS.View.Enrollment +{ + partial class EnrollmentSearchForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows 窗体设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.panel1 = new System.Windows.Forms.Panel(); + this.NameSearch = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.DgcRegItem = new DevExpress.XtraGrid.GridControl(); + this.DgvRegItem = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.DgvRegItem)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.NameSearch); + this.panel1.Controls.Add(this.label1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1520, 40); + this.panel1.TabIndex = 0; + // + // NameSearch + // + this.NameSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.NameSearch.Font = new System.Drawing.Font("微软雅黑", 9F); + this.NameSearch.Location = new System.Drawing.Point(91, 8); + this.NameSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.NameSearch.Name = "NameSearch"; + this.NameSearch.Size = new System.Drawing.Size(506, 23); + this.NameSearch.TabIndex = 7; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.label1.Location = new System.Drawing.Point(11, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(90, 21); + this.label1.TabIndex = 1; + this.label1.Text = "模糊检索："; + // + // DgcRegItem + // + this.DgcRegItem.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcRegItem.Location = new System.Drawing.Point(0, 40); + this.DgcRegItem.MainView = this.DgvRegItem; + this.DgcRegItem.Name = "DgcRegItem"; + this.DgcRegItem.Size = new System.Drawing.Size(1520, 919); + this.DgcRegItem.TabIndex = 135; + this.DgcRegItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.DgvRegItem}); + // + // DgvRegItem + // + this.DgvRegItem.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold); + this.DgvRegItem.Appearance.FooterPanel.ForeColor = System.Drawing.Color.Red; + this.DgvRegItem.Appearance.FooterPanel.Options.UseFont = true; + this.DgvRegItem.Appearance.FooterPanel.Options.UseForeColor = true; + this.DgvRegItem.Appearance.GroupRow.Font = new System.Drawing.Font("微软雅黑", 10.5F); + this.DgvRegItem.Appearance.GroupRow.Options.UseFont = true; + this.DgvRegItem.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 10F); + this.DgvRegItem.Appearance.Row.Options.UseFont = true; + this.DgvRegItem.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn10, + this.gridColumn1, + this.gridColumn2, + this.gridColumn9, + this.gridColumn5, + this.gridColumn6, + this.gridColumn3, + this.gridColumn4, + this.gridColumn7, + this.gridColumn8}); + this.DgvRegItem.GridControl = this.DgcRegItem; + this.DgvRegItem.GroupCount = 1; + this.DgvRegItem.GroupFormat = ""; + this.DgvRegItem.Name = "DgvRegItem"; + this.DgvRegItem.OptionsFilter.AllowFilterEditor = false; + this.DgvRegItem.OptionsMenu.EnableColumnMenu = false; + this.DgvRegItem.OptionsSelection.MultiSelect = true; + this.DgvRegItem.OptionsView.ColumnAutoWidth = false; + this.DgvRegItem.OptionsView.ShowGroupPanel = false; + this.DgvRegItem.RowHeight = 35; + this.DgvRegItem.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] { + new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn10, DevExpress.Data.ColumnSortOrder.Ascending)}); + // + // gridColumn10 + // + this.gridColumn10.Caption = "gridColumn10"; + this.gridColumn10.FieldName = "Tel2"; + this.gridColumn10.Name = "gridColumn10"; + // + // gridColumn1 + // + this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn1.AppearanceCell.Options.UseFont = true; + this.gridColumn1.Caption = "体检号"; + this.gridColumn1.FieldName = "ID"; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.OptionsColumn.AllowEdit = false; + this.gridColumn1.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn1.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn1.OptionsColumn.ReadOnly = true; + this.gridColumn1.OptionsFilter.AllowFilter = false; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 0; + this.gridColumn1.Width = 87; + // + // gridColumn2 + // + this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn2.AppearanceCell.Options.UseFont = true; + this.gridColumn2.Caption = "姓名"; + this.gridColumn2.FieldName = "Name"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.OptionsColumn.AllowEdit = false; + this.gridColumn2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn2.OptionsColumn.ReadOnly = true; + this.gridColumn2.OptionsFilter.AllowFilter = false; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 1; + this.gridColumn2.Width = 87; + // + // gridColumn9 + // + this.gridColumn9.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn9.AppearanceCell.Options.UseFont = true; + this.gridColumn9.Caption = "证件号"; + this.gridColumn9.FieldName = "CardNo"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.OptionsColumn.AllowEdit = false; + this.gridColumn9.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn9.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn9.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn9.OptionsColumn.ReadOnly = true; + this.gridColumn9.OptionsFilter.AllowFilter = false; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 2; + this.gridColumn9.Width = 99; + // + // gridColumn5 + // + this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn5.AppearanceCell.Options.UseFont = true; + this.gridColumn5.Caption = "性别"; + this.gridColumn5.FieldName = "Sex"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.AllowEdit = false; + this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.ReadOnly = true; + this.gridColumn5.OptionsFilter.AllowFilter = false; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 66; + // + // gridColumn6 + // + this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn6.AppearanceCell.Options.UseFont = true; + this.gridColumn6.Caption = "年龄"; + this.gridColumn6.FieldName = "AgeClass"; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.OptionsColumn.AllowEdit = false; + this.gridColumn6.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn6.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn6.OptionsColumn.ReadOnly = true; + this.gridColumn6.OptionsFilter.AllowFilter = false; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 62; + // + // gridColumn3 + // + this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn3.AppearanceCell.Options.UseFont = true; + this.gridColumn3.Caption = "登记日期"; + this.gridColumn3.DisplayFormat.FormatString = "yyyy-MM-dd"; + this.gridColumn3.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn3.FieldName = "CreateTime"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.OptionsColumn.AllowEdit = false; + this.gridColumn3.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn3.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn3.OptionsColumn.ReadOnly = true; + this.gridColumn3.OptionsFilter.AllowFilter = false; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 5; + this.gridColumn3.Width = 109; + // + // gridColumn4 + // + this.gridColumn4.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn4.AppearanceCell.Options.UseFont = true; + this.gridColumn4.Caption = "签到日期"; + this.gridColumn4.DisplayFormat.FormatString = "yyyy-MM-dd"; + this.gridColumn4.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn4.FieldName = "SignTime"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.OptionsColumn.AllowEdit = false; + this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn4.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn4.OptionsColumn.ReadOnly = true; + this.gridColumn4.OptionsFilter.AllowFilter = false; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 6; + this.gridColumn4.Width = 109; + // + // gridColumn7 + // + this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn7.AppearanceCell.Options.UseFont = true; + this.gridColumn7.Caption = "团体号"; + this.gridColumn7.FieldName = "OEID"; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.OptionsColumn.AllowEdit = false; + this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn7.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn7.OptionsColumn.ReadOnly = true; + this.gridColumn7.OptionsFilter.AllowFilter = false; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 7; + this.gridColumn7.Width = 69; + // + // gridColumn8 + // + this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn8.AppearanceCell.Options.UseFont = true; + this.gridColumn8.Caption = "团体名称"; + this.gridColumn8.FieldName = "OrgName"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.OptionsColumn.AllowEdit = false; + this.gridColumn8.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn8.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn8.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn8.OptionsColumn.ReadOnly = true; + this.gridColumn8.OptionsFilter.AllowFilter = false; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 8; + this.gridColumn8.Width = 271; + // + // EnrollmentSearchForm + // + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(1520, 959); + this.Controls.Add(this.DgcRegItem); + this.Controls.Add(this.panel1); + this.Name = "EnrollmentSearchForm"; + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.DgvRegItem)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox NameSearch; + private DevExpress.XtraGrid.GridControl DgcRegItem; + private DevExpress.XtraGrid.Views.Grid.GridView DgvRegItem; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + } +} diff --git a/PEIS/View/Enrollment/EnrollmentSearchForm.cs b/PEIS/View/Enrollment/EnrollmentSearchForm.cs new file mode 100644 index 0000000..fbfdda9 --- /dev/null +++ b/PEIS/View/Enrollment/EnrollmentSearchForm.cs @@ -0,0 +1,63 @@ +using DevExpress.XtraGrid.Views.Grid.ViewInfo; +using PEIS.Base; +using PEIS.Entity; +using PEIS.Event; +using PEIS.Presenter; +using System; +using System.Collections.Generic; +using System.Windows.Forms; + +namespace PEIS.View.Enrollment +{ + public partial class EnrollmentSearchForm : ViewBase, IEnrollmentSearchView + { + List _lstRegItems = null; + + public EnrollmentSearchForm() + { + InitializeComponent(); + NameSearch.KeyDown += NameSearch_KeyDown; + // 分组别名 + DgvRegItem.CustomDrawGroupRow += DgvRegItem_CustomDrawGroupRow; + } + + private void DgvRegItem_CustomDrawGroupRow(object sender, DevExpress.XtraGrid.Views.Base.RowObjectCustomDrawEventArgs e) + { + GridGroupRowInfo grid = e.Info as GridGroupRowInfo; + var index = DgvRegItem.GetDataRowHandleByGroupRowHandle(e.RowHandle); + + grid.GroupText = DgvRegItem.GetRowCellValue(index, "Tel2") == null ? "个人" : "团体"; + } + + private void NameSearch_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) OnGetRegItems(); + } + + // 获取登记列表 + public event EventHandler> GetRegItems; + public void ShowRegItems(List items) + { + items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : ""); + Invoke(new Action(() => _lstRegItems = items)); + Invoke(new Action(() => { + DgcRegItem.DataSource = null; + DgcRegItem.DataSource = _lstRegItems; + DgvRegItem.ExpandAllGroups(); + DgvRegItem.BestFitColumns(); + })); + } + protected virtual void OnGetRegItems() + { + GetRegItems?.Invoke(this, new Args() + { + Name = NameSearch.Text.Trim() + }); + } + + protected override object CreatePresenter() + { + return new EnrollmentSearchPresenter(this); + } + } +} diff --git a/PEIS/View/Enrollment/EnrollmentSearchForm.resx b/PEIS/View/Enrollment/EnrollmentSearchForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/PEIS/View/Enrollment/EnrollmentSearchForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PEIS/View/Enrollment/IEnrollmentSearchView.cs b/PEIS/View/Enrollment/IEnrollmentSearchView.cs new file mode 100644 index 0000000..b313f90 --- /dev/null +++ b/PEIS/View/Enrollment/IEnrollmentSearchView.cs @@ -0,0 +1,15 @@ +using PEIS.Base; +using PEIS.Entity; +using PEIS.Event; +using System; +using System.Collections.Generic; + +namespace PEIS.View.Enrollment +{ + interface IEnrollmentSearchView : IViewBase + { + // 获取登记列表 + event EventHandler> GetRegItems; + void ShowRegItems(List items); + } +} diff --git a/PEIS/View/MainForm.Designer.cs b/PEIS/View/MainForm.Designer.cs index 9a08261..0821d43 100644 --- a/PEIS/View/MainForm.Designer.cs +++ b/PEIS/View/MainForm.Designer.cs @@ -52,7 +52,7 @@ namespace PEIS.View this.lblHospital = new System.Windows.Forms.Label(); this.NbcMain = new DevExpress.XtraNavBar.NavBarControl(); this.NbgReg = new DevExpress.XtraNavBar.NavBarGroup(); - this.NavBarItem1 = new DevExpress.XtraNavBar.NavBarItem(); + this.NbiEnrollmentSearch = new DevExpress.XtraNavBar.NavBarItem(); this.NbiEnrollmentPerson = new DevExpress.XtraNavBar.NavBarItem(); this.NbiEnrollmentOrg = new DevExpress.XtraNavBar.NavBarItem(); this.NbiBasePerson = new DevExpress.XtraNavBar.NavBarItem(); @@ -382,7 +382,7 @@ namespace PEIS.View this.NbgNull}); this.NbcMain.HideGroupCaptions = true; this.NbcMain.Items.AddRange(new DevExpress.XtraNavBar.NavBarItem[] { - this.NavBarItem1, + this.NbiEnrollmentSearch, this.NbiEnrollmentPerson, this.NbiEnrollmentOrg, this.NbiBasePerson, @@ -415,19 +415,18 @@ namespace PEIS.View this.NbgReg.Caption = "检前登记"; this.NbgReg.Expanded = true; this.NbgReg.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] { - new DevExpress.XtraNavBar.NavBarItemLink(this.NavBarItem1), + new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentSearch), new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentPerson), new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentOrg), new DevExpress.XtraNavBar.NavBarItemLink(this.NbiBasePerson), new DevExpress.XtraNavBar.NavBarItemLink(this.NbiBaseOrg)}); this.NbgReg.Name = "NbgReg"; // - // NavBarItem1 + // NbiEnrollmentSearch // - this.NavBarItem1.Caption = "查找"; - this.NavBarItem1.LargeImage = ((System.Drawing.Image)(resources.GetObject("NavBarItem1.LargeImage"))); - this.NavBarItem1.Name = "NavBarItem1"; - this.NavBarItem1.Visible = false; + this.NbiEnrollmentSearch.Caption = "查找"; + this.NbiEnrollmentSearch.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiEnrollmentSearch.LargeImage"))); + this.NbiEnrollmentSearch.Name = "NbiEnrollmentSearch"; // // NbiEnrollmentPerson // @@ -632,7 +631,7 @@ namespace PEIS.View private System.Windows.Forms.Panel panelFooter; private DevExpress.XtraNavBar.NavBarControl NbcMain; private DevExpress.XtraNavBar.NavBarGroup NbgReg; - private DevExpress.XtraNavBar.NavBarItem NavBarItem1; + private DevExpress.XtraNavBar.NavBarItem NbiEnrollmentSearch; private DevExpress.XtraNavBar.NavBarItem NbiEnrollmentPerson; private DevExpress.XtraNavBar.NavBarItem NbiEnrollmentOrg; private DevExpress.XtraNavBar.NavBarItem NbiBasePerson; diff --git a/PEIS/View/MainForm.cs b/PEIS/View/MainForm.cs index b71c70c..b263fd6 100644 --- a/PEIS/View/MainForm.cs +++ b/PEIS/View/MainForm.cs @@ -51,6 +51,7 @@ namespace PEIS.View // 子页面切换隐藏左侧导航菜单 XtmmMain.SelectedPageChanged += XtmmMain_SelectedPageChanged; // 体检登记子菜单 + NbiEnrollmentSearch.LinkClicked += (s, e) => AddTab("NbiEnrollmentSearch", e.Link.Item); NbiEnrollmentPerson.LinkClicked += (s, e) => AddTab("NbiEnrollmentPerson", e.Link.Item); NbiEnrollmentOrg.LinkClicked += (s, e) => AddTab("NbiEnrollmentOrg", e.Link.Item); NbiBaseOrg.LinkClicked += (s, e) => AddTab("NbiBaseOrg", e.Link.Item); @@ -239,7 +240,6 @@ namespace PEIS.View case "NbiEnrollmentPerson": var PersonForm = new EnrollmentPersonForm(); PersonForm.SelectedPatientEvent += UpdateStepViewerEid; - isNeedShowPanelFooter = true; return PersonForm; @@ -249,6 +249,9 @@ namespace PEIS.View isNeedShowPanelFooter = true; return EnrollmentOrgForm; + case "NbiEnrollmentSearch": + return new EnrollmentSearchForm(); + case "NbiFeeItem": return new FeeItemForm(); diff --git a/PEIS/View/MainForm.resx b/PEIS/View/MainForm.resx index 3fa659c..035e846 100644 --- a/PEIS/View/MainForm.resx +++ b/PEIS/View/MainForm.resx @@ -247,7 +247,7 @@ 86 - + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAh1JREFUSEu9 lbFLHEEUxrcVQpRAsLGwCiQQSSfq7rAQQZIqQa6Iuzs5UUSsxC6kSLp0+gekTGeZIiRYpIhKikBC8D8I