From 711670d9389f0995e4b5cd598e7d755fa5293f23 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Fri, 13 Mar 2026 16:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=80=BB=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientRegisterAppService.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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))