From f28d86937a0d7c462cc8da694aeea50d2b2edab4 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 20 Oct 2026 10:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.总检界面的职业体检情况，隐藏【复查】这个职业结论 2.修复查询已审核科室的项目结果SQL --- PEIS/Model/Exam/PartModel.cs | 2 +- PEIS/View/Exam/TotalForm.Designer.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 2769537..c22a0de 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -645,7 +645,7 @@ FROM StatusData;"; FROM Exam_Part A LEFT JOIN Exam_Result B ON A.ID = B.PID - LEFT JOIN Enrollment_FeeItem C ON B.FID=C.ID + LEFT JOIN Enrollment_FeeItem C ON A.EID=C.EID AND B.FID=C.FID WHERE A.VerifyTime IS NOT NULL AND A.GiveUpTime IS NULL AND C.GiveUpTime IS NULL AND A.EID = {eid} AND A.DeptCode = {deptCode} diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index 89ae623..d05928f 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TotalForm)); this.splitContainerBase = new System.Windows.Forms.SplitContainer(); this.panelLeftBase = new System.Windows.Forms.Panel(); @@ -239,7 +238,7 @@ this.toolStripTxtStatus = new System.Windows.Forms.ToolStripTextBox(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components); + this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(); this.linqInstantFeedbackSource1 = new DevExpress.Data.Linq.LinqInstantFeedbackSource(); this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -1413,6 +1412,7 @@ this.OccupationalConclusion_2.TabStop = true; this.OccupationalConclusion_2.Text = "复查"; this.OccupationalConclusion_2.UseVisualStyleBackColor = true; + this.OccupationalConclusion_2.Visible = false; // // OccupationalConclusion_1 //