1、代码提交

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -926,17 +926,17 @@ namespace PEIS.View.Enrollment
             if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return;
             OnGetRegInfo(_chooseRegItem.ID);
 
-            if (_regInfo.SignTime != null)
+            //if (_regInfo.SignTime != null)
-            {
+            //{
-                Global.Msg("info", "当前体检者已发送不可编辑！");
+            //    Global.Msg("info", "当前体检者已发送不可编辑！");
-                return;
+            //    return;
-            }
+            //}
 
-            if (_lstCheckCost.Where(w => w.EID == _regInfo.ID).Count() != 0)
+            //if (_lstCheckCost.Where(w => w.EID == _regInfo.ID).Count() != 0)
-            {
+            //{
-                Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
+            //    Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
-                return;
+            //    return;
-            }
+            //}
 
 
             NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_regInfo, true);

PEIS/View/Enrollment/EnrollmentPersonForm.cs

@@ -310,17 +310,17 @@ namespace PEIS.View.Enrollment
         {
             if (_lstRegItems == null || _lstRegItems.Count() == 0) return;
 
-            if(_chooseRegItem.SignTime != null)
+            //if(_chooseRegItem.SignTime != null)
-            {
+            //{
-                Global.Msg("info", "当前体检者已发送不可编辑！");
+            //    Global.Msg("info", "当前体检者已发送不可编辑！");
-                return;
+            //    return;
-            }
+            //}
-
+
-            if(_lstCheckCost.Count != 0)
+            //if(_lstCheckCost.Count != 0)
-            {
+            //{
-                Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
+            //    Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
-                return;
+            //    return;
-            }
+            //}
 
             NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_chooseRegItem, true);
             enrollmentPersonForm.ShowDialog();

PEIS/View/Exam/CareerHisInqForm.cs

@@ -30,7 +30,7 @@ namespace PEIS.View.Exam
         /// 职业史问诊
         /// </summary>
         /// <param name="pID">体检患者表id</param>
-        public CareerHisInqForm(Int32 eID)
+        public CareerHisInqForm(Int64 eID)
         {
             InitializeComponent();
             EID = eID;

PEIS/View/Exam/PartForm.cs

@@ -1091,7 +1091,7 @@ namespace PEIS.View.Exam
         /// <param name="e"></param>
         private void TsmiOccupation_Click(object sender, EventArgs e)
         {
-            CareerHisInqForm form = new CareerHisInqForm(Convert.ToInt16(_patient.ID));
+            CareerHisInqForm form = new CareerHisInqForm(_patient.ID);
             form.ShowDialog();
         }