From 6e87226f0a0b381222e2da677a809f6e4fe58974 Mon Sep 17 00:00:00 2001
From: luoxingjian <1010378449@qq.com>
Date: Thu, 14 Nov 2024 16:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E5=8F=B2=E9=97=AE=E8=AF=8A?=
 =?UTF-8?q?=E4=B8=AD--=E8=81=8C=E4=B8=9A=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 PEIS/Entity/ExamCareerHisInq.cs              |   8 +-
 PEIS/Entity/ExamEmploymentHis.cs             |  49 ++
 PEIS/Model/Exam/CareerHisInqModel.cs         |  14 +-
 PEIS/PEIS.csproj                             |  10 +
 PEIS/Presenter/CareerHisInqPresenter.cs      |   9 +
 PEIS/View/Exam/CareerHisInqForm.Designer.cs  | 874 +++++++++++--------
 PEIS/View/Exam/CareerHisInqForm.cs           | 223 ++++-
 PEIS/View/Exam/CareerHisInqForm.resx         |   3 +
 PEIS/View/Exam/EmploymentHisForm.Designer.cs | 306 +++++++
 PEIS/View/Exam/EmploymentHisForm.cs          |  75 ++
 PEIS/View/Exam/EmploymentHisForm.resx        | 139 +++
 PEIS/View/Exam/ICareerHisInqView.cs          |  10 +-
 12 files changed, 1315 insertions(+), 405 deletions(-)
 create mode 100644 PEIS/Entity/ExamEmploymentHis.cs
 create mode 100644 PEIS/View/Exam/EmploymentHisForm.Designer.cs
 create mode 100644 PEIS/View/Exam/EmploymentHisForm.cs
 create mode 100644 PEIS/View/Exam/EmploymentHisForm.resx
diff --git a/PEIS/Entity/ExamCareerHisInq.cs b/PEIS/Entity/ExamCareerHisInq.cs
index 892bc2b..a642c70 100644
--- a/PEIS/Entity/ExamCareerHisInq.cs
+++ b/PEIS/Entity/ExamCareerHisInq.cs
@@ -13,9 +13,9 @@ namespace PEIS.Entity
     {
         public override String TableName => "Exam_CareerHisInq";
         /// 
-        /// 患者id
+        /// 体检患者ID
         /// 
-        public Int64? PID { get; set; }
+        public Int64 PID { get; set; }
         /// 
         /// 既往史
         /// 
@@ -83,7 +83,7 @@ namespace PEIS.Entity
         /// 
         /// 吸烟情况(1:不吸烟;2:偶吸烟;3:经常吸)--烟酒史
         /// 
-        public Int64? SmokeState { get; set; }
+        public int SmokeState { get; set; }
         /// 
         /// 吸烟数量(支/天)--烟酒史
         /// 
@@ -99,7 +99,7 @@ namespace PEIS.Entity
         /// 
         /// 饮酒情况(1:不饮酒;2:偶饮酒;3:经常饮)--烟酒史
         /// 
-        public Int64? DrinkState { get; set; }
+        public int DrinkState { get; set; }
         /// 
         /// 饮酒数量(mL/天)--烟酒史
         /// 
diff --git a/PEIS/Entity/ExamEmploymentHis.cs b/PEIS/Entity/ExamEmploymentHis.cs
new file mode 100644
index 0000000..7a1de1e
--- /dev/null
+++ b/PEIS/Entity/ExamEmploymentHis.cs
@@ -0,0 +1,49 @@
+using PEIS.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace PEIS.Entity
+{
+    /// 
+    /// 职业史表
+    /// 
+   public class ExamEmploymentHis : ObjectData
+    {
+        public override String TableName => "Exam_EmploymentHis";
+        /// 
+        /// 体检患者ID
+        /// 
+        public Int64 PID { get; set; }
+        /// 
+        /// 工作单位
+        /// 
+        public string WorkUnit { get; set; }
+        /// 
+        /// 车间
+        /// 
+        public string Workshop { get; set; }
+        /// 
+        /// 工种
+        /// 
+        public string WorkType { get; set; }
+        /// 
+        /// 开始时间
+        /// 
+        public DateTime StartTime { get; set; }
+        /// 
+        /// 结束时间
+        /// 
+        public DateTime EndTime { get; set; }
+
+        /// 
+        /// 有害因素
+        /// 
+        public string HarmfulFactors { get; set; }
+        /// 
+        /// 防护措施
+        /// 
+        public string ProtectiveMeasures { get; set; }
+}
+}
diff --git a/PEIS/Model/Exam/CareerHisInqModel.cs b/PEIS/Model/Exam/CareerHisInqModel.cs
index 0a39041..bcbe894 100644
--- a/PEIS/Model/Exam/CareerHisInqModel.cs
+++ b/PEIS/Model/Exam/CareerHisInqModel.cs
@@ -9,10 +9,20 @@ namespace PEIS.Model.Exam
 {
   public class CareerHisInqModel
    {
-        public BasePatient GetPatient(Int64 pID)
+        public EnrollmentPatient GetPatient(Int64 eID)
         {
-            var item = DAOHelp.GetDataBySQL($@"Select * From Base_Patient a WHERE a.ID = {pID}");
+            var item = DAOHelp.GetDataBySQL($@"Select * From Enrollment_Patient a WHERE a.ID = {eID}");
             return item.Count != 0 ? item[0] : null;
         }
+        public ExamCareerHisInq GetExamCareerHisInqByEid(Int64 eID)
+        {
+            var item= DAOHelp.GetDataBySQL($@"Select * From Exam_CareerHisInq a WHERE a.PID = {eID}");
+            return item.Count != 0 ? item[0] : null;
+        }
+        public List GetEmploymentHises(Int64 eID)
+        {
+            var list = DAOHelp.GetDataBySQL($@"Select * From Exam_EmploymentHis a WHERE a.PID = {eID}");
+            return list;
+        }
     }
 }
diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj
index 1a2b354..fc438d2 100644
--- a/PEIS/PEIS.csproj
+++ b/PEIS/PEIS.csproj
@@ -195,6 +195,7 @@
     
     
     
+    
     
     
     
@@ -392,6 +393,12 @@
     
       CareerHisInqForm.cs
     
+    
+      Form
+    
+    
+      EmploymentHisForm.cs
+    
     
     
     
@@ -584,6 +591,9 @@
     
       CareerHisInqForm.cs
     
+    
+      EmploymentHisForm.cs
+    
     
       PartForm.cs
       Designer
diff --git a/PEIS/Presenter/CareerHisInqPresenter.cs b/PEIS/Presenter/CareerHisInqPresenter.cs
index 5d0dd74..50f60d4 100644
--- a/PEIS/Presenter/CareerHisInqPresenter.cs
+++ b/PEIS/Presenter/CareerHisInqPresenter.cs
@@ -1,4 +1,5 @@
 using PEIS.Base;
+using PEIS.Entity;
 using PEIS.Model.Exam;
 using PEIS.View.Exam;
 using System;
@@ -19,6 +20,14 @@ namespace PEIS.Presenter
             {
                 View.ShowPatient(new CareerHisInqModel().GetPatient(args.ID));
             };
+            View.GetCareerHisInq += (send, args) => 
+            {
+                View.ShowExamCareerHisInq(new CareerHisInqModel().GetExamCareerHisInqByEid(args.Eid));
+            };
+            View.GetEmploymentHis += (send, args) =>
+            {
+                View.ShowEmploymentHis(new CareerHisInqModel().GetEmploymentHises(args.Eid));
+            };
         }
     }
 }
diff --git a/PEIS/View/Exam/CareerHisInqForm.Designer.cs b/PEIS/View/Exam/CareerHisInqForm.Designer.cs
index 17aceeb..3fe81b0 100644
--- a/PEIS/View/Exam/CareerHisInqForm.Designer.cs
+++ b/PEIS/View/Exam/CareerHisInqForm.Designer.cs
@@ -58,83 +58,89 @@
             this.advPropertyGrid1 = new FastReport.DevComponents.DotNetBar.AdvPropertyGrid();
             this.panelMain = new System.Windows.Forms.Panel();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.panelDrink = new System.Windows.Forms.Panel();
+            this.DrinkState_1 = new System.Windows.Forms.RadioButton();
+            this.DrinkState_2 = new System.Windows.Forms.RadioButton();
+            this.DrinkState_3 = new System.Windows.Forms.RadioButton();
+            this.panelSmoke = new System.Windows.Forms.Panel();
+            this.SmokeState_1 = new System.Windows.Forms.RadioButton();
+            this.SmokeState_2 = new System.Windows.Forms.RadioButton();
+            this.SmokeState_3 = new System.Windows.Forms.RadioButton();
             this.button6 = new System.Windows.Forms.Button();
-            this.textBox36 = new System.Windows.Forms.TextBox();
+            this.Symptom = new System.Windows.Forms.TextBox();
             this.label44 = new System.Windows.Forms.Label();
-            this.textBox35 = new System.Windows.Forms.TextBox();
+            this.Other = new System.Windows.Forms.TextBox();
             this.label43 = new System.Windows.Forms.Label();
-            this.textBox34 = new System.Windows.Forms.TextBox();
+            this.SleepCondition = new System.Windows.Forms.TextBox();
             this.label42 = new System.Windows.Forms.Label();
             this.label41 = new System.Windows.Forms.Label();
-            this.textBox33 = new System.Windows.Forms.TextBox();
+            this.DrinkYears = new System.Windows.Forms.TextBox();
             this.label40 = new System.Windows.Forms.Label();
-            this.textBox32 = new System.Windows.Forms.TextBox();
+            this.DrinkQuantity = new System.Windows.Forms.TextBox();
             this.label39 = new System.Windows.Forms.Label();
-            this.textBox31 = new System.Windows.Forms.TextBox();
+            this.SmokeMonths = new System.Windows.Forms.TextBox();
             this.label38 = new System.Windows.Forms.Label();
-            this.textBox30 = new System.Windows.Forms.TextBox();
+            this.SmokeYears = new System.Windows.Forms.TextBox();
             this.label37 = new System.Windows.Forms.Label();
-            this.textBox29 = new System.Windows.Forms.TextBox();
-            this.radioButton6 = new System.Windows.Forms.RadioButton();
-            this.radioButton5 = new System.Windows.Forms.RadioButton();
-            this.radioButton4 = new System.Windows.Forms.RadioButton();
-            this.radioButton3 = new System.Windows.Forms.RadioButton();
-            this.radioButton2 = new System.Windows.Forms.RadioButton();
-            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.SmokeQuantity = new System.Windows.Forms.TextBox();
             this.label36 = new System.Windows.Forms.Label();
-            this.textBox28 = new System.Windows.Forms.TextBox();
+            this.PrematureDelivery = new System.Windows.Forms.TextBox();
             this.label35 = new System.Windows.Forms.Label();
             this.label34 = new System.Windows.Forms.Label();
-            this.textBox27 = new System.Windows.Forms.TextBox();
+            this.AbnormalFetus = new System.Windows.Forms.TextBox();
             this.label33 = new System.Windows.Forms.Label();
