diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index 8112db4b..d4a1e88c 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -3079,7 +3079,22 @@ namespace Shentun.Peis.PatientRegisters throw new UserFriendlyException("只有本人才能取消总检"); } } - entity.CompleteFlag = PatientRegisterCompleteFlag.PartCheck; + + #region 如果所有检查都没有做 改为正式登记 + + var checkedCount = await _registerCheckRepository.CountAsync(c => c.PatientRegisterId == input.PatientRegisterId && c.CompleteFlag == RegisterCheckCompleteFlag.Checked); + if (checkedCount == 0) + { + entity.CompleteFlag = PatientRegisterCompleteFlag.Registration; + } + else + { + entity.CompleteFlag = PatientRegisterCompleteFlag.PartCheck; + } + + #endregion + + var cancelClearManAndDate = await _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, "cancel_clear_manAndDate"); if (string.IsNullOrWhiteSpace(cancelClearManAndDate))