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); }