-            this.textBox26 = new System.Windows.Forms.TextBox();
+            this.Stillbirth = new System.Windows.Forms.TextBox();
             this.label32 = new System.Windows.Forms.Label();
-            this.textBox25 = new System.Windows.Forms.TextBox();
+            this.Abortion = new System.Windows.Forms.TextBox();
             this.label31 = new System.Windows.Forms.Label();
-            this.textBox24 = new System.Windows.Forms.TextBox();
+            this.ExistingChildren = new System.Windows.Forms.TextBox();
             this.label30 = new System.Windows.Forms.Label();
             this.label29 = new System.Windows.Forms.Label();
             this.label28 = new System.Windows.Forms.Label();
-            this.textBox23 = new System.Windows.Forms.TextBox();
+            this.LastMenstrualPod = new System.Windows.Forms.TextBox();
             this.label27 = new System.Windows.Forms.Label();
             this.label26 = new System.Windows.Forms.Label();
-            this.textBox22 = new System.Windows.Forms.TextBox();
+            this.MenarcheCycle = new System.Windows.Forms.TextBox();
             this.label25 = new System.Windows.Forms.Label();
             this.label24 = new System.Windows.Forms.Label();
-            this.textBox21 = new System.Windows.Forms.TextBox();
+            this.MenarchePeriod = new System.Windows.Forms.TextBox();
             this.label23 = new System.Windows.Forms.Label();
-            this.textBox20 = new System.Windows.Forms.TextBox();
+            this.Menarche = new System.Windows.Forms.TextBox();
             this.label22 = new System.Windows.Forms.Label();
             this.label21 = new System.Windows.Forms.Label();
-            this.textBox19 = new System.Windows.Forms.TextBox();
+            this.SpouseOctionhealth = new System.Windows.Forms.TextBox();
             this.label20 = new System.Windows.Forms.Label();
-            this.textBox18 = new System.Windows.Forms.TextBox();
+            this.SpouseRadiationHis = new System.Windows.Forms.TextBox();
             this.label19 = new System.Windows.Forms.Label();
-            this.textBox17 = new System.Windows.Forms.TextBox();
+            this.MarriageDate = new System.Windows.Forms.TextBox();
             this.label18 = new System.Windows.Forms.Label();
             this.label17 = new System.Windows.Forms.Label();
             this.button5 = new System.Windows.Forms.Button();
-            this.textBox16 = new System.Windows.Forms.TextBox();
+            this.SurgicalHistory = new System.Windows.Forms.TextBox();
             this.label16 = new System.Windows.Forms.Label();
             this.button4 = new System.Windows.Forms.Button();
-            this.textBox15 = new System.Windows.Forms.TextBox();
+            this.FamilyHistory = new System.Windows.Forms.TextBox();
             this.label15 = new System.Windows.Forms.Label();
             this.button3 = new System.Windows.Forms.Button();
-            this.textBox14 = new System.Windows.Forms.TextBox();
+            this.PreHisIllness = new System.Windows.Forms.TextBox();
             this.label14 = new System.Windows.Forms.Label();
             this.button2 = new System.Windows.Forms.Button();
-            this.textBox13 = new System.Windows.Forms.TextBox();
+            this.PastHistory = new System.Windows.Forms.TextBox();
             this.label13 = new System.Windows.Forms.Label();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridOccupation = new DevExpress.XtraGrid.GridControl();
+            this.gVEmploymentHis = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.toolMenuItem_Add = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStMenuItem_Del = new System.Windows.Forms.ToolStripMenuItem();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.panelButtom = new System.Windows.Forms.Panel();
             this.CancelBtn = new System.Windows.Forms.Button();
@@ -144,10 +150,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.advPropertyGrid1)).BeginInit();
             this.panelMain.SuspendLayout();
             this.groupBox1.SuspendLayout();
+            this.panelDrink.SuspendLayout();
+            this.panelSmoke.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridOccupation)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gVEmploymentHis)).BeginInit();
+            this.menuStrip1.SuspendLayout();
             this.panelButtom.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit();
             this.SuspendLayout();
@@ -333,7 +342,7 @@
             // label5
             // 
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(1022, 23);
+            this.label5.Location = new System.Drawing.Point(1022, 20);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(84, 24);
             this.label5.TabIndex = 8;
@@ -351,7 +360,7 @@
             // label4
             // 
             this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(820, 23);
+            this.label4.Location = new System.Drawing.Point(820, 20);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(84, 24);
             this.label4.TabIndex = 6;
@@ -369,7 +378,7 @@
             // label3
             // 
             this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(561, 23);
+            this.label3.Location = new System.Drawing.Point(561, 20);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(84, 24);
             this.label3.TabIndex = 4;
@@ -387,7 +396,7 @@
             // label2
             // 
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(302, 23);
+            this.label2.Location = new System.Drawing.Point(302, 20);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(84, 24);
             this.label2.TabIndex = 2;
@@ -405,7 +414,7 @@
             // label1
             // 
             this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(43, 27);
+            this.label1.Location = new System.Drawing.Point(43, 20);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(84, 24);
             this.label1.TabIndex = 0;
@@ -432,77 +441,73 @@
             this.panelMain.Location = new System.Drawing.Point(0, 0);
             this.panelMain.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panelMain.Name = "panelMain";
-            this.panelMain.Size = new System.Drawing.Size(1261, 933);
+            this.panelMain.Size = new System.Drawing.Size(1261, 932);
             this.panelMain.TabIndex = 2;
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.panelDrink);
+            this.groupBox1.Controls.Add(this.panelSmoke);
             this.groupBox1.Controls.Add(this.button6);
-            this.groupBox1.Controls.Add(this.textBox36);
+            this.groupBox1.Controls.Add(this.Symptom);
             this.groupBox1.Controls.Add(this.label44);
-            this.groupBox1.Controls.Add(this.textBox35);
+            this.groupBox1.Controls.Add(this.Other);
             this.groupBox1.Controls.Add(this.label43);
-            this.groupBox1.Controls.Add(this.textBox34);
+            this.groupBox1.Controls.Add(this.SleepCondition);
             this.groupBox1.Controls.Add(this.label42);
             this.groupBox1.Controls.Add(this.label41);
-            this.groupBox1.Controls.Add(this.textBox33);
+            this.groupBox1.Controls.Add(this.DrinkYears);
             this.groupBox1.Controls.Add(this.label40);
-            this.groupBox1.Controls.Add(this.textBox32);
+            this.groupBox1.Controls.Add(this.DrinkQuantity);
             this.groupBox1.Controls.Add(this.label39);
-            this.groupBox1.Controls.Add(this.textBox31);
+            this.groupBox1.Controls.Add(this.SmokeMonths);
             this.groupBox1.Controls.Add(this.label38);
-            this.groupBox1.Controls.Add(this.textBox30);
+            this.groupBox1.Controls.Add(this.SmokeYears);
             this.groupBox1.Controls.Add(this.label37);
-            this.groupBox1.Controls.Add(this.textBox29);
-            this.groupBox1.Controls.Add(this.radioButton6);
-            this.groupBox1.Controls.Add(this.radioButton5);
-            this.groupBox1.Controls.Add(this.radioButton4);
-            this.groupBox1.Controls.Add(this.radioButton3);
-            this.groupBox1.Controls.Add(this.radioButton2);
-            this.groupBox1.Controls.Add(this.radioButton1);
+            this.groupBox1.Controls.Add(this.SmokeQuantity);
             this.groupBox1.Controls.Add(this.label36);
-            this.groupBox1.Controls.Add(this.textBox28);
+            this.groupBox1.Controls.Add(this.PrematureDelivery);
             this.groupBox1.Controls.Add(this.label35);
             this.groupBox1.Controls.Add(this.label34);
-            this.groupBox1.Controls.Add(this.textBox27);
+            this.groupBox1.Controls.Add(this.AbnormalFetus);
             this.groupBox1.Controls.Add(this.label33);
-            this.groupBox1.Controls.Add(this.textBox26);
+            this.groupBox1.Controls.Add(this.Stillbirth);
             this.groupBox1.Controls.Add(this.label32);
-            this.groupBox1.Controls.Add(this.textBox25);
+            this.groupBox1.Controls.Add(this.Abortion);
             this.groupBox1.Controls.Add(this.label31);
-            this.groupBox1.Controls.Add(this.textBox24);
+            this.groupBox1.Controls.Add(this.ExistingChildren);
             this.groupBox1.Controls.Add(this.label30);
             this.groupBox1.Controls.Add(this.label29);
             this.groupBox1.Controls.Add(this.label28);
-            this.groupBox1.Controls.Add(this.textBox23);
+            this.groupBox1.Controls.Add(this.LastMenstrualPod);
             this.groupBox1.Controls.Add(this.label27);
             this.groupBox1.Controls.Add(this.label26);
-            this.groupBox1.Controls.Add(this.textBox22);
+            this.groupBox1.Controls.Add(this.MenarcheCycle);
             this.groupBox1.Controls.Add(this.label25);
             this.groupBox1.Controls.Add(this.label24);
-            this.groupBox1.Controls.Add(this.textBox21);
+            this.groupBox1.Controls.Add(this.MenarchePeriod);
             this.groupBox1.Controls.Add(this.label23);
-            this.groupBox1.Controls.Add(this.textBox20);
+            this.groupBox1.Controls.Add(this.Menarche);
             this.groupBox1.Controls.Add(this.label22);
             this.groupBox1.Controls.Add(this.label21);
-            this.groupBox1.Controls.Add(this.textBox19);
+            this.groupBox1.Controls.Add(this.SpouseOctionhealth);
             this.groupBox1.Controls.Add(this.label20);
-            this.groupBox1.Controls.Add(this.textBox18);
+            this.groupBox1.Controls.Add(this.SpouseRadiationHis);
             this.groupBox1.Controls.Add(this.label19);
-            this.groupBox1.Controls.Add(this.textBox17);
+            this.groupBox1.Controls.Add(this.MarriageDate);
             this.groupBox1.Controls.Add(this.label18);
             this.groupBox1.Controls.Add(this.label17);
             this.groupBox1.Controls.Add(this.button5);
-            this.groupBox1.Controls.Add(this.textBox16);
+            this.groupBox1.Controls.Add(this.SurgicalHistory);
             this.groupBox1.Controls.Add(this.label16);
             this.groupBox1.Controls.Add(this.button4);
-            this.groupBox1.Controls.Add(this.textBox15);
+            this.groupBox1.Controls.Add(this.FamilyHistory);
             this.groupBox1.Controls.Add(this.label15);
             this.groupBox1.Controls.Add(this.button3);
-            this.groupBox1.Controls.Add(this.textBox14);
+            this.groupBox1.Controls.Add(this.PreHisIllness);
             this.groupBox1.Controls.Add(this.label14);
             this.groupBox1.Controls.Add(this.button2);
-            this.groupBox1.Controls.Add(this.textBox13);
+            this.groupBox1.Controls.Add(this.PastHistory);
             this.groupBox1.Controls.Add(this.label13);
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -510,11 +515,101 @@
             this.groupBox1.Margin = new System.Windows.Forms.Padding(19, 4, 3, 4);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(19, 4, 3, 4);
