diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index f6bab3e..a03e0a7 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -27,7 +27,7 @@ "Study_VisitAfterSubseqError": "The current study batch check time {0} cannot be later than the study batch check time {1} .Please check whether the check data is correct.", "Study_UploadArchiving": "Someone is currently uploading and archiving this study !", "Study_VisitEndedNotAllowed": "Subject study is over, and uploading is not allowed!", - "Study_ImgAlreadyUploaded": "Uploading is not allowed above here.The current image check has been uploaded to {1} of subject {0}", + "Study_ImgAlreadyUploaded": "Uploading is not allowed above here.The current image study has already been uploaded to {1} of Subject {0}.", "User_UsernameExist": "The user name already exists.", diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json index 31fbf5f..f585057 100644 --- a/IRaCIS.Core.Application/Resources/zh-CN.json +++ b/IRaCIS.Core.Application/Resources/zh-CN.json @@ -27,7 +27,7 @@ "Study_VisitAfterSubseqError": "当前检查批次检查时间{0}不能晚于该检查批次之后的检查时间{1},请核对检查数据是否有误", "Study_UploadArchiving": "当前有人正在上传归档该检查!", "Study_VisitEndedNotAllowed": "患者检查结束,不允许上传!", - "Study_ImgAlreadyUploaded": "此处不可以上传。当前影像检查已经上传给患者{0}的{1}", + "Study_ImgAlreadyUploaded": "此处不可以上传。当前影像检查已上传至受试者{0}的{1}", "User_UsernameExist": "用户名已经存在。", diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index cfb59af..e9d2ad2 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -90,7 +90,7 @@ namespace IRaCIS.Core.Infra.EFCore //modelBuilder.HasDbFunction(typeof(DbContext).GetMethod(nameof(GetTableList))); - + modelBuilder.Entity().HasQueryFilter(u => u.UserTypeEnum != UserTypeEnum.SuperAdmin); modelBuilder.Entity().HasMany(t => t.VisitTaskList).WithOne(t => t.DoctorUser).HasForeignKey(t => t.DoctorUserId).IsRequired(false);