1、乙肝关联项目审核不参与校验

PEIS/View/Enrollment/NewEnrollmentOrgForm.Designer.cs

@@ -30,6 +30,9 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewEnrollmentOrgForm));
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.occupationFalse = new System.Windows.Forms.RadioButton();
+            this.occupationTrue = new System.Windows.Forms.RadioButton();
+            this.label9 = new System.Windows.Forms.Label();
             this.BtnFind = new System.Windows.Forms.Button();
             this.TxtDescription = new System.Windows.Forms.TextBox();
             this.label7 = new System.Windows.Forms.Label();
@@ -54,6 +57,9 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.occupationFalse);
+            this.groupBox1.Controls.Add(this.occupationTrue);
+            this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.BtnFind);
             this.groupBox1.Controls.Add(this.TxtDescription);
             this.groupBox1.Controls.Add(this.label7);
@@ -73,10 +79,44 @@
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Location = new System.Drawing.Point(28, 12);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(542, 276);
+            this.groupBox1.Size = new System.Drawing.Size(542, 300);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
+            // occupationFalse
+            // 
+            this.occupationFalse.AutoSize = true;
+            this.occupationFalse.Checked = true;
+            this.occupationFalse.Location = new System.Drawing.Point(145, 261);
+            this.occupationFalse.Name = "occupationFalse";
+            this.occupationFalse.Size = new System.Drawing.Size(38, 21);
+            this.occupationFalse.TabIndex = 40;
+            this.occupationFalse.TabStop = true;
+            this.occupationFalse.Text = "否";
+            this.occupationFalse.UseVisualStyleBackColor = true;
+            this.occupationFalse.Visible = false;
+            // 
+            // occupationTrue
+            // 
+            this.occupationTrue.AutoSize = true;
+            this.occupationTrue.Location = new System.Drawing.Point(91, 261);
+            this.occupationTrue.Name = "occupationTrue";
+            this.occupationTrue.Size = new System.Drawing.Size(38, 21);
+            this.occupationTrue.TabIndex = 39;
+            this.occupationTrue.Text = "是";
+            this.occupationTrue.UseVisualStyleBackColor = true;
+            this.occupationTrue.Visible = false;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(9, 263);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(68, 17);
+            this.label9.TabIndex = 38;
+            this.label9.Text = "职业病团体";
+            this.label9.Visible = false;
+            // 
             // BtnFind
             // 
             this.BtnFind.FlatAppearance.BorderSize = 0;
@@ -94,7 +134,7 @@
             // 
             this.TxtDescription.Location = new System.Drawing.Point(76, 219);
             this.TxtDescription.Name = "TxtDescription";
-            this.TxtDescription.Size = new System.Drawing.Size(357, 27);
+            this.TxtDescription.Size = new System.Drawing.Size(357, 23);
             this.TxtDescription.TabIndex = 36;
             // 
             // label7
@@ -102,7 +142,7 @@
             this.label7.AutoSize = true;
             this.label7.Location = new System.Drawing.Point(33, 222);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(39, 20);
+            this.label7.Size = new System.Drawing.Size(32, 17);
             this.label7.TabIndex = 35;
             this.label7.Text = "备注";
             // 
@@ -110,35 +150,35 @@
             // 
             this.TxtAddress.Location = new System.Drawing.Point(76, 178);
             this.TxtAddress.Name = "TxtAddress";
-            this.TxtAddress.Size = new System.Drawing.Size(357, 27);
+            this.TxtAddress.Size = new System.Drawing.Size(357, 23);
             this.TxtAddress.TabIndex = 34;
             // 
             // TxtTel2
             // 
             this.TxtTel2.Location = new System.Drawing.Point(273, 139);
             this.TxtTel2.Name = "TxtTel2";
-            this.TxtTel2.Size = new System.Drawing.Size(160, 27);
+            this.TxtTel2.Size = new System.Drawing.Size(160, 23);
             this.TxtTel2.TabIndex = 33;
             // 
             // TxtTel1
             // 
             this.TxtTel1.Location = new System.Drawing.Point(273, 100);
             this.TxtTel1.Name = "TxtTel1";
-            this.TxtTel1.Size = new System.Drawing.Size(160, 27);
+            this.TxtTel1.Size = new System.Drawing.Size(160, 23);
             this.TxtTel1.TabIndex = 32;
             // 
             // TxtContactor2
             // 
             this.TxtContactor2.Location = new System.Drawing.Point(76, 139);
             this.TxtContactor2.Name = "TxtContactor2";
-            this.TxtContactor2.Size = new System.Drawing.Size(117, 27);
+            this.TxtContactor2.Size = new System.Drawing.Size(117, 23);
             this.TxtContactor2.TabIndex = 31;
             // 
             // TxtContactor1
             // 
             this.TxtContactor1.Location = new System.Drawing.Point(76, 100);
             this.TxtContactor1.Name = "TxtContactor1";
-            this.TxtContactor1.Size = new System.Drawing.Size(117, 27);
+            this.TxtContactor1.Size = new System.Drawing.Size(117, 23);
             this.TxtContactor1.TabIndex = 30;
             // 
             // DtpExamDate
