From fa440032c680a04365ee675802b03fdda8e6f0b4 Mon Sep 17 00:00:00 2001 From: lsm Date: Tue, 19 Nov 2024 15:18:39 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=81=8C=E4=B8=9A=E7=97=85=E4=BD=93?= =?UTF-8?q?=E6=A3=80=E5=9B=A2=E4=BD=93=E7=99=BB=E8=AE=B0=E6=9A=82=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Entity/EnrollmentOrg.cs | 3 + PEIS/Entity/EnrollmentOrgGroup.cs | 7 + PEIS/Entity/EnrollmentPatient.cs | 8 + .../Enrollment/EnrollentOrgGroupModel.cs | 3 +- .../Enrollment/EnrollmentOrgFeeItemModel.cs | 17 +- PEIS/Model/Enrollment/EnrollmentOrgModel.cs | 2 +- .../Enrollment/EnrollmentOrgForm.Designer.cs | 157 +++++++++++++++++- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 35 +++- PEIS/View/Enrollment/NewEnrollmentOrgForm.cs | 7 + 9 files changed, 221 insertions(+), 18 deletions(-) diff --git a/PEIS/Entity/EnrollmentOrg.cs b/PEIS/Entity/EnrollmentOrg.cs index 204af44..5b3b331 100644 --- a/PEIS/Entity/EnrollmentOrg.cs +++ b/PEIS/Entity/EnrollmentOrg.cs @@ -24,5 +24,8 @@ namespace PEIS.Entity public String Creator { get; set; } public Int64? OID { get; set; } public String SpellCode { get; set; } + + // 是否职业病团体 + public bool? IsOccupational { get; set; } } } \ No newline at end of file diff --git a/PEIS/Entity/EnrollmentOrgGroup.cs b/PEIS/Entity/EnrollmentOrgGroup.cs index e25acfd..03e8a8d 100644 --- a/PEIS/Entity/EnrollmentOrgGroup.cs +++ b/PEIS/Entity/EnrollmentOrgGroup.cs @@ -21,5 +21,12 @@ namespace PEIS.Entity public String CheckerCode { get; set; } public String Checker { get; set; } public Int64 OID { get; set; } + + // 在岗情况 + public String JobStatus { get; set; } + // 危害因素 + public String HazardFactors { get; set; } + // 工种 + public String JobTypes { get; set; } } } \ No newline at end of file diff --git a/PEIS/Entity/EnrollmentPatient.cs b/PEIS/Entity/EnrollmentPatient.cs index 3a5fbf0..eb5bd36 100644 --- a/PEIS/Entity/EnrollmentPatient.cs +++ b/PEIS/Entity/EnrollmentPatient.cs @@ -55,6 +55,14 @@ namespace PEIS.Entity public String LastPrinterCode { get; set; } public String LastPrinter { get; set; } public String SpellCode { get; set; } + + // 在岗情况 + public String JobStatus { get; set; } + // 危害因素 + public String HazardFactors { get; set; } + // 工种 + public String JobTypes { get; set; } + /// /// 0：默认值，体检客户端登记； /// 1：体检登记为微信预约且预约缴费成功，此状态时才可在客户端查看； diff --git a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs index 0efb9f3..89c6309 100644 --- a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs +++ b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs @@ -45,7 +45,8 @@ namespace PEIS.Model.Enrollment return; } - DAOHelp.ExecuteSql($"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}', Description= '{item.Description}', Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}' WHERE ID= {item.ID}", false); + DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}', Description= '{item.Description}', Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}', + JobStatus = '{item.JobStatus}', JobTypes = '{item.JobTypes}', HazardFactors = '{item.HazardFactors}' WHERE ID= {item.ID}", false); } } } \ No newline at end of file diff --git a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs index e661248..56362df 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs @@ -49,15 +49,14 @@ namespace PEIS.Model.Enrollment public void ApplyOrgFeeItem(Int64 oeID, Int64 groupID) { // 个人登记信息 - DAOHelp.ExecuteSql($"Insert into Enrollment_Patient " + - $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, Description, CreateTime, CreatorCode, Creator)" + - $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, a.Description, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}' " + - $"FROM dbo.Base_Patient a " + - $"LEFT JOIN dbo.Enrollment_OrgPatient b ON a.ID = b.PID " + - $"LEFT JOIN dbo.Enrollment_Org c ON b.OID = c.ID " + - $"LEFT JOIN dbo.Enrollment_OrgGroup d ON b.GroupID = d.ID " + - $"WHERE c.ID = {oeID} AND d.ID = {groupID}" + - $"AND a.ID NOT IN (SELECT PID FROM Enrollment_Patient WHERE OEID = {oeID})"); + DAOHelp.ExecuteSql($@"Insert into Enrollment_Patient (Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, Description, JobTypes, JobStatus, HazardFactors, CreateTime, CreatorCode, Creator) + SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, a.Description, d.JobTypes, d.JobStatus, d.HazardFactors, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}' + FROM dbo.Base_Patient a + LEFT JOIN dbo.Enrollment_OrgPatient b ON a.ID = b.PID + LEFT JOIN dbo.Enrollment_Org c ON b.OID = c.ID + LEFT JOIN dbo.Enrollment_OrgGroup d ON b.GroupID = d.ID + WHERE c.ID = { oeID} AND d.ID = { groupID} + AND a.ID NOT IN (SELECT PID FROM Enrollment_Patient WHERE OEID = {oeID})"); var groupFeeItem = DAOHelp.GetDataBySQL($@"SELECT * FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID}"); diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index 8a95e8f..7b5cbb5 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -39,7 +39,7 @@ namespace PEIS.Model.Enrollment } else { - return DAOHelp.GetDataBySQL($"Select * from Enrollment_Org Where Name like '%{name}%'"); + return DAOHelp.GetDataBySQL($"Select * from Enrollment_Org Where Name like '%{name}%' or SpellCode like '%{name}%'"); } } diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index e99350c..768e3e0 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm)); DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); @@ -67,7 +68,7 @@ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.DgcGroupPatient = new DevExpress.XtraGrid.GridControl(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.FastGroupMove = new System.Windows.Forms.ToolStripMenuItem(); this.DgvGroupPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -126,6 +127,11 @@ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.RiCmbExamType = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.JobTypesCol = new DevExpress.XtraGrid.Columns.GridColumn(); + this.RiCmbJobTypes = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.JobStatusCol = new DevExpress.XtraGrid.Columns.GridColumn(); + this.RiCmbJobStatus = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.HazardFactorsCol = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -185,6 +191,9 @@ this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn62 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.JobTypesCol2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.JobStatusCol2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.HazardFactorsCol2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -197,7 +206,7 @@ this.xtraTabControl4 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost2 = new DevExpress.XtraGrid.GridControl(); - this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); + this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.PFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -228,7 +237,7 @@ this.xtraTabControl3 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost = new DevExpress.XtraGrid.GridControl(); - this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); + this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.TFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -319,7 +328,7 @@ this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl(); this.panel11 = new System.Windows.Forms.Panel(); this.DgcEnrollment = new DevExpress.XtraGrid.GridControl(); - this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(); + this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.FastCamera = new System.Windows.Forms.ToolStripMenuItem(); this.FastDelete = new System.Windows.Forms.ToolStripMenuItem(); this.FastExport = new System.Windows.Forms.ToolStripMenuItem(); @@ -374,6 +383,7 @@ this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.RiCmbHazardFactors = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -403,6 +413,8 @@ ((System.ComponentModel.ISupportInitialize)(this.RiCmbSex)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbMarriage)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbExamType)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobTypes)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobStatus)).BeginInit(); this.panel3.SuspendLayout(); this.TpGroupFeeItem.SuspendLayout(); this.panel5.SuspendLayout(); @@ -469,6 +481,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbHazardFactors)).BeginInit(); this.SuspendLayout(); // // gridColumn99 @@ -1635,7 +1648,10 @@ this.DgcGroup.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.RiCmbSex, this.RiCmbMarriage, - this.RiCmbExamType}); + this.RiCmbExamType, + this.RiCmbJobStatus, + this.RiCmbJobTypes, + this.RiCmbHazardFactors}); this.DgcGroup.Size = new System.Drawing.Size(1196, 142); this.DgcGroup.TabIndex = 130; this.DgcGroup.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1658,6 +1674,9 @@ this.gridColumn8, this.gridColumn9, this.gridColumn10, + this.JobTypesCol, + this.JobStatusCol, + this.HazardFactorsCol, this.gridColumn11, this.gridColumn12, this.gridColumn13, @@ -1678,6 +1697,7 @@ this.gridColumn4.Caption = "分组"; this.gridColumn4.FieldName = "Name"; this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.OptionsFilter.AllowFilter = false; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 0; this.gridColumn4.Width = 120; @@ -1767,6 +1787,7 @@ this.gridColumn10.ColumnEdit = this.RiCmbExamType; this.gridColumn10.FieldName = "Type"; this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.OptionsFilter.AllowFilter = false; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 5; this.gridColumn10.Width = 100; @@ -1778,6 +1799,52 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.RiCmbExamType.Name = "RiCmbExamType"; // + // JobTypesCol + // + this.JobTypesCol.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.JobTypesCol.AppearanceCell.Options.UseFont = true; + this.JobTypesCol.Caption = "工种"; + this.JobTypesCol.ColumnEdit = this.RiCmbJobTypes; + this.JobTypesCol.FieldName = "JobTypes"; + this.JobTypesCol.Name = "JobTypesCol"; + this.JobTypesCol.OptionsFilter.AllowFilter = false; + this.JobTypesCol.Width = 90; + // + // RiCmbJobTypes + // + this.RiCmbJobTypes.AutoHeight = false; + this.RiCmbJobTypes.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.RiCmbJobTypes.Name = "RiCmbJobTypes"; + // + // JobStatusCol + // + this.JobStatusCol.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.JobStatusCol.AppearanceCell.Options.UseFont = true; + this.JobStatusCol.Caption = "在岗情况"; + this.JobStatusCol.ColumnEdit = this.RiCmbJobStatus; + this.JobStatusCol.FieldName = "JobStatus"; + this.JobStatusCol.Name = "JobStatusCol"; + this.JobStatusCol.OptionsFilter.AllowFilter = false; + // + // RiCmbJobStatus + // + this.RiCmbJobStatus.AutoHeight = false; + this.RiCmbJobStatus.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.RiCmbJobStatus.Name = "RiCmbJobStatus"; + // + // HazardFactorsCol + // + this.HazardFactorsCol.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.HazardFactorsCol.AppearanceCell.Options.UseFont = true; + this.HazardFactorsCol.Caption = "危害因素"; + this.HazardFactorsCol.ColumnEdit = this.RiCmbHazardFactors; + this.HazardFactorsCol.FieldName = "HazardFactors"; + this.HazardFactorsCol.Name = "HazardFactorsCol"; + this.HazardFactorsCol.OptionsFilter.AllowFilter = false; + this.HazardFactorsCol.Width = 90; + // // gridColumn11 // this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -1788,6 +1855,7 @@ this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.OptionsColumn.AllowEdit = false; this.gridColumn11.OptionsColumn.ReadOnly = true; + this.gridColumn11.OptionsFilter.AllowFilter = false; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 6; this.gridColumn11.Width = 130; @@ -1803,6 +1871,7 @@ this.gridColumn12.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn12.OptionsColumn.AllowMove = false; this.gridColumn12.OptionsColumn.ReadOnly = true; + this.gridColumn12.OptionsFilter.AllowFilter = false; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 7; this.gridColumn12.Width = 60; @@ -1832,7 +1901,10 @@ this.gridColumn18.FieldName = "ID"; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.OptionsColumn.AllowEdit = false; + this.gridColumn18.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn18.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn18.OptionsColumn.ReadOnly = true; + this.gridColumn18.OptionsFilter.AllowFilter = false; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 9; this.gridColumn18.Width = 40; @@ -2530,6 +2602,9 @@ this.gridColumn60, this.gridColumn61, this.gridColumn62, + this.JobTypesCol2, + this.JobStatusCol2, + this.HazardFactorsCol2, this.gridColumn63, this.gridColumn64, this.gridColumn65, @@ -2554,6 +2629,7 @@ this.gridColumn57.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn57.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn57.OptionsColumn.ReadOnly = true; + this.gridColumn57.OptionsFilter.AllowFilter = false; this.gridColumn57.Visible = true; this.gridColumn57.VisibleIndex = 0; this.gridColumn57.Width = 120; @@ -2655,6 +2731,7 @@ this.gridColumn62.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn62.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn62.OptionsColumn.ReadOnly = true; + this.gridColumn62.OptionsFilter.AllowFilter = false; this.gridColumn62.Visible = true; this.gridColumn62.VisibleIndex = 5; this.gridColumn62.Width = 100; @@ -2666,6 +2743,54 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemComboBox3.Name = "repositoryItemComboBox3"; // + // JobTypesCol2 + // + this.JobTypesCol2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.JobTypesCol2.AppearanceCell.Options.UseFont = true; + this.JobTypesCol2.Caption = "工种"; + this.JobTypesCol2.FieldName = "JobTypes"; + this.JobTypesCol2.Name = "JobTypesCol2"; + this.JobTypesCol2.OptionsColumn.AllowEdit = false; + this.JobTypesCol2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.JobTypesCol2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.JobTypesCol2.OptionsColumn.AllowMove = false; + this.JobTypesCol2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.JobTypesCol2.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.JobTypesCol2.OptionsColumn.ReadOnly = true; + this.JobTypesCol2.OptionsFilter.AllowFilter = false; + // + // JobStatusCol2 + // + this.JobStatusCol2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.JobStatusCol2.AppearanceCell.Options.UseFont = true; + this.JobStatusCol2.Caption = "在岗情况"; + this.JobStatusCol2.FieldName = "JobStatus"; + this.JobStatusCol2.Name = "JobStatusCol2"; + this.JobStatusCol2.OptionsColumn.AllowEdit = false; + this.JobStatusCol2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.JobStatusCol2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.JobStatusCol2.OptionsColumn.AllowMove = false; + this.JobStatusCol2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.JobStatusCol2.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.JobStatusCol2.OptionsColumn.ReadOnly = true; + this.JobStatusCol2.OptionsFilter.AllowFilter = false; + // + // HazardFactorsCol2 + // + this.HazardFactorsCol2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.HazardFactorsCol2.AppearanceCell.Options.UseFont = true; + this.HazardFactorsCol2.Caption = "危害因素"; + this.HazardFactorsCol2.FieldName = "HazardFactors"; + this.HazardFactorsCol2.Name = "HazardFactorsCol2"; + this.HazardFactorsCol2.OptionsColumn.AllowEdit = false; + this.HazardFactorsCol2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.HazardFactorsCol2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.HazardFactorsCol2.OptionsColumn.AllowMove = false; + this.HazardFactorsCol2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.HazardFactorsCol2.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.HazardFactorsCol2.OptionsColumn.ReadOnly = true; + this.HazardFactorsCol2.OptionsFilter.AllowFilter = false; + // // gridColumn63 // this.gridColumn63.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -2678,6 +2803,7 @@ this.gridColumn63.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn63.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn63.OptionsColumn.ReadOnly = true; + this.gridColumn63.OptionsFilter.AllowFilter = false; this.gridColumn63.Visible = true; this.gridColumn63.VisibleIndex = 6; this.gridColumn63.Width = 130; @@ -2694,6 +2820,7 @@ this.gridColumn64.OptionsColumn.AllowMove = false; this.gridColumn64.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn64.OptionsColumn.ReadOnly = true; + this.gridColumn64.OptionsFilter.AllowFilter = false; this.gridColumn64.Visible = true; this.gridColumn64.VisibleIndex = 7; this.gridColumn64.Width = 60; @@ -2726,6 +2853,7 @@ this.gridColumn66.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn66.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn66.OptionsColumn.ReadOnly = true; + this.gridColumn66.OptionsFilter.AllowFilter = false; this.gridColumn66.Visible = true; this.gridColumn66.VisibleIndex = 9; this.gridColumn66.Width = 40; @@ -5153,6 +5281,13 @@ // this.gridView8.Name = "gridView8"; // + // RiCmbHazardFactors + // + this.RiCmbHazardFactors.AutoHeight = false; + this.RiCmbHazardFactors.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.RiCmbHazardFactors.Name = "RiCmbHazardFactors"; + // // EnrollmentOrgForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -5197,6 +5332,8 @@ ((System.ComponentModel.ISupportInitialize)(this.RiCmbSex)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbMarriage)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbExamType)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobTypes)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobStatus)).EndInit(); this.panel3.ResumeLayout(false); this.TpGroupFeeItem.ResumeLayout(false); this.panel5.ResumeLayout(false); @@ -5268,6 +5405,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbHazardFactors)).EndInit(); this.ResumeLayout(false); } @@ -5615,5 +5753,14 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn104; private DevExpress.XtraGrid.Columns.GridColumn gridColumn105; private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn JobTypesCol; + private DevExpress.XtraGrid.Columns.GridColumn JobStatusCol; + private DevExpress.XtraGrid.Columns.GridColumn HazardFactorsCol; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox RiCmbJobTypes; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox RiCmbJobStatus; + private DevExpress.XtraGrid.Columns.GridColumn JobTypesCol2; + private DevExpress.XtraGrid.Columns.GridColumn JobStatusCol2; + private DevExpress.XtraGrid.Columns.GridColumn HazardFactorsCol2; + private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit RiCmbHazardFactors; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index def9127..548dcb5 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -206,7 +206,6 @@ namespace PEIS.View.Enrollment { 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()); RiCmbSex.Items.Add("男/女"); RiCmbSex.Items.Add("男"); @@ -214,6 +213,13 @@ namespace PEIS.View.Enrollment RiCmbMarriage.Items.Add("所有"); RiCmbMarriage.Items.Add("已婚"); RiCmbMarriage.Items.Add("未婚"); + RiCmbJobStatus.Items.Add("岗前"); + RiCmbJobStatus.Items.Add("在岗"); + RiCmbJobStatus.Items.Add("岗后"); + RiCmbJobTypes.Items.Add("测试工种1"); + RiCmbJobTypes.Items.Add("测试工种2"); + RiCmbHazardFactors.Items.Add("危害因素1"); + RiCmbHazardFactors.Items.Add("危害因素2"); OnGetPack(); OnGetFeeItem(); @@ -232,6 +238,7 @@ namespace PEIS.View.Enrollment EmptyDataSource(); return; } + OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); } @@ -252,6 +259,31 @@ namespace PEIS.View.Enrollment // 清空数据源 EmptyDataSource(); + if (Convert.ToBoolean(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "IsOccupational"))) + { + + JobTypesCol.Visible = true; + JobTypesCol.VisibleIndex = 6; + JobStatusCol.Visible = true; + JobStatusCol.VisibleIndex = 7; + HazardFactorsCol.Visible = true; + HazardFactorsCol.VisibleIndex = 8; + + + JobTypesCol2.Visible = true; + JobTypesCol2.VisibleIndex = 6; + JobStatusCol2.Visible = true; + JobStatusCol2.VisibleIndex = 7; + HazardFactorsCol2.Visible = true; + HazardFactorsCol2.VisibleIndex = 8; + } + else + { + JobTypesCol.Visible = false; + JobStatusCol.Visible = false; + HazardFactorsCol.Visible = false; + } + OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); OnGetOrgPatient(); OnGetEnrollmentPatient(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); @@ -1779,7 +1811,6 @@ namespace PEIS.View.Enrollment _lstGroup = items; _lstGroup.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "男/女"); DgcGroup.DataSource = _lstGroup; - DgvGroup.BestFitColumns(); DgcGroup2.DataSource = _lstGroup; DgvGroup2.BestFitColumns(); } diff --git a/PEIS/View/Enrollment/NewEnrollmentOrgForm.cs b/PEIS/View/Enrollment/NewEnrollmentOrgForm.cs index 22a76f9..952d8ad 100644 --- a/PEIS/View/Enrollment/NewEnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/NewEnrollmentOrgForm.cs @@ -50,6 +50,12 @@ namespace PEIS.View.Enrollment private void BtnOk_Click(object sender, EventArgs e) { + if (_org == null) + { + Global.Msg("info", "请选择团体"); + return; + } + EnrollmentOrg enrollmentOrg = new EnrollmentOrg(); enrollmentOrg.Address = TxtAddress.Text.Trim(); enrollmentOrg.Contactor1 = TxtContactor1.Text.Trim(); @@ -63,6 +69,7 @@ namespace PEIS.View.Enrollment enrollmentOrg.Name = TxtName.Text.Trim(); enrollmentOrg.OID = _org.ID; enrollmentOrg.SpellCode = Pinyin.GetInitials(TxtName.Text.Trim(), Encoding.UTF8).ToLower(); + enrollmentOrg.IsOccupational = occupationTrue.Checked; enrollmentOrg.Save(); Close(); }