-            this.groupBox1.Size = new System.Drawing.Size(1261, 614);
+            this.groupBox1.Size = new System.Drawing.Size(1261, 613);
             this.groupBox1.TabIndex = 2;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "问诊";
             // 
+            // panelDrink
+            // 
+            this.panelDrink.Controls.Add(this.DrinkState_1);
+            this.panelDrink.Controls.Add(this.DrinkState_2);
+            this.panelDrink.Controls.Add(this.DrinkState_3);
+            this.panelDrink.Location = new System.Drawing.Point(134, 425);
+            this.panelDrink.Name = "panelDrink";
+            this.panelDrink.Size = new System.Drawing.Size(220, 40);
+            this.panelDrink.TabIndex = 96;
+            // 
+            // DrinkState_1
+            // 
+            this.DrinkState_1.AutoSize = true;
+            this.DrinkState_1.Checked = true;
+            this.DrinkState_1.Location = new System.Drawing.Point(4, 12);
+            this.DrinkState_1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.DrinkState_1.Name = "DrinkState_1";
+            this.DrinkState_1.Size = new System.Drawing.Size(62, 21);
+            this.DrinkState_1.TabIndex = 68;
+            this.DrinkState_1.TabStop = true;
+            this.DrinkState_1.Text = "不饮酒";
+            this.DrinkState_1.UseVisualStyleBackColor = true;
+            // 
+            // DrinkState_2
+            // 
+            this.DrinkState_2.AutoSize = true;
+            this.DrinkState_2.Location = new System.Drawing.Point(82, 9);
+            this.DrinkState_2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.DrinkState_2.Name = "DrinkState_2";
+            this.DrinkState_2.Size = new System.Drawing.Size(62, 21);
+            this.DrinkState_2.TabIndex = 71;
+            this.DrinkState_2.Text = "偶饮酒";
+            this.DrinkState_2.UseVisualStyleBackColor = true;
+            // 
+            // DrinkState_3
+            // 
+            this.DrinkState_3.AutoSize = true;
+            this.DrinkState_3.Location = new System.Drawing.Point(156, 9);
+            this.DrinkState_3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.DrinkState_3.Name = "DrinkState_3";
+            this.DrinkState_3.Size = new System.Drawing.Size(62, 21);
+            this.DrinkState_3.TabIndex = 72;
+            this.DrinkState_3.Text = "经常饮";
+            this.DrinkState_3.UseVisualStyleBackColor = true;
+            // 
+            // panelSmoke
+            // 
+            this.panelSmoke.Controls.Add(this.SmokeState_1);
+            this.panelSmoke.Controls.Add(this.SmokeState_2);
+            this.panelSmoke.Controls.Add(this.SmokeState_3);
+            this.panelSmoke.Location = new System.Drawing.Point(134, 384);
+            this.panelSmoke.Name = "panelSmoke";
+            this.panelSmoke.Size = new System.Drawing.Size(220, 40);
+            this.panelSmoke.TabIndex = 95;
+            // 
+            // SmokeState_1
+            // 
+            this.SmokeState_1.AutoSize = true;
+            this.SmokeState_1.Checked = true;
+            this.SmokeState_1.Location = new System.Drawing.Point(3, 9);
+            this.SmokeState_1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SmokeState_1.Name = "SmokeState_1";
+            this.SmokeState_1.Size = new System.Drawing.Size(62, 21);
+            this.SmokeState_1.TabIndex = 67;
+            this.SmokeState_1.TabStop = true;
+            this.SmokeState_1.Text = "不吸烟";
+            this.SmokeState_1.UseVisualStyleBackColor = true;
+            // 
+            // SmokeState_2
+            // 
+            this.SmokeState_2.AutoSize = true;
+            this.SmokeState_2.Location = new System.Drawing.Point(80, 9);
+            this.SmokeState_2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SmokeState_2.Name = "SmokeState_2";
+            this.SmokeState_2.Size = new System.Drawing.Size(62, 21);
+            this.SmokeState_2.TabIndex = 69;
+            this.SmokeState_2.Text = "偶吸烟";
+            this.SmokeState_2.UseVisualStyleBackColor = true;
+            // 
+            // SmokeState_3
+            // 
+            this.SmokeState_3.AutoSize = true;
+            this.SmokeState_3.Location = new System.Drawing.Point(156, 10);
+            this.SmokeState_3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SmokeState_3.Name = "SmokeState_3";
+            this.SmokeState_3.Size = new System.Drawing.Size(62, 21);
+            this.SmokeState_3.TabIndex = 70;
+            this.SmokeState_3.Text = "经常吸";
+            this.SmokeState_3.UseVisualStyleBackColor = true;
+            // 
             // button6
             // 
             this.button6.Location = new System.Drawing.Point(1049, 565);
@@ -525,56 +620,57 @@
             this.button6.Text = "选择";
             this.button6.UseVisualStyleBackColor = true;
             // 
-            // textBox36
+            // Symptom
             // 
-            this.textBox36.Location = new System.Drawing.Point(134, 567);
-            this.textBox36.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox36.Name = "textBox36";
-            this.textBox36.Size = new System.Drawing.Size(916, 23);
-            this.textBox36.TabIndex = 93;
+            this.Symptom.Location = new System.Drawing.Point(134, 567);
+            this.Symptom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Symptom.Name = "Symptom";
+            this.Symptom.Size = new System.Drawing.Size(916, 23);
+            this.Symptom.TabIndex = 93;
             // 
             // label44
             // 
             this.label44.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label44.Location = new System.Drawing.Point(28, 566);
+            this.label44.Location = new System.Drawing.Point(22, 566);
             this.label44.Name = "label44";
             this.label44.Size = new System.Drawing.Size(105, 24);
             this.label44.TabIndex = 92;
             this.label44.Text = "十一、症状:";
             this.label44.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox35
+            // Other
             // 
-            this.textBox35.Location = new System.Drawing.Point(135, 529);
-            this.textBox35.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox35.Name = "textBox35";
-            this.textBox35.Size = new System.Drawing.Size(916, 23);
-            this.textBox35.TabIndex = 91;
+            this.Other.Location = new System.Drawing.Point(134, 529);
+            this.Other.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Other.Name = "Other";
+            this.Other.Size = new System.Drawing.Size(916, 23);
+            this.Other.TabIndex = 91;
             // 
             // label43
             // 
             this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label43.Location = new System.Drawing.Point(28, 529);
+            this.label43.Location = new System.Drawing.Point(22, 529);
             this.label43.Name = "label43";
             this.label43.Size = new System.Drawing.Size(105, 24);
             this.label43.TabIndex = 90;
             this.label43.Text = "十、其  他:";
             this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox34
+            // SleepCondition
             // 
-            this.textBox34.Location = new System.Drawing.Point(135, 488);
-            this.textBox34.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox34.Name = "textBox34";
-            this.textBox34.Size = new System.Drawing.Size(916, 23);
-            this.textBox34.TabIndex = 89;
+            this.SleepCondition.Location = new System.Drawing.Point(134, 488);
+            this.SleepCondition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SleepCondition.Name = "SleepCondition";
+            this.SleepCondition.Size = new System.Drawing.Size(916, 23);
+            this.SleepCondition.TabIndex = 89;
+            this.SleepCondition.Text = "良好";
             // 
             // label42
             // 
             this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label42.Location = new System.Drawing.Point(12, 487);
+            this.label42.Location = new System.Drawing.Point(22, 487);
             this.label42.Name = "label42";
-            this.label42.Size = new System.Drawing.Size(121, 24);
+            this.label42.Size = new System.Drawing.Size(105, 24);
             this.label42.TabIndex = 88;
             this.label42.Text = "九、睡眠情况:";
             this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -582,164 +678,92 @@
             // label41
             // 
             this.label41.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label41.Location = new System.Drawing.Point(591, 433);
+            this.label41.Location = new System.Drawing.Point(571, 433);
             this.label41.Name = "label41";
-            this.label41.Size = new System.Drawing.Size(26, 24);
+            this.label41.Size = new System.Drawing.Size(20, 24);
             this.label41.TabIndex = 87;
             this.label41.Text = "年";
             this.label41.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox33
+            // DrinkYears
             // 
-            this.textBox33.Location = new System.Drawing.Point(520, 433);
-            this.textBox33.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox33.Name = "textBox33";
-            this.textBox33.Size = new System.Drawing.Size(65, 23);
-            this.textBox33.TabIndex = 86;
+            this.DrinkYears.Location = new System.Drawing.Point(505, 433);
+            this.DrinkYears.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.DrinkYears.Name = "DrinkYears";
+            this.DrinkYears.Size = new System.Drawing.Size(65, 23);
+            this.DrinkYears.TabIndex = 86;
             // 
             // label40
             // 
             this.label40.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label40.Location = new System.Drawing.Point(443, 435);
+            this.label40.Location = new System.Drawing.Point(440, 433);
             this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(82, 24);
+            this.label40.Size = new System.Drawing.Size(70, 24);
             this.label40.TabIndex = 85;
             this.label40.Text = "mL/天,共";
             this.label40.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox32
+            // DrinkQuantity
             // 
-            this.textBox32.Location = new System.Drawing.Point(372, 433);
-            this.textBox32.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox32.Name = "textBox32";
-            this.textBox32.Size = new System.Drawing.Size(65, 23);
-            this.textBox32.TabIndex = 79;
+            this.DrinkQuantity.Location = new System.Drawing.Point(372, 433);
+            this.DrinkQuantity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.DrinkQuantity.Name = "DrinkQuantity";
+            this.DrinkQuantity.Size = new System.Drawing.Size(65, 23);
+            this.DrinkQuantity.TabIndex = 79;
             // 
             // label39
             // 
             this.label39.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label39.Location = new System.Drawing.Point(694, 394);
+            this.label39.Location = new System.Drawing.Point(662, 390);
             this.label39.Name = "label39";
-            this.label39.Size = new System.Drawing.Size(26, 24);
+            this.label39.Size = new System.Drawing.Size(20, 24);
             this.label39.TabIndex = 78;
             this.label39.Text = "月";
             this.label39.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox31
+            // SmokeMonths
             // 
-            this.textBox31.Location = new System.Drawing.Point(623, 395);
-            this.textBox31.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox31.Name = "textBox31";
-            this.textBox31.Size = new System.Drawing.Size(65, 23);
-            this.textBox31.TabIndex = 77;
+            this.SmokeMonths.Location = new System.Drawing.Point(595, 392);
+            this.SmokeMonths.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SmokeMonths.Name = "SmokeMonths";
+            this.SmokeMonths.Size = new System.Drawing.Size(65, 23);
+            this.SmokeMonths.TabIndex = 77;
             // 
             // label38
             // 
             this.label38.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label38.Location = new System.Drawing.Point(591, 391);
+            this.label38.Location = new System.Drawing.Point(571, 391);
             this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(26, 24);
+            this.label38.Size = new System.Drawing.Size(20, 24);
             this.label38.TabIndex = 76;
             this.label38.Text = "年";
             this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox30
+            // SmokeYears
             // 
