diff --git a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs index 563c01b..fef4769 100644 --- a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs +++ b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs @@ -105,6 +105,12 @@ namespace Shentun.Peis.RegisterChecks await _patientRegisterRepository.UpdateAsync(patientRegister); } registerCheckEnt.CompleteFlag = CompleteFlag; + if (registerCheckEnt.CompleteFlag == RegisterCheckCompleteFlag.UnChecked) + { + registerCheckEnt.CheckDoctorId = null; + registerCheckEnt.ExecOrganizationUnitId = null; + registerCheckEnt.CheckDate = null; + } var result = await _registerCheckRepository.UpdateAsync(registerCheckEnt); if (registerCheckEnt.CompleteFlag == RegisterCheckCompleteFlag.UnChecked) { diff --git a/test/Shentun.Peis.Application.Tests/RegisterCheckAppServiceTest.cs b/test/Shentun.Peis.Application.Tests/RegisterCheckAppServiceTest.cs index 7d53068..272e42c 100644 --- a/test/Shentun.Peis.Application.Tests/RegisterCheckAppServiceTest.cs +++ b/test/Shentun.Peis.Application.Tests/RegisterCheckAppServiceTest.cs @@ -35,37 +35,37 @@ namespace Shentun.Peis { var updateCheckResultDto = new UpdateCheckResultDto() { - RegisterCheckId = new Guid("3a11ee70-0351-8970-5bc5-dc0f72e62339"), - CheckDoctorId = "王医生", + RegisterCheckId = new Guid("3a123c55-079e-8eaa-e2d3-87714c774bf2"), + // CheckDoctorId = "王医生", CheckDate = new DateTime(2022,1,1), RegisterCheckItems = new List { new UpdateRegisterCheckItemDetail() { - ItemId = new Guid("3a0c6555-0dad-55b4-b59f-b11e8074cfdd"), - Result = "阳性" + ItemId = new Guid("3a1203c2-cba9-2c6f-325e-c957b76aa814"), + Result = "3" }, new UpdateRegisterCheckItemDetail() { - ItemId = new Guid("3a0c6558-e2a6-4aab-e6e9-d34957a7c3ed"), - Result = "阴性" - }, - new UpdateRegisterCheckItemDetail() - { - ItemId = new Guid("3a0c655a-1fdc-2447-6dc9-d8ec8e110d2e"), - Result = "阳性" - }, - new UpdateRegisterCheckItemDetail() - { - ItemId = new Guid("3a0c655c-1c9f-c8c5-150a-59b3cc351472"), - Result = "阴性" - }, - new UpdateRegisterCheckItemDetail() - { - ItemId = new Guid("3a0c655d-6ab7-ca7e-3920-3b493ec83192"), - Result = "阳性" + ItemId = new Guid("3a1203c2-cfdc-df56-b5ff-22ded29bd4ca"), + Result = "5" }, + //new UpdateRegisterCheckItemDetail() + //{ + // ItemId = new Guid("3a0c655a-1fdc-2447-6dc9-d8ec8e110d2e"), + // Result = "阳性" + //}, + //new UpdateRegisterCheckItemDetail() + //{ + // ItemId = new Guid("3a0c655c-1c9f-c8c5-150a-59b3cc351472"), + // Result = "阴性" + //}, + //new UpdateRegisterCheckItemDetail() + //{ + // ItemId = new Guid("3a0c655d-6ab7-ca7e-3920-3b493ec83192"), + // Result = "阳性" + //}, }, Summarys = new List() { diff --git a/test/Shentun.Peis.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/test/Shentun.Peis.TestBase/Security/FakeCurrentPrincipalAccessor.cs index 4de5699..a209aaa 100644 --- a/test/Shentun.Peis.TestBase/Security/FakeCurrentPrincipalAccessor.cs +++ b/test/Shentun.Peis.TestBase/Security/FakeCurrentPrincipalAccessor.cs @@ -27,7 +27,7 @@ public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor new ClaimsIdentity( new List { - new Claim(AbpClaimTypes.UserId,"3a0c4180-107c-0c89-b25b-0bd34666dcec"), + new Claim(AbpClaimTypes.UserId,"3a11fe49-5719-0e9e-dd44-0c4aff0900b0"), new Claim(AbpClaimTypes.UserName,"admin"), new Claim(AbpClaimTypes.Email,"admin@abp.io") }