From 1667e50286b8fdd23af35c9b73bfe2273c9d5f51 Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Tue, 18 Feb 2025 11:00:47 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/View/Enrollment/EnrollmentOrgForm.cs    | 20 +++++++++---------
 PEIS/View/Enrollment/EnrollmentPersonForm.cs | 22 ++++++++++----------
 PEIS/View/Exam/CareerHisInqForm.cs           |  2 +-
 PEIS/View/Exam/PartForm.cs                   |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
index 9a1d355..304ebcd 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs
+++ b/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)
-            {
-                Global.Msg("info", "当前体检者已发送不可编辑！");
-                return;
-            }
+            //if (_regInfo.SignTime != null)
+            //{
+            //    Global.Msg("info", "当前体检者已发送不可编辑！");
+            //    return;
+            //}
 
-            if (_lstCheckCost.Where(w => w.EID == _regInfo.ID).Count() != 0)
-            {
-                Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
-                return;
-            }
+            //if (_lstCheckCost.Where(w => w.EID == _regInfo.ID).Count() != 0)
+            //{
+            //    Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
+            //    return;
+            //}
 
 
             NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_regInfo, true);
diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs
index e448d7e..4afc45b 100644
--- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs
+++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs
@@ -310,17 +310,17 @@ namespace PEIS.View.Enrollment
         {
             if (_lstRegItems == null || _lstRegItems.Count() == 0) return;
 
-            if(_chooseRegItem.SignTime != null)
-            {
-                Global.Msg("info", "当前体检者已发送不可编辑！");
-                return;
-            }
-
-            if(_lstCheckCost.Count != 0)
-            {
-                Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
-                return;
-            }
+            //if(_chooseRegItem.SignTime != null)
+            //{
+            //    Global.Msg("info", "当前体检者已发送不可编辑！");
+            //    return;
+            //}
+
+            //if(_lstCheckCost.Count != 0)
+            //{
+            //    Global.Msg("info", "当前体检者下存在订单，请删除后再试！");
+            //    return;
+            //}
 
             NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_chooseRegItem, true);
             enrollmentPersonForm.ShowDialog();
diff --git a/PEIS/View/Exam/CareerHisInqForm.cs b/PEIS/View/Exam/CareerHisInqForm.cs
index b24c1ce..d994b9c 100644
--- a/PEIS/View/Exam/CareerHisInqForm.cs
+++ b/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;
diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs
index 317cbf9..827d124 100644
--- a/PEIS/View/Exam/PartForm.cs
+++ b/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();
         }