-            this.textBox30.Location = new System.Drawing.Point(520, 392);
-            this.textBox30.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox30.Name = "textBox30";
-            this.textBox30.Size = new System.Drawing.Size(65, 23);
-            this.textBox30.TabIndex = 75;
+            this.SmokeYears.Location = new System.Drawing.Point(505, 392);
+            this.SmokeYears.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SmokeYears.Name = "SmokeYears";
+            this.SmokeYears.Size = new System.Drawing.Size(65, 23);
+            this.SmokeYears.TabIndex = 75;
             // 
             // label37
             // 
             this.label37.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label37.Location = new System.Drawing.Point(443, 392);
+            this.label37.Location = new System.Drawing.Point(440, 392);
             this.label37.Name = "label37";
-            this.label37.Size = new System.Drawing.Size(71, 24);
+            this.label37.Size = new System.Drawing.Size(65, 24);
             this.label37.TabIndex = 74;
             this.label37.Text = "支/天,共";
             this.label37.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox29
-            // 
-            this.textBox29.Location = new System.Drawing.Point(372, 393);
-            this.textBox29.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox29.Name = "textBox29";
-            this.textBox29.Size = new System.Drawing.Size(65, 23);
-            this.textBox29.TabIndex = 73;
-            // 
-            // radioButton6
-            // 
-            this.radioButton6.AutoSize = true;
-            this.radioButton6.Location = new System.Drawing.Point(289, 437);
-            this.radioButton6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.radioButton6.Name = "radioButton6";
-            this.radioButton6.Size = new System.Drawing.Size(62, 21);
-            this.radioButton6.TabIndex = 72;
-            this.radioButton6.TabStop = true;
-            this.radioButton6.Text = "经常饮";
-            this.radioButton6.UseVisualStyleBackColor = true;
-            // 
-            // radioButton5
-            // 
-            this.radioButton5.AutoSize = true;
-            this.radioButton5.Location = new System.Drawing.Point(213, 435);
-            this.radioButton5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.radioButton5.Name = "radioButton5";
-            this.radioButton5.Size = new System.Drawing.Size(62, 21);
-            this.radioButton5.TabIndex = 71;
-            this.radioButton5.TabStop = true;
-            this.radioButton5.Text = "偶饮酒";
-            this.radioButton5.UseVisualStyleBackColor = true;
-            // 
-            // radioButton4
-            // 
-            this.radioButton4.AutoSize = true;
-            this.radioButton4.Location = new System.Drawing.Point(289, 395);
-            this.radioButton4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.radioButton4.Name = "radioButton4";
-            this.radioButton4.Size = new System.Drawing.Size(62, 21);
-            this.radioButton4.TabIndex = 70;
-            this.radioButton4.TabStop = true;
-            this.radioButton4.Text = "经常吸";
-            this.radioButton4.UseVisualStyleBackColor = true;
-            // 
-            // radioButton3
-            // 
-            this.radioButton3.AutoSize = true;
-            this.radioButton3.Location = new System.Drawing.Point(213, 395);
-            this.radioButton3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.radioButton3.Name = "radioButton3";
-            this.radioButton3.Size = new System.Drawing.Size(62, 21);
-            this.radioButton3.TabIndex = 69;
-            this.radioButton3.TabStop = true;
-            this.radioButton3.Text = "偶吸烟";
-            this.radioButton3.UseVisualStyleBackColor = true;
-            // 
-            // radioButton2
-            // 
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.Location = new System.Drawing.Point(133, 435);
-            this.radioButton2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(62, 21);
-            this.radioButton2.TabIndex = 68;
-            this.radioButton2.TabStop = true;
-            this.radioButton2.Text = "不饮酒";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            // 
-            // radioButton1
-            // 
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Location = new System.Drawing.Point(134, 395);
-            this.radioButton1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(62, 21);
-            this.radioButton1.TabIndex = 67;
-            this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "不吸烟";
-            this.radioButton1.UseVisualStyleBackColor = true;
+            // SmokeQuantity
+            // 
+            this.SmokeQuantity.Location = new System.Drawing.Point(372, 393);
+            this.SmokeQuantity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SmokeQuantity.Name = "SmokeQuantity";
+            this.SmokeQuantity.Size = new System.Drawing.Size(65, 23);
+            this.SmokeQuantity.TabIndex = 73;
             // 
             // label36
             // 
@@ -751,20 +775,20 @@
             this.label36.Text = "八、烟酒史:";
             this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox28
+            // PrematureDelivery
             // 
-            this.textBox28.Location = new System.Drawing.Point(489, 339);
-            this.textBox28.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox28.Name = "textBox28";
-            this.textBox28.Size = new System.Drawing.Size(65, 23);
-            this.textBox28.TabIndex = 65;
+            this.PrematureDelivery.Location = new System.Drawing.Point(470, 339);
+            this.PrematureDelivery.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.PrematureDelivery.Name = "PrematureDelivery";
+            this.PrematureDelivery.Size = new System.Drawing.Size(65, 23);
+            this.PrematureDelivery.TabIndex = 65;
             // 
             // label35
             // 
             this.label35.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label35.Location = new System.Drawing.Point(421, 343);
+            this.label35.Location = new System.Drawing.Point(410, 340);
             this.label35.Name = "label35";
-            this.label35.Size = new System.Drawing.Size(69, 24);
+            this.label35.Size = new System.Drawing.Size(60, 24);
             this.label35.TabIndex = 64;
             this.label35.Text = "次,早产";
             this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -772,79 +796,79 @@
             // label34
             // 
             this.label34.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label34.Location = new System.Drawing.Point(842, 343);
+            this.label34.Location = new System.Drawing.Point(810, 340);
             this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(26, 24);
+            this.label34.Size = new System.Drawing.Size(20, 24);
             this.label34.TabIndex = 63;
             this.label34.Text = "次";
-            this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox27
+            // AbnormalFetus
             // 
-            this.textBox27.Location = new System.Drawing.Point(777, 339);
-            this.textBox27.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox27.Name = "textBox27";
-            this.textBox27.Size = new System.Drawing.Size(65, 23);
-            this.textBox27.TabIndex = 62;
+            this.AbnormalFetus.Location = new System.Drawing.Point(740, 339);
+            this.AbnormalFetus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.AbnormalFetus.Name = "AbnormalFetus";
+            this.AbnormalFetus.Size = new System.Drawing.Size(65, 23);
+            this.AbnormalFetus.TabIndex = 62;
             // 
             // label33
             // 
             this.label33.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label33.Location = new System.Drawing.Point(696, 343);
+            this.label33.Location = new System.Drawing.Point(670, 340);
             this.label33.Name = "label33";
-            this.label33.Size = new System.Drawing.Size(87, 24);
+            this.label33.Size = new System.Drawing.Size(70, 24);
             this.label33.TabIndex = 61;
             this.label33.Text = "次,异常胎";
             this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox26
+            // Stillbirth
             // 
-            this.textBox26.Location = new System.Drawing.Point(628, 339);
-            this.textBox26.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox26.Name = "textBox26";
-            this.textBox26.Size = new System.Drawing.Size(65, 23);
-            this.textBox26.TabIndex = 60;
+            this.Stillbirth.Location = new System.Drawing.Point(600, 339);
+            this.Stillbirth.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Stillbirth.Name = "Stillbirth";
+            this.Stillbirth.Size = new System.Drawing.Size(65, 23);
+            this.Stillbirth.TabIndex = 60;
             // 
             // label32
             // 
             this.label32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label32.Location = new System.Drawing.Point(559, 343);
+            this.label32.Location = new System.Drawing.Point(540, 340);
             this.label32.Name = "label32";
-            this.label32.Size = new System.Drawing.Size(69, 24);
+            this.label32.Size = new System.Drawing.Size(60, 24);
             this.label32.TabIndex = 59;
             this.label32.Text = "次,死产";
             this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox25
+            // Abortion
             // 
-            this.textBox25.Location = new System.Drawing.Point(356, 339);
-            this.textBox25.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox25.Name = "textBox25";
-            this.textBox25.Size = new System.Drawing.Size(65, 23);
-            this.textBox25.TabIndex = 58;
+            this.Abortion.Location = new System.Drawing.Point(340, 339);
+            this.Abortion.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Abortion.Name = "Abortion";
+            this.Abortion.Size = new System.Drawing.Size(65, 23);
+            this.Abortion.TabIndex = 58;
             // 
             // label31
             // 
             this.label31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label31.Location = new System.Drawing.Point(282, 343);
+            this.label31.Location = new System.Drawing.Point(282, 340);
             this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(69, 24);
+            this.label31.Size = new System.Drawing.Size(60, 24);
             this.label31.TabIndex = 57;
             this.label31.Text = "人,流产";
             this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox24
+            // ExistingChildren
             // 
-            this.textBox24.Location = new System.Drawing.Point(215, 339);
-            this.textBox24.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox24.Name = "textBox24";
-            this.textBox24.Size = new System.Drawing.Size(65, 23);
-            this.textBox24.TabIndex = 56;
+            this.ExistingChildren.Location = new System.Drawing.Point(215, 339);
+            this.ExistingChildren.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.ExistingChildren.Name = "ExistingChildren";
+            this.ExistingChildren.Size = new System.Drawing.Size(65, 23);
+            this.ExistingChildren.TabIndex = 56;
             // 
             // label30
             // 
             this.label30.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label30.Location = new System.Drawing.Point(131, 343);
+            this.label30.Location = new System.Drawing.Point(134, 340);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(82, 24);
             this.label30.TabIndex = 55;
@@ -864,25 +888,25 @@
             // label28
             // 
             this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label28.Location = new System.Drawing.Point(878, 290);
+            this.label28.Location = new System.Drawing.Point(845, 290);
             this.label28.Name = "label28";
             this.label28.Size = new System.Drawing.Size(26, 24);
             this.label28.TabIndex = 53;
             this.label28.Text = ")";
             this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox23
+            // LastMenstrualPod
             // 
-            this.textBox23.Location = new System.Drawing.Point(717, 290);
-            this.textBox23.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox23.Name = "textBox23";
-            this.textBox23.Size = new System.Drawing.Size(160, 23);
-            this.textBox23.TabIndex = 52;
+            this.LastMenstrualPod.Location = new System.Drawing.Point(684, 290);
+            this.LastMenstrualPod.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.LastMenstrualPod.Name = "LastMenstrualPod";
+            this.LastMenstrualPod.Size = new System.Drawing.Size(160, 23);
+            this.LastMenstrualPod.TabIndex = 52;
             // 
             // label27
             // 
             this.label27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label27.Location = new System.Drawing.Point(581, 290);
+            this.label27.Location = new System.Drawing.Point(548, 290);
             this.label27.Name = "label27";
             this.label27.Size = new System.Drawing.Size(146, 24);
             this.label27.TabIndex = 51;
@@ -892,112 +916,112 @@
             // label26
             // 
             this.label26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label26.Location = new System.Drawing.Point(531, 304);
+            this.label26.Location = new System.Drawing.Point(498, 302);
             this.label26.Name = "label26";
             this.label26.Size = new System.Drawing.Size(26, 24);
             this.label26.TabIndex = 50;
             this.label26.Text = "天";
             this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox22
+            // MenarcheCycle
             // 
