diff --git a/PEIS/App.config b/PEIS/App.config index 49b5930..e35a23d 100644 --- a/PEIS/App.config +++ b/PEIS/App.config @@ -15,9 +15,9 @@ - + - + diff --git a/PEIS/Entity/ExamConclusion.cs b/PEIS/Entity/ExamConclusion.cs index 173bce0..cb872bb 100644 --- a/PEIS/Entity/ExamConclusion.cs +++ b/PEIS/Entity/ExamConclusion.cs @@ -23,6 +23,7 @@ namespace PEIS.Entity public String Advice { get; set; } public String DietaryGuidance { get; set; } public Int32 Seq { get; set; } + public Boolean IsOccupational { get; set; } #region report临时 diff --git a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs index a0f7dc3..3a79f4e 100644 --- a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs +++ b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs @@ -48,11 +48,12 @@ namespace PEIS.Model.Enrollment if (item.Type.Contains("职业")) { DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}',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); + JobStatus = '{item.JobStatus}', HazardFactors = '{item.HazardFactors}' WHERE ID= {item.ID}", false); } else { - DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}',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}',Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}', + JobStatus = null, JobTypes = null, HazardFactors = null WHERE ID= {item.ID}", false); } } diff --git a/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs b/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs index 8ab2cd9..048ed41 100644 --- a/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs @@ -34,7 +34,7 @@ namespace PEIS.Model.Enrollment public List GetCheckCost(Int64 oeID, Int64 enrollmentID) { - var team = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where a.OEID = {oeID} AND DeleteTime is null AND CancelTime is null"); + var team = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where a.OEID = {oeID} AND DeleteTime is null AND CancelTime is null AND EID > 0"); var person = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where EID = {enrollmentID} AND DeleteTime is null AND CancelTime is null"); return team.Concat(person).GroupBy(g => g.ID).Select(s => s.First()).ToList(); diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs index 547027d..006b333 100644 --- a/PEIS/Model/ReportModel.cs +++ b/PEIS/Model/ReportModel.cs @@ -117,7 +117,7 @@ namespace PEIS.Model // 根据体检号获取总结结论词报告 public List GetExamConclusions(Int64 Eid) { - var data = DAOHelp.GetDataBySQL($"SELECT Conclusion,Suggestion FROM Exam_Conclusion WHERE EID = {Eid}"); + var data = DAOHelp.GetDataBySQL($"SELECT Conclusion,Suggestion,IsOccupational FROM Exam_Conclusion WHERE EID = {Eid}"); var items = data.Where(w => w.Suggestion != null).ToList(); return items; } diff --git a/PEIS/Properties/licenses.licx b/PEIS/Properties/licenses.licx index 3acb427..e69de29 100644 --- a/PEIS/Properties/licenses.licx +++ b/PEIS/Properties/licenses.licx @@ -1,4 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/PEIS/ReportFiles/CAPReport.frx b/PEIS/ReportFiles/CAPReport.frx index 4d78336..ccf099c 100644 --- a/PEIS/ReportFiles/CAPReport.frx +++ b/PEIS/ReportFiles/CAPReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -185,7 +185,7 @@ namespace FastReport - + @@ -465,7 +465,7 @@ namespace FastReport - + @@ -586,7 +586,7 @@ namespace FastReport - + @@ -602,12 +602,12 @@ namespace FastReport - - + + - + @@ -620,7 +620,7 @@ namespace FastReport - + diff --git a/PEIS/ReportFiles/CATReport.frx b/PEIS/ReportFiles/CATReport.frx index 4d17465..035e98f 100644 --- a/PEIS/ReportFiles/CATReport.frx +++ b/PEIS/ReportFiles/CATReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -34,6 +34,9 @@ namespace FastReport + + + @@ -126,7 +129,7 @@ namespace FastReport - + @@ -134,7 +137,7 @@ namespace FastReport - + diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index 765a5e6..79c7b6f 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -113,24 +113,21 @@ namespace PEIS.Utils /// /// 体检号 /// - public static FastReport.Report GetReport(Int64 eid) + public static FastReport.Report GetReport(Int64 eid,String paramFile = null) { try { var patient = new ReportModel().GetPatientInfo(eid); if (patient == null) return null; - var fileName = - DAOHelp.GetDataBySQL($"SELECT Description FROM Dict_Config where Value='{patient.Type}'") - .FirstOrDefault()?.Description ?? "PReport.frx"; - var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", - fileName); + var fileName = DAOHelp.GetDataBySQL($"SELECT Description FROM Dict_Config where Value='{patient.Type}'").FirstOrDefault()?.Description ?? "PReport.frx"; + var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles",string.IsNullOrEmpty(paramFile) ? fileName : paramFile); if (!File.Exists(filePath)) { MessageBox.Show($@"未找到报告单模板文件：{fileName}", @"获取报告单失败"); return null; } - switch (fileName) + switch (string.IsNullOrEmpty(paramFile) ? fileName : paramFile) { case "Children.frx": return EasyReport(patient, eid, filePath); @@ -248,7 +245,7 @@ namespace PEIS.Utils rpt.Load(filePath); var lstEFeeItems = new ReportModel().GetEFeeItem(eid); - var lstConclusions = new ReportModel().GetExamConclusions(eid); + var lstConclusions = new ReportModel().GetExamConclusions(eid).Where(w => w.IsOccupational).ToList(); var lstGeneral = new ReportModel().GetGeneralResult(eid); var lstLis = new ReportModel().GetLisResult(eid); var lstPacs = new ReportModel().GetPacsResult(eid); @@ -397,8 +394,8 @@ namespace PEIS.Utils { for (int i = 0; i < lstConclusions.Count; i++) { - Conclusion +=$"{(i + 1)}、{lstConclusions[i].Conclusion}。"; - Suggestion+= $"{(i + 1)}、{lstConclusions[i].Suggestion}"; + Conclusion +=$"{(i + 1)}、{lstConclusions[i].Conclusion}。" + "\r\n"; + Suggestion+= $"{lstConclusions[i].Suggestion}" + "\r\n" ; } } rpt.SetParameterValue("Conclusion", Conclusion); @@ -442,7 +439,7 @@ namespace PEIS.Utils rpt.Load(filePath); var lstEFeeItems = new ReportModel().GetEFeeItem(eid); - var lstConclusions = new ReportModel().GetExamConclusions(eid); + var lstConclusions = new ReportModel().GetExamConclusions(eid).Where(w => !w.IsOccupational).ToList(); var lstGeneral = new ReportModel().GetGeneralResult(eid); var lstLis = new ReportModel().GetLisResult(eid); var lstPacs = new ReportModel().GetPacsResult(eid); diff --git a/PEIS/View/EReport/TeamReportForm.cs b/PEIS/View/EReport/TeamReportForm.cs index 6dfac11..7d79068 100644 --- a/PEIS/View/EReport/TeamReportForm.cs +++ b/PEIS/View/EReport/TeamReportForm.cs @@ -280,14 +280,24 @@ namespace PEIS.View.EReport tReport.SetParameterValue("Postcode", Global._hospital.Code); tReport.SetParameterValue("JobStatus", "在岗期间职业健康体检"); - //人员数据 - var OrgPatient = DAOHelp.GetDataBySQL($@"SELECT ID,Name,HazardFactors FROM Enrollment_Patient WHERE OEID = {_regInfo.ID}"); + + // 人员数据 + var OrgPatient = DAOHelp.GetDataBySQL($@"SELECT ID,Name,HazardFactors,Type,SignTime FROM Enrollment_Patient WHERE OEID = {_regInfo.ID}"); + tReport.SetParameterValue("Total", OrgPatient.Count()); + tReport.SetParameterValue("TotalHazard", OrgPatient.Where(w => w.Type.Contains("职业")).Count()); + tReport.SetParameterValue("TotalHazardSign", OrgPatient.Where(w => w.Type.Contains("职业") && w.SignTime != null).Count()); + + // 在岗情况 + var Group = DAOHelp.GetDataBySQL($@"SELECT TOP 1 JobStatus FROM Enrollment_OrgGroup WHERE OID = {_regInfo.ID} AND Type LIKE '%职业%'")?[0]; + tReport.SetParameterValue("JobStatus", $@"{Group.JobStatus}期间职业健康体检"); // 接害因素 var HazardFactors = DAOHelp.GetDataBySQL($@"SELECT STUFF((SELECT '; ' + HazardFactors FROM Enrollment_OrgGroup WHERE OID = {_regInfo.ID} FOR XML PATH('')), 1, 2, '') AS HazardFactors")?[0].HazardFactors.Split(';').Select(s => s.Trim()).ToList(); - var _lsthazard = new List(); - if(HazardFactors.Count != 0) + tReport.SetParameterValue("HazardFactors", String.Join("、", HazardFactors)); + + + if (HazardFactors.Count != 0) { foreach (var item in HazardFactors) { diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 8529992..30f0938 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -28,11 +28,12 @@ /// private void InitializeComponent() { + 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(); @@ -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,7 +127,6 @@ 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.JobStatusCol = new DevExpress.XtraGrid.Columns.GridColumn(); this.RiCmbJobStatus = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.HazardFactorsCol = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -191,7 +191,6 @@ 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(); @@ -206,7 +205,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(); @@ -237,7 +236,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(); @@ -328,7 +327,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(); @@ -1673,7 +1672,6 @@ this.gridColumn8, this.gridColumn9, this.gridColumn10, - this.JobTypesCol, this.JobStatusCol, this.HazardFactorsCol, this.gridColumn11, @@ -1783,13 +1781,13 @@ this.gridColumn10.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn10.AppearanceCell.Options.UseFont = true; this.gridColumn10.Caption = "体检类型"; + this.gridColumn10.ColumnEdit = this.RiCmbExamType; this.gridColumn10.FieldName = "Type"; this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.OptionsColumn.AllowEdit = false; this.gridColumn10.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn10.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn10.OptionsColumn.AllowMove = false; this.gridColumn10.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn10.OptionsColumn.ReadOnly = true; this.gridColumn10.OptionsFilter.AllowFilter = false; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 5; @@ -1802,16 +1800,6 @@ 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.FieldName = "JobTypes"; - this.JobTypesCol.Name = "JobTypesCol"; - this.JobTypesCol.OptionsFilter.AllowFilter = false; - this.JobTypesCol.Width = 90; - // // JobStatusCol // this.JobStatusCol.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -2198,11 +2186,11 @@ // TpPack // this.TpPack.Controls.Add(this.DgcPack); - this.TpPack.Location = new System.Drawing.Point(4, 24); + this.TpPack.Location = new System.Drawing.Point(4, 23); this.TpPack.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpPack.Name = "TpPack"; this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.TpPack.Size = new System.Drawing.Size(452, 523); + this.TpPack.Size = new System.Drawing.Size(452, 512); this.TpPack.TabIndex = 1; this.TpPack.Text = "套餐"; this.TpPack.UseVisualStyleBackColor = true; @@ -2213,7 +2201,7 @@ this.DgcPack.Location = new System.Drawing.Point(2, 3); this.DgcPack.MainView = this.DgvPack; this.DgcPack.Name = "DgcPack"; - this.DgcPack.Size = new System.Drawing.Size(448, 517); + this.DgcPack.Size = new System.Drawing.Size(448, 506); this.DgcPack.TabIndex = 122; this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack, @@ -2374,11 +2362,11 @@ // this.TpFeeItem.Controls.Add(this.DgcFeeItem); this.TpFeeItem.Controls.Add(this.FeeItemSearch); - this.TpFeeItem.Location = new System.Drawing.Point(4, 24); + this.TpFeeItem.Location = new System.Drawing.Point(4, 23); this.TpFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpFeeItem.Name = "TpFeeItem"; this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.TpFeeItem.Size = new System.Drawing.Size(452, 523); + this.TpFeeItem.Size = new System.Drawing.Size(452, 512); this.TpFeeItem.TabIndex = 0; this.TpFeeItem.Text = "收费项目"; this.TpFeeItem.UseVisualStyleBackColor = true; @@ -2391,7 +2379,7 @@ this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(448, 495); + this.DgcFeeItem.Size = new System.Drawing.Size(448, 484); this.DgcFeeItem.TabIndex = 137; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem, @@ -2613,7 +2601,6 @@ this.gridColumn60, this.gridColumn61, this.gridColumn62, - this.JobTypesCol2, this.JobStatusCol2, this.HazardFactorsCol2, this.gridColumn63, @@ -2754,22 +2741,6 @@ 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); @@ -3068,15 +3039,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 = 65; @@ -3514,15 +3485,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 = ""; @@ -4111,11 +4082,11 @@ // tabPage1 // this.tabPage1.Controls.Add(this.DgcPack2); - this.tabPage1.Location = new System.Drawing.Point(4, 24); + this.tabPage1.Location = new System.Drawing.Point(4, 23); this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.tabPage1.Size = new System.Drawing.Size(372, 361); + this.tabPage1.Size = new System.Drawing.Size(372, 362); this.tabPage1.TabIndex = 1; this.tabPage1.Text = "套餐"; this.tabPage1.UseVisualStyleBackColor = true; @@ -4126,7 +4097,7 @@ this.DgcPack2.Location = new System.Drawing.Point(2, 3); this.DgcPack2.MainView = this.DgvPack2; this.DgcPack2.Name = "DgcPack2"; - this.DgcPack2.Size = new System.Drawing.Size(368, 355); + this.DgcPack2.Size = new System.Drawing.Size(368, 356); this.DgcPack2.TabIndex = 122; this.DgcPack2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack2, @@ -4288,11 +4259,11 @@ // this.tabPage2.Controls.Add(this.DgcFeeItem2); this.tabPage2.Controls.Add(this.FeeItemSearch2); - this.tabPage2.Location = new System.Drawing.Point(4, 24); + this.tabPage2.Location = new System.Drawing.Point(4, 23); this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.tabPage2.Size = new System.Drawing.Size(372, 361); + this.tabPage2.Size = new System.Drawing.Size(372, 362); this.tabPage2.TabIndex = 0; this.tabPage2.Text = "收费项目"; this.tabPage2.UseVisualStyleBackColor = true; @@ -4305,7 +4276,7 @@ this.DgcFeeItem2.Name = "DgcFeeItem2"; this.DgcFeeItem2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcFeeItem2.Size = new System.Drawing.Size(368, 333); + this.DgcFeeItem2.Size = new System.Drawing.Size(368, 334); this.DgcFeeItem2.TabIndex = 138; this.DgcFeeItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem2, @@ -5757,12 +5728,10 @@ 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; diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 4b208f9..9a1d355 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -269,26 +269,26 @@ namespace PEIS.View.Enrollment 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; + RiCmbExamType.Items.Clear(); + RiCmbExamType.Items.AddRange(Global._lstConfig.Where(a => a.Key.Equals("ExamType")).ToList().Select(a => a.Value).ToList()); } else { - JobTypesCol.Visible = false; JobStatusCol.Visible = false; HazardFactorsCol.Visible = false; + RiCmbExamType.Items.Clear(); + RiCmbExamType.Items.AddRange(new List() { "健康体检" }); } OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); @@ -300,6 +300,7 @@ namespace PEIS.View.Enrollment { if (!DgvGroup.GetSelectedRows().Any()) return; + RiCmbHazardFactors.Items.Clear(); var status = DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "JobStatus")?.ToString(); var _lst = DAOHelp.GetDataBySQL($@"SELECT Name FROM Dict_HazardType WHERE ID IN (SELECT HID FROM Dict_HTypeFItem GROUP BY HID) @@ -327,9 +328,7 @@ namespace PEIS.View.Enrollment AgeMin = 0, AgeMax = 999, Marriage = "所有", - Sex = "男/女", - JobStatus = Convert.ToBoolean(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "IsOccupational")) ? "岗前" : null, - Type = Convert.ToBoolean(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "IsOccupational")) ? "职业体检" : "健康体检" + Sex = "男/女" }); DgvGroup.RefreshData(); @@ -350,17 +349,24 @@ namespace PEIS.View.Enrollment var IsOccupational = Convert.ToBoolean(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "IsOccupational")); foreach (var item in _lstGroup) { - if (IsOccupational) + // 体检类型必填 + if (string.IsNullOrEmpty(item.Type)) + { + Global.Msg("info", $@"请选择{item.Name}分组，体检类型"); + return; + } + + // + if (IsOccupational && item.Type.Contains("职业")) { if(string.IsNullOrEmpty(item.JobStatus) || string.IsNullOrEmpty(item.HazardFactors)) { - Global.Msg("info", "请选择在岗情况或接害因素"); + Global.Msg("info", $@"请选择{item.Name}分组，在岗情况或接害因素"); return; } } item.Sex = item.Sex == null ? "0" : item.Sex.Equals("男") ? "1" : item.Sex.Equals("女") ? "2" : "0"; - item.Type = IsOccupational ? "职业体检" : "健康体检"; if(item.ID != 0) { var _list = DAOHelp.GetDataBySQL($@"SELECT * FROM Enrollment_OrgGroup WHERE ID = {item.ID}"); @@ -381,7 +387,7 @@ namespace PEIS.View.Enrollment foreach (var item in _lstGroup) { // 同步后的不可更改项目 - if (item.CheckTime != null) continue; + if (item.CheckTime != null || !(item.Type.Contains("职业"))) continue; // 避免重复开设，删除分组原有所有项目 DAOHelp.ExecuteSql($@" DELETE FROM Enrollment_OrgFeeItem WHERE GroupID = {item?.ID}"); @@ -430,6 +436,7 @@ namespace PEIS.View.Enrollment } } + OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); } } @@ -1249,6 +1256,7 @@ namespace PEIS.View.Enrollment if (e.Column.FieldName == "JobStatus") { // 获取当前行的前一列的值 + RiCmbHazardFactors.Items.Clear(); var status = DgvGroup.GetRowCellValue(e.RowHandle, e.Column)?.ToString(); var _lst = DAOHelp.GetDataBySQL($@"SELECT Name FROM Dict_HazardType WHERE ID IN (SELECT HID FROM Dict_HTypeFItem GROUP BY HID) diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.resx b/PEIS/View/Enrollment/EnrollmentOrgForm.resx index 754d1cb..5ae4a3e 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.resx +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.resx @@ -120,6 +120,9 @@ 510, 16 + + 510, 16 + 1597, 17 @@ -272,6 +275,9 @@ 1914, 17 + + 1914, 17 + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAT5JREFUSEvd @@ -301,7 +307,7 @@ KGtGXgAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 @@ -313,7 +319,7 @@ FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 @@ -325,7 +331,7 @@ FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 @@ -337,7 +343,7 @@ FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs index fd56dad..317cbf9 100644 --- a/PEIS/View/Exam/PartForm.cs +++ b/PEIS/View/Exam/PartForm.cs @@ -1192,45 +1192,66 @@ namespace PEIS.View.Exam if (result != DialogResult.Yes) return; // 检验科判断项目是否完全出结果 - if(_examPart.DeptCode == "3001") + if (_examPart.DeptCode == "3001") { var feeItem = new List(); - var examFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001' AND FID NOT IN (100,101)"); // FID = 100、101为包含乙肝项目不做校验。 - - var resultFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} GROUP BY FeeItemName"); - foreach (var item in resultFeeItem) + var examFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001' "); // FID = 100、101为包含乙肝项目不做校验。 + + var resultFeeItem = DAOHelp.GetDataBySQL($@"SELECT c.FeeItemName + FROM lis.rmlis6.dbo.vw_checked_labresult A + LEFT JOIN Dict_ReportItem B ON ( A.rpt_itemcode = B.RptItemCode OR A.rptcode = B.RptItemCode ) + LEFT JOIN Enrollment_FeeItem C ON B.FID = C.FID AND CONVERT ( INT, pat_no ) = c.EID + WHERE pat_no = '{_patient.ID}' AND pat_typecode = 4 AND C.FID IS NOT NULL GROUP BY c.FeeItemName"); + //foreach (var item in resultFeeItem) + //{ + // if (item.FeeItemName.Contains("，")) + // { + // var one = item.FeeItemName.Split('，'); + // foreach (var o in one) + // { + // feeItem.Add(new EnrollmentFeeItem() { FeeItemName = o }); + // } + // } else if (item.FeeItemName.Contains(",")) + // { + // var two = item.FeeItemName.Split(','); + // foreach (var t in two) + // { + // feeItem.Add(new EnrollmentFeeItem() { FeeItemName = t }); + // } + // } + // else if (item.FeeItemName.Contains("补充项目")) + // { + // continue; + // } + // else + // { + // feeItem.Add(new EnrollmentFeeItem() { FeeItemName = item.FeeItemName }); + // } + //} + + if (resultFeeItem.Count != examFeeItem.Count) { - if (item.FeeItemName.Contains("，")) + List diff = new List(); + foreach (var item1 in examFeeItem) { - var one = item.FeeItemName.Split('，'); - foreach (var o in one) + bool found = false; + foreach (var item2 in resultFeeItem) { - if (o.Contains("两对半")) continue; - feeItem.Add(new EnrollmentFeeItem() { FeeItemName = o} ); + if (item1.FeeItemName == item2.FeeItemName) + { + found = true; + break; + } } - }else if (item.FeeItemName.Contains(",")) - { - var two = item.FeeItemName.Split(','); - foreach (var t in two) + if (!found) { - if (t.Contains("两对半")) continue; - feeItem.Add(new EnrollmentFeeItem() { FeeItemName = t }); + diff.Add(item1); } } - else if (item.FeeItemName.Contains("补充项目")) - { - continue; - } - else - { - feeItem.Add(new EnrollmentFeeItem() { FeeItemName = item.FeeItemName }); - } - } - if (feeItem.Count != examFeeItem.Count) - { - Msg("info", "请核对检验项目是否齐全后重试！"); + + Msg("info", string.Join("、", diff.Select(s => s.FeeItemName).First()) + "未出结果！"); return; } } diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index a872252..9621ef9 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -95,6 +95,8 @@ this.colExamConclusion3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.colExamConclusion4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); + this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit(); this.colConclusionSelect = new DevExpress.XtraGrid.Columns.GridColumn(); this.CmbSearchConclusion = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit(); this.DgvSearchConclusion = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -220,6 +222,7 @@ this.menuStrip = new System.Windows.Forms.MenuStrip(); this.TsmiWeChatViewReport = new System.Windows.Forms.ToolStripMenuItem(); this.TsmiAbandoned = new System.Windows.Forms.ToolStripMenuItem(); + this.TsmiOccupational = new System.Windows.Forms.ToolStripMenuItem(); this.TsmiFinishCancel = new System.Windows.Forms.ToolStripMenuItem(); this.TsmiFinish = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItemStatusTxt = new System.Windows.Forms.ToolStripMenuItem(); @@ -267,6 +270,7 @@ ((System.ComponentModel.ISupportInitialize)(this.DgcExamConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvExamConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.CmbSearchConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvSearchConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemRichTextEdit2)).BeginInit(); @@ -345,7 +349,7 @@ // splitContainerBase.Panel2 // this.splitContainerBase.Panel2.Controls.Add(this.panelRightBase); - this.splitContainerBase.Size = new System.Drawing.Size(1904, 1041); + this.splitContainerBase.Size = new System.Drawing.Size(722, 483); this.splitContainerBase.SplitterDistance = 235; this.splitContainerBase.TabIndex = 0; // @@ -358,7 +362,7 @@ this.panelLeftBase.Location = new System.Drawing.Point(0, 0); this.panelLeftBase.Margin = new System.Windows.Forms.Padding(0); this.panelLeftBase.Name = "panelLeftBase"; - this.panelLeftBase.Size = new System.Drawing.Size(235, 1041); + this.panelLeftBase.Size = new System.Drawing.Size(235, 483); this.panelLeftBase.TabIndex = 0; // // DgcPatient @@ -370,7 +374,7 @@ this.DgcPatient.Name = "DgcPatient"; this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcPatient.Size = new System.Drawing.Size(235, 791); + this.DgcPatient.Size = new System.Drawing.Size(235, 233); this.DgcPatient.TabIndex = 127; this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPatient}); @@ -839,7 +843,7 @@ this.panelRightBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelRightBase.Location = new System.Drawing.Point(0, 0); this.panelRightBase.Name = "panelRightBase"; - this.panelRightBase.Size = new System.Drawing.Size(1665, 1041); + this.panelRightBase.Size = new System.Drawing.Size(483, 483); this.panelRightBase.TabIndex = 2; // // panelExamInfoBase @@ -849,7 +853,7 @@ this.panelExamInfoBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExamInfoBase.Location = new System.Drawing.Point(0, 181); this.panelExamInfoBase.Name = "panelExamInfoBase"; - this.panelExamInfoBase.Size = new System.Drawing.Size(1665, 860); + this.panelExamInfoBase.Size = new System.Drawing.Size(483, 302); this.panelExamInfoBase.TabIndex = 60; // // splitContainerExamInfo @@ -867,8 +871,8 @@ // splitContainerExamInfo.Panel2 // this.splitContainerExamInfo.Panel2.Controls.Add(this.panelExamInfoL); - this.splitContainerExamInfo.Size = new System.Drawing.Size(1665, 860); - this.splitContainerExamInfo.SplitterDistance = 544; + this.splitContainerExamInfo.Size = new System.Drawing.Size(483, 302); + this.splitContainerExamInfo.SplitterDistance = 25; this.splitContainerExamInfo.TabIndex = 0; // // panelTxtSummary @@ -878,7 +882,7 @@ this.panelTxtSummary.Dock = System.Windows.Forms.DockStyle.Fill; this.panelTxtSummary.Location = new System.Drawing.Point(0, 0); this.panelTxtSummary.Name = "panelTxtSummary"; - this.panelTxtSummary.Size = new System.Drawing.Size(544, 860); + this.panelTxtSummary.Size = new System.Drawing.Size(25, 302); this.panelTxtSummary.TabIndex = 2; // // splitExamPart @@ -895,8 +899,8 @@ // splitExamPart.Panel2 // this.splitExamPart.Panel2.Controls.Add(this.txtSummary); - this.splitExamPart.Size = new System.Drawing.Size(544, 860); - this.splitExamPart.SplitterDistance = 249; + this.splitExamPart.Size = new System.Drawing.Size(25, 302); + this.splitExamPart.SplitterDistance = 665; this.splitExamPart.TabIndex = 0; // // panel5 @@ -907,7 +911,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(0, 0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(249, 860); + this.panel5.Size = new System.Drawing.Size(332, 700); this.panel5.TabIndex = 0; // // DgcExamResultData @@ -920,7 +924,7 @@ this.DgcExamResultData.Name = "DgcExamResultData"; this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit4}); - this.DgcExamResultData.Size = new System.Drawing.Size(600, 843); + this.DgcExamResultData.Size = new System.Drawing.Size(600, 683); this.DgcExamResultData.TabIndex = 0; this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamResultData}); @@ -1082,7 +1086,7 @@ this.txtSummary.Name = "txtSummary"; this.txtSummary.ReadOnly = true; this.txtSummary.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtSummary.Size = new System.Drawing.Size(291, 860); + this.txtSummary.Size = new System.Drawing.Size(420, 700); this.txtSummary.TabIndex = 4; this.txtSummary.Text = "科室小结"; // @@ -1092,7 +1096,7 @@ this.panelExamInfoL.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExamInfoL.Location = new System.Drawing.Point(0, 0); this.panelExamInfoL.Name = "panelExamInfoL"; - this.panelExamInfoL.Size = new System.Drawing.Size(1117, 860); + this.panelExamInfoL.Size = new System.Drawing.Size(454, 302); this.panelExamInfoL.TabIndex = 2; // // TabPart @@ -1120,7 +1124,7 @@ this.TabPart.Name = "TabPart"; this.TabPart.SelectedTabPage = this.tabPageConslusion; this.TabPart.ShowTabHeader = DevExpress.Utils.DefaultBoolean.True; - this.TabPart.Size = new System.Drawing.Size(1117, 860); + this.TabPart.Size = new System.Drawing.Size(454, 302); this.TabPart.TabIndex = 0; this.TabPart.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabPageConslusion, @@ -1137,9 +1141,9 @@ this.tabPageConslusion.Controls.Add(this.panelAllConclusion); this.tabPageConslusion.Controls.Add(this.panelConclussionMenu); this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu; - this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2); + this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPageConslusion.Name = "tabPageConslusion"; - this.tabPageConslusion.Size = new System.Drawing.Size(1111, 821); + this.tabPageConslusion.Size = new System.Drawing.Size(448, 263); this.tabPageConslusion.Text = "结论词"; // // panelConclussion @@ -1149,7 +1153,7 @@ this.panelConclussion.Dock = System.Windows.Forms.DockStyle.Fill; this.panelConclussion.Location = new System.Drawing.Point(0, 40); this.panelConclussion.Name = "panelConclussion"; - this.panelConclussion.Size = new System.Drawing.Size(770, 781); + this.panelConclussion.Size = new System.Drawing.Size(107, 223); this.panelConclussion.TabIndex = 3; // // DgcExamConclusion @@ -1162,8 +1166,9 @@ this.DgcExamConclusion.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemRichTextEdit2, this.repositoryItemMemoEdit2, - this.CmbSearchConclusion}); - this.DgcExamConclusion.Size = new System.Drawing.Size(770, 781); + this.CmbSearchConclusion, + this.repositoryItemCheckEdit1}); + this.DgcExamConclusion.Size = new System.Drawing.Size(107, 223); this.DgcExamConclusion.TabIndex = 5; this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamConclusion, @@ -1177,6 +1182,7 @@ this.colExamConclusion1, this.colExamConclusion3, this.colExamConclusion4, + this.gridColumn33, this.colConclusionSelect}); this.DgvExamConclusion.GridControl = this.DgcExamConclusion; this.DgvExamConclusion.Name = "DgvExamConclusion"; @@ -1209,7 +1215,7 @@ this.colExamConclusion3.Name = "colExamConclusion3"; this.colExamConclusion3.Visible = true; this.colExamConclusion3.VisibleIndex = 1; - this.colExamConclusion3.Width = 230; + this.colExamConclusion3.Width = 206; // // colExamConclusion4 // @@ -1221,12 +1227,27 @@ this.colExamConclusion4.Name = "colExamConclusion4"; this.colExamConclusion4.Visible = true; this.colExamConclusion4.VisibleIndex = 2; - this.colExamConclusion4.Width = 612; + this.colExamConclusion4.Width = 614; // // repositoryItemMemoEdit2 // this.repositoryItemMemoEdit2.Name = "repositoryItemMemoEdit2"; // + // gridColumn33 + // + this.gridColumn33.Caption = "职业病结论"; + this.gridColumn33.ColumnEdit = this.repositoryItemCheckEdit1; + this.gridColumn33.FieldName = "IsOccupational"; + this.gridColumn33.Name = "gridColumn33"; + this.gridColumn33.Visible = true; + this.gridColumn33.VisibleIndex = 3; + this.gridColumn33.Width = 128; + // + // repositoryItemCheckEdit1 + // + this.repositoryItemCheckEdit1.AutoHeight = false; + this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1"; + // // colConclusionSelect // this.colConclusionSelect.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(247))))); @@ -1316,9 +1337,9 @@ this.panelAllConclusion.Controls.Add(this.DgcAllConclusion); this.panelAllConclusion.Controls.Add(this.panel2); this.panelAllConclusion.Dock = System.Windows.Forms.DockStyle.Right; - this.panelAllConclusion.Location = new System.Drawing.Point(770, 40); + this.panelAllConclusion.Location = new System.Drawing.Point(107, 40); this.panelAllConclusion.Name = "panelAllConclusion"; - this.panelAllConclusion.Size = new System.Drawing.Size(341, 781); + this.panelAllConclusion.Size = new System.Drawing.Size(341, 223); this.panelAllConclusion.TabIndex = 2; // // DgcAllConclusion @@ -1328,7 +1349,7 @@ this.DgcAllConclusion.Location = new System.Drawing.Point(0, 36); this.DgcAllConclusion.MainView = this.DgvAllConclusion; this.DgcAllConclusion.Name = "DgcAllConclusion"; - this.DgcAllConclusion.Size = new System.Drawing.Size(500, 728); + this.DgcAllConclusion.Size = new System.Drawing.Size(500, 170); this.DgcAllConclusion.TabIndex = 2; this.DgcAllConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvAllConclusion}); @@ -1358,7 +1379,7 @@ this.gridColumn5.OptionsColumn.ReadOnly = true; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 0; - this.gridColumn5.Width = 35; + this.gridColumn5.Width = 67; // // gridColumn6 // @@ -1371,7 +1392,7 @@ this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 1; - this.gridColumn6.Width = 165; + this.gridColumn6.Width = 220; // // gridColumn7 // @@ -1387,7 +1408,7 @@ this.gridColumn7.OptionsFilter.AllowFilter = false; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 2; - this.gridColumn7.Width = 500; + this.gridColumn7.Width = 669; // // gridColumn8 // @@ -1398,7 +1419,7 @@ this.gridColumn8.OptionsColumn.ReadOnly = true; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 3; - this.gridColumn8.Width = 20; + this.gridColumn8.Width = 29; // // panel2 // @@ -1438,7 +1459,7 @@ this.panelConclussionMenu.Dock = System.Windows.Forms.DockStyle.Top; this.panelConclussionMenu.Location = new System.Drawing.Point(0, 0); this.panelConclussionMenu.Name = "panelConclussionMenu"; - this.panelConclussionMenu.Size = new System.Drawing.Size(1111, 40); + this.panelConclussionMenu.Size = new System.Drawing.Size(448, 40); this.panelConclussionMenu.TabIndex = 0; // // OpsConclusion @@ -1447,7 +1468,7 @@ this.OpsConclusion.Location = new System.Drawing.Point(0, 0); this.OpsConclusion.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7); this.OpsConclusion.Name = "OpsConclusion"; - this.OpsConclusion.Size = new System.Drawing.Size(1111, 40); + this.OpsConclusion.Size = new System.Drawing.Size(448, 40); this.OpsConclusion.TabIndex = 5; // // tabPageExam @@ -1468,9 +1489,9 @@ this.tabPageExam.Appearance.PageClient.Options.UseForeColor = true; this.tabPageExam.Controls.Add(this.DgcExamResult); this.tabPageExam.Image = global::PEIS.Properties.Resources.menu; - this.tabPageExam.Margin = new System.Windows.Forms.Padding(2); + this.tabPageExam.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPageExam.Name = "tabPageExam"; - this.tabPageExam.Size = new System.Drawing.Size(1111, 821); + this.tabPageExam.Size = new System.Drawing.Size(554, 661); this.tabPageExam.Text = "一般项目"; // // DgcExamResult @@ -1481,7 +1502,7 @@ this.DgcExamResult.Name = "DgcExamResult"; this.DgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit3}); - this.DgcExamResult.Size = new System.Drawing.Size(1111, 821); + this.DgcExamResult.Size = new System.Drawing.Size(554, 661); this.DgcExamResult.TabIndex = 140; this.DgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamResult}); @@ -1667,9 +1688,9 @@ // this.tabPageSummary.Controls.Add(this.panelDeptSummary); this.tabPageSummary.Image = global::PEIS.Properties.Resources.menu; - this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2); + this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPageSummary.Name = "tabPageSummary"; - this.tabPageSummary.Size = new System.Drawing.Size(1111, 821); + this.tabPageSummary.Size = new System.Drawing.Size(554, 661); this.tabPageSummary.Text = "科室小结"; // // panelDeptSummary @@ -1679,7 +1700,7 @@ this.panelDeptSummary.Dock = System.Windows.Forms.DockStyle.Fill; this.panelDeptSummary.Location = new System.Drawing.Point(0, 0); this.panelDeptSummary.Name = "panelDeptSummary"; - this.panelDeptSummary.Size = new System.Drawing.Size(1111, 821); + this.panelDeptSummary.Size = new System.Drawing.Size(554, 661); this.panelDeptSummary.TabIndex = 61; // // DgcSummary @@ -1692,7 +1713,7 @@ this.repositoryItemRichTextEdit1, this.repositoryItemTextEdit1, this.repositoryItemMemoEdit1}); - this.DgcSummary.Size = new System.Drawing.Size(1111, 821); + this.DgcSummary.Size = new System.Drawing.Size(554, 661); this.DgcSummary.TabIndex = 0; this.DgcSummary.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvSummary}); @@ -1754,9 +1775,9 @@ // this.tabPageLis.Controls.Add(this.DgcLisReport); this.tabPageLis.Image = global::PEIS.Properties.Resources.menu; - this.tabPageLis.Margin = new System.Windows.Forms.Padding(2); + this.tabPageLis.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPageLis.Name = "tabPageLis"; - this.tabPageLis.Size = new System.Drawing.Size(1111, 821); + this.tabPageLis.Size = new System.Drawing.Size(554, 661); this.tabPageLis.Text = "检验报告"; // // DgcLisReport @@ -1765,7 +1786,7 @@ this.DgcLisReport.Location = new System.Drawing.Point(0, 0); this.DgcLisReport.MainView = this.DgvLisReport; this.DgcLisReport.Name = "DgcLisReport"; - this.DgcLisReport.Size = new System.Drawing.Size(1111, 821); + this.DgcLisReport.Size = new System.Drawing.Size(554, 661); this.DgcLisReport.TabIndex = 1; this.DgcLisReport.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvLisReport}); @@ -1874,9 +1895,9 @@ // this.tabPagePacs.Controls.Add(this.panelPacsBase); this.tabPagePacs.Image = global::PEIS.Properties.Resources.menu; - this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2); + this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPagePacs.Name = "tabPagePacs"; - this.tabPagePacs.Size = new System.Drawing.Size(1111, 821); + this.tabPagePacs.Size = new System.Drawing.Size(554, 661); this.tabPagePacs.Text = "检查报告"; // // panelPacsBase @@ -1886,7 +1907,7 @@ this.panelPacsBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsBase.Location = new System.Drawing.Point(0, 0); this.panelPacsBase.Name = "panelPacsBase"; - this.panelPacsBase.Size = new System.Drawing.Size(1111, 821); + this.panelPacsBase.Size = new System.Drawing.Size(554, 661); this.panelPacsBase.TabIndex = 1; // // xtraTabControl1 @@ -1897,7 +1918,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(260, 0); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabPacsRpt; - this.xtraTabControl1.Size = new System.Drawing.Size(851, 821); + this.xtraTabControl1.Size = new System.Drawing.Size(294, 661); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabPacsRpt, @@ -1907,7 +1928,7 @@ // this.tabPacsRpt.Controls.Add(this.panelPacsRpt); this.tabPacsRpt.Name = "tabPacsRpt"; - this.tabPacsRpt.Size = new System.Drawing.Size(807, 815); + this.tabPacsRpt.Size = new System.Drawing.Size(250, 655); this.tabPacsRpt.Text = "报告"; // // panelPacsRpt @@ -1918,7 +1939,7 @@ this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsRpt.Location = new System.Drawing.Point(0, 0); this.panelPacsRpt.Name = "panelPacsRpt"; - this.panelPacsRpt.Size = new System.Drawing.Size(807, 815); + this.panelPacsRpt.Size = new System.Drawing.Size(250, 655); this.panelPacsRpt.TabIndex = 3; // // pictureBoxPacsRpt @@ -1936,7 +1957,7 @@ // this.tabPacsImg.Controls.Add(this.panel12); this.tabPacsImg.Name = "tabPacsImg"; - this.tabPacsImg.Size = new System.Drawing.Size(807, 815); + this.tabPacsImg.Size = new System.Drawing.Size(807, 661); this.tabPacsImg.Text = "图片"; // // panel12 @@ -1945,7 +1966,7 @@ this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; this.panel12.Location = new System.Drawing.Point(0, 0); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(807, 815); + this.panel12.Size = new System.Drawing.Size(807, 661); this.panel12.TabIndex = 3; // // panel13 @@ -1955,7 +1976,7 @@ this.panel13.Dock = System.Windows.Forms.DockStyle.Fill; this.panel13.Location = new System.Drawing.Point(0, 0); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(807, 815); + this.panel13.Size = new System.Drawing.Size(807, 661); this.panel13.TabIndex = 6; // // panel15 @@ -1964,7 +1985,7 @@ this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; this.panel15.Location = new System.Drawing.Point(0, 0); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(807, 815); + this.panel15.Size = new System.Drawing.Size(807, 661); this.panel15.TabIndex = 4; // // panelPacsImg @@ -1974,7 +1995,7 @@ this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsImg.Location = new System.Drawing.Point(0, 0); this.panelPacsImg.Name = "panelPacsImg"; - this.panelPacsImg.Size = new System.Drawing.Size(807, 815); + this.panelPacsImg.Size = new System.Drawing.Size(807, 661); this.panelPacsImg.TabIndex = 5; // // flowLayoutPanelPacsImg @@ -1984,7 +2005,7 @@ this.flowLayoutPanelPacsImg.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanelPacsImg.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanelPacsImg.Name = "flowLayoutPanelPacsImg"; - this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(807, 815); + this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(807, 661); this.flowLayoutPanelPacsImg.TabIndex = 0; // // panelPacsRptList @@ -1993,7 +2014,7 @@ this.panelPacsRptList.Dock = System.Windows.Forms.DockStyle.Left; this.panelPacsRptList.Location = new System.Drawing.Point(0, 0); this.panelPacsRptList.Name = "panelPacsRptList"; - this.panelPacsRptList.Size = new System.Drawing.Size(260, 821); + this.panelPacsRptList.Size = new System.Drawing.Size(260, 661); this.panelPacsRptList.TabIndex = 0; // // DgcRptPacs @@ -2002,7 +2023,7 @@ this.DgcRptPacs.Location = new System.Drawing.Point(0, 0); this.DgcRptPacs.MainView = this.DgvRptPacs; this.DgcRptPacs.Name = "DgcRptPacs"; - this.DgcRptPacs.Size = new System.Drawing.Size(260, 821); + this.DgcRptPacs.Size = new System.Drawing.Size(260, 661); this.DgcRptPacs.TabIndex = 1; this.DgcRptPacs.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRptPacs}); @@ -2067,9 +2088,9 @@ // this.tabPageReport.Controls.Add(this.panelReportBase); this.tabPageReport.Image = global::PEIS.Properties.Resources.menu; - this.tabPageReport.Margin = new System.Windows.Forms.Padding(2); + this.tabPageReport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPageReport.Name = "tabPageReport"; - this.tabPageReport.Size = new System.Drawing.Size(1111, 821); + this.tabPageReport.Size = new System.Drawing.Size(554, 661); this.tabPageReport.Text = "其他报告"; // // panelReportBase @@ -2079,7 +2100,7 @@ this.panelReportBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelReportBase.Location = new System.Drawing.Point(0, 0); this.panelReportBase.Name = "panelReportBase"; - this.panelReportBase.Size = new System.Drawing.Size(1111, 821); + this.panelReportBase.Size = new System.Drawing.Size(554, 661); this.panelReportBase.TabIndex = 0; // // panelReport @@ -2090,7 +2111,7 @@ this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill; this.panelReport.Location = new System.Drawing.Point(260, 0); this.panelReport.Name = "panelReport"; - this.panelReport.Size = new System.Drawing.Size(851, 821); + this.panelReport.Size = new System.Drawing.Size(294, 661); this.panelReport.TabIndex = 2; // // PictureBoxReportExt @@ -2110,7 +2131,7 @@ this.DgcRptExt.Location = new System.Drawing.Point(0, 0); this.DgcRptExt.MainView = this.DgvRptExt; this.DgcRptExt.Name = "DgcRptExt"; - this.DgcRptExt.Size = new System.Drawing.Size(260, 821); + this.DgcRptExt.Size = new System.Drawing.Size(260, 661); this.DgcRptExt.TabIndex = 1; this.DgcRptExt.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRptExt}); @@ -2163,9 +2184,9 @@ // // tabPageHistory // - this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2); + this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabPageHistory.Name = "tabPageHistory"; - this.tabPageHistory.Size = new System.Drawing.Size(1111, 821); + this.tabPageHistory.Size = new System.Drawing.Size(554, 661); this.tabPageHistory.Text = "历史结果"; // // panelPatientInfo @@ -2176,8 +2197,8 @@ this.panelPatientInfo.Location = new System.Drawing.Point(0, 45); this.panelPatientInfo.Margin = new System.Windows.Forms.Padding(0); this.panelPatientInfo.Name = "panelPatientInfo"; - this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1); - this.panelPatientInfo.Size = new System.Drawing.Size(1665, 136); + this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1, 1, 1, 1); + this.panelPatientInfo.Size = new System.Drawing.Size(483, 136); this.panelPatientInfo.TabIndex = 59; // // panel3 @@ -2188,7 +2209,7 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(1, 1); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1663, 134); + this.panel3.Size = new System.Drawing.Size(481, 134); this.panel3.TabIndex = 1; // // tableLayoutPanel1 @@ -2242,13 +2263,13 @@ this.tableLayoutPanel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tableLayoutPanel1.Location = new System.Drawing.Point(125, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5); + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); this.tableLayoutPanel1.RowCount = 4; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1538, 134); + this.tableLayoutPanel1.Size = new System.Drawing.Size(356, 134); this.tableLayoutPanel1.TabIndex = 69; // // label3 @@ -2696,7 +2717,7 @@ this.lblCardNo.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCardNo.Location = new System.Drawing.Point(940, 5); this.lblCardNo.Name = "lblCardNo"; - this.lblCardNo.Size = new System.Drawing.Size(590, 31); + this.lblCardNo.Size = new System.Drawing.Size(1, 31); this.lblCardNo.TabIndex = 67; this.lblCardNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -2708,7 +2729,7 @@ this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Padding = new System.Windows.Forms.Padding(5); + this.panel4.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel4.Size = new System.Drawing.Size(125, 134); this.panel4.TabIndex = 68; // @@ -2744,7 +2765,7 @@ this.panelMenu.Dock = System.Windows.Forms.DockStyle.Top; this.panelMenu.Location = new System.Drawing.Point(0, 0); this.panelMenu.Name = "panelMenu"; - this.panelMenu.Size = new System.Drawing.Size(1665, 45); + this.panelMenu.Size = new System.Drawing.Size(483, 45); this.panelMenu.TabIndex = 58; // // menuStrip @@ -2758,6 +2779,7 @@ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.TsmiWeChatViewReport, this.TsmiAbandoned, + this.TsmiOccupational, this.TsmiFinishCancel, this.TsmiFinish, this.ToolStripMenuItemStatusTxt, @@ -2766,7 +2788,7 @@ this.menuStrip.Name = "menuStrip"; this.menuStrip.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0); this.menuStrip.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.menuStrip.Size = new System.Drawing.Size(1665, 45); + this.menuStrip.Size = new System.Drawing.Size(483, 45); this.menuStrip.TabIndex = 58; this.menuStrip.Text = "menuStrip2"; // @@ -2787,6 +2809,15 @@ this.TsmiAbandoned.Size = new System.Drawing.Size(101, 45); this.TsmiAbandoned.Text = "预览报告"; // + // TsmiOccupational + // + this.TsmiOccupational.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.TsmiOccupational.Image = global::PEIS.Properties.Resources.预览报告; + this.TsmiOccupational.Name = "TsmiOccupational"; + this.TsmiOccupational.Size = new System.Drawing.Size(115, 45); + this.TsmiOccupational.Text = "职业病报告"; + this.TsmiOccupational.Visible = false; + // // TsmiFinishCancel // this.TsmiFinishCancel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -2852,7 +2883,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1904, 1041); + this.ClientSize = new System.Drawing.Size(722, 483); this.Controls.Add(this.splitContainerBase); this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Name = "TotalForm"; @@ -2895,6 +2926,7 @@ ((System.ComponentModel.ISupportInitialize)(this.DgcExamConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvExamConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.CmbSearchConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvSearchConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemRichTextEdit2)).EndInit(); @@ -3169,5 +3201,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit4; + private System.Windows.Forms.ToolStripMenuItem TsmiOccupational; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn33; + private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1; } } \ No newline at end of file diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs index a55bd18..7e89992 100644 --- a/PEIS/View/Exam/TotalForm.cs +++ b/PEIS/View/Exam/TotalForm.cs @@ -190,8 +190,11 @@ namespace PEIS.View.Exam TsmiWeChatViewReport.ForeColor = status ? Color.Black : Color.Red; picWeChat.Visible = status; }; - + // 健康报告 TsmiAbandoned.Click += TsmiAbandoned_Click; + // 职业报告 + TsmiOccupational.Click += TsmiOccupational_Click; + //1.2.1.PACS DgvRptPacs.RowClick += DgvReportPacs_DoubleClick; //1.3.1.其他报告 @@ -435,7 +438,7 @@ namespace PEIS.View.Exam } /// - /// 预览报告单 + /// 预览健康报告单 /// /// /// @@ -444,7 +447,28 @@ namespace PEIS.View.Exam var eid = _patient.ID; if (eid > 0) { - var rpt = ReportHelper.GetReport(eid); + var rpt = ReportHelper.GetReport(eid, "PReport.frx"); + if (rpt == null) + { + Global.Msg("err", "报告生成失败！"); + return; + } + + rpt.Show(); + } + } + + /// + /// 预览职业报告单 + /// + /// + /// + private void TsmiOccupational_Click(object sender, EventArgs e) + { + var eid = _patient.ID; + if (eid > 0) + { + var rpt = ReportHelper.GetReport(eid, "CAPReport.frx"); if (rpt == null) { Global.Msg("err", "报告生成失败！"); @@ -455,6 +479,7 @@ namespace PEIS.View.Exam } } + #region IViewClick /// @@ -660,6 +685,8 @@ namespace PEIS.View.Exam Invoke(new Action(() => GetExamResultData(_patient.ID))); GetExamConclusion?.Invoke(this, new Args(_patient.ID)); + TsmiOccupational.Visible = selected.Type.Contains("职业"); + //调用 SelectedPatientEvent?.Invoke(selected?.ID); } diff --git a/PEIS/View/Exam/TotalForm.resx b/PEIS/View/Exam/TotalForm.resx index 3a5483d..801c1d5 100644 --- a/PEIS/View/Exam/TotalForm.resx +++ b/PEIS/View/Exam/TotalForm.resx @@ -126,40 +126,39 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAbNJREFUWEft - lL9LQlEUxx9E2m8ShH4RIuoUpIhpa4Ggk4tES7g3NQVtQUJbf0VQU9ASObg1RFPwioZojyBoCKIh6p7n - 97zejfde99pTCN4HvtA533PO/YKaQRTrN5/9kvXgT9wGeyU8KUNGtnp+jLInhAHCAF0FiCdqFV7UEdYl - /DzPANHR+TiF0BXWJboKECRhgP8ZIDZXzuaqrSNdYV2iqwD0jeZFHWFdws/zDBAkYYC+BIiMzMaEElAM - bYueBSjWzWs+7qMr/htrMmS4BfD/FZhtZ52vXWxhzSaZ3910zpBgyZChH4BkvmP0V5x7aH1DTdWPwPOI - gD2VGZQdqKESQMy1aHYgMjmGlg0fFnoTeuIatkTHMx9QagXwPVpauz1FaUxnGivUG4/no2jZiMc/pDtU - BBEgtdRMo7Sgnvge5VDaZKute+kOFUEEcHo6s8oBCK/D6eWDdfZYi5WzE9g2ov9IXqqwM4SWXoCF1cMy - P4CWhPh8L4XuUErwXqlu7qPVgQ1VDQ5PTTjqV5zxRMw88/xMplFC+++Igy98WEHK/7S0SRaaGy4PWkoW - 9rYx5oJhfAGVr959DZrS8gAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAZFJREFUWEdj + YGBgYDALufKfXhhkHwZAV0RLjG43GIAk9D13rEAXpyYYdcCoA8hygIi8vwdMIykY3RwQwCeH0wHs3LIi + IEeQitHNAQGyHEBNMOqAoekAQWlXfQPPnctJxejmgABZDhjwbEhNMOoAujiAjUtKkI1LSh6KBZHlaOYA + s5DLF2CG48GnyHIA/lxweS8y38j/SAG6fkWjhix0fehqwIA8B4Ad8RNdDy6A1xG4HIAN4DQEzRJCajAE + iXGAWciVnSC1zGwCPFjkYBZ/Nwu58gqrRVAAkbt8F0WASAfgNdQ87OpGGF9CNd4RJMYrYsSOqhKccP+i + mEMtByibtqigi4nI+xsgi4GAvufO2zRxALIcOh8ZYMgR6wAQwNAMBSoWfREwORjW89i2Dl2dWciVFyA5 + ZZNKDmRBoh2g7bTEFZcjQMAs5PIJs5DL19HFQQCmzzzkcjtWCWIxK6c4HxL/C4phWIBZyJW3MPWSqvHm + 6PJkA7OQKx/QHYcHE11okQwUTVpisVgIxoomzWXo6pEBAJWv3n1jU/VkAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYBJREFUWEft - lM9KwzAcx4sIwjqQTQU91j2DdOyk4lNsB1/AJxBkUpVOJqakhzag+AwevPsSvoMXbx4ERU3mNyWGdDat - dJd+4AfJ9/eXNKnT0GBLFLMvYdjWi2y+kAHU5rUPoDevdQC9aa0D6M0FtQ1gai5QdWEkTo46ne4y3P+D - 2gBShurTjVD2iLDyqAUh5bLj9zf5CYRqjjASpXcIsUMtAsmKiLKXrAZln5CLUbW5SqlaMmFtfaMLqRLW - QxCaXMqEluu2IFdC1iMxe4I0H3UISJWxrjeZRrFMcg0nIX0Ge+PxSwjLmFxF9z/+9BXS36hD6HdC6vNs - d+9gH+EzpI5tMfLuRF4xHh9Inx7Dn+SH2Pv+oA2pGKY7oe91XLe9ImOEnZ1PRyfji6FYE5o+IKw4+p2Q - a7hzOQ3CRMbyV3BbNM+IOoRNIW+7t1omz4j6OWwKeV7v1yeBXI6y/4lxEB7P8ih7hlQefqGurd404M3f - h6PDG2wXg98fbGHZ0AAc5xt8asXwHSUE5wAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAXZJREFUWEft + k0FKw0AUhosIQqcgrQq6jD2DpHSl4inahRfwBEKJREsqFWeYWUwGFM/gwr2X8A5u3LkQFJWoI5O/kyaT + Ytzkg4Hm/e+9/yeZNho1NY4woT6Sg/VK0Ob/EsA0rzwAmlcaAE0rDYDmZi3d+QfYzLGeHCrkUbvdWTZ7 + FibLHDU8lKt77Hdmnjmy4/c2qZDRTBAW32BvIVzMbTCunn53cPWO+lwWNTcptUsPrK1vdFArg3MIyuW5 + HmgS0kS9DHofFeoBNStmCNTK4rxvMmVCDxHLmzBfLZwXQsgS9k8u2O23Hj+jlokZAu+ExXjm7O4d7Ntm + zFouWXciaxnlMsQgWmNcvSXPvt9vpadysN0JfEYIaa2YIU7PpsNRMB4kvymP77A/F7wTeQE0J2EkdS8V + 6rronBUzhMsib7u7WmbOivk5XBZ5Xjf1SVB3wnYnihCE0fHXHFePqDkzCsaXTv/pHxhXr4Ph4RXWK8Xv + 9bewVlPzCXxqxfADZJ9UAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAdFJREFUWEft - l79OAkEQxjHkOIMSEA2JRiu0wA5DDFZY+QQmvoed9lYaK16AN6GkP5IraXgACxsLxRnum7uL7N7t3p/Y - 8Es24b6d+WZyu7d3VLaYUqufONf385XJ4Fik5adxdOX+KTBz3NYOpkNY47l4bLMzqGI6G2TiiVn79K4O - ORWOlTz2gGxHZOC9QbKGc8UHkhmS1B087ULKDHtYNUFd+0UVF6ImPB+SmmjDea+QCoM92ZtrQNokKG65 - XhYk+stzbrPbbZGnQ3lOJHaXEZWntg4mZrjMja4Q11Dp6wTHPdg44bJAG+5H58eatgH8zAX7pHmV1oAU - r9Za+5CUWDUA0wUutSBudTF8OYekRVlLKRLd4fsjzD8gbUBr/skxFHsLKRFtA7pNeDma9IMmvC9IIaQv - eK43mjxDSiRxE9LQPoa90fgYMWEy/Z7y9c2DP4aUCteIe4SwqJyI4e6ddSQuNqaYNkLycBlBx+P6RWRy - FNNSfHMs5bQhGRE7itUvJG13BZHq3zjsN4OgEl/HVAOSGgpacmA5HyTzJaRkEPw/n2SCJOVZDrnt1sUF - SlwvBw+bDxXZ7Rhmt11HtDHDYfzHJHXD2eDinDAZHIu0LSlUKr+V+oXkhb7NtAAAAABJRU5ErkJggg== + l79OAkEQxjEEzpwSEAyJRCu0wA5DNlhh5RNs4nvYaW+loeIFeBNK+r2E0oYHsLCx8E8GGG753F12D+j4 + JVsw3+zMsLc7e5fL7fGkGDcKQia/PoN8cX5mSqc3ESQYF6LKAfqRjTTdt1zv5NEvCCETxcGq5/cx6jbI + VytEoe5FGkC9oeYLzeU4qDnhSc3O0yFqoVCMoCKEVJNtJWfSItQEtRXSDadeUdsUikmxKQdqS4KWKgPO + +HzOQ3Z7KHw6jH3CWV1GTDFNNl0Yoz0rtkTcrNA+m1CITv51uCwIqX5s8chmLQBtWbD9cx2jbjQGwsnz + xcoxajrGXEZjGvQd7Qgnv+q+XKKGGHMZjdTFuv3HRfAP1Bgh1Sf5NLv9O9RMGHOR0bRpiOvesD0vQn2h + RqtDWqs3fEbNhHMTuo5hqzc442Vmm5DJiH7fPkwGq952nMfQKGhERxd19tPGCP1cWPMU48bsIvJpxUKq + b/Itxo0qai60Vmy+kKzVbYm18Uu1dnnutMPruNYuo7aCkMmUHHfzQpJMUTPCS7WNIoJfyRietMnj4GUP + Ts7w46DhczoYeC33W3Yb6cZcDu8Pk7UbLoRo0Sd8Bvni/D02/gCV+oXkt0KAYAAAAABJRU5ErkJggg==