From 9a790f03c8142b9a279da8a0504cc702687efe84 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 22 May 2024 11:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E6=A3=80=E5=85=81=E8=AE=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientRegisterManager.cs                 | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs
index 226f080..eecae3d 100644
--- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs
+++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs
@@ -505,13 +505,20 @@ namespace Shentun.Peis.PatientRegisters
 
             DataHelper.CheckCharIsYOrN(sourceEntity.IsNameHide, "姓名隐藏");
 
-            if (sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration &&
-                sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.Registration &&
-                sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PartCheck)
+            //if (sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration &&
+            //    sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.Registration &&
+            //    sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PartCheck
+            //    )
+            //{
+            //    throw new ArgumentException("完成标志错误");
+            //}
+            if (sourceEntity.CompleteFlag == PatientRegisterCompleteFlag.SumCheck &&
+                targetEntity.CompleteFlag != PatientRegisterCompleteFlag.SumCheck
+                )
             {
                 throw new ArgumentException("完成标志错误");
             }
-            if(targetEntity.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration 
+            if (targetEntity.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration
                 && sourceEntity.CompleteFlag == PatientRegisterCompleteFlag.Registration
                 && targetEntity.PatientRegisterNo.StartsWith("P"))
             {
@@ -684,7 +691,7 @@ namespace Shentun.Peis.PatientRegisters
             }
 
             //预登记改正式登记  修改体检日期跟状态
-            if (targetEntity.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration 
+            if (targetEntity.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration
                 && sourceEntity.CompleteFlag == PatientRegisterCompleteFlag.Registration)
             {
                 targetEntity.MedicalStartDate = DateTime.Now;
@@ -860,7 +867,7 @@ namespace Shentun.Peis.PatientRegisters
                         SerialNo = maxnum
                     };
 
-                    await _primarykeyBuilderRepository.InsertAsync(primarykeyBuilderEnt,true);
+                    await _primarykeyBuilderRepository.InsertAsync(primarykeyBuilderEnt, true);
                 }
                 #endregion
             }
@@ -887,7 +894,7 @@ namespace Shentun.Peis.PatientRegisters
                         SerialNo = maxnum
                     };
 
-                    await _primarykeyBuilderRepository.InsertAsync(primarykeyBuilderEnt,true);
+                    await _primarykeyBuilderRepository.InsertAsync(primarykeyBuilderEnt, true);
                 }
 
 
@@ -917,7 +924,7 @@ namespace Shentun.Peis.PatientRegisters
                 maxnum = (Convert.ToInt32(primarykeyBuilderEnt.SerialNo) + 1).ToString();
                 primarykeyBuilderEnt.SerialNo = maxnum; //更新新的序列号
 
-                prePatientRegisterNo =  date + maxnum.PadLeft(Convert.ToInt32(5), '0');
+                prePatientRegisterNo = date + maxnum.PadLeft(Convert.ToInt32(5), '0');
 
                 await _primarykeyBuilderRepository.UpdateAsync(primarykeyBuilderEnt);
             }