-            this.textBox22.Location = new System.Drawing.Point(465, 304);
-            this.textBox22.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox22.Name = "textBox22";
-            this.textBox22.Size = new System.Drawing.Size(65, 23);
-            this.textBox22.TabIndex = 49;
+            this.MenarcheCycle.Location = new System.Drawing.Point(432, 300);
+            this.MenarcheCycle.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.MenarcheCycle.Name = "MenarcheCycle";
+            this.MenarcheCycle.Size = new System.Drawing.Size(65, 23);
+            this.MenarcheCycle.TabIndex = 49;
             // 
             // label25
             // 
             this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label25.Location = new System.Drawing.Point(419, 302);
+            this.label25.Location = new System.Drawing.Point(382, 302);
             this.label25.Name = "label25";
             this.label25.Size = new System.Drawing.Size(51, 24);
             this.label25.TabIndex = 48;
-            this.label25.Text = "经期";
+            this.label25.Text = "周期";
             this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // label24
             // 
             this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label24.Location = new System.Drawing.Point(531, 272);
+            this.label24.Location = new System.Drawing.Point(498, 270);
             this.label24.Name = "label24";
             this.label24.Size = new System.Drawing.Size(26, 24);
             this.label24.TabIndex = 47;
             this.label24.Text = "天";
             this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox21
+            // MenarchePeriod
             // 
-            this.textBox21.Location = new System.Drawing.Point(465, 268);
-            this.textBox21.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox21.Name = "textBox21";
-            this.textBox21.Size = new System.Drawing.Size(65, 23);
-            this.textBox21.TabIndex = 46;
+            this.MenarchePeriod.Location = new System.Drawing.Point(432, 268);
+            this.MenarchePeriod.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.MenarchePeriod.Name = "MenarchePeriod";
+            this.MenarchePeriod.Size = new System.Drawing.Size(65, 23);
+            this.MenarchePeriod.TabIndex = 46;
             // 
             // label23
             // 
             this.label23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label23.Location = new System.Drawing.Point(419, 270);
+            this.label23.Location = new System.Drawing.Point(382, 270);
             this.label23.Name = "label23";
             this.label23.Size = new System.Drawing.Size(51, 24);
             this.label23.TabIndex = 45;
             this.label23.Text = "经期";
             this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox20
+            // Menarche
             // 
-            this.textBox20.Location = new System.Drawing.Point(236, 290);
-            this.textBox20.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox20.Name = "textBox20";
-            this.textBox20.Size = new System.Drawing.Size(160, 23);
-            this.textBox20.TabIndex = 44;
+            this.Menarche.Location = new System.Drawing.Point(173, 290);
+            this.Menarche.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Menarche.Name = "Menarche";
+            this.Menarche.Size = new System.Drawing.Size(160, 23);
+            this.Menarche.TabIndex = 44;
             // 
             // label22
             // 
             this.label22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.Location = new System.Drawing.Point(134, 290);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(105, 24);
+            this.label22.Size = new System.Drawing.Size(45, 24);
             this.label22.TabIndex = 43;
-            this.label22.Text = "(初潮";
-            this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label22.Text = "(初潮";
+            this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // label21
             // 
             this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label21.Location = new System.Drawing.Point(22, 294);
+            this.label21.Location = new System.Drawing.Point(22, 290);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(105, 24);
             this.label21.TabIndex = 42;
             this.label21.Text = "六、月经史:";
             this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox19
+            // SpouseOctionhealth
             // 
-            this.textBox19.Location = new System.Drawing.Point(280, 229);
-            this.textBox19.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox19.Name = "textBox19";
-            this.textBox19.Size = new System.Drawing.Size(770, 23);
-            this.textBox19.TabIndex = 41;
+            this.SpouseOctionhealth.Location = new System.Drawing.Point(280, 229);
+            this.SpouseOctionhealth.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SpouseOctionhealth.Name = "SpouseOctionhealth";
+            this.SpouseOctionhealth.Size = new System.Drawing.Size(770, 23);
+            this.SpouseOctionhealth.TabIndex = 41;
             // 
             // label20
             // 
             this.label20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label20.Location = new System.Drawing.Point(134, 232);
+            this.label20.Location = new System.Drawing.Point(134, 229);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(149, 24);
             this.label20.TabIndex = 40;
             this.label20.Text = "配偶职业及健康状况:";
             this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // textBox18
+            // SpouseRadiationHis
             // 
-            this.textBox18.Location = new System.Drawing.Point(573, 188);
-            this.textBox18.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox18.Name = "textBox18";
-            this.textBox18.Size = new System.Drawing.Size(478, 23);
-            this.textBox18.TabIndex = 39;
+            this.SpouseRadiationHis.Location = new System.Drawing.Point(573, 188);
+            this.SpouseRadiationHis.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SpouseRadiationHis.Name = "SpouseRadiationHis";
+            this.SpouseRadiationHis.Size = new System.Drawing.Size(478, 23);
+            this.SpouseRadiationHis.TabIndex = 39;
             // 
             // label19
             // 
@@ -1009,18 +1033,18 @@
             this.label19.Text = "配偶放射历史:";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // textBox17
+            // MarriageDate
             // 
-            this.textBox17.Location = new System.Drawing.Point(215, 188);
-            this.textBox17.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox17.Name = "textBox17";
-            this.textBox17.Size = new System.Drawing.Size(160, 23);
-            this.textBox17.TabIndex = 37;
+            this.MarriageDate.Location = new System.Drawing.Point(215, 188);
+            this.MarriageDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.MarriageDate.Name = "MarriageDate";
+            this.MarriageDate.Size = new System.Drawing.Size(160, 23);
+            this.MarriageDate.TabIndex = 37;
             // 
             // label18
             // 
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(131, 192);
+            this.label18.Location = new System.Drawing.Point(134, 192);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(82, 24);
             this.label18.TabIndex = 36;
@@ -1047,13 +1071,14 @@
             this.button5.Text = "选择";
             this.button5.UseVisualStyleBackColor = true;
             // 
-            // textBox16
+            // SurgicalHistory
             // 
-            this.textBox16.Location = new System.Drawing.Point(134, 144);
-            this.textBox16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox16.Name = "textBox16";
-            this.textBox16.Size = new System.Drawing.Size(916, 23);
-            this.textBox16.TabIndex = 33;
+            this.SurgicalHistory.Location = new System.Drawing.Point(134, 144);
+            this.SurgicalHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SurgicalHistory.Name = "SurgicalHistory";
+            this.SurgicalHistory.Size = new System.Drawing.Size(916, 23);
+            this.SurgicalHistory.TabIndex = 33;
+            this.SurgicalHistory.Text = "无";
             // 
             // label16
             // 
@@ -1075,13 +1100,14 @@
             this.button4.Text = "选择";
             this.button4.UseVisualStyleBackColor = true;
             // 
-            // textBox15
+            // FamilyHistory
             // 
-            this.textBox15.Location = new System.Drawing.Point(134, 108);
-            this.textBox15.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox15.Name = "textBox15";
-            this.textBox15.Size = new System.Drawing.Size(916, 23);
-            this.textBox15.TabIndex = 30;
+            this.FamilyHistory.Location = new System.Drawing.Point(134, 108);
+            this.FamilyHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.FamilyHistory.Name = "FamilyHistory";
+            this.FamilyHistory.Size = new System.Drawing.Size(916, 23);
+            this.FamilyHistory.TabIndex = 30;
+            this.FamilyHistory.Text = "无";
             // 
             // label15
             // 
@@ -1103,13 +1129,14 @@
             this.button3.Text = "选择";
             this.button3.UseVisualStyleBackColor = true;
             // 
-            // textBox14
+            // PreHisIllness
             // 
-            this.textBox14.Location = new System.Drawing.Point(134, 72);
-            this.textBox14.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox14.Name = "textBox14";
-            this.textBox14.Size = new System.Drawing.Size(916, 23);
-            this.textBox14.TabIndex = 27;
+            this.PreHisIllness.Location = new System.Drawing.Point(134, 72);
+            this.PreHisIllness.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.PreHisIllness.Name = "PreHisIllness";
+            this.PreHisIllness.Size = new System.Drawing.Size(916, 23);
+            this.PreHisIllness.TabIndex = 27;
+            this.PreHisIllness.Text = "自述无不适";
             // 
             // label14
             // 
@@ -1131,13 +1158,14 @@
             this.button2.Text = "选择";
             this.button2.UseVisualStyleBackColor = true;
             // 
-            // textBox13
+            // PastHistory
             // 
-            this.textBox13.Location = new System.Drawing.Point(134, 38);
-            this.textBox13.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBox13.Name = "textBox13";
-            this.textBox13.Size = new System.Drawing.Size(916, 23);
-            this.textBox13.TabIndex = 14;
+            this.PastHistory.Location = new System.Drawing.Point(134, 38);
+            this.PastHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.PastHistory.Name = "PastHistory";
+            this.PastHistory.Size = new System.Drawing.Size(916, 23);
+            this.PastHistory.TabIndex = 14;
+            this.PastHistory.Text = "无";
             // 
             // label13
             // 
@@ -1164,7 +1192,8 @@
             // 
             // tabPage1
             // 
-            this.tabPage1.Controls.Add(this.gridControl1);
+            this.tabPage1.Controls.Add(this.gridOccupation);
+            this.tabPage1.Controls.Add(this.menuStrip1);
             this.tabPage1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
@@ -1175,39 +1204,44 @@
             this.tabPage1.Text = "职业史表";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
-            // gridControl1
+            // gridOccupation
             // 
-            this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.gridControl1.Location = new System.Drawing.Point(3, 4);
-            this.gridControl1.MainView = this.gridView1;
-            this.gridControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(1247, 145);
-            this.gridControl1.TabIndex = 0;
-            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
+            this.gridOccupation.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridOccupation.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.gridOccupation.Location = new System.Drawing.Point(3, 29);
+            this.gridOccupation.MainView = this.gVEmploymentHis;
+            this.gridOccupation.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.gridOccupation.Name = "gridOccupation";
+            this.gridOccupation.Size = new System.Drawing.Size(1247, 120);
+            this.gridOccupation.TabIndex = 0;
+            this.gridOccupation.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gVEmploymentHis});
             // 
-            // gridView1
+            // gVEmploymentHis
             // 
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gVEmploymentHis.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn1,
             this.gridColumn2,
             this.gridColumn3,
             this.gridColumn4,
             this.gridColumn5,
-            this.gridColumn6});
-            this.gridView1.GridControl = this.gridControl1;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsView.ShowGroupExpandCollapseButtons = false;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
+            this.gridColumn6,
+            this.gridColumn7});
+            this.gVEmploymentHis.GridControl = this.gridOccupation;
+            this.gVEmploymentHis.Name = "gVEmploymentHis";
+            this.gVEmploymentHis.OptionsView.ShowGroupExpandCollapseButtons = false;
+            this.gVEmploymentHis.OptionsView.ShowGroupPanel = false;
             // 
             // gridColumn1
             // 
             this.gridColumn1.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn1.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn1.Caption = "起止日期";