@@ -148,7 +188,7 @@
             this.DtpExamDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
             this.DtpExamDate.Location = new System.Drawing.Point(76, 61);
             this.DtpExamDate.Name = "DtpExamDate";
-            this.DtpExamDate.Size = new System.Drawing.Size(170, 27);
+            this.DtpExamDate.Size = new System.Drawing.Size(170, 23);
             this.DtpExamDate.TabIndex = 29;
             // 
             // label8
@@ -156,7 +196,7 @@
             this.label8.AutoSize = true;
             this.label8.Location = new System.Drawing.Point(9, 181);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(69, 20);
+            this.label8.Size = new System.Drawing.Size(56, 17);
             this.label8.TabIndex = 17;
             this.label8.Text = "联系地址";
             // 
@@ -165,7 +205,7 @@
             this.label5.AutoSize = true;
             this.label5.Location = new System.Drawing.Point(204, 142);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(78, 20);
+            this.label5.Size = new System.Drawing.Size(63, 17);
             this.label5.TabIndex = 16;
             this.label5.Text = "联系电话2";
             // 
@@ -174,7 +214,7 @@
             this.label6.AutoSize = true;
             this.label6.Location = new System.Drawing.Point(14, 142);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(63, 20);
+            this.label6.Size = new System.Drawing.Size(51, 17);
             this.label6.TabIndex = 15;
             this.label6.Text = "联系人2";
             // 
@@ -183,7 +223,7 @@
             this.label4.AutoSize = true;
             this.label4.Location = new System.Drawing.Point(204, 103);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(78, 20);
+            this.label4.Size = new System.Drawing.Size(63, 17);
             this.label4.TabIndex = 14;
             this.label4.Text = "联系电话1";
             // 
@@ -192,7 +232,7 @@
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(14, 103);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(63, 20);
+            this.label3.Size = new System.Drawing.Size(51, 17);
             this.label3.TabIndex = 13;
             this.label3.Text = "联系人1";
             // 
@@ -201,7 +241,7 @@
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(9, 64);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(69, 20);
+            this.label2.Size = new System.Drawing.Size(56, 17);
             this.label2.TabIndex = 12;
             this.label2.Text = "体检日期";
             // 
@@ -210,7 +250,7 @@
             this.TxtName.Enabled = false;
             this.TxtName.Location = new System.Drawing.Point(76, 22);
             this.TxtName.Name = "TxtName";
-            this.TxtName.Size = new System.Drawing.Size(357, 27);
+            this.TxtName.Size = new System.Drawing.Size(357, 23);
             this.TxtName.TabIndex = 11;
             // 
             // label1
@@ -218,7 +258,7 @@
             this.label1.AutoSize = true;
             this.label1.Location = new System.Drawing.Point(9, 25);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(69, 20);
+            this.label1.Size = new System.Drawing.Size(56, 17);
             this.label1.TabIndex = 10;
             this.label1.Text = "团体名称";
             // 
@@ -227,7 +267,7 @@
             this.BtnCancel.FlatAppearance.BorderSize = 0;
             this.BtnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.BtnCancel.Image = ((System.Drawing.Image)(resources.GetObject("BtnCancel.Image")));
-            this.BtnCancel.Location = new System.Drawing.Point(480, 297);
+            this.BtnCancel.Location = new System.Drawing.Point(480, 327);
             this.BtnCancel.Name = "BtnCancel";
             this.BtnCancel.Size = new System.Drawing.Size(87, 40);
             this.BtnCancel.TabIndex = 7;
@@ -240,7 +280,7 @@
             this.BtnOk.FlatAppearance.BorderSize = 0;
             this.BtnOk.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.BtnOk.Image = global::PEIS.Properties.Resources.保存2;
-            this.BtnOk.Location = new System.Drawing.Point(369, 297);
+            this.BtnOk.Location = new System.Drawing.Point(369, 327);
             this.BtnOk.Name = "BtnOk";
             this.BtnOk.Size = new System.Drawing.Size(92, 40);
             this.BtnOk.TabIndex = 6;
@@ -252,7 +292,7 @@
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(600, 349);
+            this.ClientSize = new System.Drawing.Size(600, 375);
             this.Controls.Add(this.BtnCancel);
             this.Controls.Add(this.BtnOk);
             this.Controls.Add(this.groupBox1);
@@ -287,5 +327,8 @@
         private System.Windows.Forms.Button BtnCancel;
         private System.Windows.Forms.Button BtnOk;
         private System.Windows.Forms.Button BtnFind;
+        private System.Windows.Forms.RadioButton occupationFalse;
+        private System.Windows.Forms.RadioButton occupationTrue;
+        private System.Windows.Forms.Label label9;
     }
 }

PEIS/View/Exam/PartForm.cs

@@ -1182,7 +1182,7 @@ namespace PEIS.View.Exam
             {
                 var feeItem = new List<EnrollmentFeeItem>();
 
-                var examFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001'");
+                var examFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"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<ExamResult>($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} GROUP BY FeeItemName");
                 foreach (var item in resultFeeItem)