+            this.gridColumn1.FieldName = "StartEndTime";
             this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.OptionsColumn.AllowMove = false;
+            this.gridColumn1.OptionsFilter.AllowAutoFilter = false;
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 0;
             // 
@@ -1216,7 +1250,11 @@
             this.gridColumn2.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn2.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn2.Caption = "工作单位";
+            this.gridColumn2.FieldName = "WorkUnit";
             this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.OptionsColumn.AllowMove = false;
+            this.gridColumn2.OptionsFilter.AllowFilter = false;
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 1;
             // 
@@ -1225,7 +1263,11 @@
             this.gridColumn3.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn3.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn3.Caption = "车间";
+            this.gridColumn3.FieldName = "Workshop";
             this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            this.gridColumn3.OptionsColumn.AllowMove = false;
+            this.gridColumn3.OptionsFilter.AllowFilter = false;
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 2;
             // 
@@ -1234,7 +1276,11 @@
             this.gridColumn4.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn4.Caption = "工种";
+            this.gridColumn4.FieldName = "WorkType";
             this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.AllowEdit = false;
+            this.gridColumn4.OptionsColumn.AllowMove = false;
+            this.gridColumn4.OptionsFilter.AllowAutoFilter = false;
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 3;
             // 
@@ -1243,7 +1289,11 @@
             this.gridColumn5.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn5.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn5.Caption = "有害因素";
+            this.gridColumn5.FieldName = "HarmfulFactors";
             this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.AllowEdit = false;
+            this.gridColumn5.OptionsColumn.AllowMove = false;
+            this.gridColumn5.OptionsFilter.AllowFilter = false;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 4;
             // 
@@ -1252,10 +1302,48 @@
             this.gridColumn6.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn6.Caption = "防护措施";
+            this.gridColumn6.FieldName = "ProtectiveMeasures";
             this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.AllowEdit = false;
+            this.gridColumn6.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn6.OptionsFilter.AllowFilter = false;
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 5;
             // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "ID";
+            this.gridColumn7.FieldName = "ID";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.AllowEdit = false;
+            this.gridColumn7.OptionsColumn.AllowMove = false;
+            this.gridColumn7.OptionsFilter.AllowFilter = false;
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolMenuItem_Add,
+            this.toolStMenuItem_Del});
+            this.menuStrip1.Location = new System.Drawing.Point(3, 4);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(1247, 25);
+            this.menuStrip1.TabIndex = 1;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // toolMenuItem_Add
+            // 
+            this.toolMenuItem_Add.Image = global::PEIS.Properties.Resources.add;
+            this.toolMenuItem_Add.Name = "toolMenuItem_Add";
+            this.toolMenuItem_Add.Size = new System.Drawing.Size(60, 21);
+            this.toolMenuItem_Add.Text = "添加";
+            // 
+            // toolStMenuItem_Del
+            // 
+            this.toolStMenuItem_Del.Image = global::PEIS.Properties.Resources.删除;
+            this.toolStMenuItem_Del.Name = "toolStMenuItem_Del";
+            this.toolStMenuItem_Del.Size = new System.Drawing.Size(60, 21);
+            this.toolStMenuItem_Del.Text = "删除";
+            // 
             // tabPage2
             // 
             this.tabPage2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1273,16 +1361,16 @@
             this.panelButtom.Controls.Add(this.CancelBtn);
             this.panelButtom.Controls.Add(this.ConfirmBtn);
             this.panelButtom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelButtom.Location = new System.Drawing.Point(0, 933);
+            this.panelButtom.Location = new System.Drawing.Point(0, 932);
             this.panelButtom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panelButtom.Name = "panelButtom";
-            this.panelButtom.Size = new System.Drawing.Size(1261, 66);
+            this.panelButtom.Size = new System.Drawing.Size(1261, 50);
             this.panelButtom.TabIndex = 3;
             // 
             // CancelBtn
             // 
             this.CancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("CancelBtn.Image")));
-            this.CancelBtn.Location = new System.Drawing.Point(701, 8);
+            this.CancelBtn.Location = new System.Drawing.Point(701, 0);
             this.CancelBtn.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.CancelBtn.Name = "CancelBtn";
             this.CancelBtn.Size = new System.Drawing.Size(91, 48);
@@ -1295,7 +1383,7 @@
             // ConfirmBtn
             // 
             this.ConfirmBtn.Image = ((System.Drawing.Image)(resources.GetObject("ConfirmBtn.Image")));
-            this.ConfirmBtn.Location = new System.Drawing.Point(426, 8);
+            this.ConfirmBtn.Location = new System.Drawing.Point(426, 0);
             this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.ConfirmBtn.Name = "ConfirmBtn";
             this.ConfirmBtn.Size = new System.Drawing.Size(90, 48);
@@ -1332,12 +1420,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1261, 999);
+            this.ClientSize = new System.Drawing.Size(1261, 982);
             this.Controls.Add(this.panelMain);
             this.Controls.Add(this.panelButtom);
             this.Controls.Add(this.advPropertyGrid1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MainMenuStrip = this.menuStrip1;
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "CareerHisInqForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "职业史问诊";
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
@@ -1345,10 +1436,17 @@
             this.panelMain.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
+            this.panelDrink.ResumeLayout(false);
+            this.panelDrink.PerformLayout();
+            this.panelSmoke.ResumeLayout(false);
+            this.panelSmoke.PerformLayout();
             this.tabControl1.ResumeLayout(false);
             this.tabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.tabPage1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridOccupation)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gVEmploymentHis)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
             this.panelButtom.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit();
             this.ResumeLayout(false);
@@ -1393,80 +1491,86 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Label label22;
         private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.TextBox textBox19;
+        private System.Windows.Forms.TextBox SpouseOctionhealth;
         private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.TextBox textBox18;
+        private System.Windows.Forms.TextBox SpouseRadiationHis;
         private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.TextBox textBox17;
+        private System.Windows.Forms.TextBox MarriageDate;
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.Label label17;
         private System.Windows.Forms.Button button5;
-        private System.Windows.Forms.TextBox textBox16;
+        private System.Windows.Forms.TextBox SurgicalHistory;
         private System.Windows.Forms.Label label16;
         private System.Windows.Forms.Button button4;
-        private System.Windows.Forms.TextBox textBox15;
+        private System.Windows.Forms.TextBox FamilyHistory;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.TextBox textBox14;
+        private System.Windows.Forms.TextBox PreHisIllness;
         private System.Windows.Forms.Label label14;
         private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.TextBox textBox13;
+        private System.Windows.Forms.TextBox PastHistory;
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.Label label34;
-        private System.Windows.Forms.TextBox textBox27;
+        private System.Windows.Forms.TextBox AbnormalFetus;
         private System.Windows.Forms.Label label33;
-        private System.Windows.Forms.TextBox textBox26;
+        private System.Windows.Forms.TextBox Stillbirth;
         private System.Windows.Forms.Label label32;
-        private System.Windows.Forms.TextBox textBox25;
+        private System.Windows.Forms.TextBox Abortion;
         private System.Windows.Forms.Label label31;
-        private System.Windows.Forms.TextBox textBox24;
+        private System.Windows.Forms.TextBox ExistingChildren;
         private System.Windows.Forms.Label label30;
         private System.Windows.Forms.Label label29;
         private System.Windows.Forms.Label label28;
-        private System.Windows.Forms.TextBox textBox23;
+        private System.Windows.Forms.TextBox LastMenstrualPod;
         private System.Windows.Forms.Label label27;
         private System.Windows.Forms.Label label26;
-        private System.Windows.Forms.TextBox textBox22;
+        private System.Windows.Forms.TextBox MenarcheCycle;
         private System.Windows.Forms.Label label25;
         private System.Windows.Forms.Label label24;
-        private System.Windows.Forms.TextBox textBox21;
+        private System.Windows.Forms.TextBox MenarchePeriod;
         private System.Windows.Forms.Label label23;
-        private System.Windows.Forms.TextBox textBox20;
+        private System.Windows.Forms.TextBox Menarche;
         private System.Windows.Forms.Label label36;
-        private System.Windows.Forms.TextBox textBox28;
+        private System.Windows.Forms.TextBox PrematureDelivery;
         private System.Windows.Forms.Label label35;
         private System.Windows.Forms.Button button6;
-        private System.Windows.Forms.TextBox textBox36;
+        private System.Windows.Forms.TextBox Symptom;
         private System.Windows.Forms.Label label44;
-        private System.Windows.Forms.TextBox textBox35;
+        private System.Windows.Forms.TextBox Other;
         private System.Windows.Forms.Label label43;
-        private System.Windows.Forms.TextBox textBox34;
+        private System.Windows.Forms.TextBox SleepCondition;
         private System.Windows.Forms.Label label42;
         private System.Windows.Forms.Label label41;
-        private System.Windows.Forms.TextBox textBox33;
+        private System.Windows.Forms.TextBox DrinkYears;
         private System.Windows.Forms.Label label40;
-        private System.Windows.Forms.TextBox textBox32;
+        private System.Windows.Forms.TextBox DrinkQuantity;
         private System.Windows.Forms.Label label39;
-        private System.Windows.Forms.TextBox textBox31;
+        private System.Windows.Forms.TextBox SmokeMonths;
         private System.Windows.Forms.Label label38;
-        private System.Windows.Forms.TextBox textBox30;
+        private System.Windows.Forms.TextBox SmokeYears;
         private System.Windows.Forms.Label label37;
-        private System.Windows.Forms.TextBox textBox29;
-        private System.Windows.Forms.RadioButton radioButton6;
-        private System.Windows.Forms.RadioButton radioButton5;
-        private System.Windows.Forms.RadioButton radioButton4;
-        private System.Windows.Forms.RadioButton radioButton3;
-        private System.Windows.Forms.RadioButton radioButton2;
-        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.TextBox SmokeQuantity;
+        private System.Windows.Forms.RadioButton DrinkState_3;
+        private System.Windows.Forms.RadioButton DrinkState_2;
+        private System.Windows.Forms.RadioButton SmokeState_3;
+        private System.Windows.Forms.RadioButton SmokeState_2;
+        private System.Windows.Forms.RadioButton DrinkState_1;
+        private System.Windows.Forms.RadioButton SmokeState_1;
         private System.Windows.Forms.Button ConfirmBtn;
         private System.Windows.Forms.Button CancelBtn;
-        private DevExpress.XtraGrid.GridControl gridControl1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.GridControl gridOccupation;
+        private DevExpress.XtraGrid.Views.Grid.GridView gVEmploymentHis;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private System.Windows.Forms.Panel panelDrink;
+        private System.Windows.Forms.Panel panelSmoke;
+        private System.Windows.Forms.MenuStrip menuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem toolMenuItem_Add;
+        private System.Windows.Forms.ToolStripMenuItem toolStMenuItem_Del;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
     }
 }
\ No newline at end of file
diff --git a/PEIS/View/Exam/CareerHisInqForm.cs b/PEIS/View/Exam/CareerHisInqForm.cs
index f84baf9..b8bc545 100644
--- a/PEIS/View/Exam/CareerHisInqForm.cs
+++ b/PEIS/View/Exam/CareerHisInqForm.cs
@@ -2,6 +2,7 @@
 using PEIS.Entity;
 using PEIS.Event;
 using PEIS.Presenter;
+using PEIS.Utils;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -15,35 +16,233 @@ namespace PEIS.View.Exam
 {
     public partial class CareerHisInqForm : ViewBase, ICareerHisInqView
     {
-        private Int64 PID;
-        public CareerHisInqForm(Int64 pID)
+        private Int64 EID;
+        private Int64? ID;
+        /// 
+        /// 
+        /// 
+        /// 体检患者表id
+        public CareerHisInqForm(Int64 eID)
         {
             InitializeComponent();
-            PID = pID;
-            Shown += CareerHisInqForm_Shown;
+            EID = eID;
             ConfirmBtn.Click += ConfirmBtn_Click;
             CancelBtn.Click += CancelBtn_Click;
-            LoadPatients(pID);
+            toolMenuItem_Add.Click += ToolMenuItem_Add_Click;
+            toolStMenuItem_Del.Click += ToolStMenuItem_Del_Click;
+            Shown += CareerHisInqForm_Shown;
+            
+        }
 
+        private void CareerHisInqForm_Shown(object sender, EventArgs e)
+        {
+            LoadPatients(EID);
+            LoadEmploymentHis(EID);
+            LoadExamCareerHisInq(EID);
         }
-        protected virtual void LoadPatients(Int64 pID)
+
+        private void ToolMenuItem_Add_Click(object sender, EventArgs e)
         {
-            GetPatients?.Invoke(this, new Args { ID = pID });
+            var employmentHisForm = new EmploymentHisForm(EID);
+            employmentHisForm.ShowDialog();
+            if (employmentHisForm.DialogResult == DialogResult.OK)
+            {
+                LoadEmploymentHis(EID);
+            }
+       }
+        private void ToolStMenuItem_Del_Click(object sender, EventArgs e)
+        {
+           var selected = gVEmploymentHis.GetRow(gVEmploymentHis.GetSelectedRows()[0]) as ExamEmploymentHis;
+            if (selected != null)
+            {
+               var dialogResult=Global.MsgDelete($"是否确认删除{selected.WorkUnit}的职业史?");
+                if (dialogResult)
+                {
+                   var result=selected.Delete();
+                    if(result) LoadEmploymentHis(EID);
+                }
+            }
+            else {
+                Global.Msg("info", "请选择删除项");
+            }
+        }
+
+        protected virtual void LoadPatients(Int64 eID)
+        {
+            GetPatients?.Invoke(this, new Args { ID = eID });
+        }
+        protected virtual void LoadEmploymentHis(Int64 eID)
+        {
+            GetEmploymentHis?.Invoke(this, new Args { Eid = eID });
+        }
+        protected virtual void LoadExamCareerHisInq(Int64 eID)
+        {
+            GetCareerHisInq?.Invoke(this, new Args { Eid = eID });
         }
         //获取患者基本信息
-        public event EventHandler> GetPatients;
-        public void ShowPatient(BasePatient patient)
+        public event EventHandler> GetPatients;
+        public void ShowPatient(EnrollmentPatient patient)
         {
+            if (patient!=null)
+            {
+                textBox1.Text = patient.ID.ToString();
+                textBox2.Text= patient.ID.ToString();
+                textBox3.Text = patient.Name;
+                textBox4.Text = patient.Sex == "1" ? "男" : "女";
+                textBox5.Text = patient.Age.ToString();
+                //textBox9.Text = patient.
+                //textBox7.Text = patient.HazardFactors;
+                //textBox8.Text= patient
+                //textBox9.Text= patient.JobTypes
+                //textBox10.Text =
+                //textBox11.Text = patient.WorkYears
+                //textBox12.Text =
+            }
         }
 
-        private void CareerHisInqForm_Shown(object sender, EventArgs e)
+        //职业史问诊
+        public event EventHandler> GetCareerHisInq;
+        public void ShowExamCareerHisInq(ExamCareerHisInq examCareer)
+        {
+            if (examCareer != null)
+            {
+                SetViewData(examCareer);
+                ID = examCareer.ID;
+            }  
+        }
+        //职业史数据
+        public event EventHandler> GetEmploymentHis;
+        public void ShowEmploymentHis(List employmentHis)
         {
-            throw new NotImplementedException();
+            List list = new List();
+            foreach (var item in employmentHis)
+            {
+                ExamEmploymentHisView examEmployment = new ExamEmploymentHisView();
+                if (item.StartTime != null&& item.EndTime != null)
+                {
+                    examEmployment.StartEndTime = $"{item.StartTime.Year}年{item.StartTime.Month}月至{item.EndTime.Year}年{item.EndTime.Month}月";
+                }
+                examEmployment.ID = item.ID;
+                examEmployment.PID = item.PID;
+                examEmployment.WorkUnit = item.WorkUnit;
+                examEmployment.Workshop = item.Workshop;
+                examEmployment.WorkType = item.WorkType;
+                examEmployment.HarmfulFactors = item.HarmfulFactors;
+                examEmployment.ProtectiveMeasures = item.ProtectiveMeasures;
+                list.Add(examEmployment);
+            }
+            Invoke(new Action(() => gridOccupation.DataSource = null));
+            Invoke(new Action(() =>{gridOccupation.DataSource = list; }));
+            Invoke(new Action(() => gVEmploymentHis.BestFitColumns()));
         }
 
+
         private void ConfirmBtn_Click(object sender, EventArgs e)
         {
-            throw new NotImplementedException();
+            try
+            {
+                ConfirmBtn.Enabled = false;
+                var examCareerHisInq = GetViewData();
+                if (examCareerHisInq.SmokeState==1&&(!string.IsNullOrWhiteSpace(examCareerHisInq.SmokeQuantity)||
+                    !string.IsNullOrWhiteSpace(examCareerHisInq.SmokeMonths)||!string.IsNullOrWhiteSpace(examCareerHisInq.SmokeYears)))
+                {
+                    Global.Msg("info","患者不吸烟,不应该有吸烟数量或者吸烟年份或吸烟月");
+                    return;
+                }
+                if (examCareerHisInq.DrinkState==1&&(!string.IsNullOrWhiteSpace(examCareerHisInq.DrinkQuantity)|| !string.IsNullOrWhiteSpace(examCareerHisInq.DrinkYears)))
+                {
+                    Global.Msg("info", "患者不喝酒,不应该有喝酒数量或者喝酒年份");
+                    return;
+                }
+                var result = false;
+                if (ID == null) result = examCareerHisInq.Save();
+                else result = examCareerHisInq.Update();
+                if (result) Close();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally {
+                ConfirmBtn.Enabled = true;
+            }
+           
+        }
+        public void SetViewData(ExamCareerHisInq examCareerHisInq)
+        {
+            ExamCareerHisInq examCareerHis = new ExamCareerHisInq();
+            examCareerHis = examCareerHisInq;
+            var properties = examCareerHis.GetType().GetProperties();
+            foreach (var item in groupBox1.Controls)
+            {
+                var textbox = item as TextBox;
+                var panel = item as Panel;
+                if (textbox != null)
+                {
+                    var propert = properties.Where(p => p.Name == textbox.Name).FirstOrDefault();
+                    if (propert!=null) textbox.Text = propert.GetValue(examCareerHis, null)?.ToString();
+                   
+                }
+                if (panel != null)
+                {
+                    foreach (var item2 in panel.Controls)
+                    {
+                        var radioButton = item2 as RadioButton;
+                        var radioButName = radioButton.Name;
+                        var pName = radioButton.Name.Split('_')[0];
+                        var radioButValue = radioButton.Name.Split('_')[1];
+                        var propert = properties.Where(p => p.Name == pName).FirstOrDefault();
+                        if (propert != null)
+                        {
+                            var value = propert.GetValue(examCareerHis, null)?.ToString();
+                            var radioName = pName + "_" + value;
+                            if (radioButName == radioName) radioButton.Checked = true;
+                            else radioButton.Checked = false;
+                        }
+                    }
+                }
+             }
+         }
+        public ExamCareerHisInq GetViewData()
+        {
+            ExamCareerHisInq examCareerHis = new ExamCareerHisInq();
+            examCareerHis.PID = EID;
+            if (ID!=null) examCareerHis.ID = Int64.Parse(ID.ToString());
+            Type objectType = examCareerHis.GetType();
+            var properties = objectType.GetProperties();
+            foreach (var item in groupBox1.Controls)
+            {
+                var textbox = item as TextBox;
+                var panel = item as Panel;
+                if (textbox!=null)
+                {
+                    if (!string.IsNullOrEmpty(textbox.Text.Trim()))
+                    {
+                        var propert=properties.Where(p => p.Name == textbox.Name).FirstOrDefault();
+                        if (propert != null)
+                            propert.SetValue(examCareerHis, textbox.Text.Trim(), null);
+                    }
+                }
+                if (panel!=null)
+                {
+                    foreach (var item2 in panel.Controls)
+                    {
+                        var radioButton= item2 as RadioButton;
+                        if (radioButton.Checked)
+                        {
+                            var radioButName = radioButton.Name;
+                            var pName = radioButton.Name.Split('_')[0];
+                            var radioButValue = radioButton.Name.Split('_')[1];
+                            var propert = properties.Where(p => p.Name == pName).FirstOrDefault();
+                            if (propert != null)
+                            {
+                                propert.SetValue(examCareerHis, Int32.Parse(radioButValue), null);
+                            }
+                        }
+                    }
+                }
+            }
+            return examCareerHis;
         }
         private void CancelBtn_Click(object sender, EventArgs e)
         {
diff --git a/PEIS/View/Exam/CareerHisInqForm.resx b/PEIS/View/Exam/CareerHisInqForm.resx
index 2fa380b..ae4fd66 100644
--- a/PEIS/View/Exam/CareerHisInqForm.resx
+++ b/PEIS/View/Exam/CareerHisInqForm.resx
@@ -117,6 +117,9 @@
   
     System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
   
+  
+    175, 17
+  
   
   
     
diff --git a/PEIS/View/Exam/EmploymentHisForm.Designer.cs b/PEIS/View/Exam/EmploymentHisForm.Designer.cs
new file mode 100644
index 0000000..edfceee
--- /dev/null
+++ b/PEIS/View/Exam/EmploymentHisForm.Designer.cs
@@ -0,0 +1,306 @@
+namespace PEIS.View.Exam
+{
+    partial class EmploymentHisForm
+    {
+        /// 
+        /// Required designer variable.
+        /// 
+        private System.ComponentModel.IContainer components = null;
+
+        /// 
+        /// Clean up any resources being used.
+        /// 
+        /// true if managed resources should be disposed; otherwise, false.
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// 
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// 
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EmploymentHisForm));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.textBox5 = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.textBox4 = new System.Windows.Forms.TextBox();
+            this.dateEdit2 = new DevExpress.XtraEditors.DateEdit();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.dateEdit1 = new DevExpress.XtraEditors.DateEdit();
+            this.textBox3 = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.CancelBtn = new System.Windows.Forms.Button();
+            this.ConfirmBtn = new System.Windows.Forms.Button();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).BeginInit();
+            this.panel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.textBox5);
+            this.panel1.Controls.Add(this.label7);
+            this.panel1.Controls.Add(this.label6);
+            this.panel1.Controls.Add(this.textBox4);
+            this.panel1.Controls.Add(this.dateEdit2);
+            this.panel1.Controls.Add(this.label5);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.dateEdit1);
+            this.panel1.Controls.Add(this.textBox3);
+            this.panel1.Controls.Add(this.label3);
+            this.panel1.Controls.Add(this.textBox2);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.textBox1);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(461, 270);
+            this.panel1.TabIndex = 0;
+            // 
+            // textBox5
+            // 
+            this.textBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox5.Location = new System.Drawing.Point(129, 211);
+            this.textBox5.Multiline = true;
+            this.textBox5.Name = "textBox5";
+            this.textBox5.Size = new System.Drawing.Size(222, 53);
+            this.textBox5.TabIndex = 13;
+            // 
+            // label7
+            // 
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label7.Location = new System.Drawing.Point(23, 209);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(100, 23);
+            this.label7.TabIndex = 12;
+            this.label7.Text = "防护措施:";
+            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label6
+            // 
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label6.Location = new System.Drawing.Point(23, 145);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(100, 23);
+            this.label6.TabIndex = 11;
+            this.label6.Text = "有害因素:";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // textBox4
+            // 
+            this.textBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox4.Location = new System.Drawing.Point(129, 147);
+            this.textBox4.Multiline = true;
+            this.textBox4.Name = "textBox4";
+            this.textBox4.Size = new System.Drawing.Size(222, 53);
+            this.textBox4.TabIndex = 10;
+            // 
+            // dateEdit2
+            // 
+            this.dateEdit2.EditValue = null;
+            this.dateEdit2.Location = new System.Drawing.Point(129, 120);
+            this.dateEdit2.Name = "dateEdit2";
+            this.dateEdit2.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dateEdit2.Properties.Appearance.Options.UseFont = true;
+            this.dateEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.dateEdit2.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.dateEdit2.Size = new System.Drawing.Size(222, 24);
+            this.dateEdit2.TabIndex = 9;
+            // 
+            // label5
+            // 
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label5.Location = new System.Drawing.Point(23, 117);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(100, 23);
+            this.label5.TabIndex = 8;
+            this.label5.Text = "终止时间:";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label4
+            // 
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label4.Location = new System.Drawing.Point(23, 91);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(100, 23);
+            this.label4.TabIndex = 7;
+            this.label4.Text = "起始时间:";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // dateEdit1
+            // 
+            this.dateEdit1.EditValue = null;
+            this.dateEdit1.Location = new System.Drawing.Point(129, 94);
+            this.dateEdit1.Name = "dateEdit1";
+            this.dateEdit1.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dateEdit1.Properties.Appearance.Options.UseFont = true;
+            this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.dateEdit1.Size = new System.Drawing.Size(222, 24);
+            this.dateEdit1.TabIndex = 6;
+            // 
+            // textBox3
+            // 
+            this.textBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox3.Location = new System.Drawing.Point(129, 67);
+            this.textBox3.Name = "textBox3";
+            this.textBox3.Size = new System.Drawing.Size(222, 23);
+            this.textBox3.TabIndex = 5;
+            // 
+            // label3
+            // 
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label3.Location = new System.Drawing.Point(23, 64);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(100, 23);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "车间:";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // textBox2
+            // 
+            this.textBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox2.Location = new System.Drawing.Point(129, 40);
+            this.textBox2.Name = "textBox2";
+            this.textBox2.Size = new System.Drawing.Size(222, 23);
+            this.textBox2.TabIndex = 3;
+            // 
+            // label2
+            // 
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label2.Location = new System.Drawing.Point(23, 38);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(100, 23);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "工种:";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label1
+            // 
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label1.Location = new System.Drawing.Point(23, 15);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(100, 23);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "单位:";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox1.Location = new System.Drawing.Point(129, 15);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(222, 23);
+            this.textBox1.TabIndex = 0;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.CancelBtn);
+            this.panel2.Controls.Add(this.ConfirmBtn);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(0, 270);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(461, 57);
+            this.panel2.TabIndex = 1;
+            // 
+            // CancelBtn
+            // 
+            this.CancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("CancelBtn.Image")));
+            this.CancelBtn.Location = new System.Drawing.Point(251, -3);
+            this.CancelBtn.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.CancelBtn.Name = "CancelBtn";
+            this.CancelBtn.Size = new System.Drawing.Size(91, 41);
+            this.CancelBtn.TabIndex = 20;
+            this.CancelBtn.Text = "取消";
+            this.CancelBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.CancelBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.CancelBtn.UseVisualStyleBackColor = true;
+            // 
+            // ConfirmBtn
+            // 
+            this.ConfirmBtn.Image = ((System.Drawing.Image)(resources.GetObject("ConfirmBtn.Image")));
+            this.ConfirmBtn.Location = new System.Drawing.Point(129, 0);
+            this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.ConfirmBtn.Name = "ConfirmBtn";
+            this.ConfirmBtn.Size = new System.Drawing.Size(90, 38);
+            this.ConfirmBtn.TabIndex = 19;
+            this.ConfirmBtn.Text = "确认";
+            this.ConfirmBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.ConfirmBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.ConfirmBtn.UseVisualStyleBackColor = true;
+            // 
+            // EmploymentHisForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(461, 327);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.panel2);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Name = "EmploymentHisForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "职业史";
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).EndInit();
+            this.panel2.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.TextBox textBox3;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox textBox2;
+        private System.Windows.Forms.Label label2;
+        private DevExpress.XtraEditors.DateEdit dateEdit1;
+        private DevExpress.XtraEditors.DateEdit dateEdit2;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox textBox4;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox textBox5;
+        private System.Windows.Forms.Button ConfirmBtn;
+        private System.Windows.Forms.Button CancelBtn;
+    }
+}
\ No newline at end of file
diff --git a/PEIS/View/Exam/EmploymentHisForm.cs b/PEIS/View/Exam/EmploymentHisForm.cs
new file mode 100644
index 0000000..8dcdda4
--- /dev/null
+++ b/PEIS/View/Exam/EmploymentHisForm.cs
@@ -0,0 +1,75 @@
+using PEIS.Entity;
+using PEIS.Utils;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace PEIS.View.Exam
+{
+    public partial class EmploymentHisForm : Form
+    {
+        private Int64 PID;
+        public EmploymentHisForm(Int64 eID)
+        {
+            InitializeComponent();
+            PID = eID;
+            ConfirmBtn.Click += ConfirmBtn_Click;
+            CancelBtn.Click += (sender, e)=>{ DialogResult = DialogResult.Cancel; };
+        }
+        private void ConfirmBtn_Click(object sender, EventArgs e)
+        {
+            ExamEmploymentHis examEmployment = new ExamEmploymentHis();
+            examEmployment.PID = PID;
+            if (string.IsNullOrWhiteSpace(textBox1.Text))
+            {
+                Global.Msg("info", "请填写工作单位");
+                return;
+            }
+            if (dateEdit1.EditValue==null||dateEdit1.EditValue == DBNull.Value)
+            {
+                Global.Msg("info", "请填写开始时间");
+                return;
+            }
+            if (dateEdit2.EditValue == null || dateEdit2.EditValue == DBNull.Value)
+            {
+                Global.Msg("info", "请填写结束时间");
+                return;
+            }
+            if (dateEdit2.DateTime< dateEdit1.DateTime)
+            {
+                Global.Msg("info", "结束时间不能小于开始时间");
+                return;
+            }
+            examEmployment.WorkUnit = textBox1.Text.Trim();
+            examEmployment.WorkType = textBox2.Text.Trim();
+            examEmployment.Workshop= textBox3.Text.Trim();
+            examEmployment.StartTime = dateEdit1.DateTime;
+            examEmployment.EndTime = dateEdit2.DateTime;
+            examEmployment.HarmfulFactors= textBox4.Text.Trim();
+            examEmployment.ProtectiveMeasures = textBox5.Text.Trim();
+            var result = examEmployment.Save();
+            if (result)
+            {
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+        }
+        private void CancelBtn_Click(object sender, EventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
+    }
+    public class ExamEmploymentHisView : ExamEmploymentHis
+    {
+        /// 
+        /// 起始时间
+        /// 
+        public string StartEndTime { get; set;}
+    }
+}
diff --git a/PEIS/View/Exam/EmploymentHisForm.resx b/PEIS/View/Exam/EmploymentHisForm.resx
new file mode 100644
index 0000000..2fa380b
--- /dev/null
+++ b/PEIS/View/Exam/EmploymentHisForm.resx
@@ -0,0 +1,139 @@
+
+
+  
+  
+    
+    
+      
+        
+          
+            
+              
+                
+              
+              
+              
+              
+              
+            
+          
+          
+            
+              
+              
+            
+          
+          
+            
+              
+                
+                
+              
+              
+              
+              
+              
+            
+          
+          
+            
+              
+                
+              
+              
+            
+          
+        
+      
+    
+  
+  
+    text/microsoft-resx
+  
+  
+    2.0
+  
+  
+    System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+  
+  
+    System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+  
+  
+  
+    
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt
+        lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k
+        iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo
+        4OWtCNeHAAAAAElFTkSuQmCC
+
+  
+  
+    
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPJJREFUSEtj
+        GAWjgCRgP/9/KJRJfWA/73+kw7z//4GWmEKFqAeAhsaCDAfiy3az/2tChakDgC5PhBp+3m7+f1WoMHUA
+        0OWpUMPP2Mz7rwQVpg4AujwTavgJl4X/5aDChIHD3P8NUCZOAHR5Ltjwuf+POE3/Lw0VJgyAmtKhGnFa
+        AnR5IdTlB5xn/xeHChMPgBpX4bIE6PJSqNwe54X/haHCpAO4JfP/10OFQC6vBIvN+78DKC4AFSYfwC0B
+        +gTo8looe4vDqv88UCWUA7glELzBsu8/J1SKegBsyfz/a4xn/meFCtEANPxngrJGwShABwwMAJBYlx6C
+        WXdWAAAAAElFTkSuQmCC
+
+  
+
\ No newline at end of file
diff --git a/PEIS/View/Exam/ICareerHisInqView.cs b/PEIS/View/Exam/ICareerHisInqView.cs
index 17d1843..933bb0c 100644
--- a/PEIS/View/Exam/ICareerHisInqView.cs
+++ b/PEIS/View/Exam/ICareerHisInqView.cs
@@ -11,7 +11,13 @@ namespace PEIS.View.Exam
     internal interface ICareerHisInqView:IViewBase
     {
         //获取患者基本信息
-        event EventHandler> GetPatients;
-        void ShowPatient(BasePatient patient);
+        event EventHandler> GetPatients;
+        void ShowPatient(EnrollmentPatient patient);
+        //职业史问诊
+        event EventHandler> GetCareerHisInq;
+        void ShowExamCareerHisInq(ExamCareerHisInq examCareer);
+        //职业史数据
+        event EventHandler> GetEmploymentHis;
+        void ShowEmploymentHis(List employmentHis);
     }
 }