修改异常提示

RelevanceValueList 字段

.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

Dockerfile

@@ -0,0 +1,26 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src
+COPY ["IRaCIS.Core.API/IRaCIS.Core.API.csproj", "IRaCIS.Core.API/"]
+COPY ["IRaCIS.Core.Application/IRaCIS.Core.Application.csproj", "IRaCIS.Core.Application/"]
+COPY ["IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj", "IRaCIS.Core.Infra.EFCore/"]
+COPY ["IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj", "IRaCIS.Core.Domain/"]
+COPY ["IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj", "IRaCIS.Core.Domain.Share/"]
+COPY ["IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj", "IRaCIS.Core.Infrastructure/"]
+RUN dotnet restore "IRaCIS.Core.API/IRaCIS.Core.API.csproj"
+COPY . .
+WORKDIR "/src/IRaCIS.Core.API"
+RUN dotnet build "IRaCIS.Core.API.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "IRaCIS.Core.API.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]

IRaCIS.Core.API.sln

@@ -11,25 +11,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Application", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Domain.Share", "IRaCIS.Core.Domain.Share\IRaCIS.Core.Domain.Share.csproj", "{7CBC76F5-3817-46B7-8D9D-79253A89B578}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.JWT.RS256", "ZhiZhunAuthenticationCenter\IRaCIS.JWT.RS256.csproj", "{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Test", "IRaCIS.Core.Test\IRaCIS.Core.Test.csproj", "{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infra.EFCore", "IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj", "{6D8115E5-84D6-424B-8F8D-0C2D40347A8C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infrastructure", "IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj", "{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IRaCIS.AuthenticationCenter", "IRaCIS.AuthenticationCenter", "{481329D6-B8A0-491F-A398-1DF66A0FBB62}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.IdentityServer4", "IRaCIS.Core.IdentityServer4\IRaCIS.Core.IdentityServer4.csproj", "{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.IdentityServer4.MVC", "IRaCIS.Core.IdentityServer4.MVC\IRaCIS.Core.IdentityServer4.MVC.csproj", "{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F852ABFB-88AC-48BE-B876-2228BE2373D6}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -52,10 +39,6 @@ Global
 		{7CBC76F5-3817-46B7-8D9D-79253A89B578}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CBC76F5-3817-46B7-8D9D-79253A89B578}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CBC76F5-3817-46B7-8D9D-79253A89B578}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3292B2B4-6E8A-43AA-84C0-AB4A391E8A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -68,23 +51,10 @@ Global
 		{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07EED0F8-08E6-46F3-ACBE-17BC1391BD4C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3EF210EE-D5D1-4C93-A8FA-E0DB1852BD39} = {481329D6-B8A0-491F-A398-1DF66A0FBB62}
-		{C3DD48CF-B8B3-40F6-9BDB-B7C7F0851674} = {481329D6-B8A0-491F-A398-1DF66A0FBB62}
-		{F621ADD6-94E8-4A4B-998E-25B8EF15D39C} = {481329D6-B8A0-491F-A398-1DF66A0FBB62}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BCC2EB19-3914-489B-B1D7-B7303E0218A3}
 	EndGlobalSection

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Net.Http;
 using EasyCaching.Core;
-using gRPC.ZHiZHUN.AuthServer.protos;
-using Grpc.Net.Client;
-using Grpc.Net.Client.Configuration;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
@@ -24,6 +21,11 @@ using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Infrastructure;
 using System.Linq;
 using Microsoft.Extensions.Logging;
+using Aliyun.Acs.Core;
+using Aliyun.Acs.Core.Profile;
+using Aliyun.Acs.Sts.Model.V20150401;
+using Microsoft.AspNetCore.Hosting;
+using MassTransit;
 
 namespace IRaCIS.Api.Controllers
 {
@@ -35,55 +37,6 @@ namespace IRaCIS.Api.Controllers
     {
 
 
-        /// <summary>
-        ///  获取医生详情 
-        /// </summary>
-        /// <param name="attachmentService"></param>
-        /// <param name="_doctorService"></param>
-        /// <param name="_educationService"></param>
-        /// <param name="_trialExperienceService"></param>
-        /// <param name="_researchPublicationService"></param>
-        /// <param name="_vacationService"></param>
-        /// <param name="doctorId"></param>
-        /// <returns></returns>
-        [HttpGet, Route("doctor/getDetail/{doctorId:guid}")]
-       
-        public  async Task<IResponseOutput<DoctorDetailDTO>> GetDoctorDetail([FromServices] IAttachmentService attachmentService, [FromServices] IDoctorService _doctorService,
-            [FromServices] IEducationService _educationService, [FromServices] ITrialExperienceService _trialExperienceService,
-            [FromServices] IResearchPublicationService _researchPublicationService, [FromServices] IVacationService _vacationService, Guid doctorId)
-        {
-            var education = await _educationService.GetEducation(doctorId);
-
-            var sowList = _doctorService.GetDoctorSowList(doctorId);
-            var ackSowList = _doctorService.GetDoctorAckSowList(doctorId);
-
-            var doctorDetail = new DoctorDetailDTO
-            {
-                AuditView =await _doctorService.GetAuditState(doctorId),
-                BasicInfoView = await _doctorService.GetBasicInfo(doctorId),
-                EmploymentView = await _doctorService.GetEmploymentInfo(doctorId),
-                AttachmentList = await attachmentService.GetAttachments(doctorId),
-
-                EducationList = education.EducationList,
-                PostgraduateList = education.PostgraduateList,
-
-                TrialExperienceView = await _trialExperienceService.GetTrialExperience(doctorId),
-                ResearchPublicationView = await _researchPublicationService.GetResearchPublication(doctorId),
-
-                SpecialtyView =await _doctorService.GetSpecialtyInfo(doctorId),
-                InHoliday = (await _vacationService.OnVacation(doctorId)).IsSuccess,
-                IntoGroupInfo = _doctorService.GetDoctorIntoGroupInfo(doctorId),
-                SowList = sowList,
-                AckSowList = ackSowList
-            };
-
-            return ResponseOutput.Ok(doctorDetail);
-        }
-
-
-
-
-
 
 
         /// <summary>  系统用户登录接口[New] </summary>
@@ -164,9 +117,9 @@ namespace IRaCIS.Api.Controllers
                 // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
                 var option = new CookieOptions
                 {
-                    Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
-                    HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
-                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
+                    Expires = DateTime.Now.AddMonths(1),
+                    HttpOnly = true, // 确保 cookie 只能通过 HTTP 访问
+                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Unspecified, // 设置 SameSite 属性
                     Secure = false // 确保 cookie 只能通过 HTTPS 访问
                 };
 
@@ -182,6 +135,51 @@ namespace IRaCIS.Api.Controllers
         }
 
 
+        [HttpGet("user/GenerateSTS")]
+        public IResponseOutput GenerateSTS( [FromServices] IWebHostEnvironment webHostEnvironment)
+        {
+           
+
+            var configuration = new ConfigurationBuilder()
+              .AddJsonFile($"appsettings.{webHostEnvironment.EnvironmentName}.json")
+              .Build();
+
+
+            IClientProfile profile = DefaultProfile.GetProfile("cn-shanghai", configuration["AliyunOSS:accessKeyId"], configuration["AliyunOSS:accessKeySecret"]);
+            DefaultAcsClient client = new DefaultAcsClient(profile);
+
+
+            // 创建一个STS请求
+            AssumeRoleRequest request = new AssumeRoleRequest
+            {
+                RoleArn = "acs:ram::1899121822495495:role/oss-upload", // 角色ARN，需要替换为你的角色ARN
+                RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
+                DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
+            };
+
+
+            AssumeRoleResponse response = client.GetAcsResponse(request);
+
+            // 返回STS令牌信息给前端
+            var stsToken = new
+            {
+                AccessKeyId = response.Credentials.AccessKeyId,
+                AccessKeySecret = response.Credentials.AccessKeySecret,
+                SecurityToken = response.Credentials.SecurityToken,
+                Expiration = response.Credentials.Expiration,
+
+                Region= configuration["AliyunOSS:region"],
+                BucketName = configuration["AliyunOSS:bucketName"],
+                ViewEndpoint = configuration["AliyunOSS:viewEndpoint"],
+
+            };
+
+            return ResponseOutput.Ok(stsToken);
+
+        }
+
+
+
 
         [HttpGet, Route("imageShare/ShareImage")]
         [AllowAnonymous]
@@ -208,12 +206,12 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet("User/UserRedirect")]
         [AllowAnonymous]
-        public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository,  string url ,[FromServices]ILogger<ExtraController> _logger)
+        public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository, string url, [FromServices] ILogger<ExtraController> _logger)
         {
 
             var decodeUrl = System.Web.HttpUtility.UrlDecode(url);
 
-            var userId = decodeUrl.Substring(decodeUrl.IndexOf("UserId=") + "UserId=".Length , 36) ;
+            var userId = decodeUrl.Substring(decodeUrl.IndexOf("UserId=") + "UserId=".Length, 36);
 
             var token = decodeUrl.Substring(decodeUrl.IndexOf("access_token=") + "access_token=".Length);
 
@@ -221,12 +219,12 @@ namespace IRaCIS.Api.Controllers
 
             var domainStrList = decodeUrl.Split("/").ToList().Take(3).ToList();
 
-            var errorUrl = domainStrList[0]+"//"+ domainStrList[2]+ "/error";
+            var errorUrl = domainStrList[0] + "//" + domainStrList[2] + "/error";
 
 
             if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
             {
-                decodeUrl = errorUrl+ $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang=="zh"? "您的初始化链接已过期": "Error！The initialization link has expired.    Return")} ";
+                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
             }
 
             return Redirect(decodeUrl);

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -22,14 +22,14 @@ namespace IRaCIS.Core.API.Controllers.Special
     public class FinancialChangeController : ControllerBase
     {
         private readonly ITrialService _trialService;
-        private readonly ICalculateService _calculateService;
+   
 		private  IStringLocalizer _localizer { get; set; }
-		public FinancialChangeController(ITrialService trialService, ICalculateService calculateService, IStringLocalizer localizer
+		public FinancialChangeController(ITrialService trialService, IStringLocalizer localizer
 			)
         {
             _localizer = localizer;
 			_trialService = trialService;
-            _calculateService = calculateService;
+          
         }
 
 
@@ -60,267 +60,27 @@ namespace IRaCIS.Core.API.Controllers.Special
             var userId = Guid.Parse(User.FindFirst("id").Value);
             var result = await _trialService.AddOrUpdateTrial(param);
 
-            if (_trialService.TrialExpeditedChange)
-            {
-                var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value);
-                var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
-
-                calcList.ForEach(t =>
-                {
-                    if (needCalReviewerIds.Contains(t.DoctorId))
-                    {
-                        _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                        {
-                            NeedCalculateReviewers = new List<Guid>()
-                            {
-                                t.DoctorId
-                            },
-                            CalculateMonth = DateTime.Parse(t.YearMonth)
-                        }, User.FindFirst("id").Value);
-
-                    }
-                });
-            }
 
             return result;
         }
 
 
-        /// <summary>
-        /// 添加或更新工作量[AUTH]
-        /// </summary>
-        /// <param name="_trialWorkloadService"></param>
-        /// <param name="workLoadAddOrUpdateModel"></param>
-        /// <returns></returns>
-        
-        [HttpPost, Route("doctorWorkload/workLoadAddOrUpdate")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task<IResponseOutput> WorkLoadAddOrUpdate([FromServices] IDoctorWorkloadService _trialWorkloadService, WorkloadCommand workLoadAddOrUpdateModel)
-        {
-            var userId = Guid.Parse(User.FindFirst("id").Value);
-            var result = await _trialWorkloadService.AddOrUpdateWorkload(workLoadAddOrUpdateModel, userId);
-            if (result.IsSuccess && workLoadAddOrUpdateModel.DataFrom == 2)
-            {
-                await _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                {
-                    NeedCalculateReviewers = new List<Guid>()
-                    {
-                        workLoadAddOrUpdateModel.DoctorId
-                    },
-                    CalculateMonth = workLoadAddOrUpdateModel.WorkTime
-                }, User.FindFirst("id").Value);
-            }
-            return result;
-        }
       
 
 
-        [HttpDelete, Route("doctorWorkload/deleteWorkLoad/{id:guid}/{trialId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task<IResponseOutput> DeleteWorkLoad([FromServices] IDoctorWorkloadService _trialWorkloadService, Guid id)
-        {
-            //先判断该工作量的费用是否被锁定，如果被锁定，则不能删除
-            var workload = await _trialWorkloadService.GetWorkloadDetailById(id);
-            var yearMonth = workload.WorkTime.ToString("yyyy-MM");
-            var isLock = await _calculateService.IsLock(workload.DoctorId, yearMonth);
-
-            if (isLock)
-            {
-                //---Expenses have been settled and workload can not be reset.
-                return ResponseOutput.NotOk(_localizer["Financial_ChargeSettled"]);
-            }
-
-            var deleteResult = await _trialWorkloadService.DeleteWorkload(id);
-            if (workload.DataFrom == (int)Domain.Share.WorkLoadFromStatus.FinalConfirm)
-            {
-                await _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                {
-                    NeedCalculateReviewers = new List<Guid>()
-                    {
-                        workload.DoctorId
-                    },
-                    CalculateMonth = workload.WorkTime
-                }, User.FindFirst("id").Value);
-            }
-            return deleteResult;
-        }
-
-
-        /// <summary>
-        /// 添加或更新汇率（会触发没有对锁定的费用计算）
-        /// </summary>
-        
-        [HttpPost, Route("exchangeRate/addOrUpdateExchangeRate")]
-        public async Task<IResponseOutput> AddOrUpdateExchangeRate([FromServices] IExchangeRateService _exchangeRateService, [FromServices] IPaymentAdjustmentService _costAdjustmentService, ExchangeRateCommand addOrUpdateModel)
-        {
-            var result = await _exchangeRateService.AddOrUpdateExchangeRate(addOrUpdateModel);
-            var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, addOrUpdateModel.YearMonth);
-            foreach (var item in calcList)
-            {
-                if (item != null)
-                {
-                   await  _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                    {
-                        NeedCalculateReviewers = new List<Guid>()
-                        {
-                            item.DoctorId
-                        },
-                        CalculateMonth = DateTime.Parse(item.YearMonth)
-                    }, User.FindFirst("id").Value);
-                }
-            }
-           await _costAdjustmentService.CalculateCNY(addOrUpdateModel.YearMonth, addOrUpdateModel.Rate);
-            return result;
-        }
-
-
-        /// <summary>
-        /// 添加或更新 职称单价[AUTH]
-        /// </summary>
-        
-        [HttpPost, Route("rankPrice/addOrUpdateRankPrice")]
-        public async Task<IResponseOutput> AddOrUpdateRankPrice([FromServices] IReviewerPayInfoService _reviewerPayInfoService, [FromServices] IRankPriceService _rankPriceService, RankPriceCommand addOrUpdateModel)
-        {
-            if (addOrUpdateModel.Id != Guid.Empty && addOrUpdateModel.Id != null)
-            {
-                var needCalReviewerIds =await _reviewerPayInfoService.GetReviewerIdByRankId(Guid.Parse(addOrUpdateModel.Id.ToString()));
-                var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
-
-                foreach (var item in calcList)
-                {
-                    if (item != null && needCalReviewerIds.Contains(item.DoctorId))
-                    {
-                        await _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                        {
-                            NeedCalculateReviewers = new List<Guid>()
-                            {
-                                item.DoctorId
-                            },
-                            CalculateMonth = DateTime.Parse(item.YearMonth)
-                        }, User.FindFirst("id").Value);
-                    }
-                }
-            }
-            var userId = Guid.Parse(User.FindFirst("id").Value);
-            return await _rankPriceService.AddOrUpdateRankPrice(addOrUpdateModel, userId);
-        }
     
 
 
-        /// <summary>
-        /// 添加或更新（替换）医生支付展信息[AUTH]
-        /// </summary>
-        
-        [HttpPost, Route("reviewerPayInfo/addOrUpdateReviewerPayInfo")]
-        public async Task<IResponseOutput> AddOrUpdateReviewerPayInfo([FromServices] IReviewerPayInfoService _doctorPayInfoService, ReviewerPayInfoCommand addOrUpdateModel)
-        {
-            var userId = Guid.Parse(User.FindFirst("id").Value);
-            var result =await _doctorPayInfoService.AddOrUpdateReviewerPayInfo(addOrUpdateModel, userId);
-            var calcList = await _calculateService.GetNeedCalculateReviewerList(addOrUpdateModel.DoctorId, string.Empty);
-            foreach (var item in calcList)
-            {
-                if (item != null)
-                {
-                    await _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                    {
-                        NeedCalculateReviewers = new List<Guid>()
-                        {
-                            item.DoctorId
-                        },
-                        CalculateMonth = DateTime.Parse(item.YearMonth)
-                    }, User.FindFirst("id").Value);
-                }
-            }
-            return result;
-        }
 
        
 
-        /// <summary>
-        /// 保存（替换）项目支付价格信息（会触发没有被锁定的费用计算）[AUTH]
-        /// </summary>
-        
-        [HttpPost, Route("trialPaymentPrice/addOrUpdateTrialPaymentPrice")]
-        public async Task<IResponseOutput> AddOrUpdateTrialPaymentPrice([FromServices] ITrialPaymentPriceService _trialPaymentPriceService, TrialPaymentPriceCommand addOrUpdateModel)
-        {
-            var userId = Guid.Parse(User.FindFirst("id").Value);
-            var result =await _trialPaymentPriceService.AddOrUpdateTrialPaymentPrice(addOrUpdateModel);
-            var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(addOrUpdateModel.TrialId);
-            var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
-
-            foreach (var item in calcList)
-            {
-                if (item != null && needCalReviewerIds.Contains(item.DoctorId))
-                {
-                   await _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                    {
-                        NeedCalculateReviewers = new List<Guid>()
-                        {
-                            item.DoctorId
-                        },
-                        CalculateMonth = DateTime.Parse(item.YearMonth)
-                    }, User.FindFirst("id").Value);
-                }
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 批量更新奖励费用[AUTH]
-        /// </summary>
-        
-        [HttpPost, Route("volumeReward/addOrUpdatevolumeRewardPriceList")]
-        public async Task<IResponseOutput> AddOrUpdateAwardPriceList([FromServices] IVolumeRewardService _volumeRewardService, IEnumerable<AwardPriceCommand> addOrUpdateModel)
-        {
-
-            var result =await _volumeRewardService.AddOrUpdateVolumeRewardPriceList(addOrUpdateModel);
-
-            var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
-            foreach (var item in calcList)
-            {
-                if (item != null)
-                {
-                    await _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                    {
-                        NeedCalculateReviewers = new List<Guid>()
-                        {
-                            item.DoctorId
-                        },
-                        CalculateMonth = DateTime.Parse(item.YearMonth)
-                    }, User.FindFirst("id").Value);
-                }
-            }
-            return result;
-        }
 
 
      
-        /// <summary>
-        /// 计算医生月度费用，并将计算的结果存入费用表
-        /// </summary>
-        [HttpPost, Route("financial/calculateMonthlyPayment")]
-        public async Task<IResponseOutput> CalculateMonthlyPayment(CalculateDoctorAndMonthDTO param)
-        {
-            if (!ModelState.IsValid)
-            {
-                //---Invalid parameter.
-                return ResponseOutput.NotOk(_localizer["Financial_InvalidParameter"]);
-            }
-            return await _calculateService.CalculateMonthlyPayment(param, User.FindFirst("id").Value);
-        }
 
-        /// <summary>
-        /// Financials /Monthly Payment 列表查询接口
-        /// </summary>
-        [HttpPost, Route("financial/getMonthlyPaymentList")]
-        public async Task<IResponseOutput<PaymentDTO>> GetMonthlyPaymentList([FromServices] IPaymentService _paymentService, [FromServices] IExchangeRateService _exchangeRateService, MonthlyPaymentQueryDTO queryParam)
-        {
-            return ResponseOutput.Ok(new PaymentDTO
-            {
-                CostList = await _paymentService.GetMonthlyPaymentList(queryParam),
-                ExchangeRate = await _exchangeRateService.GetExchangeRateByMonth(queryParam.StatisticsDate.ToString("yyyy-MM"))
-            });
-        }
+      
+
+
     
 
     }

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -11,6 +11,7 @@ using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.Service.Reading.Interface;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
@@ -36,6 +37,7 @@ namespace IRaCIS.Core.API.Controllers
         private readonly IHttpContextAccessor _httpContext;
         private readonly ITrialConfigService _trialConfigService;
         private readonly INoneDicomStudyService _noneDicomStudyService;
+        private readonly IClinicalAnswerService _clinicalAnswerService;
         private readonly ISubjectService _subjectService;
         private readonly IReadingClinicalDataService _readingClinicalDataService;
         private readonly ISubjectVisitService _subjectVisitService;
@@ -62,6 +64,7 @@ namespace IRaCIS.Core.API.Controllers
              IReadingMedicineQuestionService readingMedicineQuestionService,
             ITrialConfigService _trialConfigService,
             INoneDicomStudyService noneDicomStudyService,
+            IClinicalAnswerService clinicalAnswerService,
             ISubjectService _subjectService,
             IReadingClinicalDataService _readingClinicalDataService,
             ISubjectVisitService subjectVisitService,
@@ -82,6 +85,7 @@ namespace IRaCIS.Core.API.Controllers
             this._httpContext = httpContext;
             this._trialConfigService = _trialConfigService;
             this._noneDicomStudyService = noneDicomStudyService;
+            this._clinicalAnswerService = clinicalAnswerService;
             this._subjectService = _subjectService;
             this._readingClinicalDataService = _readingClinicalDataService;
             this._subjectVisitService = subjectVisitService;
@@ -233,6 +237,94 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+        /// <summary>
+        /// CRC签名临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCSignClinicalData")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCSignClinicalData(DataInspectionDto<CRCSignClinicalDataInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCSignClinicalData(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// CRC确认临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+        /// <summary>
+        /// CRC撤销临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCCancelConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCCancelConfirmClinical(DataInspectionDto<CRCCancelConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCCancelConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// PM确认临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/PMConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> PMConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.PMConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+         /// <summary>
+         /// 提交结构化录入并签名
+         /// </summary>
+         /// <param name="opt"></param>
+         /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> SubmitClinicalFormAndSign(DataInspectionDto<SubmitClinicalFormInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.SubmitClinicalForm(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
         /// <summary>
         /// 提交阅片裁判问题
         /// </summary>

IRaCIS.Core.API/Dockerfile

@@ -0,0 +1,26 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src
+COPY ["IRaCIS.Core.API/IRaCIS.Core.API.csproj", "IRaCIS.Core.API/"]
+COPY ["IRaCIS.Core.Application/IRaCIS.Core.Application.csproj", "IRaCIS.Core.Application/"]
+COPY ["IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj", "IRaCIS.Core.Infra.EFCore/"]
+COPY ["IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj", "IRaCIS.Core.Domain/"]
+COPY ["IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj", "IRaCIS.Core.Domain.Share/"]
+COPY ["IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj", "IRaCIS.Core.Infrastructure/"]
+RUN dotnet restore "IRaCIS.Core.API/IRaCIS.Core.API.csproj"
+COPY . .
+WORKDIR "/src/IRaCIS.Core.API"
+RUN dotnet build "IRaCIS.Core.API.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "IRaCIS.Core.API.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -66,26 +66,21 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
     <PackageReference Include="EasyCaching.InMemory" Version="1.7.0" />
     <PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.7.0" />
     <PackageReference Include="EntityFrameworkCore.Triggered.Extensions" Version="3.2.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.21.8" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.49.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.50.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Hangfire.Tags.SqlServer" Version="1.8.1" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
+    <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
+    <PackageReference Include="Hangfire.SqlServer" Version="1.8.5" />
     <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
     <PackageReference Include="LogDashboard" Version="1.4.8" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
     <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.6.2" />
     <PackageReference Include="Quartz.Extensions.Hosting" Version="3.6.2" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
@@ -105,8 +100,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Content Update="appsettings.Uat_Study.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
     <Content Update="wwwroot\EmailTemplate\AdminAddUser_US.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -170,5 +167,13 @@
 
   <ProjectExtensions><VisualStudio><UserProperties anonymizetagsetting_1json__JsonSchema="http://json.schemastore.org/jovo-language-model" properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 
+  <ItemGroup>
+    <None Remove="..\.dockerignore" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="..\.dockerignore" />
+  </ItemGroup>
+
 
 </Project>

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -16,19 +16,6 @@
             医生基本信息 、工作信息  专业信息、审核状态
             </summary>
         </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.GetDoctorDetail(IRaCIS.Application.Interfaces.IAttachmentService,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Application.Interfaces.IEducationService,IRaCIS.Application.Interfaces.ITrialExperienceService,IRaCIS.Application.Interfaces.IResearchPublicationService,IRaCIS.Application.Interfaces.IVacationService,System.Guid)">
-            <summary>
-             获取医生详情 
-            </summary>
-            <param name="attachmentService"></param>
-            <param name="_doctorService"></param>
-            <param name="_educationService"></param>
-            <param name="_trialExperienceService"></param>
-            <param name="_researchPublicationService"></param>
-            <param name="_vacationService"></param>
-            <param name="doctorId"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,EasyCaching.Core.IEasyCachingProvider,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,Microsoft.Extensions.Configuration.IConfiguration)">
             <summary>  系统用户登录接口[New] </summary>
         </member>
@@ -41,49 +28,6 @@
             <param name="param"></param>
             <returns>新记录Id</returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.WorkLoadAddOrUpdate(IRaCIS.Application.Services.IDoctorWorkloadService,IRaCIS.Application.Contracts.WorkloadCommand)">
-            <summary>
-            添加或更新工作量[AUTH]
-            </summary>
-            <param name="_trialWorkloadService"></param>
-            <param name="workLoadAddOrUpdateModel"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateExchangeRate(IRaCIS.Application.Interfaces.IExchangeRateService,IRaCIS.Application.Interfaces.IPaymentAdjustmentService,IRaCIS.Application.Contracts.ExchangeRateCommand)">
-            <summary>
-            添加或更新汇率（会触发没有对锁定的费用计算）
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateRankPrice(IRaCIS.Application.Interfaces.IReviewerPayInfoService,IRaCIS.Application.Interfaces.IRankPriceService,IRaCIS.Application.Contracts.RankPriceCommand)">
-            <summary>
-            添加或更新 职称单价[AUTH]
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateReviewerPayInfo(IRaCIS.Application.Interfaces.IReviewerPayInfoService,IRaCIS.Application.Contracts.ReviewerPayInfoCommand)">
-            <summary>
-            添加或更新（替换）医生支付展信息[AUTH]
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialPaymentPrice(IRaCIS.Application.Interfaces.ITrialPaymentPriceService,IRaCIS.Application.Contracts.TrialPaymentPriceCommand)">
-            <summary>
-            保存（替换）项目支付价格信息（会触发没有被锁定的费用计算）[AUTH]
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateAwardPriceList(IRaCIS.Application.Interfaces.IVolumeRewardService,System.Collections.Generic.IEnumerable{IRaCIS.Application.Interfaces.AwardPriceCommand})">
-            <summary>
-            批量更新奖励费用[AUTH]
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.CalculateMonthlyPayment(IRaCIS.Application.Contracts.CalculateDoctorAndMonthDTO)">
-            <summary>
-            计算医生月度费用，并将计算的结果存入费用表
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.GetMonthlyPaymentList(IRaCIS.Application.Interfaces.IPaymentService,IRaCIS.Application.Interfaces.IExchangeRateService,IRaCIS.Application.Contracts.MonthlyPaymentQueryDTO)">
-            <summary>
-            Financials /Monthly Payment 列表查询接口
-            </summary>
-        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.GetInspectionList(IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionDto)">
             <summary>
             获取稽查数据
@@ -139,6 +83,41 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCSignClinicalData(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCSignClinicalDataInDto})">
+            <summary>
+            CRC签名临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            CRC确认临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCCancelConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCCancelConfirmClinicalInDto})">
+            <summary>
+            CRC撤销临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.PMConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            PM确认临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitClinicalFormAndSign(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto})">
+            <summary>
+            提交结构化录入并签名
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitJudgeVisitTaskResult(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeVisitTaskResult})">
             <summary>
             提交阅片裁判问题
@@ -233,68 +212,10 @@
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.ArchiveStudyNew(System.Guid,System.Guid,System.String,System.Nullable{System.Guid},System.Guid,Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.API.Controllers.UploadDownLoadController},EasyCaching.Core.IEasyCachingProvider,IRaCIS.Core.Application.Contracts.IStudyService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.UploadHub,IRaCIS.Core.API.IUploadClient},IRaCIS.Core.Application.Contracts.Dicom.IDicomArchiveService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
             <summary>Dicom 归档</summary>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitClinicalData(System.Guid)">
-            <summary>
-            上传临床数据  多文件
-            </summary>
-            <param name="subjectVisitId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadClinicalTemplate(System.Nullable{System.Guid})">
-            <summary>
-            上传临床数据模板
-            </summary>
-            <param name="trialId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadReadClinicalData(System.Guid,System.Guid,System.Guid)">
-            <summary>
-            上传阅片临床数据
-            </summary>
-            <param name="trialId"></param>
-            <param name="subjectId"></param>
-            <param name="readingId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadPrintscreen(System.Guid)">
-            <summary>
-            上传截图
-            </summary>
-            <param name="subjectId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadReadingAnswerImage(System.Guid,System.Guid)">
-            <summary>
-            上传Reading问题的图像
-            </summary>
-            <param name="trialId"></param>
-            <param name="visitTaskId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadJudgeTaskImage(System.Guid,System.Guid)">
-            <summary>
-            上传裁判任务的图像
-            </summary>
-            <param name="trialId"></param>
-            <param name="visitTaskId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadMedicalReviewImage(System.Guid,System.Guid)">
-            <summary>
-            上传医学审核图片
-            </summary>
-            <param name="trialId"></param>
-            <param name="taskMedicalReviewId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(Microsoft.AspNetCore.Http.IFormCollection,System.Guid,System.Guid,System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFileCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
             <summary>
             上传非Dicom 文件 支持压缩包 多文件上传
             </summary>
-            <param name="formCollection"></param>
-            <param name="subjectVisitId"></param>
-            <param name="noneDicomStudyId"></param>
-            <param name="studyMonitorId"></param>
             <param name="_noneDicomStudyRepository"></param>
             <returns></returns>
         </member>
@@ -305,92 +226,15 @@
             <param name="trialId"></param>
             <returns></returns>
         </member>
-        <member name="T:IRaCIS.Core.API.Controllers.FileController">
-            <summary>医生文件上传下载</summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.UploadOrdinaryFile(System.String,System.Guid)">
-            <summary>
-            上传文件[FileUpload]
-            </summary>
-            <param name="attachmentType">附件类型</param>
-            <param name="doctorId">医生Id</param>
-            <returns>返回文件信息</returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.UploadNonDoctorFile(System.String)">
-            <summary>
-            上传文件（ 不是医生个人的文件）[FileUpload]
-            例如：阅片章程等
-            </summary>
-            <param name="type">文件类型</param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadAttachment(System.Guid[])">
-            <summary>
-            下载多个医生的所有附件
-            </summary>
-            <param name="doctorIds"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadOfficialResume(System.Int32,System.Guid[])">
-            <summary>
-            下载医生官方简历
-            </summary>
-            <param name="language"></param>
-            <param name="doctorIds"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.FileController.DownloadAttachmentById(System.Guid,System.Guid[])">
-            <summary>
-            下载指定医生的指定附件
-            </summary>
-            <param name="doctorId">医生Id</param>
-            <param name="attachmentIds">要下载的附件Id</param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.LocalFilePreview(System.String)">
-            <summary>  缩略图 </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadCommonFile(System.String,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument})">
-            <summary>  通用文件下载 </summary>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadTrialClinicalFile(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataTrialSet})">
-            <summary>
-            下载项目临床数据文件
-            </summary>
-            <param name="clinicalDataTrialSetId"></param>
-            <param name="_clinicalDataTrialSetRepository"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadSystemClinicalFile(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ClinicalDataSystemSet})">
-            <summary>
-            下载系统临床数据文件
-            </summary>
-            <param name="clinicalDataSystemSetId"></param>
-            <param name="_clinicalDataSystemSetRepository"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadTrialDoc(System.Guid)">
-             <summary>
-            上传项目签名文档
-             </summary>
-             <param name="trialId"></param>
-             <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadSysTemDoc">
-            <summary>
-            上传系统签名文档
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadCommonDoc">
             <summary>
             上传通用文档  比如一致性核查的 比如导出的excel 模板
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadSystemNoticeDoc">
+        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.Upload(IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadFileType)">
             <summary>
-            上传系统通知文档
+            1：数据上传  2：导出、 3：邮件附件  4：邮件Html     通过 ----new
             </summary>
             <returns></returns>
         </member>
@@ -449,113 +293,5 @@
             <param name="withPrivate"></param>
             <returns></returns>
         </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.GrpcTokenReflection">
-            <summary>Holder for reflection information generated from Protos/GrpcToken.proto</summary>
-        </member>
-        <member name="P:gRPC.ZHiZHUN.AuthServer.protos.GrpcTokenReflection.Descriptor">
-            <summary>File descriptor for Protos/GrpcToken.proto</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest">
-            <summary>
-            新增用户时需要传递数据消息， 可理解为一个类
-            </summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.IdFieldNumber">
-            <summary>Field number for the "id" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.UserNameFieldNumber">
-            <summary>Field number for the "userName" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.RealNameFieldNumber">
-            <summary>Field number for the "realName" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.ReviewerCodeFieldNumber">
-            <summary>Field number for the "reviewerCode" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.UserTypeEnumIntFieldNumber">
-            <summary>Field number for the "userTypeEnumInt" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.UserTypeShortNameFieldNumber">
-            <summary>Field number for the "userTypeShortName" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest.IsAdminFieldNumber">
-            <summary>Field number for the "isAdmin" field.</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.GetTokenResponse">
-            <summary>
-            新增时返回的消息格式
-            </summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenResponse.CodeFieldNumber">
-            <summary>Field number for the "code" field.</summary>
-        </member>
-        <member name="F:gRPC.ZHiZHUN.AuthServer.protos.GetTokenResponse.TokenFieldNumber">
-            <summary>Field number for the "token" field.</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService">
-            <summary>
-            service 用标识定义服务的，里面写对应的方法
-            </summary>
-        </member>
-        <member name="P:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.Descriptor">
-            <summary>Service descriptor</summary>
-        </member>
-        <member name="T:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient">
-            <summary>Client for TokenGrpcService</summary>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor(Grpc.Core.ChannelBase)">
-            <summary>Creates a new client for TokenGrpcService</summary>
-            <param name="channel">The channel to use to make remote calls.</param>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor(Grpc.Core.CallInvoker)">
-            <summary>Creates a new client for TokenGrpcService that uses a custom <c>CallInvoker</c>.</summary>
-            <param name="callInvoker">The callInvoker to use to make remote calls.</param>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor">
-            <summary>Protected parameterless constructor to allow creation of test doubles.</summary>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.#ctor(Grpc.Core.ClientBase.ClientBaseConfiguration)">
-            <summary>Protected constructor to allow creation of configured clients.</summary>
-            <param name="configuration">The client configuration.</param>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserToken(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.Metadata,System.Nullable{System.DateTime},System.Threading.CancellationToken)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="headers">The initial metadata to send with the call. This parameter is optional.</param>
-            <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
-            <param name="cancellationToken">An optional token for canceling the call.</param>
-            <returns>The response received from the server.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserToken(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.CallOptions)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="options">The options for the call.</param>
-            <returns>The response received from the server.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserTokenAsync(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.Metadata,System.Nullable{System.DateTime},System.Threading.CancellationToken)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="headers">The initial metadata to send with the call. This parameter is optional.</param>
-            <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
-            <param name="cancellationToken">An optional token for canceling the call.</param>
-            <returns>The call object.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.GetUserTokenAsync(gRPC.ZHiZHUN.AuthServer.protos.GetTokenReuqest,Grpc.Core.CallOptions)">
-            <summary>
-            获取token
-            </summary>
-            <param name="request">The request to send to the server.</param>
-            <param name="options">The options for the call.</param>
-            <returns>The call object.</returns>
-        </member>
-        <member name="M:gRPC.ZHiZHUN.AuthServer.protos.TokenGrpcService.TokenGrpcServiceClient.NewInstance(Grpc.Core.ClientBase.ClientBaseConfiguration)">
-            <summary>Creates a new instance of client from given <c>ClientBaseConfiguration</c>.</summary>
-        </member>
     </members>
 </doc>

IRaCIS.Core.API/NLog.config

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      autoReload="true"
-      throwExceptions="false"
-      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
-	<variable name="myvar" value="myvalue"/>
-
-	<targets>
-
-		<target xsi:type="file" name="File" fileName="${basedir}/logs/${shortdate}/${level}.log"
-		        layout="${longdate}||${level}||${logger}||${message}||${exception:format=ToString:innerFormat=ToString:maxInnerExceptionLevel=10:separator=\r\n}||end" />
-	</targets>
-
-	<rules>
-		<logger name="*" minlevel="Debug" writeTo="file" />
-	</rules>
-</nlog>

IRaCIS.Core.API/Program.cs

@@ -13,6 +13,8 @@ using System.IO;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Application.Services.BackGroundJob;
+using Hangfire;
 
 namespace IRaCIS.Core.API
 {
@@ -59,17 +61,10 @@ namespace IRaCIS.Core.API
                 Log.Logger.Warning($"当前环境：{enviromentName}");
 
 
-
                 NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
 
-
-                //缓存项目的状态  匿名化数据
-                await InitCache(host);
-
-              
-
-
-
+                ////缓存项目的状态  匿名化数据
+                //await InitCache(host);
 
                 host.Run();
 
@@ -107,15 +102,7 @@ namespace IRaCIS.Core.API
             var _repository = host.Services.GetService(typeof(IRepository)) as IRepository;
 
             //初始化 国际化数据，并且监测国际化文件变更
-           await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_repository);
-
-            var _mediator = host.Services.GetService(typeof(IMediator)) as IMediator;
-
-            await _mediator.Send(new AnonymizeCacheRequest());
-
-            await _mediator.Send(new TrialStateCacheRequest());
-
-
+           //await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_repository);
 
         }
 

IRaCIS.Core.API/Properties/launchSettings.json

@@ -1,58 +1,27 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:3305",
-      "sslPort": 0
-    }
-  },
   "profiles": {  
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IRaCIS.Development": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:6100"
-    },
     "Docker": {
       "commandName": "Docker",
       "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
       "publishAllPorts": true
     },
-    "IRaCIS.Staging": {
+    "Uat_Study": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Staging"
+        "ASPNETCORE_ENVIRONMENT": "Uat_Study"
       },
-      "applicationUrl": "http://localhost:6200"
+      "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.Production": {
+    "Test_Study": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Production"
+        "ASPNETCORE_ENVIRONMENT": "Test_Study"
       },
-      "applicationUrl": "http://localhost:6300"
-    },
-    "IRaCIS.CertificateApply": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "CertificateApply"
-      },
-      "applicationUrl": "http://localhost:6400"
+      "applicationUrl": "http://localhost:6100"
     }
   }
 }

IRaCIS.Core.API/Startup.cs

@@ -24,6 +24,11 @@ using Invio.Extensions.Authentication.JwtBearer;
 using Microsoft.AspNetCore.SignalR;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.StaticFiles;
+using IRaCIS.Application.Services.BackGroundJob;
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Http;
+using Autofac.Core;
+using DocumentFormat.OpenXml.InkML;
 
 namespace IRaCIS.Core.API
 {
@@ -89,7 +94,7 @@ namespace IRaCIS.Core.API
             })
                 .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
 
-            services.AddOptions().Configure<SystemEmailSendConfig>( _configuration.GetSection("SystemEmailSendConfig"));
+            services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.GetSection("SystemEmailSendConfig"));
             services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
 
 
@@ -114,7 +119,8 @@ namespace IRaCIS.Core.API
             //services.AddDistributedMemoryCache();
 
             // hangfire  定时任务框架  有界面，更友好~
-            //services.AddhangfireSetup(_configuration);
+            services.AddhangfireSetup(_configuration);
+
             //  QuartZ 定时任务框架  使用了hangfire 暂时不用，后续需要可以打开，已经配好
             services.AddQuartZSetup(_configuration);
 
@@ -161,8 +167,10 @@ namespace IRaCIS.Core.API
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public async void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            //app.UsePathBase(PathString.FromUriComponent("/api"));
+
             //本地化
             app.UseLocalization();
 
@@ -178,10 +186,10 @@ namespace IRaCIS.Core.API
 
 
             //LogDashboard
-            app.UseLogDashboard("/LogDashboard");
+            app.UseLogDashboard("/back/logs");
 
             //hangfire
-            //app.UseHangfireConfig(env);
+            app.UseHangfireConfig(env);
 
             ////暂时废弃
             //app.UseHttpReports();
@@ -235,6 +243,14 @@ namespace IRaCIS.Core.API
                 endpoints.MapHub<UploadHub>("/UploadHub");
             });
 
+
+            var hangfireJobService = app.ApplicationServices.GetRequiredService<IIRaCISHangfireJob>();
+
+            await hangfireJobService.InitHangfireJobTaskAsync();
+            //有的时候每调用
+            //HangfireJobHelper.NotImmediatelyOnceOnlyJob<IIRaCISHangfireJob>(t => t.InitHangfireJobTaskAsync(),TimeSpan.FromSeconds(1));
+
+
         }
     }
 }

IRaCIS.Core.API/Test.cs

@@ -1,99 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace EFSaving.Concurrency
-{
-    public class Sample
-    {
-        public static void Run()
-        {
-            // Ensure database is created and has a person in it
-            using (var setupContext = new PersonContext())
-            {
-                setupContext.Database.EnsureDeleted();
-                setupContext.Database.EnsureCreated();
-
-                setupContext.People.Add(new Person { FirstName = "John", LastName = "Doe" });
-                setupContext.SaveChanges();
-            }
-
-            #region ConcurrencyHandlingCode
-            using var context = new PersonContext();
-            // Fetch a person from database and change phone number
-            var person = context.People.Single(p => p.PersonId == 1);
-            person.PhoneNumber = "555-555-5555";
-
-            // Change the person's name in the database to simulate a concurrency conflict
-            context.Database.ExecuteSqlRaw(
-                "UPDATE dbo.People SET FirstName = 'Jane' WHERE PersonId = 1");
-
-            var saved = false;
-            while (!saved)
-            {
-                try
-                {
-                    // Attempt to save changes to the database
-                    context.SaveChanges();
-                    saved = true;
-                }
-                catch (DbUpdateConcurrencyException ex)
-                {
-                    foreach (var entry in ex.Entries)
-                    {
-                        if (entry.Entity is Person)
-                        {
-                            var proposedValues = entry.CurrentValues;
-                            var databaseValues = entry.GetDatabaseValues();
-
-                            foreach (var property in proposedValues.Properties)
-                            {
-                                var proposedValue = proposedValues[property];
-                                var databaseValue = databaseValues[property];
-
-                                // TODO: decide which value should be written to database
-                                // proposedValues[property] = <value to be saved>;
-                            }
-
-                            // Refresh original values to bypass next concurrency check
-                            entry.OriginalValues.SetValues(databaseValues);
-                        }
-                        else
-                        {
-                            throw new NotSupportedException(
-                                "Don't know how to handle concurrency conflicts for "
-                                + entry.Metadata.Name);
-                        }
-                    }
-                }
-            }
-            #endregion
-        }
-
-        public class PersonContext : DbContext
-        {
-            public DbSet<Person> People { get; set; }
-
-            protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-            {
-                // Requires NuGet package Microsoft.EntityFrameworkCore.SqlServer
-                optionsBuilder.UseSqlServer(
-                    @"Server=(localdb)\mssqllocaldb;Database=EFSaving.Concurrency;Trusted_Connection=True");
-            }
-        }
-
-        public class Person
-        {
-            public int PersonId { get; set; }
-
-            [ConcurrencyCheck]
-            public string FirstName { get; set; }
-
-            [ConcurrencyCheck]
-            public string LastName { get; set; }
-
-            public string PhoneNumber { get; set; }
-        }
-    }
-}

IRaCIS.Core.API/_PipelineExtensions/Dashboard/hangfireAuthorizationFilter.cs

@@ -0,0 +1,39 @@
+using Hangfire.Dashboard;
+using System.IdentityModel.Tokens.Jwt;
+using System;
+using System.Linq;
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.API.Filter
+{
+
+    //从cookie 中取值
+    public class hangfireAuthorizationFilter : IDashboardAuthorizationFilter
+    {
+        public bool Authorize(DashboardContext context)
+        {
+            var httpContext = context.GetHttpContext();
+
+            // Allow all authenticated users to see the Dashboard (potentially dangerous).
+            //return httpContext.User.Identity.IsAuthenticated;
+
+            var jwtToken = httpContext.Request.Cookies["access_token"]?.ToString();
+
+            var handler = new JwtSecurityTokenHandler();
+
+            if (handler.CanReadToken(jwtToken))
+            {
+
+                var jwtSecurityToken = handler.ReadJwtToken(jwtToken);
+
+                return jwtSecurityToken.Claims.Any(t => t.Type == JwtIRaCISClaimType.UserTypeEnum && (t.Value == UserTypeEnum.Admin.ToString()||  t.Value== UserTypeEnum.SuperAdmin.ToString()));
+            }
+            else
+            {
+                return false;
+            }
+
+
+        }
+    }
+}

IRaCIS.Core.API/_PipelineExtensions/Hangfire/HangfireConfig.cs

@@ -1,40 +0,0 @@
-using Hangfire;
-using Hangfire.Dashboard;
-using IRaCIS.Application.Services.BackGroundJob;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-
-namespace IRaCIS.Core.API
-{
-  
-
-    public static class HangfireConfig
-    {
-
-        public static void UseHangfireConfig(this IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            app.UseHangfireDashboard("/api/hangfire", new DashboardOptions()
-            {
-                //直接访问，没有带token 获取不到用户身份信息，所以这种自定义授权暂时没法使用
-                //Authorization = new[] { new hangfireAuthorizationFilter() }
-
-                //本地请求 才能看
-                Authorization = new[] { new LocalRequestsOnlyAuthorizationFilter() }
-
-            });
-
-            #region hangfire
-            //// 延迟任务执行  1秒之后执行  有时启动没运行  换成添加到队列中
-            //BackgroundJob.Schedule<ICacheTrialStatusJob>(t => t.MemoryCacheTrialStatus(), TimeSpan.FromSeconds(1));
-            ////添加到后台任务队列，
-            //BackgroundJob.Enqueue<ICacheTrialStatusJob>(t => t.MemoryCacheTrialStatus());
-
-            //周期性任务，1天执行一次
-
-            RecurringJob.AddOrUpdate<IIRaCISCacheHangfireJob>(t => t.ProjectStartCache(), Cron.Daily);
-
-            #endregion
-
-        }
-    }
-}

IRaCIS.Core.API/_PipelineExtensions/Hangfire/hangfireAuthorizationFilter.cs

@@ -1,17 +0,0 @@
-using Hangfire.Dashboard;
-
-namespace IRaCIS.Core.API.Filter
-{
-    public class hangfireAuthorizationFilter : IDashboardAuthorizationFilter
-    {
-        public bool Authorize(DashboardContext context)
-        {
-            var httpContext = context.GetHttpContext();
-
-            // Allow all authenticated users to see the Dashboard (potentially dangerous).
-            return httpContext.User.Identity.IsAuthenticated;
-
-            //return true;
-        }
-    }
-}

IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs

@@ -0,0 +1,66 @@
+using Hangfire;
+using Hangfire.Dashboard;
+using Hangfire.Dashboard.BasicAuthorization;
+using IRaCIS.Application.Services.BackGroundJob;
+using IRaCIS.Core.API.Filter;
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+
+namespace IRaCIS.Core.API
+{
+
+
+    public static class HangfireConfig
+    {
+
+        public static void UseHangfireConfig(this IApplicationBuilder app, IWebHostEnvironment env)
+        {
+
+
+            app.UseHangfireDashboard("/back/hangfire", new DashboardOptions()
+            {
+
+
+
+                Authorization = new IDashboardAuthorizationFilter[] { /*new hangfireAuthorizationFilter(),*/
+
+                new BasicAuthAuthorizationFilter(new BasicAuthAuthorizationFilterOptions(){
+                            SslRedirect=false,
+                            RequireSsl=false,
+                            Users=new BasicAuthAuthorizationUser[]{
+                                  new BasicAuthAuthorizationUser(){
+                                      Login="admin",
+                                      PasswordClear="admin",
+
+                                  }
+                             }
+
+                      })
+                },
+
+                DashboardTitle ="后台任务管理",
+
+
+                //Authorization = new BasicAuthAuthorizationFilter[] {
+                //      new BasicAuthAuthorizationFilter(new BasicAuthAuthorizationFilterOptions(){
+                //            SslRedirect=false,
+                //            RequireSsl=false,
+                //            Users=new BasicAuthAuthorizationUser[]{
+                //                  new BasicAuthAuthorizationUser(){
+                //                      Login="admin",
+                //                      PasswordClear="test",
+
+                //                  }
+                //             }
+
+                //      })
+                //}
+
+            });
+
+
+
+        }
+    }
+}

IRaCIS.Core.API/_PipelineExtensions/Serilog/SerilogConfig.cs

@@ -1,6 +1,4 @@
-using Hangfire;
-using Hangfire.Dashboard;
-using IRaCIS.Core.API._PipelineExtensions.Serilog;
+using IRaCIS.Core.API._PipelineExtensions.Serilog;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Serilog;

IRaCIS.Core.API/_ServiceExtensions/Authorization/AuthorizationPolicySetup.cs

@@ -1,86 +0,0 @@
-using IRaCIS.Core.Application.Auth;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace IRaCIS.Core.API
-{
-    public static class AuthorizationPolicySetup
-    {
-
-        public static void AddAuthorizationPolicySetup(this IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddAuthorization(options =>
-            {
-                //影像质控策略  只允许 CRC  IQC进行操作
-                options.AddPolicy(IRaCISPolicy.CRC_IQC, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ClinicalResearchCoordinator).ToString(), ((int)UserTypeEnum.IQC).ToString());
-                });
-
-                //一致性核查策略  只允许 CRC  PM APM 进行操作
-                options.AddPolicy(IRaCISPolicy.PM_APM_CRC, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.ClinicalResearchCoordinator).ToString(), ((int)UserTypeEnum.APM).ToString());
-                });
-
-
-                options.AddPolicy(IRaCISPolicy.PM_APM, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.APM).ToString());
-                });
-
-                options.AddPolicy(IRaCISPolicy.PM_IQC, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.IQC).ToString());
-                });
-       
-
-                options.AddPolicy(IRaCISPolicy.PM, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString());
-                });
-
-
-                options.AddPolicy(IRaCISPolicy.IQC, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.IQC).ToString());
-                });
-
-                options.AddPolicy(IRaCISPolicy.CRC, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ClinicalResearchCoordinator).ToString());
-                });
-
-                options.AddPolicy(IRaCISPolicy.PM_APM_CRC_QC, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(),((int)UserTypeEnum.ClinicalResearchCoordinator).ToString(), ((int)UserTypeEnum.APM).ToString(), ((int)UserTypeEnum.IQC).ToString());
-                });
-
-                options.AddPolicy(IRaCISPolicy.SPM_CPM, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.SPM).ToString(), ((int)UserTypeEnum.CPM).ToString());
-                });
-
-                options.AddPolicy(IRaCISPolicy.PM_APM_SPM_CPM, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.APM).ToString(),((int)UserTypeEnum.SPM).ToString(), ((int)UserTypeEnum.CPM).ToString());
-                });
-
-                options.AddPolicy(IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM, policyBuilder =>
-                {
-                    policyBuilder.RequireClaim("userTypeEnumInt", ((int)UserTypeEnum.ProjectManager).ToString(), ((int)UserTypeEnum.APM).ToString(), ((int)UserTypeEnum.SPM).ToString(), 
-                        ((int)UserTypeEnum.CPM).ToString(), ((int)UserTypeEnum.SMM).ToString(), ((int)UserTypeEnum.CMM).ToString());
-                });
-
-
-                
-
-            });
-        }
-
-
-      
-
-    }
-}

IRaCIS.Core.API/_ServiceExtensions/AutofacModuleSetup.cs

@@ -15,6 +15,7 @@ using MediatR;
 using IRaCIS.Application.Services;
 using IRaCIS.Application.Interfaces;
 using AutoMapper;
+using Quartz;
 
 namespace IRaCIS.Core.API
 {
@@ -65,7 +66,6 @@ namespace IRaCIS.Core.API
             containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
             containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
 
-
             //containerBuilder.RegisterType<Dictionary>().InstancePerLifetimeScope();
             //Autofac 注册拦截器  需要注意的是生成api上服务上的动态代理AOP失效    间接掉用不影响
             //containerBuilder.RegisterType<TrialStatusAutofacAOP>();

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -37,6 +37,7 @@ namespace IRaCIS.Core.API
                     triggerOptions.AddTrigger<AddSubjectTrigger>();
                     triggerOptions.AddTrigger<ChallengeStateTrigger>();
                     triggerOptions.AddTrigger<SubjectStateTrigger>();
+                    triggerOptions.AddTrigger<AddCRCCliniaclDataTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitCheckPassedTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitFinalVisitTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitTrigger>();
@@ -44,10 +45,7 @@ namespace IRaCIS.Core.API
                     triggerOptions.AddTrigger<TableQuestionRowTrigger>();
                     //triggerOptions.AddTrigger<AddlTrialUserTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIsFrontTaskNeedSignButNotSignTrigger>();
-
-                    
-
-
+                    triggerOptions.AddTrigger<VisitTaskIAfterSignTrigger>();
                  
                 });
 

IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs

@@ -13,12 +13,14 @@ namespace IRaCIS.Core.API
             services.AddLogDashboard(opt =>
             {
                 //opt.PathMatch = "/api/LogDashboard";
-                opt.PathMatch = "/LogDashboard";
+                opt.PathMatch = "/back/logs";
 
                 //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018"));
 
                 //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter());
 
+
+
             });
 
         }

IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs

@@ -10,7 +10,7 @@ namespace IRaCIS.Core.API
     {
         public static void AddQuartZSetup(this IServiceCollection services, IConfiguration configuration)
         {
-            services.AddTransient<CacheTrialStatusQuartZJob>();
+            services.AddTransient<CancelTaskQuartZJob>();
 
             services.AddQuartz(q =>
             {
@@ -20,17 +20,21 @@ namespace IRaCIS.Core.API
                 q.UseMicrosoftDependencyInjectionJobFactory();
 
                 // 基本Quartz调度器、作业和触发器配置
-                var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup");
-                q.AddJob<CacheTrialStatusQuartZJob>(jobKey, j => j
-                    .WithDescription("Trial regular work")
-                );
-                q.AddTrigger(t => t
-                    .WithIdentity("TrialStatusTrigger")
-                    .ForJob(jobKey)
+                //var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup");
+                //q.AddJob<CacheTrialStatusQuartZJob>(jobKey, j => j
+                //    .WithDescription("Trial regular work")
+                //);
+
+                //q.AddTrigger(t => t
+                //    .WithIdentity("TrialStatusTrigger")
+                //    .ForJob(jobKey)                   
+                //    .WithCronSchedule("0 0 * * * ?")
+                //    .WithDescription("My regular trial work trigger")
+                //);
+
+
+
 
-                    .WithCronSchedule("0 0 * * * ?")
-                    .WithDescription("My regular trial work trigger")
-                );
             });
 
             // ASP.NET Core hosting

IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs

@@ -1,6 +1,5 @@
 using Hangfire;
 using Hangfire.SqlServer;
-using Hangfire.Tags.SqlServer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -15,24 +14,29 @@ namespace IRaCIS.Core.API
 
             services.AddHangfire(hangFireConfig =>
             {
+
+                //hangFireConfig.UseInMemoryStorage();
+
                 //指定存储介质
                 hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
                 {
-                    SchemaName = "hangfire",
+                    SchemaName = "dbo",
                     CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
                     SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
                     QueuePollInterval = TimeSpan.Zero,
                     UseRecommendedIsolationLevel = true,
-                    UsePageLocksOnDequeue = true,
                     DisableGlobalLocks = true
                 });
 
-                hangFireConfig.UseTagsWithSql(); //nuget引入Hangfire.Tags.SqlServer
+                //hangFireConfig.UseTagsWithSql(); //nuget引入Hangfire.Tags.SqlServer
                 //.UseHangfireHttpJob();
 
             });
 
-            services.AddHangfireServer();
+            services.AddHangfireServer(option =>
+            {
+                option.Queues = new[] { "immediately_once","default","sys_init" , "not_immediately_once" };
+            });
 
         }
     }

IRaCIS.Core.API/appsettings.CenterImageDev.json

@@ -1,31 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=CenterImage_Test;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.CertificateApply.json

@@ -1,33 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Certificate;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.Development.json

@@ -1,37 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
-    "LoginMaxFailCount": 3,
-
-    "LoginFailLockMinutes":1
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.Prod_Study.json

@@ -0,0 +1,48 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AliyunOSS": {
+    "regionId": "cn-shanghai",
+    "region": "oss-cn-shanghai",
+    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+    "bucketName": "zy-sir-store",
+    "viewEndpoint": "https://zy-sir-cache.oss-cn-shanghai.aliyuncs.com"
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=47.117.165.18,1434;Database=Prod_Study;User ID=sa;Password=WHxckj@2019;TrustServerCertificate=true",
+    "Hangfire": "Server=47.117.165.18,1434;Database=Prod_Study.hangfire;User ID=sa;Password=WHxckj@2019;TrustServerCertificate=true"
+  },
+
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
+
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "study@extimaging.com",
+    "FromName": "study.extimaging",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "https://study.extimaging.com/login"
+  }
+
+}

IRaCIS.Core.API/appsettings.Production.json

@@ -1,42 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  //"RootUrl": "http://123.56.181.144:8060/",
-  "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1433;Database=IRaCIS.Production;User ID=sa;Password=zhanying2021;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1433;Database=Hangfire.IRaCIS.Production;User ID=sa;Password=zhanying2021;TrustServerCertificate=true"
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 3,
-
-    "LoginFailLockMinutes": 1
-  },
-  //"SystemEmailSendConfig": {
-  //  "Port": 465,
-  //  "Host": "smtp.163.com",
-  //  "FromEmail": "zhou941003@qq.com",
-  //  "FromName": "hangZhou",
-  //  "AuthorizationCode": "sqfhlpfdvnexbcab"
-  //}
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "IRC@extimaging.com",
-    "FromName": "IRC",
-    "AuthorizationCode": "ExtImg@2022"
-  }
-
-
-}

IRaCIS.Core.API/appsettings.Staging.json

@@ -1,34 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_Verify;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 3,
-
-    "LoginFailLockMinutes": 1
-
-  },
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "uat@extimaging.com",
-    "FromName": "UAT_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-
-}

IRaCIS.Core.API/appsettings.Test_Study.json

@@ -0,0 +1,47 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AliyunOSS": {
+    "regionId": "cn-shanghai",
+    "region": "oss-cn-shanghai",
+    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+    "bucketName": "zy-sir-test-store",
+    "viewEndpoint": "https://zy-sir-test-store.oss-cn-shanghai.aliyuncs.com"
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
+    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study.hangfire;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
+  },
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
+
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "test-study@extimaging.com",
+    "FromName": "Test_Study",
+    "AuthorizationCode": "zhanying123",
+
+    "SiteUrl": "http://test.study.extimaging.com/login"
+  }
+
+}

IRaCIS.Core.API/appsettings.USDemo.json

@@ -1,37 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=47.90.161.85,1433\\MSSQLSERVER;Database=IRaCIS_Demo_US;User ID=sa;Password=zhanying2021;TrustServerCertificate=true",
-    "Hangfire": "Server=47.90.161.85,1433\\MSSQLSERVER;Database=Hangfire.IRaCIS_Demo_US;User ID=sa;Password=zhanying2021;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
-    "LoginMaxFailCount": 3,
-
-    "LoginFailLockMinutes": 1
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.Uat_Study.json

@@ -0,0 +1,46 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AliyunOSS": {
+    "regionId": "cn-shanghai",
+    "region": "oss-cn-shanghai",
+    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+    "bucketName": "zy-sir-uat-store",
+    "viewEndpoint": "https://zy-sir-uat-store.oss-cn-shanghai.aliyuncs.com"
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=47.117.164.182,1434;Database=Uat.Study;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=47.117.164.182,1434;Database=Uat.Study.hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
+
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "uat-study@extimaging.com",
+    "FromName": "Uat_Study",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "http://uat.study.extimaging.com/login"
+  }
+
+}

IRaCIS.Core.API/appsettings.json

@@ -5,6 +5,7 @@
     "Audience": "ZhiZhun",
     "TokenExpireDays": "7"
   },
+  //ip
   "IpRateLimiting": {
     "EnableEndpointRateLimiting": true,
     "StackBlockedRequests": false,
@@ -19,6 +20,7 @@
     "EndpointWhitelist": [
       "post:/study/archivestudy/*"
     ],
+
     "IpWhitelist": [],
     "GeneralRules": [
       {

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作。
+                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -38,7 +38,6 @@
                 </div>
             </div>
 
-
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！/Best Regards</div>
                 <div style="font-size: 14px;">展影医疗</div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html

@@ -11,7 +11,7 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the IRC service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
+                As the service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
                 Digital workflow is implemented for this trial, and your account information is as follows:

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
+                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html

@@ -11,7 +11,7 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the IRC service provider of {1}trial (Protocol ID is {2}), Extensive Imaging invites you to participate in the independent assessment work of this trial. 
+                As the service provider of {1}trial (Protocol ID is {2}), Extensive Imaging invites you to participate in the independent assessment work of this trial. 
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
+                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html

@@ -11,7 +11,7 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
+                As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
                 Digital workflow is implemented for this trial, and your account information is as follows:

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作。
+                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html

@@ -11,7 +11,7 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
+                As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 Digital workflow is implemented for this trial, and your account information is as follows:

IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html

@@ -11,7 +11,7 @@
                 Dear Sir or Madam:
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                Thank you for using our IRC imaging system.
+                Thank you for using our imaging system.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
                 {0}, the verification code is {1}. Please enter this code within 3 minutes for follow-up operations.

IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js

@@ -414,8 +414,8 @@ var abp = abp || {};
 
         //Inputs
         createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)');
-        createInput(modalUxContent, 'userName', 'Username or email address','text','admin');
-        createInput(modalUxContent, 'password', 'Password','password');
+        createInput(modalUxContent, 'userName', 'Username or email address','text','cyldev');
+        createInput(modalUxContent, 'password', 'Password','password','123456');
 
         //Buttons
         var authBtnWrapper = document.createElement('div');

IRaCIS.Core.Application/BackGroundJob/CacheTrialStatusQuartZJob.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EasyCaching.Core;
-using IRaCIS.Core.Domain;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Domain.Models;
-using Microsoft.Extensions.Logging;
-using Quartz;
-using IRaCIS.Core.Domain.Share;
-
-namespace IRaCIS.Application.Services.BackGroundJob
-{
-
-    public class CacheTrialStatusQuartZJob: IJob
-    {
-
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IEasyCachingProvider _provider;
-        private readonly ILogger<CacheTrialStatusQuartZJob> _logger;
-        private readonly IRepository<SystemAnonymization> _systemAnonymizationRepository;
-
-        public CacheTrialStatusQuartZJob(IRepository<Trial> trialRepository, IEasyCachingProvider provider,ILogger<CacheTrialStatusQuartZJob> logger, IRepository<SystemAnonymization> systemAnonymizationRepository)
-        {
-            _trialRepository = trialRepository;
-            _provider = provider;
-            _logger = logger;
-            _systemAnonymizationRepository = systemAnonymizationRepository;
-        }
-
-        public async Task Execute(IJobExecutionContext context)
-        
-        {
-            _logger.LogInformation($"开始执行QuartZ定时任务作业");
-            try
-            {
-                await MemoryCacheTrialStatus();
-
-                await MemoryCacheAnonymizeData();
-
-            }
-            catch (Exception e)
-            {
-                _logger.LogError($" 查询和缓存过程出现异常"+e.Message);
-            }
-            _logger.LogInformation("QuartZ定时任务作业结束");
-        }
-
-
-        public async Task MemoryCacheTrialStatus()
-        {
-            var list = await _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr })
-                  .ToListAsync();
-
-            list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(7)));
-
-        }
-
-        public async Task MemoryCacheAnonymizeData()
-        {
-            var systemAnonymizationList = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync();
-
-            _provider.Set(StaticData.Anonymize.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
-        }
-
-
-
-    }
-}

IRaCIS.Core.Application/BackGroundJob/CancelTaskQuartZJob.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EasyCaching.Core;
+using IRaCIS.Core.Domain;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Domain.Models;
+using Microsoft.Extensions.Logging;
+using Quartz;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Application.Contracts;
+
+namespace IRaCIS.Application.Services.BackGroundJob
+{
+
+    public class CancelTaskQuartZJob : IJob
+    {
+
+        private readonly IRepository<Subject> _subjectRepository;
+        private readonly ILogger<CancelTaskQuartZJob> _logger;
+        private readonly IRepository<VisitTask> _visitTaskRepository;
+
+        public CancelTaskQuartZJob(IRepository<Subject> subjectRepository, IEasyCachingProvider provider, ILogger<CancelTaskQuartZJob> logger, IRepository<VisitTask> visitTaskRepository)
+        {
+            _subjectRepository = subjectRepository;
+            _logger = logger;
+            _visitTaskRepository = visitTaskRepository;
+        }
+
+        public async Task Execute(IJobExecutionContext context)
+
+        {
+            _logger.LogInformation($"开始执行QuartZ定时取消任务作业");
+
+            try
+            {
+                JobDataMap dataMap = context.JobDetail.JobDataMap;
+
+                bool isInOrder = (bool)dataMap.Get("IsInOrder");
+
+                if (isInOrder)
+                {
+                    Guid subjectId = (Guid)dataMap.Get("SubjectId");
+
+                    Guid trialReadingCriterionId = (Guid)dataMap.Get("TrialReadingCriterionId");
+                   
+                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId==trialReadingCriterionId, u => new VisitTask() { SubjectCriterionClaimUserId = null });
+
+                }
+                else
+                {
+                    Guid id = (Guid)dataMap.Get("VisitTaskId");
+
+                    await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == id && t.ReadingTaskState!=ReadingTaskState.HaveSigned, u => new VisitTask() { DoctorUserId = null }, true);
+                }
+
+            }
+            catch (Exception e)
+            {
+                _logger.LogError($"QuartZ定时取消任务异常" + e.Message);
+            }
+            _logger.LogInformation("QuartZ定时取消任务作业结束");
+        }
+
+
+
+
+
+
+
+    }
+}

IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs

@@ -0,0 +1,200 @@
+using EasyCaching.Core;
+using Hangfire;
+using Hangfire.Storage;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure;
+using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+
+namespace IRaCIS.Application.Services.BackGroundJob
+{
+
+    public interface IIRaCISHangfireJob
+    {
+
+        Task MemoryCacheTrialStatusAsync();
+
+        Task InitHangfireJobTaskAsync();
+
+    }
+    public class IRaCISCHangfireJob : IIRaCISHangfireJob
+    {
+        public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
+
+        private readonly IRepository<Trial> _trialRepository;
+        private readonly IEasyCachingProvider _provider;
+        private readonly ILogger<IRaCISCHangfireJob> _logger;
+
+        private readonly IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository;
+        private readonly IRepository<Internationalization> _internationalizationRepository;
+
+
+
+        public IRaCISCHangfireJob(IRepository<Trial> trialRepository, ILogger<IRaCISCHangfireJob> logger, IEasyCachingProvider provider, IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<Internationalization> internationalizationRepository)
+        {
+            _trialRepository = trialRepository;
+            _provider = provider;
+            _logger = logger;
+            _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
+            _internationalizationRepository = internationalizationRepository;
+        }
+
+        public async Task InitHangfireJobTaskAsync()
+        {
+            _logger.LogInformation("项目启动 hangfire 任务初始化 执行开始~");
+
+
+            //项目状态 立即加载到缓存中
+            await MemoryCacheTrialStatusAsync();
+
+
+            //创建项目缓存 定时任务
+            HangfireJobHelper.AddOrUpdateInitCronJob<IIRaCISHangfireJob>("RecurringJob_Cache_TrialState", t => t.MemoryCacheTrialStatusAsync(), Cron.Daily());
+
+            //初始化
+
+            await InitInternationlizationDataAndWatchJsonFileAsync();
+
+            //创建邮件定时任务
+            await InitSysAndTrialCronJobAsync();
+
+
+            _logger.LogInformation("项目启动 hangfire 任务初始化 执行结束");
+        }
+
+        /// <summary>
+        /// 缓存项目状态
+        /// </summary>
+        /// <returns></returns>
+        public async Task MemoryCacheTrialStatusAsync()
+        {
+
+            var list = await _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr })
+                 .ToListAsync();
+
+            list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(7)));
+
+        }
+
+
+        #region 国际化 初始化
+
+
+        public async Task InitInternationlizationDataAndWatchJsonFileAsync()
+        {
+            //查询数据库的数据
+            var toJsonList = await _internationalizationRepository.Where(t => t.InternationalizationType == 1).Select(t => new
+            {
+                t.Code,
+                t.Value,
+                t.ValueCN
+            }).ToListAsync();
+
+            //组织成json 文件
+
+            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
+            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
+
+
+            //本地静态文件国际化需要
+            foreach (var tojsonItem in toJsonList)
+            {
+                StaticData.En_US_Dic[tojsonItem.Code] = tojsonItem.Value;
+                StaticData.Zh_CN_Dic[tojsonItem.Code] = tojsonItem.ValueCN;
+            }
+
+            File.WriteAllText(usJsonPath, JsonConvert.SerializeObject(StaticData.En_US_Dic));
+            File.WriteAllText(cnJsonPath, JsonConvert.SerializeObject(StaticData.Zh_CN_Dic));
+
+
+            //监测Json文件变更 实时刷新数据
+            WatchJsonFile(usJsonPath);
+            WatchJsonFile(cnJsonPath);
+
+        }
+
+        public void WatchJsonFile(string filePath)
+        {
+            if (!File.Exists(filePath))
+            {
+                throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
+            }
+
+            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
+            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
+            watcher.EnableRaisingEvents = true;
+
+        }
+
+
+        private void LoadJsonFile(string filePath)
+        {
+
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
+
+            IConfigurationRoot enConfiguration = builder.Build();
+
+            foreach (IConfigurationSection section in enConfiguration.GetChildren())
+            {
+                if (filePath.Contains(StaticData.En_US_Json))
+                {
+                    StaticData.En_US_Dic[section.Key] = section.Value;
+
+                }
+                else
+                {
+                    StaticData.Zh_CN_Dic[section.Key] = section.Value;
+                }
+            }
+        }
+
+        #endregion
+
+        public async Task InitSysAndTrialCronJobAsync()
+        {
+            //var deleteJobIdList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend)
+            //   .Select(t => t.TrialId + "_" + t.Id)
+            //    .ToListAsync();
+
+            //foreach (var jobId in deleteJobIdList)
+            //{
+            //    HangfireJobHelper.RemoveCronJob(jobId);
+            //}
+
+
+            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr == StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend)
+                  .Select(t => new { t.Id, t.Code, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+                  .ToListAsync();
+
+            foreach (var task in taskInfoList)
+            {
+                //利用主键作为任务Id
+                var jobId = $"{task.TrialId}_{task.Id}";
+
+                HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, task.TrialId, task.BusinessScenarioEnum, task.EmailCron);
+            }
+
+            var addOrUpdateJobIdList = taskInfoList.Select(t => $"{t.TrialId}_{t.Id}").ToList();
+
+            var list = JobStorage.Current.GetConnection().GetRecurringJobs().ToList();
+
+            //项目定时任务都在default 队列
+            //var dbJobIdList = JobStorage.Current.GetConnection().GetRecurringJobs().Where(t => t.Queue == "default").Select(t => t.Id).ToList();
+
+            //var deleteList=  dbJobIdList.Except(addOrUpdateJobIdList).ToList();
+
+            //  foreach (var jobId in deleteList)
+            //  {
+            //      HangfireJobHelper.RemoveCronJob(jobId);
+            //  }
+
+
+        }
+    }
+
+
+}

IRaCIS.Core.Application/BackGroundJob/IRaCISCacheHangfireJob.cs

@@ -1,99 +0,0 @@
-using EasyCaching.Core;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
-using Microsoft.Extensions.Logging;
-
-namespace IRaCIS.Application.Services.BackGroundJob
-{
-
-    public interface IIRaCISCacheHangfireJob
-    {
-
-        Task ProjectStartCache();
-        Task MemoryCacheTrialStatus();
-
-        Task MemoryCacheAnonymizeData();
-
-        Task CacheUserTypePermission(Guid? cacheUserTypeId);
-    }
-    public class IRaCISCacheHangfireJob: IIRaCISCacheHangfireJob
-    {
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IEasyCachingProvider _provider;
-        private readonly ILogger<IRaCISCacheHangfireJob> _logger;
-        private readonly IRepository<SystemAnonymization> _systemAnonymizationRepository;
-
-        private readonly IRepository<UserTypeMenu> _userTypeMenuRepository;
-
-        public IRaCISCacheHangfireJob(IRepository<Trial> trialRepository,
-            IRepository<SystemAnonymization> systemAnonymizationRepository, IRepository<UserTypeMenu> userTypeMenuRepository,
-            IEasyCachingProvider provider,ILogger<IRaCISCacheHangfireJob> logger)
-        {
-            _trialRepository = trialRepository;
-            _provider = provider;
-            _logger = logger;
-            _systemAnonymizationRepository = systemAnonymizationRepository;
-            _userTypeMenuRepository = userTypeMenuRepository;
-        }
-
-
-        public async Task ProjectStartCache()
-        {
-            _logger.LogInformation("hangfire 定时缓存项目状态任务开始~");
-            try
-            {
-                await MemoryCacheTrialStatus();
-
-                await MemoryCacheAnonymizeData();
-
-                await CacheUserTypePermission();
-            }
-            catch (Exception e)
-            {
-                _logger.LogError("hangfire 定时任务执行失败" + e.Message);
-
-            }
-
-            _logger.LogInformation("hangfire 定时任务执行结束");
-        }
-
-        public async Task MemoryCacheTrialStatus()
-        {
-            var list = await _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr })
-                  .ToListAsync();
-
-            list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(7)));
-
-        }
-
-
-
-
-
-
-
-        public async Task MemoryCacheAnonymizeData()
-        {
-            var systemAnonymizationList = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync();
-
-            _provider.Set(StaticData.Anonymize.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
-        }
-
-        public async Task CacheUserTypePermission(Guid? cacheUserTypeId=null)
-        {
-
-            var permissionList = await _userTypeMenuRepository.Where(t => t.Menu.MenuType == "F")
-                  .WhereIf(cacheUserTypeId != null, t => t.UserTypeId == cacheUserTypeId.Value).Select(t => new { t.UserTypeId, t.Menu.PermissionStr }).ToListAsync();
-
-            foreach (var userTypeGroup in permissionList.GroupBy(t => t.UserTypeId))
-            {
-                _provider.Set($"{StaticData.CacheKey.UserTypeId}_{userTypeGroup.Key}", userTypeGroup.Select(t => t.PermissionStr).ToList(), TimeSpan.FromDays(7));
-            }
-        }
-
-
-    }
-}

IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs

@@ -57,11 +57,15 @@ namespace IRaCIS.Core.Application.Filter
 
             // 后期列举出具体的类型，其他任何用户类型，都不允许操作
             if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA)
+            {
+                if (!_userInfo.RequestUrl.Contains("TrialDocument/userConfirm"))
                 {
                     //---对不起，您的账户没有操作权限。
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));
 
                     return;
+
+                }
             }
 
             #endregion

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -1,10 +1,14 @@
 
 
+using Aliyun.OSS;
+using Aliyun.OSS.Util;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace IRaCIS.Core.Application.Helper;
@@ -12,6 +16,89 @@ namespace IRaCIS.Core.Application.Helper;
 public static class FileStoreHelper
 {
 
+    /// <summary>
+    /// 上传文件到OOS
+    /// </summary>
+    /// <param name="filePath">本地文件路径</param>
+    /// <param name="oosPath">OOS路径例如(test/test)</param>
+    /// <param name="isDeleteOriginalFile">是否删除本地文件</param>
+    /// <returns>返回文件路径</returns>
+    /// <exception cref="BusinessValidationFailedException"></exception>
+    public static string UploadOOS(string filePath,string oosPath, bool isDeleteOriginalFile)
+    {
+        var config = new ConfigurationBuilder()
+                      .AddEnvironmentVariables()
+                      .Build();
+
+        var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
+
+        var configuration = new ConfigurationBuilder()
+          .AddJsonFile($"appsettings.{enviromentName}.json")
+          .Build();
+
+        var endpoint = configuration.GetSection("AliyunOSS:endpoint").Value;
+        // yourEndpoint填写Bucket所在地域对应的Endpoint。以华东1（杭州）为例，Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
+
+        // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
+        var accessKeyId = configuration.GetSection("AliyunOSS:accessKeyId").Value;
+        var accessKeySecret = configuration.GetSection("AliyunOSS:accessKeySecret").Value;
+        // 填写Bucket名称，例如examplebucket。
+        var bucketName = configuration.GetSection("AliyunOSS:bucketName").Value;
+        // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。
+
+        var fileNameList = filePath.Split('\\').ToList();
+        var fileName = fileNameList[fileNameList.Count() - 1];
+        if (oosPath != string.Empty)
+        {
+            fileName = oosPath + "/" + fileName;
+        }
+        var objectName = fileName;
+        // 填写本地文件完整路径，例如D:\\localpath\\examplefile.txt。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
+        var localFilename = filePath;
+        // 创建OSSClient实例。
+        var client = new OssClient(endpoint, accessKeyId, accessKeySecret);
+        try
+        {
+            // 上传文件。
+            var result = client.PutObject(bucketName, objectName, localFilename);
+            var expiration = DateTime.Now.AddYears(1);
+            var url = client.GeneratePresignedUri(bucketName, objectName, expiration).ToString();
+            if (File.Exists(filePath)&& isDeleteOriginalFile)
+            {
+                // 删除文件
+                File.Delete(filePath);
+            }
+            return url;
+        }
+        catch (Exception ex)
+        {
+            throw new BusinessValidationFailedException("上传异常!");
+
+        }
+    }
+
+    private static ObjectMetadata BuildCallbackMetadata(string callbackUrl, string callbackBody)
+    {
+        string callbackHeaderBuilder = new CallbackHeaderBuilder(callbackUrl, callbackBody).Build();
+        string CallbackVariableHeaderBuilder = new CallbackVariableHeaderBuilder().
+            AddCallbackVariable("x:var1", "x:value1").AddCallbackVariable("x:var2", "x:value2").Build();
+        var metadata = new ObjectMetadata();
+        metadata.AddHeader(HttpHeaders.Callback, callbackHeaderBuilder);
+        metadata.AddHeader(HttpHeaders.CallbackVar, CallbackVariableHeaderBuilder);
+        return metadata;
+    }
+
+    private static string GetCallbackResponse(PutObjectResult putObjectResult)
+    {
+        string callbackResponse = null;
+        using (var stream = putObjectResult.ResponseStream)
+        {
+            var buffer = new byte[4 * 1024];
+            var bytesRead = stream.Read(buffer, 0, buffer.Length);
+            callbackResponse = Encoding.Default.GetString(buffer, 0, bytesRead);
+        }
+        return callbackResponse;
+    }
 
     //处理文件名  压缩包，或者目录类的  会带上相对路径
     public static (string TrustedFileNameForFileStorage, string RealName) GetStoreFileName(string fileName,bool isChangeToPdfFormat=false)
@@ -41,12 +128,12 @@ public static class FileStoreHelper
 
         if (isChangeToPdfFormat==false)
         {
-            trustedFileNameForFileStorage= Guid.NewGuid().ToString() + fileName;
+            trustedFileNameForFileStorage= Path.GetFileNameWithoutExtension(fileName) + Guid.NewGuid().ToString()+Path.GetExtension(fileName) ;
 
         }
         else
         {
-            trustedFileNameForFileStorage=Guid.NewGuid().ToString() + Path.GetFileNameWithoutExtension(fileName) + ".pdf";
+            trustedFileNameForFileStorage= Path.GetFileNameWithoutExtension(fileName) + Guid.NewGuid().ToString() + ".pdf";
         }
 
         return (trustedFileNameForFileStorage, fileName);
@@ -227,6 +314,54 @@ public static class FileStoreHelper
         return (serverFilePath, relativePath);
     }
 
+    #region 修改后留存
+
+
+    public static (string PhysicalPath, string RelativePath) GetSystemFileUploadPath(IWebHostEnvironment _hostEnvironment, string templateFolderName, string fileName)
+    {
+        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
+        //文件类型路径处理
+        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, templateFolderName);
+        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
+
+
+        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
+
+
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{templateFolderName}/{trustedFileNameForFileStorage}";
+
+        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
+
+        return (serverFilePath, relativePath);
+    }
+
+    public static (string PhysicalPath, string RelativePath) GetOtherFileUploadPath(IWebHostEnvironment _hostEnvironment, string templateFolderName, string fileName)
+    {
+        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
+        //文件类型路径处理
+        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.OtherDataFolder, templateFolderName);
+        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
+
+
+        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
+
+
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.OtherDataFolder}/{templateFolderName}/{trustedFileNameForFileStorage}";
+
+        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
+
+        return (serverFilePath, relativePath);
+    }
+
+
+    #endregion
+
+
+
+
+
     // 获取通用文档存放路径（excel模板 ）
 
     public static (string PhysicalPath, string RelativePath) GetCommonDocPath(IWebHostEnvironment _hostEnvironment, string fileName)
@@ -292,6 +427,28 @@ public static class FileStoreHelper
         return (serverFilePath, relativePath);
     }
 
+    //获取 中心调研用户路径
+
+    public static (string PhysicalPath, string RelativePath) GetTrialSiteSurveyFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId)
+    {
+        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
+        //上传根路径
+        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.UploadSiteSurveyData);
+
+        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
+
+
+        var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName);
+
+
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.UploadSiteSurveyData}/{trustedFileNameForFileStorage}";
+
+        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
+
+        return (serverFilePath, relativePath);
+    }
+
 
     public static (string PhysicalPath, string RelativePath, string FileRealName) GetClinicalTemplatePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId)
     {

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -0,0 +1,92 @@
+using Hangfire;
+using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public static class HangfireJobHelper
+    {
+
+
+
+        //public static void AddOrUpdateCronJob(string jobId, string queueName, Expression<Action> methodCall, string cron)
+        //{
+        //    RecurringJob.AddOrUpdate(jobId, queueName, methodCall, cron);         
+        //}
+
+
+
+        //添加 或者更新定时任务  Id 要唯一标识一个定义任务
+        public static void AddOrUpdateCronJob<T>(string jobId, Expression<Action<T>> methodCall, string cron, string queueName = "default")
+        {
+            RecurringJob.AddOrUpdate<T>(jobId, queueName, methodCall, cron);
+        }
+
+        public static void AddOrUpdateInitCronJob<T>(string jobId, Expression<Action<T>> methodCall, string cron)
+        {
+            RecurringJob.AddOrUpdate<T>(jobId, "sys_init", methodCall, cron);
+        }
+
+        public static void RemoveCronJob(string jobId)
+        {
+            RecurringJob.RemoveIfExists(jobId);
+
+        }
+
+
+
+        public static void ImmediatelyOnceOnlyJob(Expression<Action> methodCall)
+        {
+            BackgroundJob.Enqueue("immediately_once", methodCall);
+        }
+
+        public static void ImmediatelyOnceOnlyJob<T>(Expression<Action<T>> methodCall)
+        {
+            BackgroundJob.Enqueue<T>("immediately_once", methodCall);
+        }
+
+        public static void NotImmediatelyOnceOnlyJob(Expression<Action> methodCall, TimeSpan timeSpan)
+        {
+            BackgroundJob.Schedule("not_immediately_once", methodCall, timeSpan);
+        }
+
+        public static void NotImmediatelyOnceOnlyJob<T>(Expression<Action<T>> methodCall, TimeSpan timeSpan)
+        {
+            BackgroundJob.Schedule<T>("not_immediately_once", methodCall, timeSpan);
+        }
+
+
+        public static void AddOrUpdateTrialCronJob (string jobId, Guid trialId, EmailBusinessScenario businessScenario, string emailCron)
+        {
+
+            switch (businessScenario)
+            {
+
+                case EmailBusinessScenario.QCTask:
+                    HangfireJobHelper.AddOrUpdateCronJob<IEmailSendService>(jobId, t => t.SendTrialImageQCTaskEmailAsync(trialId), emailCron);
+                    break;
+                case EmailBusinessScenario.QCQuestion:
+                    HangfireJobHelper.AddOrUpdateCronJob<IEmailSendService>(jobId, t => t.SendTrialQCQuestionEmailAsync(trialId), emailCron);
+                    break;
+                case EmailBusinessScenario.ImageQuestion:
+                    HangfireJobHelper.AddOrUpdateCronJob<IEmailSendService>(jobId, t => t.SendTrialImageQuestionAsync(trialId), emailCron);
+                    break;
+
+                default:
+                    break;
+            }
+
+        }
+    }
+}
+    
+

IRaCIS.Core.Application/Helper/InternationalizationHelper.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static BeetleX.Redis.Commands.HSCAN;
 using static IRaCIS.Core.Application.Service.Common.SystemMonitor;
 
 namespace IRaCIS.Core.Application.Helper
@@ -23,7 +22,7 @@ namespace IRaCIS.Core.Application.Helper
             if (!Directory.Exists(JsonFileFolder) ||
                !Directory.GetFiles(JsonFileFolder).Any(filePath => Path.GetExtension(filePath).Equals(".json", StringComparison.OrdinalIgnoreCase)))
             {
-                throw new BusinessValidationFailedException("国际化Json文件目录有误");
+                throw new BusinessValidationFailedException(StaticData.International("InternationalizationHelper_PathError"));
             }
         }
 
@@ -107,73 +106,8 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
-        public static async Task InitInternationlizationDataAndWatchJsonFileAsync(IRepository _repository)
-        {
-            //查询数据库的数据
-            var toJsonList = await _repository.Where<Internationalization>(t => t.InternationalizationType == 1).Select(t => new
-            {
-                t.Code,
-                t.Value,
-                t.ValueCN
-            }).ToListAsync();
-
-            //组织成json 文件
-
-            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
-            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
 
 
-            //本地静态文件国际化需要
-            foreach (var tojsonItem in toJsonList)
-            {
-                StaticData.En_US_Dic[tojsonItem.Code] = tojsonItem.Value;
-                StaticData.Zh_CN_Dic[tojsonItem.Code] = tojsonItem.ValueCN;
-            }
 
-            File.WriteAllText(usJsonPath, JsonConvert.SerializeObject(StaticData.En_US_Dic));
-            File.WriteAllText(cnJsonPath, JsonConvert.SerializeObject(StaticData.Zh_CN_Dic));
-
-
-            //监测Json文件变更 实时刷新数据
-
-            WatchJsonFile(usJsonPath);
-            WatchJsonFile(cnJsonPath);
-
-        }
-
-        public static void WatchJsonFile(string filePath)
-        {
-            if (!File.Exists(filePath))
-            {
-                throw new BusinessValidationFailedException("国际化Json文件不存在");
-            }
-
-            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
-            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
-            watcher.EnableRaisingEvents = true;
-
-        }
-
-
-        private static void LoadJsonFile(string filePath)
-        {
-
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
-
-            IConfigurationRoot enConfiguration = builder.Build();
-
-            foreach (IConfigurationSection section in enConfiguration.GetChildren())
-            {
-                if (filePath.Contains(StaticData.En_US_Json))
-                {
-                    StaticData.En_US_Dic[section.Key] = section.Value;
-
-                }
-                else
-                {
-                    StaticData.Zh_CN_Dic[section.Key] = section.Value;
-                }
-            }
-        }
     }
 }

IRaCIS.Core.Application/Helper/NpoiWordHelper.cs

@@ -1,171 +0,0 @@
-
-using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using NPOI.OpenXmlFormats.Wordprocessing;
-using NPOI.XWPF.UserModel;
-using System.Collections;
-using System.Reflection;
-
-namespace IRaCIS.Core.Application.Service;
-
-public static class NpoiWordHelper
-{
-    public static async Task<IActionResult> TemplateExportWordAsync(string code, object data, IRepository<CommonDocument>? _commonDocumentRepository, IWebHostEnvironment _hostEnvironment)
-    {
-        //var (physicalPath, fileNmae) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
-
-        var physicalPath = code;
-
-
-        using (FileStream stream = File.OpenRead(physicalPath))
-        {
-            XWPFDocument doc = new XWPFDocument(stream);
-            //遍历段落
-            foreach (var para in doc.Paragraphs)
-            {
-                ReplaceKey(para, data);
-            }
-            //遍历表格
-            var tables = doc.Tables;
-            foreach (var table in tables)
-            {
-                //ReplaceTableKey(table, data, "Data");
-            }
-
-            foreach (var table in tables)
-            {
-                foreach (var row in table.Rows)
-                {
-                    foreach (var cell in row.GetTableCells())
-                    {
-                        foreach (var para in cell.Paragraphs)
-                        {
-                            ReplaceKey(para, data);
-                        }
-                    }
-                }
-            }
-
-            FileStream out1 = new FileStream("table.docx", FileMode.Create);
-            doc.Write(out1);
-            out1.Close();
-            return new FileStreamResult(stream, "application/msword")
-            {
-                FileDownloadName = $"replaced_{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx"
-            };
-        }
-
-
-
-      
-
-       
- 
-     
-
-
-
-
-
-
-    }
-
-    private static void ReplaceKey(XWPFParagraph para, object model)
-    {
-        string text = para.ParagraphText;
-
-        Type t = model.GetType();
-        PropertyInfo[] pi = t.GetProperties();
-        foreach (PropertyInfo p in pi)
-        {
-            //$$与模板中$$对应，也可以改成其它符号，比如{$name},务必做到唯一
-            if (text.Contains("$" + p.Name + "$"))
-            {
-                text = text.Replace("$" + p.Name + "$", p.GetValue(model)?.ToString());
-            }
-        }
-
-        //var runs = para.Runs;
-        //string styleid = para.Style;
-        //for (int i = 0; i < runs.Count; i++)
-        //{
-        //    var run = runs[i];
-        //    text = run.ToString();
-        //    Type t = model.GetType();
-        //    PropertyInfo[] pi = t.GetProperties();
-        //    foreach (PropertyInfo p in pi)
-        //    {
-        //        //$$与模板中$$对应，也可以改成其它符号，比如{$name},务必做到唯一
-        //        if (text.Contains("$" + p.Name + "$"))
-        //        {
-        //            text = text.Replace("$" + p.Name + "$", p.GetValue(model)?.ToString());
-        //        }
-        //    }
-        //    runs[i].SetText(text, 0);
-        //}
-    }
-
-
-
-
-    /// <summary>
-    /// 替换表格Key
-    /// </summary>
-    /// <param name="table"></param>
-    /// <param name="list"></param>
-    /// <param name="field"></param>
-
-    private static void ReplaceTableKey(XWPFTable table, IList list, String field)
-    {
-        List<XWPFParagraph> paras = new List<XWPFParagraph>();
-        // 获取最后一行数据，最后一行设置值
-        Int32 iLastRowIndex = 0;
-        for (int iIndex = 0; iIndex < table.Rows.Count; iIndex++)
-        {
-            if (iIndex == table.Rows.Count - 1)
-            {
-                iLastRowIndex = iIndex;
-                foreach (var cell in table.Rows[iIndex].GetTableCells())
-                {
-                    foreach (var para in cell.Paragraphs)
-                    {
-                        paras.Add(para);
-                    }
-                }
-            }
-        }
-        // 删除最后一行
-        table.RemoveRow(iLastRowIndex);
-
-        for (int iIndex = 0; iIndex < list.Count; iIndex++)
-        {
-            object data = list[iIndex];
-            Type t = data.GetType();
-            PropertyInfo[] pi = t.GetProperties();
-            // 表增加行
-            XWPFTableRow m_row = table.CreateRow();
-            CT_Row m_NewRow = new CT_Row();
-            String text = String.Empty;
-            Int32 jIndex = 0;
-            paras.ForEach(para =>
-            {
-                text = para.ParagraphText;
-                foreach (PropertyInfo p in pi)
-                {
-                    if (text.Contains("$" + field + "." + p.Name + "$"))
-                    {
-                        m_row.GetCell(jIndex).SetText(p.GetValue(data, null).ToString());
-                    }
-                }
-                jIndex++;
-            });
-            m_row = new XWPFTableRow(m_NewRow, table);
-            table.AddRow(m_row);
-
-        }
-    }
-
-
-
-}

IRaCIS.Core.Application/Helper/SendEmailHelper.cs

@@ -144,6 +144,9 @@ public static class SendEmailHelper
         }
 
     }
+
+
+
 }
 
 

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -63,8 +63,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
 		<PackageReference Include="AutoMapper.Collection.EntityFrameworkCore" Version="9.0.0" />
-		<PackageReference Include="BeetleX.BNR" Version="1.0.1" />
+		<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
 		<PackageReference Include="EasyCaching.Interceptor.AspectCore" Version="1.7.0" />
 		<PackageReference Include="ExcelDataReader" Version="3.6.0" />
@@ -75,9 +76,7 @@
 		<PackageReference Include="fo-dicom.Drawing" Version="4.0.8" />
 		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.3" />
 		<PackageReference Include="FreeSpire.Doc" Version="10.8.0" />
-		<PackageReference Include="Hangfire" Version="1.7.31">
-		  <TreatAsUsed>true</TreatAsUsed>
-		</PackageReference>
+		<PackageReference Include="Hangfire.Core" Version="1.8.5" />
 		<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.2" />
 		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.2">
 		  <TreatAsUsed>true</TreatAsUsed>

IRaCIS.Core.Application/Resources/en-US.json

@@ -1,593 +1,2 @@
 {
-  "test{0}{1}": "英文本地化{0}{1}",
-  "RequiredAttribute": "{0} is required",
-
-  // ------------------------------------------------------------_ServiceExtensions--------------------------------------------------------------------
-  //ApiResponseHandler
-  "ApiResponse_NoAccess": "You do not have access to this API",
-  "ApiResponse_Permission": "You do not have permission to do this",
-
-  // ------------------------------------------------------------Controllers--------------------------------------------------------------------
-  //FinancialChangeController
-  "Financial_ChargeSettled": "Expenses have been settled and workload can not be reset.",
-  "Financial_InvalidParameter": "Invalid parameter.",
-  //UploadDownLoadController
-  "UploadDownLoad_UnsupportedMedia": "Unsupported media type.",
-  "UploadDownLoad_ArchiveInProgress": "Another user is uploading or archiving this study.",
-  "UploadDownLoad_InvalidData": "Please ensure that the uploaded data conforms to the style of the template file and contains valid data.",
-  "UploadDownLoad_RequestError": "Request error, please try again!",
-  "UploadDownLoad_SupportedFormats": "Supports upload of .xlsx, .xls, and .csv formats.",
-
-  // ------------------------------------------------------------_MediatR--------------------------------------------------------------------
-  //ConsistencyVerificationRequest
-  "ConsistencyVerification_Tech": "Study Type",
-  "ConsistencyVerification_Time": "Incorrect time format",
-  //ConsistencyVerificationHandler
-  "ConsistencyVerification_Img": "Hello, according to the automatic recognition of this system, the imaging study submitted by the subject in the current visit in the IRC system is as follows:",
-  "ConsistencyVerification_Of": "Of",
-  "ConsistencyVerification_ImgC": "Imaging study",
-  "ConsistencyVerification_EDCA": "Check EDC data, completely consistent, approved",
-  "ConsistencyVerification_EDCB": "Check EDC data, completely consistent",
-  "ConsistencyVerification_Auto": "Automatically verified pass",
-  "ConsistencyVerification_Prob": "The following problems exist:",
-  "ConsistencyVerification_EdcL": "Image study (EDC missing)",
-  "ConsistencyVerification_IrcL": "Image study (IRC missing)",
-  "ConsistencyVerification_Desc": "Description: In order to efficiently solve all the above doubts, please verify the actual image study accurately. Please note that the image date may not be consistent with the actual study date, and multiple modalities of image studys (such as PET-CT) may exist at the same time. After accurate verification, please reply with the correct image study for this visit.",
-  "ConsistencyVerification_Conf": "According to the imported consistency check data, please confirm the following inconsistent inspection item information of this visit:",
-  "ConsistencyVerification_Edc": "EDC is lack of:",
-  "ConsistencyVerification_IrcLi": "IRC is lack of:",
-
-  //-------------------------------------------------------------------------------------Reading-----------------------------------------------------------------
-  //ClinicalDataSetService
-  "ClinicalDataSet_Apply": "",
-  "ClinicalDataSet_DupTypeFail": "The same type of clinical data exists. The operation failed.",
-  //ClinicalQuestionService
-  "ClinicalQuestion_Repeat": "",
-  //ReadingClinicalDataService
-  "ReadingClinicalData_DupTypeFail": "The same type of clinical data exists. The operation failed.",
-  "ReadingClinicalData_Unchecked": "The current clinical data status is not verified and signing is not allowed!",
-  //ReadingGlobalTaskService
-  "ReadingGlobal_NotGlobal": "System call error. The current read is not a global review read.",
-  //ReadingImageTaskService
-  "ReadingImage_NotVisit": "System call error. The current read is not a timepoint read.",
-  "ReadingImage_CantSplit": "The current read is a baseline read, and lesion split is not allowed.",
-  "ReadingImage_BeSigned": "The current read has already been signed. Please do not submit it again.",
-  "ReadingImage_Beinvalid": "The current read has already been invalidated, and reading is not allowed anymore.",
-  "ReadingImage_PresenceReview": "The current subject has a re-read request that has not been processed and is not allowed to operate",
-  "ReadingImage_NotaTask": "The coalesced lesions are not from the same timepoint.",
-  "ReadingImage_DeleteError": "Other lesions have split from or coalesced into the current lesion. Deletion failed.",
-  "ReadingImage_Idnotcorrespond": "Failed to add the lesion mark. The Instance ID and Series ID of the image do not match.",
-  "ReadingImage_IsLymphNotbigger": "The short diameter of this nodal non-target lesion on the current visit is smaller than the value on the previous visit, and the state cannot be set to 'Unequivocal progression'.",
-  "ReadingImage_NotLymphNotbigger": "The long diameter of this non-nodal non-target lesion on the current visit is smaller than the value on the previous visit, and the state cannot be set to 'Unequivocal progression'.",
-  "ReadingImage_Twice": "System call error. Questions & answers submitted are duplicated.",
-  "ReadingImage_MaxQuestion": "According to the imaging charter, the number of {0} cannot exceed {1}.",
-  "ReadingImage_Maxlesion": "According to the imaging charter, the number of target lesions in the same organ cannot exceed {0}. Please confirm.",
-  "ReadingImage_Maximum": "{0} can only be repeated {1} times, and it has been repeated {2} times so far.",
-  "ReadingImage_PCWGMaximum": "According to the imaging charter, the number of baseline lesions at the same location should enter only {0} time. Please confirm.",
-  "ReadingImage_NotNewFocus": "There should be no new lesions in the converted task",
-  "ReadingImage_RequiredQuestion": "Before submission, please fill in {0}.",
-  "ReadingImage_ClinicalRead": "The clinical data has not been read. Please confirm!",
-  "ReadingImage_IDMust": "System call failed. When there is no Read ID, the standard ID must be passed.",
-  "ReadingImage_TaskFinish": "Please note that all reads of the current subject have been completed.",
-  "ReadingImage_NeedRest": "You have been continuously reading for {0} hours. Please take a break of {1} minutes before resumption.",
-  //ReadingJudgeTaskService
-  "ReadingJudge_SouceIdNull": "System call failed. The Source ID of the global review which is being adjudicated currently is 'null'.",
-  //ReadingOncologyTaskService
-  "ReadingOncology_TaskError": "System call error. The current read is not an oncology read.",
-  "ReadingOncology_Abnormal": "System call exception. The result of adjudication is null",
-  //ReadingCalculate
-  "ReadingCalculate_Abnormal": "Configuration error of PCWG3 criteria. Data verification failed.",
-  "ReadingCalculate_questionable": "Problems with the lesions are as follows:",
-  "ReadingCalculate_NoMarker": "Lesion {0} lacks mark.",
-  "ReadingCalculate_StatusIsEmpty": "The state of Lesion {0} is empty.",
-  "ReadingCalculate_NoMarkerEmpty": "Lesion {0} is not marked, and its state is empty.",
-  "ReadingCalculate_NoDeveloped": "Please note that the current standard automatic calculation has not been developed.",
-  //ReadingMedicalReviewService
-  "MedicalReview_invalid": "This medical review read has already been invalidated, and the operation failed.",
-  "MedicalReview_SaveQuestion": "Unable to perform the current operation. Please save the medical review questions first.",
-  "MedicalReview_NeedSave": "Unable to perform the current operation. Please save the medical review questions and conclusions first.",
-  "MedicalReview_NotClosed": "Unable to perform the current operation. The current medical query conversation has not been closed.",
-  "MedicalReview_Finish": "The current medical review is the last one.",
-  //ReadingMedicineQuestionService
-  "ReadingMed_QNumDup": "Current question number is repeated",
-  "ReadingMed_HasSubQ": "This question has sub-question, please delete it first",
-  "ReadingMed_NoMedQ": "Medical review question has not been added yet. Please add it first before confirming",
-  "ReadingMed_MedQNumDup": "The display number of the medical imaging review question cannot be duplicated.",
-  "ReadingMed_ParentNumSmall": "The display number of the parent question should be smaller than that of the child question, please confirm.",
-  "ReadingMed_VisitQNotConfig": "This review criteria has no medical review questions for 'visit'",
-  "ReadingMed_GlobalQNotConfig": "The global review read is enabled in the current criterion, but has not configured with medical review questions",
-  "ReadingMed_ArbitrateQNotConfig": "Adjudication review reading is enabled in the current criterion, but has not configured with medical review questions",
-  "ReadingMed_TumorQNotConfig": "Oncology reading is enabled in the current criterion, but the oncology medical review question has not been configured",
-  //UserService
-  "User_CheckNameOrPw": "Please check the username or password.",
-  //Repository
-  "Repository_UpdateError": "Updated data does not exist in the database. ",
-  "Repository_DeleteError": "Deleted data does not exist in the database.",
-  //OrganInfoService
-  "OrganInfo_DuplicateData": "There are duplicate data, operation failed.",
-  //ReadingCriterionService
-  "ReadingCriterion_Referenced": "The current criterion has been referenced and cannot be deleted.",
-  "ReadingCriterion_InUse": "This criterion has been used in the project and cannot be deleted.",
-  "ReadingCriterion_ArbitratorWithoutJudgment": "There is no referee problem but there is an arbitration object, operation failed.",
-  //ReadingQuestionService
-  "ReadingQuestion_IdDup": "Duplicate problem ID.",
-  "ReadingQuestion_ChildrenExist": "This problem has sub-problems, please delete the sub-problems first.",
-  "ReadingQuestion_GroupReferenced": "This grouping has been referenced, please delete the referenced problems first.",
-  "ReadingQuestion_JudgmentSet": "The current question already has a referee criterion set, modification failed.",
-  "ReadingQuestion_ExcludeWithDependency": "The displayed dependent parent question and the required dependent question are the same, but the answers are mutually exclusive, operation failed.",
-  "ReadingQuestion_CircularDependency": "Calculation dependency has looped!",
-  //ReadingPeriodSetService
-  "ReadingPeriodSet_NameDup": "Review period name duplicate, operation failed",
-  "ReadingPeriodSet_Global": "Review period name cannot be Global",
-  "ReadingPeriodSet_AlreadyAdded": "{0} has already added the review period, cannot set it effective.",
-  "ReadingPeriodSet_TaskCompletedCannotRevoke": "The current criterion has generated reads and the reads have been completed, revoke failed.",
-  "ReadingPeriodSet_LastVisit": "Last visit.",
-  //ReadModuleService
-  "ReadModule_AlreadyAdded": "The current visit has already added a review period.",
-  "ReadModule_AddGlobalFirst": "Please add global review first.",
-  "ReadModule_VisitNotFound": "No qualified visit was found.",
-  "ReadModule_SignedDataCannotDelete": "Clinical data has been signed and cannot be deleted.",
-  "ReadModule_TumorExists": "The current visit has a tumor review, please delete it first.",
-  "ReadModule_TaskGenerated": "The current review has generated reads, operation failed.",
-  //UserWLTemplateService
-  "UserWLTS_MaxTemplate": "The same user can add a maximum of 10 templates.",
-  "UserWLTS_NameRepeated": "The template name is repeated",
-  "UserWLTS_ContentRepeated": "The template content is repeated",
-
-  // ------------------------------------------------------------Allocation--------------------------------------------------------------------
-  //TaskAllocationRuleService
-  "TaskAllocation_DoctorIdNotFound": "Error, the doctor's account Id was not found in the enrollment table.",
-  "TaskAllocation_DoctorConfigExists": "The doctor configuration is already available, and continued additions cannot be allowed.",
-  "TaskAllocation_TaskAssigned": "A read has been assigned to the doctor and it cannot be deleted.",
-  //TaskConsistentRuleService
-  "TaskConsistent_ConsistencyConfigExists": "Please configure the doctor for consistency analysis.",
-  "TaskConsistent_TaskGenerated": "The trial configuration is already available, and no continued additions are allowed.",
-  "TaskConsistent_MedicalAuditTaskExists": "The criterion already has reads generated by the Subject, and configuration modification is not allowed.",
-  "TaskConsistent_SignedTaskCannotBeInvalidated": "This criterion has generated a consistency analysis task and cannot be deleted.",
-  //TaskMedicalReviewRuleService
-  "TaskMedicalRule_TaskAlreadyAssigned": "The doctor configuration is already available, and continued additions cannot be allowed.",
-  "TaskMedicalRule_TaskStarted": "A medical review task has been generated.",
-  //TaskMedicalReviewService
-  "TaskMedical_DirtyData": "Signed files cannot be set to invalid.",
-  "TaskMedical_SubjectInOtherArm": "A task is currently assigned to someone else,and it cannot be assigned. Please refresh the list.",
-  //VisitTaskService
-  "VisitTask_VisitTask_TaskAlreadyApplied": "The trial has not confirmed any of the review criteria.",
-  "VisitTask_DoctorConfigNotFound": "The current doctor has begun to do the task of this standard of subject, so assignment cannot be canceled.",
-  "VisitTask_BackendDataError": "One of the reeads has been assigned to the doctor and is not allowed to be assigned.",
-  "VisitTask_DirtyData": "Dirty data appears, and the task source field has no value.",
-  "VisitTask_MissingTaskSource": "The subject had a visit and entered the return process, which has not been verified for consistency and is not allowed to be assigned.",
-  "VisitTask_InconsistentSubjectStatus": "There is a subject that already has the doctor in another Arm group.  It is not allowed to add the doctor to a new group.",
-  "VisitTask_DuplicateDoctorInArm": "There is a subject that already has the doctor in another Arm group, so the futher assignment is not allowed. Please refresh the page to confirm whether the data on the page is expired.",
-  "VisitTask_DoctorAlreadyInArm": "The assignment of a Subject task cannot be canceled because it has been applied.",
-  "VisitTask_TaskAlreadyApplied": "The configured doctor cannot be found in the configuration table, and the binding cannot be applied. Please check the data.",
-  "VisitTask_DoctorConfiguration": "Background data error",
-  "VisitTask_BackendData": "Reads that have not been completed or have not been effective are not allowed to request re-reading.",
-  "VisitTask_UnreadTask": "Reads that re-read has been applied or approved  are not allowed to apply for re-reading.",
-  "VisitTask_NoPMRecheck": "Additional review reads do not allow the PM to apply for re-reading",
-  "VisitTask_Reapply": "PM is not allowed to apply for re-reading of consistency analysis reads.",
-  "VisitTask_ConsistencyAnalysis": "PM is only allowed to apply for re-reading that the view type is visit.",
-  "VisitTask_VisitTypeRestriction": "This is chronological read, and the subject has visit that has applied for re-read by PM, but has not been processed, so it cannot been applied for continuing re-read at this time.",
-  "VisitTask_SequentialReading": "This is chronological read, and the subject has visit that has applied for re-read, but has not been processed, so it cannot been applied for  re-read for now.",
-  "VisitTask_ImageProblem": "This is chronological read, and  there is something wrong with the image. PM has applied for returning, so it cannot been applied for re-reading now.",
-  "VisitTask_LastReading": "This is chronological read,  and only the request for re-readinng by the subject reader  after completing the global task for the last time is allowed.",
-  "VisitTask_LastOncologistRecheck": "This is chronological read, and the subject will only be allowed to re-read after IR completing the last oncology read ",
-  "VisitTask_LastAdjudicatorRecheck": "This is chronological read, and the subject will only be allowed to re-read after IR completing the last adjudication read ",
-  "VisitTask_IRGlobalRecheck": "This is random read, IR is only allowed to apply for re-reading global and visit reads",
-  "VisitTask_IRReapply": "This is random read, IR is only allowed to apply for re-reading global and visit reads ",
-  "VisitTask_InvalidReapplyStatus": "The current re-read status is not requested and cannot be processed. Please refresh the page.",
-  "VisitTask_ReapplyStatusConflict": "The current re-read status has been affected by another re-read reads.  The re-read review operation is not allowed for reads in this state",
-  "VisitTask_ReReadTaskNotApplied": "Only reads with visit type are allowed to approve of re-read.",
-  "VisitTask_ReReadTaskAlreadyAffected": "Do not conform to the PM request and SPM / CPM approve , or IR request and PM approve.",
-  "VisitTask_TaskTypeNotApproved": "The current re-read status is not requested and cannot be processed. Please refresh the page.",
-  "VisitTask_NoImageReturn": "Additional review reads do not allow PM to apply for re-reading",
-  "VisitTask_NonEffectiveTaskCannotBeReturned": "Only effective and unfinished visit read can be returned. Please refresh the page data.",
-  "VisitTask_NoFurtherReturn": "The current visit has been returned to image upload, so continuing to return is not allowed!",
-  "VisitTask_ConsistencyTaskCannotBeReturned": "The consistency analysis read is not allowed to be set return back.",
-  "VisitTask_PMOnlyAllowedForReturn": "Only PM can perform the return back.",
-  "VisitTask_UnsupportedTaskType": "Re-read types are not supported.",
-  "VisitTask_UndefinedList": "The current user view list is not defined.",
-  "VisitTask_NoConsistencyReturn": "The conformance analysis read cannot be returned back",
-  "VisitTask_VisitTypeTaskAllowedForPMOnly": "Only read with visit type can be returned by PM.",
-
-  // ------------------------------------------------------------Common--------------------------------------------------------------------
-  //CommonDocumentService
-  "Document_CodeDuplication": "The Code of the document cannot be repeated.",
-  "Document_SingleTemplate": "Only one template file is allowed per scenario and  standard.",
-  "Document_ TemplateRead": "Failed to read the template content, please try saving the file as docx format!",
-  //DictionaryService
-  "Dictionary_DictionaryName": "There is already a dictionary with the name {0}.",
-  "Dictionary_DictionaryDeletion": "The current dictionary is referenced in the standard and cannot be deleted!",
-  "Dictionary_SubitemDeletion": "There is child data, direct deletion is not allowed!",
-  "Dictionary_ResumeReference": "The current entry has been referenced in the reader resume.",
-  "Dictionary_ProjectReference": "The current entry has been referenced in the trial information.",
-  "Dictionary_StandardReference": "The current entry has been referenced in the review criteria.",
-  //ExcelExportService
-  "ExcelExport_UnsupportedExport": "Currently the criterion export is not supported.",
-  //MailService
-  "Mail_EmailResetReminder": "[From Extensive Imaging IRC] A reminder about resetting the email.",
-  "Mail_Dear": "Dear {0},",
-  "Mail_ResettingEmail": "You are resetting an email address.",
-  "Mail_IRCResettingPassword ": "[From Extensive Imaging IRC] A reminder about resetting your  password",
-  "Mail_ResettingPassword ": "You are resetting the email password",
-  "Mail_ImagingIRCReminder": "[From Extensive Imaging IRC] A reminder",
-  "Mail_IRCProject": "You are participating in the Extensive Imaging IRC trial",
-  "Mail_ProjectParticipationReminder": "[From Extensive Imaging IRC] [{0}] A reminder of the Site Survey",
-  "Mail_CenterResearchReminder": "You are participating in the Site Survey of the Extensive Imaging IRC trial.",
-  "Mail_AccountCreationReminder": "[From Extensive Imaging IRC] A reminder about creating an account",
-  "Mail_AccountPasswordResetReminder": "[From Extensive Imaging IRC] A reminder about resetting account passwords",
-  "Mail_InvitationEmail": "[From Extensive Imaging IRC][{0}]Invitation",
-  //SystemMonitor
-  "SysMon_JsonConfig": "Parsing the Json file configuration failed",
-
-  // ------------------------------------------------------------Doctor--------------------------------------------------------------------
-  //DoctorService
-  "Doctor_DupPhoneOrEmail": "The current tel or email number already existed",
-  "Doctor_DupPhone": "The current tel number already existed!",
-  "Doctor_DupEmail": "The current email already existed!",
-  "Doctor_StandardDuplicateFileTypeError": "This type of file has already been added to the current criterion.",
-  "Doctor_RequiredDocumentsError": "Resume & Consultant Agreement must be upload",
-
-  // ------------------------------------------------------------Document--------------------------------------------------------------------
-  //SystemDocumentService
-  "SystemD_DuplicateFile": "A file with the same type and same name already exists in the system.",
-  "SystemD_CannotDeleteSignedFile": "The file has already been read and signed by a user,  and not allowed to be deleted.",
-  //TrialDocumentService
-  "TrialD_DuplicateFileInProject": "A file with the same type and same name already exists in this trial .",
-  "TrialD_DocumentHasAlready": "The file has already been read and signed by a user,  and not allowed to be deleted.",
-  "TrialD_FileAlreadySigned": "The file has been signed.",
-  "TrialD_ObsoleteFile": "The file has been revoked. Signature failed!",
-  //TrialEmailNoticeConfigService
-  "TrialEmailN_TaskNotSigned": "Before sending the email, the task must have been signed and triggered to complete the corresponding task generation.",
-  "TrialEmailN_NoRecipient": "The message cannot be sent without the recipient.",
-  "TrialEmailN_InvalidEmailConfig": "The configuration of the sender mail of the trial is wrong, please check.",
-  "TrialEmailN_EmailTemplateNotFound": "The email template in the standard scenario of this trial cannot be found.",
-  "TrialEmailN_EnrollmentConfirmation": "[Enrollment Confirmation Report] About  {0} item {1}Subject",
-  "TrialEmailN_Enrollment": "The attachment is the Enrollment Confirmation Report, please check.",
-  "TrialEmailN_PDReport": "[PD Confirmation Report] About  {0} item {1}Subject",
-  "TrialEmailN_SubjectDiseaseProgression": "The attachment is the PD Confirmation Report, please check.",
-  "TrialEmailN_SingleBlindedSet": "The configuration of the single and chronological read is incorrect (there should be no adjudicator configuration), please check!",
-  "TrialEmailN_SingleBlindedSequenced": "The single and chronological read, should not enter the logic here, please contact the background developers to check!",
-  "TrialEmailN_PDProgressEmailTask": "Send PD progress email found problem with the task data!",
-  "TrialEmailN_DoubleBlindedError": "The double and chronological read does not defined the adjudication rule logic, please contact the developers to check!",
-  "TrialEmailN_InCons": "The trial is not configured with the Enrollment Confirmation!",
-  "TrialEmailN_NoBaseLine": "There is no baseline visit configured with Enrollment Confirmation and IR readed，so email failed to send",
-  "TrialEmailN_IncompBase": "The baseline reads for enrollment confirmation has not been finished for IR!",
-  "TrialEmailN_EmailFail": "Email failed to generate manually，please  contact developer to verify the failure cause",
-  "TrialEmailN_NoReader": "No IR has finished the baseline read at present!",
-  "TrialEmailN_NoPDConfig": "The trial is not configured with PD Confirmation!",
-  "TrialEmailN_NoPDTasks": "There is no baseline visit configured with “PD Confirmation” and IR readed，so email failed to send",
-  "TrialEmailN_PDNotFinished": "The completion status of the latest PD interview and film reading task of the current subject does not meet the sending conditions",
-  "TrialEmailN_PDNoImaging": "The trial is configured with review period adjudication, but the current subject' s latest visit marked 'PD' have no review period",
-  "TrialEmailN_PDPhaseNotFinished": "The review period status of the current subject's latest PD visit  does not meet the sending conditions",
-  "TrialEmailN_NoRuleDefined": "The sending logic for adjudication rule is not defined! ",
-  "TrialEmailN_NoDoubleOrder": "The current trial is not double and chronological read, so the sending condition is not met",
-  "TrialEmailN_NoSendLogicDefined": "The current trial is not defined sending logic",
-  "TrialEmailN_BlindedSequencedReading": "The configuration of the chronological read is wrong (should be single or double reading), please check!",
-  "TrialEmailN_UnblindedSequencedReading": "The configuration of random read is wrong (should be single read without adjudication, or double read with adjudication for visiting ), please check!",
-  "TrialEmailN_InvalidTaskTypeForEmailSending": "Do not send emails for other type except visit, adjudication and global read. Please check the logic.",
-  "TrialEmailN_PDLogicNotDefined": "Reads for this criterion has not yet defined the PD logic,  please supplement it after consultation with the developer.",
-  "TrialEmailN_MailboxWrong": "The configuration of the sender mailbox of the trial is wrong, please check it.",
-  "TrialEmailN_InvalidRecipient": "The trial does not have a valid recipient, so the message cannot be sent.",
-  "TrialEmailN_EmailTestMessage": "Trial mail test",
-  "TrialEmailN_ConfigurationCorrect": "If this email is received, the email configuration is correct.",
-  "TrialEmailN_InvalidSenderEmailConfig": "The sender configuration is incorrect. Please check whether the server address or authorization code is correct or not.",
-
-  // ------------------------------------------------------------Financial--------------------------------------------------------------------
-  //CalculateService
-  "Cal_VolDataErr": "Volume reward data error.",
-  //ExchangeRateService
-  "ExR_SameMthExist": "The exchange rate of the same month already existed.",
-  "ExR_MthPymtRate": "The exchange rate has been used in monthly payment",
-  //PaymentAdjustmentService
-  "PayAdj_DocPymtLock": "Doctor payment has confirmed lock",
-  //RankPriceService
-  "RP_TitleUsedByRev": "This title has been used by reviewer payment information",
-  //TrialRevenuesPriceService
-  "TRP_AddMeaningful": "Please add meaningful data",
-
-  // ------------------------------------------------------------ImageAndDoc--------------------------------------------------------------------
-  //DicomArchiveService
-  "DAS_NoAnonCacheData": "The cache data for anonymous config is not obtained, and the upload stops. Please contact the developer to verify.",
-  //ImageShareService
-  "ISS_NoImgToShare": "There are no images to share for the current study.",
-  "ISS_ResNotExists": "The request resource wasn’t found.",
-  "ISS_SharePwdError": "The shared password is incorrect.",
-  "ISS_ShareExpiration": "Resource sharing expires.",
-  //StudyService
-  "Study_VisitBeforePrevError": "The current visit  check time {0} cannot be earlier than the previous visit check time {1}. Please check whether the check data is correct.",
-  "Study_VisitAfterSubseqError": "The current visit check time {0} cannot be later than the visit check time {1} .Please check whether the check data is correct.",
-  "Study_UploadArchiving": "Someone is currently uploading and archiving this visit!",
-  "Study_VisitEndedNotAllowed": "Subject visit 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}",
-
-  // ------------------------------------------------------------Inspection--------------------------------------------------------------------
-  //FrontAuditConfigService
-  "FrontAudit_IdDup": "The identifier is duplicated.",
-  "FrontAudit_NameDup": "The name is duplicated .",
-  "FrontAudit_CannotDelSub": "Subclasses exist, cannot delete.",
-  //InspectionService
-  "Inspection_UserDisabled": "The current user has been disabled.",
-
-  // ------------------------------------------------------------Institution--------------------------------------------------------------------
-  //CROService
-  "CRO_DupName": "CRO with the same name already exists. Please confirm.",
-  "CRO_InProject": "The CRO has participated in the trial and cannot be deleted.",
-  //HospitalService
-  "Hospital_DupName": "Hospital with the same name already exists. Please confirm.",
-  "Hospital_SiteAdded": "The current Site has been added to another Hospital.",
-  "Hospital_HasDoctors": "There are already doctors registered under the hospital's account and cannot be deleted.",
-  //SiteService
-  "Site_DupName": "Site with  the same name already exists. Please confirm.",
-  "Site_InProject": "This site has been added to the project and cannot be deleted.",
-  //SponsorService
-  "Sponsor_DupName": "Sponsor with the same name already exists. Please confirm.",
-  "Sponsor_InProject": "The sponsor has been added to the trial and it is not allowed to delete.",
-
-  // ------------------------------------------------------------Management--------------------------------------------------------------------
-  //MenuService
-  "Menu_ParentDupChild": "A child node with the same name already exists under the parent node.",
-  "Menu_ChildExist": "Child nodes already exists under this node . Delete the child nodes before deleting the node.",
-  //UserService
-  "User_UsernameExist": "The user name already exists.",
-  "User_PhoneDup": "A user with the same phone number already exists in this user type.",
-  "User_EmailDup": "A user with the same email already exists in this user type.",
-  "User_NewOldPwdSame": "The new password is the same as the old one.",
-  "User_OldPwdInvalid": "Failed to verify the old password.",
-  "User_LegalEmail": "Please input a legal email.",
-  "User_VerificationCodeError": "The verification code is wrong.",
-  "User_VerificationCodeExpired": "The verification code has expired.",
-  "User_CreateFailed": "Check the email address or contact maintainers. The email fails to be sent and the account cannot be created.",
-  "User_InvalidEmail": "Please enter a correct E-mail address.",
-  "User_EmailError": "The email adress is wrong.",
-  "User_InProject": "The user has participated in the trial and cannot be deleted.",
-  "User_Disabled": "The user has been disabled.",
-  //UserTypeService
-  "UserType_InUse": "User already exists in that user type, and it cannot be deleted.",
-
-  // ------------------------------------------------------------QC--------------------------------------------------------------------
-  //QCCommon
-  "QCCommon_CannotOperate": "CRC has submitted the image. Operation is not allowed.",
-  "QCCommon_NoPermission": "You are not the current recipient of the image QC. No operation authority!",
-  "QCCommon_CheckTimeEarly": "The current visit study time {0} cannot be earlier than the previous visit study time {1}. Please check whether the study data is correct.",
-  "QCCommon_CheckTimeLate": "The current visit study time {0} cannot be later than the visit study time {1} .Please check whether the study data is correct.",
-  //QCOperationService
-  "QCOperation_CheckFirst": "Please check the image first and save review questions before query.",
-  "QCOperation_QuestionExist": "The unclosed query of the current visit has been set to approve CRC reupload. After CRC has  reuploaded image, please close the original query first and then add a new query.",
-  "QCOperation_QuestionCannotClose": "CRC has applied for reuploading or QC has agreed to reupload. To close the query is not allowed. Please do not close the query until the QC rejects or the CRC reuploads the image.",
-  "QCOperation_CloseReason": "Reason for closing:",
-  "QCOperation_QuestionReplied": "The QC query has been answered.",
-  "QCOperation_NoPermissionReply": "You do not have permission to reply to the data reconciliation conversation.",
-  "QCOperation_CannotClose": "The current visit status is CRC request re-upload. The query is not allowed to be closed.",
-  "QCOperation_Reason": "Notes:",
-  "QCOperation_CannotPass": "The current visit is in the return status, and the data reconciliation cannot be set.",
-  "QCOperation_PassAfterClose": "Please close the data reconciliation query first, and then set the data reconciliation pass.",
-  "QCOperation_Cannotback": "The current visit has passed the consistency check and cannot be applied for re-upload.",
-  "QCOperation_CRCRollback": "CRC apples for re-upload.",
-  "QCOperation_OtherCRC": "Other CRCs have applied for processing. Please refresh the page.",
-  "QCOperation_PMReject": "PM/APM rejected the data reconciliation return.",
-  "QCOperation_NoPermission": "You do not have operation permission.",
-  "QCOperation_CannotRollback": "If the current visit has not do reconciliation or has passed, setbacks are not allowed.",
-  "QCOperation_PMAPMConsistency": "PM/APM agrees to the data reconciliation rollback.",
-  "QCOperation_NoModifyAfterSubmit": "Once submitted, no modifications are allowed.",
-  "QCOperation_UnresolvedQCQuery": "Image query of the current visit is not closed. This operation is not allowed.",
-  "QCOperation_CrcNoDelete": "The CRC has been committed and cannot be deleted.",
-  "QCOperation_NoRecipient": "You are not the current recipient of the quality control task, no operation authority!",
-  "QCOperation_QCImageTaskAlreadyReleased": "The image QC of the current visit has been released by the original recipient. You can get it by 'claime'.",
-  "QCOperation_QCTaskNoAccess": "The image quality control task of the current visit has been claimed by other QC, so it is not allowed to claim.",
-  "QCOperation_QCConfigFirst": "Please configure the image QC questions before claiming any image QC work.",
-  "QCOperation_NoQC": "The trial configuration of image QC was not check, and the QC Task was not be claimed.",
-  "QCOperation_InitialAuditPassed": "The first review has passed, continue to receive can not be allowed.",
-  "QCOperation_NoSingleAudit": "The trial is configured with single image QC , does not meet Submmit State: Submitted or Audit State: pending QC/ in QC, not allowed to collect.Please refresh the page.",
-  "QCOperation_NoSameReviewer": "The secondary QC cannot be the same person as the primary QC.",
-  "QCOperation_NoSecondaryAudit": "The trial is configured withr double image QC , does not meet Submmit State: Submitted or Audit State: pending review/ in QC, not allowed to collect.Please refresh the page.",
-  "QCOperation_NoTaskAccess": "You are not the current recipient of the quality control task, no operation authority!",
-  "QCOperation_NoQCFunction": "The project configuration of image QC process was not check, so there is no need to cancel the task function.",
-  "QCOperation_NoTaskOwner": "The current visiting image QC has not been claimed by anyone, and cannot been released.",
-  "QCOperation_DiseaseProgressConfirmation": "Current visit required PD Confirmation. Please process the unsubmitted prior visit before submitting the current visit: {0}.",
-  "QCOperation_UnsubmittedVisits": "After submitting the current visit, please submit any prior visits which have not been submitted as soon as possible. ({0})",
-  "QCOperation_NoBaselineData": "No clinical data at baseline. Confirm to submit?",
-  "QCOperation_NoImageData": "Dicom/ Non-dicom image data has not been uploaded. Submission is not allowed.",
-  "QCOperation_ImagesSubmitted": "The image data of the current visit has been submitted by another CRC.",
-  "QCOperation_BatchImagesSubmitted": "The visit image data is currently submitted in batches, part of which has been submitted by other CRCs.",
-  "QCOperation_MissingBaselineDate": "The trial is configured with the visit start date, but the visit start date for the subject is not filled. Submittion is not allowed.",
-  "QCOperation_RemoveItem": "You have been removed from the trial and have no operation rights.",
-  "QCOperation_QCNotClosed": "The QC query has not been closed for the current visit. This operation cannot be performed.",
-  "QCOperation_NoQCNeeded": "The trial configuration of image QC was no. No need to set image QC as pass.",
-  "QCOperation_QCNotSaved": "Image QC question is not saved. This operation is not allowed.",
-  "QCOperation_NotChangePass": "The trial configuration of image QC process was double check, so the current image QC task cannot change from the current state to pass.",
-  "QCOperation_CannotChangeToPass": "The trial configuration of image QC process was double check. The current audit state is {0}, which cannot be changed to  approved.",
-  "QCOperation_NoQCNeededNotEnd": "The trial configuration of image QC process was not check, and setting image quality control termination is not allowed.",
-  "QCOperation_CannotChangeToStop": "The trial configuration of image QC process was single check, and the current review state is not In Primary QC and cannot be changed to the QC termination.",
-  "QCOperation_CannotChangeStop": "The trial configuration of image QC process was double check, and the current review state is {0} and cannot be changed to the QC termination.",
-  "QCOperation_InvalidResend": "The current reupload state is not QC agree, so reuploading is not allowed.",
-  "QCOperation_NoResendNeeded": "No check operation, there will be no need to reupload!",
-  "QCOperation_InvalidAgreeResend": "The current re-upload- status is  not CRC requested and the approve of reuploading cannot be set.",
-  "QCOperation_CannotAgreeResend": "At the current visit, there is an unclosed query that QC set to agree to reupload, CRC has not uploaded, currently is not allowed to set again.",
-  "QCOperation_AgreeResend": "QC agrees to re-upload.",
-  "QCOperation_InvalidCompleteResend": "The current reupload status is not QC approved, setting reuploading completion is not allowed.",
-  "QCOperation_NoImageNotAllowed": "No image is currently available. Setting reuploaded is not allowed.",
-  "QCOperation_CRCTransferCompleted": "CRC reuploading has been completed. ",
-  "QCOperation_InvalidTransferStatus": "The current query re-upload status is not the initial| CRC re-uploaded. Application for re-uploading is not allowed",
-  "QCOperation_CRCTransfer": "CRC requests to reupload/upload images.",
-  "QCOperation_CannotModifyConfirmation": "The visit has been submitted, and the  enrollment confirmation state cannot be modified.",
-  "QCOperation_CannotModifyPDStatus": "This visit status is return back. Modification of PD Confirmation status is not allowed.",
-  "QCOperation_ForwardingFailed": "Failed to forward the image:",
-  //QCQuestionService
-  "QCQuestion_DuplicateIndexFailed": "Operation failed because the serial number is repeated.",
-  "QCQuestion_HasChildQuestion": "The current task has a sub-question. Deletion failed.",
-  //TrialQCQuestionService
-  "TrialQCQuestion_TemplateConfirmed": "Image QC question template has been confirmed. No operation is allowed.",
-  "TrialQCQuestion_DuplicateIndexFailed": "Operation failed because the serial number is repeated.",
-  "TrialQCQuestion_DeleteChildFirst": "Before deleting the parent question, delete the child question that references the parent question.",
-  "TrialQCQuestion_ReferencedByQCProcess": "This review question has been cited by the image QC. Deletion is not allowed.",
-
-  // ------------------------------------------------------------QC--------------------------------------------------------------------
-
-  // ------------------------------------------------------------SiteSurvey--------------------------------------------------------------------
-  //TrialSiteEquipmentSurveyService
-  "TrialSiteEquipment_Locked": "Locked and operation is not allowed.",
-  //TrialSiteSurveyService
-  "TrialSiteSurvey_InvalidEmail": "Please enter the correct email address.",
-  "TrialSiteSurvey_WrongVerificationCode": "The verification code is incorrect.",
-  "TrialSiteSurvey_ExpiredVerificationCode": "The verification code has expired.",
-  "TrialSiteSurvey_NoRecordToUpdate": "The site does not have a site survey record for the transferor , so it is not allowed to choose to update.",
-  "TrialSiteSurvey_RecordUnderReview": "Your site survey record is in review and cannot be updated. If you need to update, please do so after rejection.",
-  "TrialSiteSurvey_LockedByCurrentUser": "In the current site, the submitted survey record has been locked. Updation of other people's email survey records is not allowed.",
-  "TrialSiteSurvey_LockedByOtherUsers": "The submitted survey record of the current site has been locked. Currently, the survey record submitted by other personnel is not locked. Updation of the survey submitted before is not allowed.",
-  "TrialSiteSurvey_UnlockedRecordsExist": "The current site has unlocked survey records. Locked survey records cannot be updated.",
-  "TrialSiteSurvey_NonLatestLockedRecord": "The site survey corresponding to the mailbox {0} is not the latest. Updation is not allowed",
-  "TrialSiteSurvey_AlreadyFilledByOtherUsers": "There are already survey filled out by other users under this site. You are not allowed to fill them out",
-  "TrialSiteSurvey_Locked": "The site survey has been locked, and no operation is allowed.",
-  "TrialSiteSurvey_IRCNotification": "[from Extensive Imaging IRC] A reminder about the site survey approval.",
-  "TrialSiteSurvey_CancelUnsubmittedRecord": "Only unsubmitted records are allowed to be repealed.",
-  "TrialSiteSurvey_NoAdminAcces": "The operation is not allowed by the administrator.",
-  "TrialSiteSurvey_FailedToGenerateAccountId": "If no value is obtained for the generated account Id. Please check.",
-  "TrialSiteSurvey_IRCInvitation": "[from Extensive Imaging IRC][{0}] Invitation letter",
-  "TrialSiteSurvey_IRCInvitationContent": "Hello, as the IRC supplier of experiment plan No. {0} trial, Extensive Imaging sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.",
-  "TrialSiteSurvey_ViewAndConfirm": "Check and confirm",
-  //TrialSiteUserSurveyService
-  "TrialSiteUser_Locked": "Locked and not allowed to operate.",
-  "TrialSiteUser_InconsistentInfo": "The corresponding user of this email address is {0}, and the phone number is {1}. Please modify the inputted information and make it consistent with that already in the system, and then save.",
-  "TrialSiteUser_NoTestUserForFormal": "Formal and training triala are not allowed to add test users.",
-  "TrialSiteUser_NoFormalUserForTest": "It is the test project that regular users are not allowed in.",
-
-  // ------------------------------------------------------------Stat--------------------------------------------------------------------
-
-  // ------------------------------------------------------------TrialSiteUser--------------------------------------------------------------------
-  //TrialConfigService
-  "TrialConfig_JudgeTaskFail": "There are adjudication questions that the conditions for generating adjudication review read are not configured. Operation failed!",
-  "TrialConfig_StdConfigMissing": "Questions are not configured under the current criterion.",
-  "TrialConfig_AddEvalReq": "Selected additional assessment, must check additional assessment type",
-  "TrialConfig_SignTemplateMissing": "This operation requires electronic signature confirmation, but the signature template for this scenario is not found in the system.",
-  "TrialConfig_ProjectEnded": "The trial has ended or stopped. Configuration changes are not allowed.",
-  "TrialConfig_NoImageAuditQuestion": "No image QC question is currently added. Please add the image QC questions first, and then confirm.",
-  "TrialConfig_DuplicateAuditQuestionId": "Image QC question display number cannot be repeated.",
-  "TrialConfig_InvalidParentQuestionId": "Make sure that the display sequence number of the parent question is smaller than that of the child.",
-  "TrialConfig_AuditQuestionConfirmed": "The image QC questions have been confirmed by other personnel. Cofirmation again is not allowed. ",
-  "TrialConfig_ProjectNotInitialized": "The current trial status is not initialized. This operation is not allowed.",
-  "TrialConfig_UnconfirmedConfiguration": "This trial’s project configuration, & visit management  have not been finished, and its status cannot be changed to “Ongoing”.",
-  "TrialConfig_UnconfirmedUNACKD": "This trial’s project configuration, & visit management  have not been all confirmed, and its status cannot be changed",
-  "TrialConfig_ProjectNotStarted": "This trial status is not “Ongoing”, and cannot be set to Stoped or Completed.",
-  //TrialExternalUserService
-  "TrialExternalUser_Inconsistency": "The corresponding user of this email address is {0}, and the phone number is {1}. Please modify the inputted information and make it consistent with that already in the system, and then save.",
-  "TrialExternalUser_EmailTypeDuplicate": "Please confirm that the system already has an account with the same email address and user type as the one entered in the list.",
-  "TrialExternalUser_TestUserNotAllowed": "Formal and training trials are not allowed to add test users.",
-  "TrialExternalUser_FormalUserNotAllowed": "It is a training trial that regular users are not allowed in.",
-  "TrialExternalUser_NotEditable": "Staff  information cannot be edited. Please delete it and add it again.",
-  "TrialExternalUser_CannotDelete": "The current user has participated in the trial and cannot be deleted.",
-  "TrialExternalUser_IRCInvitation": "Hello, as the IRC supplier of experiment plan No. {0} trial, Extensive Imaging sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.",
-  "TrialExternalUser_ViewAndConfirm": "Check and confirm",
-  "TrialExternalUser_InvitationExpired": "The invitation time has expired. You can only confirm it after you are invited again.",
-  "TrialExternalUser_AccountInfo": "[from Extensive Imaging IRC][{0}] account information",
-  "TrialExternalUser_Welcome": "Hello, welcome to participate in the relevant work of trial scheme No. {0}IRC of the project. This trial adopts electronic workflow. The system and your account information are as follows:",
-  "TrialExternalUser_ProjectNumber": "Trial ID: {0}",
-  "TrialExternalUser_ExperimentPlanNumber": "Protocol ID: {0}",
-  "TrialExternalUser_ExperimentName": "Study Name: {0}",
-  "TrialExternalUser_Username": "User name: {0}",
-  "TrialExternalUser_Password": "Password: {0}（Please modify it after login）: ***（You already have your account. If you forget your password, please find it by email）",
-  "TrialExternalUser_Role": "User role: {0}",
-  "TrialExternalUser_LoginUrl": "System login address: {0} ",
-  "TrialExternalUser_ReinvitationRequired": "The invitation time has expired. You can only confirm it after you are invited again.",
-  "TrialExternalUser_UserIdStorageProblem": "There is a problem with the system user Id storage of the survey table. ",
-  "TrialExternalUser_IRCAccountInfo": "[from Extensive Imaging IRC][{0}] account information",
-  //TrialMaintenanceService
-  "TrialMaint_PersonnelJoined": "Participant has participated in site maintenance",
-  //TrialService
-  "Trial_PMApmPermission": "Only PM/APM has the operation permission!",
-  "Trial_TestUserCreateOnlyNonFormal": "Test users can only create informal projects",
-  "Trial_DuplicateProjectNumber": "The same project ID already exists.",
-  "Trial_InvalidProjectStatus": "Operations are allowed only when the project state is: initializing or ongoing.",
-  "Trial_CannotDeleteProject": "Deleting project data is not allowed in the current running environment.",
-  //TrialSiteService
-  "TrialSite_ParticipantJoined": "The subjects has been added to  this site, and couldn't be disable.",
-  "TrialSite_CodeDuplicate": "Code is not allowed to be repeated",
-  "TrialSite_CannotDeleteAssociatedCRC": "The site has been associated with CRC, and couldn't be deleted.",
-  "TrialSite_CannotDeleteAssociatedSubject": "The subjects has been added, and couldn't be deleted.",
-  "TrialSite_CannotDeleteUploadedData": "The site has been uploaded survey, and couldn't be deleted.",
-
-  // ------------------------------------------------------------Visit--------------------------------------------------------------------
-  //SubjectService
-  "Subject_NoConfirmedPlan": "The visit plan of the trial is not confirmed. Please contact PM to confirm the visit plan before adding subjects.",
-  "Subject_DuplicateSubjectNum": "Subjects with the relevant subject ID already exists.",
-  "Subject_UploadedVisitNoDelete": "The subject has visit that has uploaded the image. Deletion is not allowed.",
-  //SubjectVisitService
-  "Visit_DuplicateVisitNo": "The subject's visit schedule already includes a visit with the same visit ID.",
-  "Visit_LastVisitNoChange": "The subject has already had a visit set as the last, and the current visit cannot be set as the last visit.",
-  "Visit_DuplicateVisitName": "The subject's visit schedule already includes a visit with the same visit name.",
-  "Visit_NoExtraVisitAfterLast": "Unplanned visits cannot be added after the last assessment is set.",
-  "Visit_FinishedTasksNoAdd": "The subject has reads completed in follow-up visit ( chronological read ) , which is not allowed to be added here. If necessary, please return.",
-  "Visit_NoPDStatusChangeAfterSubmission": "The PD Confirmation status cannot be modified after the current visit image is submitted.",
-  "Visit_UploadedNoLost": "The current visit has already uploaded images and cannot be set as visit lost to follow-up.",
-  "Visit_UploadedNoDelete": "The current visit has already uploaded images and deletion is not allowed.",
-  "Visit_PlanVisitNoDelete": "Planned visits are not allowed to be deleted.",
-  "Visit_PreviousVisitNoDelete": "The current visit has been set to the previous visit of another visit and cannot be deleted.",
-  //VisitPlanService
-  "VisitPlan_OnlyInitOrOngoing": "Can be operated only when the trial state is: Initialized or ongoing.",
-  "VisitPlan_LargerVisitNumLargerInterval": "In the visit plan, the interval between visits with a large number should also be larger than that of a visit with a smaller number.",
-  "VisitPlan_LargerPlanNumLargerInterval": "In the visit plan, the planned visit with a large number should also have a larger interval than the planned visit with a smaller event number.",
-  "VisitPlan_ExistNameOrNumTemplate": "A plan visit template with visit name or visit ID of trial already exists in the visit plan.",
-  "VisitPlan_ExistBaseline": "A baseline already exists in the visit plan.",
-  "VisitPlan_ExistBaselineImgNoModify": "The subjects’ baseline image data has been uploaded, so modification of baseline visits is not allowed.",
-  "VisitPlan_OnlyInitOrOngoingModifyConfirm": "Modification confirmation is allowed only when the trial is initialized or ongoing.",
-  "VisitPlan_NoBaselineNotConfirm": "No baseline, no confirmation allowed.",
-  "VisitPlan_ConfigNotConfirmNotConfirm": "If the trial configuration is not confirmed, the visit plan cannot be confirmed.",
-  "VisitPlan_BaselineNotMinDayNotConfirm": "Baseline's VisitDay is not minimal. Confirmation is not allowed.",
-  "VisitPlan_CheckExport": "Study export _{0}.xlsx",
-  "VisitPlan_Assigned": "The visit plan has been assigned to the subjects and executed.",
-
-  // ------------------------------------------------------------WorkLoad--------------------------------------------------------------------
-  //DoctorWorkloadService
-  "DoctorWorkload_AssignType": "A task has been assigned and does not allow you to reduce the reading type.",
-  "DoctorWorkload_Unique": "This type of data can only have one",
-  "DoctorWorkload_FeeSettled": "Expenses have been settled and workload cannot be modified.",
-  //EnrollService
-  "Enroll_NotFound": "Cannot find trial {0}",
-  "Enroll_EmailFormat": "The {0} mailbox format is faulty.",
-  "Enroll_CannotRollback": "Reviewers with workload cannot go back",
-
-  // ------------------------------------------------------------Triggers--------------------------------------------------------------------
-  //AddlTrialUserTrigger
-  "AddlTrialUser_NoTestUser": "Formal and training trials are not allowed to be added test users.",
-  "AddlTrialUser_NoFormalUser": "It is a training trial that regular users are not allowed in.",
-  //SubjectStateTrigger
-  "SubjectState_CannotSetCurrentAsLastVisit": "The subject has already had a visit set as the last, and the current visit cannot be set as the last.",
-  "SubjectState_CannotSetAsLastVisitWithImage": "The image of the subject's visit after the current visit has been uploaded, and the current visit is not allowed to be set as the last visit.",
-  //SubjectVisitFinalVisitTrigger
-  "SubjectVisit_CannotSetAsLastVisit": "The subject's follow-up visits has uploaded images or submitted , and the current visit is not allowed to be set as the last visit.",
-
-  // ------------------------------------------------------------BusinessFilter--------------------------------------------------------------------
-  //LimitUserRequestAuthorization
-  "LimitUser_AuthTokenMissing": "User token was not retrieved from Header/URL, please contact developer",
-  "LimitUser_AccountLoggedInElsewhere": "User token was not retrieved from Header/URL, please contact developer",
-  //ModelActionFilter 
-  "ModelAction_InvalidAPIParameter": "Invalid parameters provided for the API.",
-  //ProjectExceptionFilter
-  "ProjectException_ConcurrentUpdateNotAllowed": "Concurrent update, operation not allowed at this time.",
-  "Project_ExceptionContactDeveloper": "Program exception, please contact developer.",
-  //TrialResourceFilter
-  "TrialResource_NoAccessPermission": "Sorry, your account does not have operation permissions.",
-  "TrialResource_ReferTrialIdFailed": "Regular expression failed to fetch trialId from request Refer, please contact developer to check",
-  "TrialResource_InterceptedProjectStatusRule": "This request was blocked by configured rules: only operations allowed when project status is in progress, please contact developer if this logic is incorrect and needs to be modified",
-  "TrialResource_MissingProjectNumber": "Project number not passed in the API parameters, please verify.",
-  //UnifiedApiResultFilter
-  "UnifiedAPI_ProgramError": "Program error, please contact developer.",
-
-  // ------------------------------------------------------------Helper--------------------------------------------------------------------
-  //FileStoreHelper
-  "FileStore_TemplateFileNotFound": "Database did not find the corresponding data template file for FileStoreHelper, please contact system maintenance personnel.",
-  "FileStore_TemplateFileStoragePathInvalid": "File doesn’t exist. Please contact the system administrator!",
-  //SendEmailHelper
-  "SendEmail_SendFail": "Failed to send email in SendEmailHelper. Your operation was unsuccessful, please check your email or contact maintenance personnel.",
-  "SendEmail_NoRecipient": "No recipient in SendEmailHelper.",
-
-  // ------------------------------------------------------------IRaCIS.Core.Domain--------------------------------------------------------------------
-  //Trial
-  "Trial_number": "Subject ID is composed of 5 digits. The first 2 are the Site ID, and the following 3 are the order number. Please ensure it is identical to the ID from the EDC system. ",
-
-  // ------------------------------------------------------------IRaCIS.Core.Infrastructure--------------------------------------------------------------------
-  //ResponseOutput
-  "RO_BizObjNotExistsOrParamIncorrect": "The business object{0} does not exist in the database, or was deleted by someone else, or an incorrect parameter query caused",
-  "RO_ExpectChangeButNoEffect": "Expect a change, but the database data has not changed",
-  "RO_SaveFailed": "Saved failed"
-
 }

IRaCIS.Core.Application/Resources/zh-CN.json

@@ -1,593 +1,2 @@
 {
-  "test{0}{1}": "中文本地化{0}{1}",
-  "RequiredAttribute": "{0} 字段是必须的",
-
-  // ------------------------------------------------------------_ServiceExtensions--------------------------------------------------------------------
-  //ApiResponseHandler
-  "ApiResponse_NoAccess": "您无权访问该接口",
-  "ApiResponse_Permission": "您的权限不允许进行该操作",
-
-  // ------------------------------------------------------------Controllers--------------------------------------------------------------------
-  //FinancialChangeController
-  "Financial_ChargeSettled": "费用已经结算，无法重置工作量",
-  "Financial_InvalidParameter": "无效的参数。",
-  //UploadDownLoadController
-  "UploadDownLoad_UnsupportedMedia": "不支持的MediaType",
-  "UploadDownLoad_ArchiveInProgress": "当前已有人正在上传和归档该检查!",
-  "UploadDownLoad_InvalidData": "请保证上传数据符合模板文件中的样式，且存在有效数据。",
-  "UploadDownLoad_RequestError": "请求异常,请重试！",
-  "UploadDownLoad_SupportedFormats": "支持.xlsx、.xls、.csv格式的文件上传。",
-
-  // ------------------------------------------------------------_MediatR--------------------------------------------------------------------
-  //ConsistencyVerificationRequest
-  "ConsistencyVerification_Tech": "检查技术",
-  "ConsistencyVerification_Time": "时间格式不对",
-  //ConsistencyVerificationHandler
-  "ConsistencyVerification_Img": "您好,根据本系统自动识别，该受试者当前访视在IRC系统中已提交的影像检查情况如下：",
-  "ConsistencyVerification_Of": "的",
-  "ConsistencyVerification_ImgC": "影像检查",
-  "ConsistencyVerification_EDCA": "核对EDC数据，完全一致, 审核通过",
-  "ConsistencyVerification_EDCB": "核对EDC数据，完全一致",
-  "ConsistencyVerification_Auto": "自动核查通过",
-  "ConsistencyVerification_Prob": "存在问题如下：",
-  "ConsistencyVerification_EdcL": "影像检查(EDC 缺少)",
-  "ConsistencyVerification_IrcL": "影像检查(IRC 缺少)",
-  "ConsistencyVerification_Desc": "说明：为高效解决/处理以上全部质疑问题，麻烦您准确核实实际影像检查情况。请注意影像日期与实际检查的日期可能会不一致，部分检查（如PET -CT)可能同时存在多种模态影像。准确核实后，请回复该访视正确的影像检查情况。",
-  "ConsistencyVerification_Conf": "根据导入的一致性核查数据，请确认本访视以下不一致检查项信息：",
-  "ConsistencyVerification_Edc": "EDC 缺少：",
-  "ConsistencyVerification_IrcLi": "IRC 缺少:",
-
-  // ------------------------------------------------------------Reading--------------------------------------------------------------------
-  //ClinicalDataSetService
-  "ClinicalDataSet_Apply": "当前临床数据需要配置一个检查日期才能应用",
-  "ClinicalDataSet_DupTypeFail": "存在同类型的临床数据,操作失败",
-  //ClinicalQuestionService
-  "ClinicalQuestion_Repeat": "存在相同的问题名称！",
-  //ReadingClinicalDataService
-  "ReadingClinicalData_DupTypeFail": "存在同类型的临床数据,操作失败",
-  "ReadingClinicalData_Unchecked": "当前临床数据状态不是已核查状态，不允许签名！",
-  //ReadingGlobalTaskService
-  "ReadingGlobal_NotGlobal": "系统调用错误，当前任务不是全局阅片任务。",
-  //ReadingImageTaskService
-  "ReadingImage_NotVisit": "系统调用错误，当前任务不是访视任务。",
-  "ReadingImage_CantSplit": "当前任务是基线任务,不能执行分裂病灶的操作。",
-  "ReadingImage_BeSigned": "当前任务已经签名，请勿重复提交。",
-  "ReadingImage_Beinvalid": "当前任务已失效，不能执行阅片。",
-  "ReadingImage_PresenceReview": "当前受试者存在重阅申请还未处理,不允许操作",
-  "ReadingImage_NotaTask": "合并的病灶并非同一个访视任务",
-  "ReadingImage_DeleteError": "当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败。",
-  "ReadingImage_Idnotcorrespond": "病灶标记添加失败，影像的Instance ID和Series ID不对应。",
-  "ReadingImage_IsLymphNotbigger": "当前访视该淋巴结非靶病灶的短径小于上一访视的值，不能设置为显著增大。",
-  "ReadingImage_NotLymphNotbigger": "当前访视该非淋巴结非靶病灶的长径小于上一访视的值，不能设置为显著增大。",
-  "ReadingImage_Twice": "系统调用错误，提交的问题及答案重复。",
-  "ReadingImage_MaxQuestion": "按照《独立影像评估章程》的相关规则，当前{0}的病灶数量不能超过{1}个。",
-  "ReadingImage_Maxlesion": "按照《独立影像评估章程》的相关规则，同一器官的靶病灶数量不能超过{0}个，请确认",
-  "ReadingImage_Maximum": "{0}的重复次数限制为{1},目前已重复{2}次。",
-  "ReadingImage_PCWGMaximum": "按照《独立影像评估章程》的相关规则，同一部位的基线病灶只需录入{0}次，请确认。",
-  "ReadingImage_NotNewFocus": "转换后的任务不应该存在新病灶",
-  "ReadingImage_RequiredQuestion": "提交前，请完成{0}",
-  "ReadingImage_ClinicalRead": "临床数据未阅读，请确认！",
-  "ReadingImage_IDMust": "系统调用失败，当没有任务ID的时候，标准ID必传。",
-  "ReadingImage_TaskFinish": "当前受试者所有阅片任务已完成，请知悉。",
-  "ReadingImage_NeedRest": "您已连续阅片{0}个小时，请休息{1}分钟后，再继续阅片。",
-  //ReadingJudgeTaskService
-  "ReadingJudge_SouceIdNull": "系统调用失败，当前裁判的全局任务的SouceId为null。",
-  //ReadingOncologyTaskService
-  "ReadingOncology_TaskError": "系统调用错误，当前任务不是肿瘤学任务。",
-  "ReadingOncology_Abnormal": "系统调用异常，裁判结果为null。",
-  //ReadingCalculate
-  "ReadingCalculate_Abnormal": "PCWG3标准配置错误，数据验证失败。",
-  "ReadingCalculate_questionable": "病灶存在以下问题：",
-  "ReadingCalculate_NoMarker": "病灶{0}缺少标记",
-  "ReadingCalculate_StatusIsEmpty": "病灶{0}状态为空",
-  "ReadingCalculate_NoMarkerEmpty": "病灶{0}未做标记，且状态为空",
-  "ReadingCalculate_NoDeveloped": "当前标准自动计算未完成开发，请知悉。",
-  //ReadingMedicalReviewService
-  "MedicalReview_invalid": "该医学审核任务已失效,操作失败。",
-  "MedicalReview_SaveQuestion": "无法执行当前操作，请先保存医学审核问题。",
-  "MedicalReview_NeedSave": "无法执行当前操作，请先保存医学审核问题和结论。",
-  "MedicalReview_NotClosed": "无法执行当前操作，当前医学质询对话未关闭。",
-  "MedicalReview_Finish": "当前医学审核任务为最后一个任务。",
-  //ReadingMedicineQuestionService
-  "ReadingMed_QNumDup": "当前问题序号存在重复",
-  "ReadingMed_HasSubQ": "此问题存在子问题,请先删除子问题",
-  "ReadingMed_NoMedQ": "当前未添加医学审核问题。请先添加医学审核问题，再进行确认。",
-  "ReadingMed_MedQNumDup": "影像医学审核问题显示序号不能重复。",
-  "ReadingMed_ParentNumSmall": "父问题的显示序号要比子问题的显示序号小，请确认。",
-  "ReadingMed_VisitQNotConfig": "当前标准未配置访视医学审核问题。",
-  "ReadingMed_GlobalQNotConfig": "当前标准启用了全局阅片,但未配置全局医学审核问题",
-  "ReadingMed_ArbitrateQNotConfig": "当前标准启用了仲裁阅片,但未配置仲裁医学审核问题",
-  "ReadingMed_TumorQNotConfig": "当前标准启用了肿瘤学阅片,但未配置肿瘤学医学审核问题",
-  //UserService
-  "User_CheckNameOrPw": "请检查用户名或者密码。",
-  //Repository
-  "Repository_UpdateError": "修改的数据在数据库不存在。",
-  "Repository_DeleteError": "删除的数据在数据库不存在。",
-  //OrganInfoService
-  "OrganInfo_DuplicateData": "存在相同的数据,操作失败",
-  //ReadingCriterionService
-  "ReadingCriterion_Referenced": "当前标准被引用过了，不可以删除",
-  "ReadingCriterion_InUse": "此标准在项目里面已被使用,操作失败",
-  "ReadingCriterion_ArbitratorWithoutJudgment": "无裁判问题却有仲裁对象,操作失败",
-  //ReadingQuestionService
-  "ReadingQuestion_IdDup": "问题编号重复",
-  "ReadingQuestion_ChildrenExist": "此问题存在子问题,请先删除子问题",
-  "ReadingQuestion_GroupReferenced": "此分组已被引用,请先删除被引用的问题",
-  "ReadingQuestion_JudgmentSet": "当前问题已经设置了裁判标准了,修改失败",
-  "ReadingQuestion_ExcludeWithDependency": "显示依赖父问题和必填依赖的问题为同一个,但答案互斥,操作失败",
-  "ReadingQuestion_CircularDependency": "计算依赖循环了！",
-  //ReadingPeriodSetService
-  "ReadingPeriodSet_NameDup": "阅片期名称重复,操作失败",
-  "ReadingPeriodSet_Global": "阅片期名称不能为Global",
-  "ReadingPeriodSet_AlreadyAdded": "{0}已经添加过阅片期,无法设置生效",
-  "ReadingPeriodSet_TaskCompletedCannotRevoke": "当前标准阅片已生成任务并且阅片完成,撤销失败。",
-  "ReadingPeriodSet_LastVisit": "末次访视",
-  //ReadModuleService
-  "ReadModule_AlreadyAdded": "当前访视已经添加过阅片期",
-  "ReadModule_AddGlobalFirst": "请先添加全局阅片",
-  "ReadModule_VisitNotFound": "未找到符合要求的访视",
-  "ReadModule_SignedDataCannotDelete": "临床资料已签名，不允许删除",
-  "ReadModule_TumorExists": "当前访视存在肿瘤学阅片,请先删除肿瘤学阅片",
-  "ReadModule_TaskGenerated": "当前阅片已生成任务,操作失败。",
-  //UserWLTemplateService
-  "UserWLTS_MaxTemplate": "同一个用户最多只能添加10个模板",
-  "UserWLTS_NameRepeated": "模板名称存在重复",
-  "UserWLTS_ContentRepeated": "模板内容存在重复",
-
-  // ------------------------------------------------------------Allocation--------------------------------------------------------------------
-  //TaskAllocationRuleService
-  "TaskAllocation_DoctorIdNotFound": "错误，未在入组表中找到该医生的账号Id",
-  "TaskAllocation_DoctorConfigExists": "已有该医生配置，不允许继续增加",
-  "TaskAllocation_TaskAssigned": "已分配任务给该医生，不允许删除",
-  //TaskConsistentRuleService
-  "TaskConsistent_ConsistencyConfigExists": "请配置一致性分析的医生",
-  "TaskConsistent_TaskGenerated": "已有该项目配置，不允许继续增加",
-  "TaskConsistent_MedicalAuditTaskExists": "该标准已有Subject 生成了任务，不允许修改配置",
-  "TaskConsistent_SignedTaskCannotBeInvalidated": "该标准已产生一致性分析任务，不允许删除",
-  //TaskMedicalReviewRuleService
-  "TaskMedicalRule_TaskAlreadyAssigned": "已有该医生配置，不允许继续增加",
-  "TaskMedicalRule_TaskStarted": "已产生医学审核任务",
-  //TaskMedicalReviewService
-  "TaskMedical_DirtyData": "已签名的不允许设置为失效",
-  "TaskMedical_SubjectInOtherArm": "当前有任务已分配给其他人，不允许分配,请刷新列表",
-  //VisitTaskService
-  "VisitTask_VisitTask_TaskAlreadyApplied": "该项目还未确认任何一个阅片标准",
-  "VisitTask_DoctorConfigNotFound": "当前医生已开始做该Subject 该标准的任务，不允许取消分配",
-  "VisitTask_BackendDataError": "其中一个任务已分配给该医生，不允许分配",
-  "VisitTask_DirtyData": "出现脏数据  任务来源字段没有值",
-  "VisitTask_MissingTaskSource": "该受试者有访视进入了退回流程，还未经过一致性核查通过，不允许分配",
-  "VisitTask_InconsistentSubjectStatus": "有Subject 在其他Arm组已有该医生，不允许在新的组添加该医生",
-  "VisitTask_DuplicateDoctorInArm": "有Subject 已有该Arm组的医生，不允许继续分配,请刷新页面，确认页面数据是否过期",
-  "VisitTask_DoctorAlreadyInArm": "有Subject任务已应用，不允许取消分配",
-  "VisitTask_TaskAlreadyApplied": "在配置表中未找到配置的医生,无法应用绑定,请核对数据",
-  "VisitTask_DoctorConfiguration": "后台数据有错误",
-  "VisitTask_BackendData": "未阅片完成，或者未生效的任务不允许申请重阅",
-  "VisitTask_UnreadTask": "重阅已申请，或者重阅已同意状态下不允许申请重阅",
-  "VisitTask_NoPMRecheck": "附加评估标准任务不允许PM 申请影像重阅",
-  "VisitTask_Reapply": "PM 不允许对一致性分析任务进行申请重阅",
-  "VisitTask_ConsistencyAnalysis": "PM 仅仅允许对访视类型的任务申请重阅",
-  "VisitTask_VisitTypeRestriction": "当前为有序阅片，该受试者已有访视已申请重阅还未处理(项目组申请)，暂不能继续申请重阅",
-  "VisitTask_SequentialReading": "当前为有序阅片，该受试者已有访视已申请重阅还未处理，暂不能继续申请重阅",
-  "VisitTask_ImageProblem": "当前为有序阅片，影像存在问题，项目组已申请回退,暂不能申请重阅",
-  "VisitTask_LastReading": "有序阅片，只允许申请该受试者阅片人最后一次完成全局任务重阅",
-  "VisitTask_LastOncologistRecheck": "有序阅片，只允许申请该受试者阅片人最后一次完成肿瘤学任务重阅",
-  "VisitTask_LastAdjudicatorRecheck": "有序阅片，只允许申请该受试者阅片人最后一次完成裁判的任务重阅",
-  "VisitTask_IRGlobalRecheck": "无序阅片，仅仅允许IR 申请 全局和访视类型类别的任务进行重阅",
-  "VisitTask_IRReapply": "无序阅片，仅仅允许IR申请全局和访视类型类别的任务进行重阅",
-  "VisitTask_InvalidReapplyStatus": "当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面",
-  "VisitTask_ReapplyStatusConflict": "当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作",
-  "VisitTask_ReReadTaskNotApplied": "仅允许同意访视类型的任务重阅",
-  "VisitTask_ReReadTaskAlreadyAffected": "不符合  PM申请   SPM / CPM审批 | IR申请  PM 审批 ",
-  "VisitTask_TaskTypeNotApproved": "当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面",
-  "VisitTask_NoImageReturn": "附加评估标准任务不允许在此入口影像退回",
-  "VisitTask_NonEffectiveTaskCannotBeReturned": "仅仅允许针对生效、未完成的访视任务进行退回操作，请刷新页面数据",
-  "VisitTask_NoFurtherReturn": "当前访视已回退到影像上传，不允许继续回退！",
-  "VisitTask_ConsistencyTaskCannotBeReturned": "一致性分析的任务，不允许设置退回",
-  "VisitTask_PMOnlyAllowedForReturn": "仅PM 可以进行回退操作",
-  "VisitTask_UnsupportedTaskType": "不支持重阅的任务类型",
-  "VisitTask_UndefinedList": "当前用户查看列表未定义",
-  "VisitTask_NoConsistencyReturn": "不允许退回一致性分析任务",
-  "VisitTask_VisitTypeTaskAllowedForPMOnly": "仅仅访视类型的任务支持PM退回",
-
-  // ------------------------------------------------------------Common--------------------------------------------------------------------
-  //CommonDocumentService
-  "Document_CodeDuplication": "文档的Code不能够重复。",
-  "Document_SingleTemplate": "一个场景一个标准只允许有一个模板文档",
-  "Document_ TemplateRead": "读取模板内容失败, 请将文件另存为docx格式尝试!",
-  //DictionaryService
-  "Dictionary_DictionaryName": "已有{0}名称的字典",
-  "Dictionary_DictionaryDeletion": "当前字典在标准中被引用,不允许删除！",
-  "Dictionary_SubitemDeletion": "有子项数据，不允许直接删除！",
-  "Dictionary_ResumeReference": "当前条目已经在阅片人的简历中被引用。",
-  "Dictionary_ProjectReference": "当前条目已经在项目信息中被引用。",
-  "Dictionary_StandardReference": "当前条目已经在阅片标准中被引用。",
-  //ExcelExportService
-  "ExcelExport_UnsupportedExport": "当前标准导出还未支持",
-  //MailService
-  "Mail_EmailResetReminder": "[来自展影IRC] 关于重置邮箱的提醒",
-  "Mail_Dear": " 尊敬的 {0} , ",
-  "Mail_ResettingEmail": "您正在进行邮箱重置操作",
-  "Mail_IRCResettingPassword ": "[来自展影IRC] 关于重置密码的提醒",
-  "Mail_ResettingPassword ": "您正在进行邮箱重置密码操作",
-  "Mail_ImagingIRCReminder": "[来自展影IRC]的提醒",
-  "Mail_IRCProject": "您正在参与展影医疗IRC项目",
-  "Mail_ProjectParticipationReminder": "[来自展影IRC] [{0}] 关于中心调研的提醒",
-  "Mail_CenterResearchReminder": "您正在参与展影医疗IRC项目中心调研工作",
-  "Mail_AccountCreationReminder": "[来自展影IRC] 关于创建账户的提醒",
-  "Mail_AccountPasswordResetReminder": "[来自展影IRC] 关于重置账户密码的提醒",
-  "Mail_InvitationEmail": "[来自展影IRC] [{0}]邀请信",
-  //SystemMonitor
-  "SysMon_JsonConfig": "解析Json文件配置出现问题",
-
-  // ------------------------------------------------------------Doctor--------------------------------------------------------------------
-  //DoctorService
-  "Doctor_DupPhoneOrEmail": "当前的电话或电子邮件号码已经存在",
-  "Doctor_DupPhone": "当前的电话号码已经存在!",
-  "Doctor_DupEmail": "当前的邮箱已经存在!",
-  "Doctor_StandardDuplicateFileTypeError": "当前标准已添加过此类型文件",
-  "Doctor_RequiredDocumentsError": "简历及顾问协议必须上传",
-
-  // ------------------------------------------------------------Document--------------------------------------------------------------------
-  //SystemDocumentService
-  "SystemD_DuplicateFile": "系统中已存在同类型的同名文件。",
-  "SystemD_CannotDeleteSignedFile": "已有用户阅读该文档，并签名，不允许删除。",
-  //TrialDocumentService
-  "TrialD_DuplicateFileInProject": "该项目中已经存在同类型的同名文件。",
-  "TrialD_DocumentHasAlready": "已有用户阅读该文档，并签名，不允许删除。",
-  "TrialD_FileAlreadySigned": "该文件已经签名",
-  "TrialD_ObsoleteFile": "文件已废除,签署失败！",
-  //TrialEmailNoticeConfigService
-  "TrialEmailN_TaskNotSigned": "进行邮件发送前，该任务必须已签名完成并已经触发完成相应的任务生成",
-  "TrialEmailN_NoRecipient": "没有收件人，无法发送邮件",
-  "TrialEmailN_InvalidEmailConfig": "项目发件邮箱配置有误，请核实",
-  "TrialEmailN_EmailTemplateNotFound": "找不到该项目标准场景下邮件模板",
-  "TrialEmailN_EnrollmentConfirmation": "【入组确认报告】关于{0}项目{1}受试者",
-  "TrialEmailN_Enrollment": " 附件为入组确认报告，请查收",
-  "TrialEmailN_PDReport": "【疾病进展确认报告】关于{0}项目{1}受试者",
-  "TrialEmailN_SubjectDiseaseProgression": " 附件为疾病进展确认报告，请查收 ",
-  "TrialEmailN_SingleBlindedSet": "单重有序阅片配置有误(不应该有仲裁对象配置)，请核查！",
-  "TrialEmailN_SingleBlindedSequenced": "单重有序阅片 该类型的任务不应进入此处逻辑，请联系后台开发核查！",
-  "TrialEmailN_PDProgressEmailTask": "发送PD 进展邮件中发现任务数据有问题！",
-  "TrialEmailN_DoubleBlindedError": "双重有序阅片 没有定义该仲裁规则处理逻辑，请联系业务和后台开发核查！",
-  "TrialEmailN_InCons": "项目未配置入组确认！",
-  "TrialEmailN_NoBaseLine": "不存在配置了入组确认的并且已阅的基线访视",
-  "TrialEmailN_IncompBase": "做入组确认的阅片人基线任务没有阅片完！",
-  "TrialEmailN_EmailFail": "邮件手动生成失败，请联系开发核实该场景失败原因",
-  "TrialEmailN_NoReader": "当前未有阅片人读完基线任务！",
-  "TrialEmailN_NoPDConfig": "项目未配置PD进展！",
-  "TrialEmailN_NoPDTasks": "不存在配置了PD进展的并且已阅的访视",
-  "TrialEmailN_PDNotFinished": "当前受试者最新PD访视阅片任务完成状态不符合发送条件",
-  "TrialEmailN_PDNoImaging": "项目配置了阅片期仲裁，但是当前受试者最新PD访视没有影像学阅片期",
-  "TrialEmailN_PDPhaseNotFinished": "当前受试者最新PD访视阅片期任务完成状态不符合发送条件",
-  "TrialEmailN_NoRuleDefined": "未定义该仲裁规则发送业务逻辑！",
-  "TrialEmailN_NoDoubleOrder": "当前项目配置，不满足双重有序阅片，不满足发送条件！",
-  "TrialEmailN_NoSendLogicDefined": "当前项目配置，未定义发送业务逻辑！",
-  "TrialEmailN_BlindedSequencedReading": "有序阅片配置有误(应为单重或者双重阅片)，请核查！",
-  "TrialEmailN_UnblindedSequencedReading": "无序阅片配置有误(应为单重无仲裁对象，双重针对访视仲裁)，请核查！",
-  "TrialEmailN_InvalidTaskTypeForEmailSending": "不应有除访视、裁判、全局其他类型的任务进行发送邮件，请核查业务逻辑",
-  "TrialEmailN_PDLogicNotDefined": "该标准任务还未定义PD获取逻辑，联系业务和后台开发协商后补充",
-  "TrialEmailN_MailboxWrong": "项目发件邮箱配置有误，请核实",
-  "TrialEmailN_InvalidRecipient": "项目没有有效的收件人，无法发送邮件",
-  "TrialEmailN_EmailTestMessage": "项目邮件测试",
-  "TrialEmailN_ConfigurationCorrect": " 收到此邮件，代表邮件配置正确",
-  "TrialEmailN_InvalidSenderEmailConfig": "发件人配置错误，请核对服务器地址或者授权码是否填写有误",
-
-  // ------------------------------------------------------------Financial--------------------------------------------------------------------
-  //CalculateService
-  "Cal_VolDataErr": "体积数据错误",
-  //ExchangeRateService
-  "ExR_SameMthExist": "同月的汇率已存在",
-  "ExR_MthPymtRate": "按月付款采用汇率",
-  //PaymentAdjustmentService
-  "PayAdj_DocPymtLock": "医生付款已确认锁定",
-  //RankPriceService
-  "RP_TitleUsedByRev": "此标题已被审稿人付款信息所使用",
-  //TrialRevenuesPriceService
-  "TRP_AddMeaningful": "请添加有意义的数据",
-
-  // ------------------------------------------------------------ImageAndDoc--------------------------------------------------------------------
-  //DicomArchiveService
-  "DAS_NoAnonCacheData": "未取到缓存匿名化配置数据，上传停止,请联系开发人员核实",
-  //ImageShareService
-  "ISS_NoImgToShare": "当前检查没有影像可以分享。 ",
-  "ISS_ResNotExists": "资源不存在。",
-  "ISS_SharePwdError": "分享密码错误。",
-  "ISS_ShareExpiration": "资源分享过期。",
-  //StudyService
-  "Study_VisitBeforePrevError": "当前访视检查时间{0}不能早于前序访视检查时间{1}，请核对检查数据是否有误",
-  "Study_VisitAfterSubseqError": "当前访视检查时间{0}不能晚于该访视之后的检查时间{1}，请核对检查数据是否有误",
-  "Study_UploadArchiving": "当前有人正在上传归档该检查!",
-  "Study_VisitEndedNotAllowed": "受试者访视结束，不允许上传!",
-  "Study_ImgAlreadyUploaded": "此处不可以上传。当前影像检查已经上传给受试者{0}的{1}",
-
-  // ------------------------------------------------------------Inspection--------------------------------------------------------------------
-  //FrontAuditConfigService
-  "FrontAudit_IdDup": "标识重复",
-  "FrontAudit_NameDup": "名称重复",
-  "FrontAudit_CannotDelSub": "存在子类 不能删除",
-  //InspectionService
-  "Inspection_UserDisabled": "当前用户已被禁用。",
-
-  // ------------------------------------------------------------Institution--------------------------------------------------------------------
-  //CROService
-  "CRO_DupName": "已经存在同名的CRO，请确认。",
-  "CRO_InProject": "该CRO已经参与项目，不能被删除。",
-  //HospitalService
-  "Hospital_DupName": "已经存在同名的医院，请确认。",
-  "Hospital_SiteAdded": "当前Site已经添加到其他Hospital了。",
-  "Hospital_HasDoctors": "该医院下已经注册有医生，不可以删除。",
-  //SiteService
-  "Site_DupName": "已经存在同名的中心，请确认。",
-  "Site_InProject": "该中心已经加入项目，不可以被删除。",
-  //SponsorService
-  "Sponsor_DupName": "已经存在同名的申办方，请确认。",
-  "Sponsor_InProject": "该申办方已经加入项目，不允许删除。",
-
-  // ------------------------------------------------------------Management--------------------------------------------------------------------
-  //MenuService
-  "Menu_ParentDupChild": "该父节点下已经存在同名的子节点。",
-  "Menu_ChildExist": "该节点存在子节点，请在删除子节点后，再删除该节点。",
-  //UserService
-  "User_UsernameExist": "用户名已经存在。",
-  "User_PhoneDup": "该用户类型中已存在具有相同的电话的用户。",
-  "User_EmailDup": "该用户类型中已存在具有相同邮箱的用户。",
-  "User_NewOldPwdSame": "新密码与旧密码相同。",
-  "User_OldPwdInvalid": "旧密码验证失败。",
-  "User_LegalEmail": "请输入合法的电子邮件。",
-  "User_VerificationCodeError": "验证码错误。",
-  "User_VerificationCodeExpired": "验证码已经过期。",
-  "User_CreateFailed": "请检查邮箱地址或者联系维护人员, 邮件发送失败, 未能创建账户成功。",
-  "User_InvalidEmail": "请输入一个正确的邮箱。",
-  "User_EmailError": "邮箱错误。",
-  "User_InProject": "该用户已经参加项目，不能够删除。",
-  "User_Disabled": "该用户已经被禁用。",
-  //UserTypeService
-  "UserType_InUse": "该用户类型中已存在用户，不能删除。",
-
-  // ------------------------------------------------------------QC--------------------------------------------------------------------
-  //QCCommon
-  "QCCommon_CannotOperate": "CRC已提交影像，不能进行操作。",
-  "QCCommon_NoPermission": "您不是该质控任务当前领取人，没有操作权限!",
-  "QCCommon_CheckTimeEarly": "当前访视检查时间{0}不能早于前序访视检查时间{1}，请核对检查数据是否有误",
-  "QCCommon_CheckTimeLate": "当前访视检查时间{0}不能晚于该访视之后的检查时间{1}，请核对检查数据是否有误",
-  //QCOperationService
-  "QCOperation_CheckFirst": "请先核查图像，并保存审核问题，然后再发质疑。",
-  "QCOperation_QuestionExist": "当前访视未关闭的质疑已设置了同意CRC重传影像。请在CRC完成影像重传后，先关闭原质疑，再添加新的质疑。",
-  "QCOperation_QuestionCannotClose": "CRC已申请重传或者QC同意重传，不允许关闭该质疑。请在QC拒绝重传申请或者CRC设置重传影像后，再关闭质疑。",
-  "QCOperation_CloseReason": "关闭原因: ",
-  "QCOperation_QuestionReplied": "当前QC质疑已经回复。",
-  "QCOperation_NoPermissionReply": "您没有权限回复一致性核查对话。",
-  "QCOperation_CannotClose": "当前访视处于申请重传状态， 不允许关闭质疑。",
-  "QCOperation_Reason": "原因:",
-  "QCOperation_CannotPass": "当前访视处于回退状态,不允许设置一致性核查通过",
-  "QCOperation_PassAfterClose": "请先关闭一致性核查质疑后，再设置一致性核查通过。",
-  "QCOperation_Cannotback": "当前访视已通过一致性核查，不允许申请重传",
-  "QCOperation_CRCRollback": "CRC申请重传",
-  "QCOperation_OtherCRC": "其他CRC已申请处理，请刷新页面",
-  "QCOperation_PMReject": "PM/APM拒绝一致性核查回退",
-  "QCOperation_NoPermission": "您不具备操作权限。",
-  "QCOperation_CannotRollback": "当前访视还未进行核查或者核查已通过，不允许设置回退。",
-  "QCOperation_PMAPMConsistency": "PM/APM同意一致性核查回退。",
-  "QCOperation_NoModifyAfterSubmit": "提交之后，不允许修改!",
-  "QCOperation_UnresolvedQCQuery": "当前访视有质疑未关闭，不允许该操作",
-  "QCOperation_CrcNoDelete": "CRC已经提交，不允许删除。",
-  "QCOperation_NoRecipient": "您不是该质控任务当前领取人，没有操作权限!",
-  "QCOperation_QCImageTaskAlreadyReleased": "当前访视的影像质控任务已被原领取人释放。您可以通过“领取”获得",
-  "QCOperation_QCTaskNoAccess": "当前访视的影像质控任务已被其他QC领取，不允许领取",
-  "QCOperation_QCConfigFirst": "请先配置影像质控审核问题，再领取影像质控任务",
-  "QCOperation_NoQC": "项目配置为不审，没有领取QC Task",
-  "QCOperation_InitialAuditPassed": "初审已通过，不能继续领取",
-  "QCOperation_NoSingleAudit": "项目配置为单审,不满足Submmit State：已提交 或者 Audit State：待审核/审核中, 不允许领取,请刷新界面",
-  "QCOperation_NoSameReviewer": "复审不能和初审是同一个人",
-  "QCOperation_NoSecondaryAudit": "项目配置为复审，不满足提交状态：已提交或者审核状态：待审核/QC中, 不允许领取,请刷新界面",
-  "QCOperation_NoTaskAccess": "您不是该质控任务当前领取人，没有操作权限!",
-  "QCOperation_NoQCFunction": "项目配置影像质控为不审，不需要取消任务功能",
-  "QCOperation_NoTaskOwner": "当前访视影像质控任务没有当前领取人，不能释放。",
-  "QCOperation_DiseaseProgressConfirmation": "当前访视要求进行疾病进展确认。请在提交当前访视前，先处理未提交的前序访视：{0}。",
-  "QCOperation_UnsubmittedVisits": "在提交当前访视后，请尽快处理尚未提交的前序访视：{0}。",
-  "QCOperation_NoBaselineData": "基线没有临床数据，确认提交？",
-  "QCOperation_NoImageData": "有访视未上传任何Dicom/非Dicom影像数据，不允许提交",
-  "QCOperation_ImagesSubmitted": "当前访视的影像数据，已经由其他CRC提交。",
-  "QCOperation_BatchImagesSubmitted": "当前批量提交访视的影像数据，其中部分已由其他CRC提交。",
-  "QCOperation_MissingBaselineDate": "项目配置了需要填写访视基准日期。但是受试者没有填写访视基准日期，不允许提交",
-  "QCOperation_RemoveItem": "您已经被移出项目，没有操作权限。",
-  "QCOperation_QCNotClosed": "当前访视有影像质控质疑未关闭，不能进行此操作。",
-  "QCOperation_NoQCNeeded": "项目配置影像质控为不审，不需要设置为影像质控通过。",
-  "QCOperation_QCNotSaved": "影像质控审核问题没有保存，不能进行此操作。",
-  "QCOperation_NotChangePass": "项目配置影像质控为单审，当前访视影像质控任务不能从当前审核状态变更到 审核通过。",
-  "QCOperation_CannotChangeToPass": "项目配置影像质控为双审。当前审核状态为 {0}，不能变更到 审核通过。",
-  "QCOperation_NoQCNeededNotEnd": "项目配置影像质控为不审，不允许设置影像质控终止。",
-  "QCOperation_CannotChangeToStop": "项目配置影像质控为单审，当前审核状态不为 In Primary QC，不能变更到 审核终止",
-  "QCOperation_CannotChangeStop": "项目配置影像质控为双审，当前审核状态为 {0}，不能变更到 审核终止",
-  "QCOperation_InvalidResend": "当前重传状态不为QC同意重传，不允许重传",
-  "QCOperation_NoResendNeeded": "不审操作，不会有需要重传的操作!",
-  "QCOperation_InvalidAgreeResend": "当前重传状态不为CRC申请重传，不允许设置同意重传",
-  "QCOperation_CannotAgreeResend": "当前访视,有一个未关闭的质疑 QC设置了同意重传，CRC还未完成上传，当前不允许再次设置",
-  "QCOperation_AgreeResend": "QC同意重传",
-  "QCOperation_InvalidCompleteResend": "当前重传状态不为QC同意重传，不允许设置重传完成",
-  "QCOperation_NoImageNotAllowed": "当前没有影像，不允许设置重传完成",
-  "QCOperation_CRCTransferCompleted": "CRC已重传完成",
-  "QCOperation_InvalidTransferStatus": "当前质疑重传状态不为初始状态|CRC重传完成状态，不允许申请重传",
-  "QCOperation_CRCTransfer": "CRC申请重传/上传影像",
-  "QCOperation_CannotModifyConfirmation": "该访视已提交，不能修改入组确认状态",
-  "QCOperation_CannotModifyPDStatus": "该访视为回退访视，不允许修改PD确认状态",
-  "QCOperation_ForwardingFailed": "转发影像失败。",
-  //QCQuestionService
-  "QCQuestion_DuplicateIndexFailed": "序号重复,操作失败",
-  "QCQuestion_HasChildQuestion": "当前任务存在子问题,删除失败",
-  //TrialQCQuestionService
-  "TrialQCQuestion_TemplateConfirmed": "影像质控审核问题模板已经确认，不允许操作。",
-  "TrialQCQuestion_DuplicateIndexFailed": "序号重复,操作失败",
-  "TrialQCQuestion_DeleteChildFirst": "请在删除父问题前，请先删除引用该父问题的子问题。",
-  "TrialQCQuestion_ReferencedByQCProcess": "该审核问题已被影像质控过程引用，不允许删除",
-
-  // ------------------------------------------------------------QC--------------------------------------------------------------------
-
-  // ------------------------------------------------------------SiteSurvey--------------------------------------------------------------------
-  //TrialSiteEquipmentSurveyService
-  "TrialSiteEquipment_Locked": "已锁定,不允许操作",
-  //TrialSiteSurveyService
-  "TrialSiteSurvey_InvalidEmail": "请输入正确的邮箱地址。",
-  "TrialSiteSurvey_WrongVerificationCode": "验证码错误。",
-  "TrialSiteSurvey_ExpiredVerificationCode": "验证码已经过期。",
-  "TrialSiteSurvey_NoRecordToUpdate": "该中心不存在该交接人的中心调研记录表,不允许选择更新。",
-  "TrialSiteSurvey_RecordUnderReview": "您的中心调研记录正在审核中，不允许进行更新操作。若需要更新，请在驳回后进行操作。",
-  "TrialSiteSurvey_LockedByCurrentUser": "当前中心中，您提交调研记录表已锁定，不允许更新其他人邮箱调研记录。",
-  "TrialSiteSurvey_LockedByOtherUsers": "当前中心，您提交的调研记录表已锁定。当前存在其他人员提交的调研记录表未锁定，不允许更新您之前提交的调研记录。",
-  "TrialSiteSurvey_UnlockedRecordsExist": "当前中心存在未锁定的调研记录，不允许更新已锁定的调研记录。",
-  "TrialSiteSurvey_NonLatestLockedRecord": "该邮箱{0}对应的调查表不是最新锁定的记录，不允许更新！",
-  "TrialSiteSurvey_AlreadyFilledByOtherUsers": "该中心下已经有其他用户已填写的调研表，您不被允许继续填写",
-  "TrialSiteSurvey_Locked": "中心调研已锁定,不允许操作。",
-  "TrialSiteSurvey_IRCNotification": "[来自展影IRC] [{0}] 关于中心调研审批的提醒",
-  "TrialSiteSurvey_CancelUnsubmittedRecord": "只允许废除未提交的记录。",
-  "TrialSiteSurvey_NoAdminAcces": "不允许管理员操作。",
-  "TrialSiteSurvey_FailedToGenerateAccountId": "生成账户Id 未取到值，请排查",
-  "TrialSiteSurvey_IRCInvitation": "[来自展影IRC] [{0}] 邀请信",
-  "TrialSiteSurvey_IRCInvitationContent": " 您好，展影医疗作为 实验方案号：{0} 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！",
-  "TrialSiteSurvey_ViewAndConfirm": "查看并确认",
-  //TrialSiteUserSurveyService
-  "TrialSiteUser_Locked": "已锁定,不允许操作",
-  "TrialSiteUser_InconsistentInfo": "该邮件地址在系统中所对应的用户为 {0}, 电话号码是 {1}。请将所输入的信息修改为与系统一致后，再保存。",
-  "TrialSiteUser_NoTestUserForFormal": "正式类型 、培训类型的项目 不允许加入测试用户",
-  "TrialSiteUser_NoFormalUserForTest": "测试项目  不允许加入正式用户",
-
-  // ------------------------------------------------------------Stat--------------------------------------------------------------------
-
-  // ------------------------------------------------------------TrialSiteUser--------------------------------------------------------------------
-  //TrialConfigService
-  "TrialConfig_JudgeTaskFail": "有裁判问题未配置产生裁判阅片任务的条件,操作失败！",
-  "TrialConfig_StdConfigMissing": "当前标准下未配置问题",
-  "TrialConfig_AddEvalReq": "选择了附加评估,必须勾选附加评估类型",
-  "TrialConfig_SignTemplateMissing": "该操作需要电子签名确认，但未在系统中找到该场景的签名模板。",
-  "TrialConfig_ProjectEnded": "该项目已结束或停止，不允许修改配置。",
-  "TrialConfig_NoImageAuditQuestion": "当前未添加影像质控审核问题。请先添加影像质控审核问题，再进行确认。",
-  "TrialConfig_DuplicateAuditQuestionId": "影像质控审核问题显示序号不能重复。",
-  "TrialConfig_InvalidParentQuestionId": "父问题的显示序号要比子问题的显示序号小，请确认。",
-  "TrialConfig_AuditQuestionConfirmed": "影像质控审核问题已被其他人员确认，不允许再次确认。",
-  "TrialConfig_ProjectNotInitialized": "该项目当前状态不是初始化，不允许进行该操作。",
-  "TrialConfig_UnconfirmedConfiguration": "该项目的项目配置、访视管理尚未完成，无法将项目状态设为”启动”。",
-  "TrialConfig_UnconfirmedUNACKD": "该项目的项目配置、访视管理中，有未确认项，无法变更项目状态。",
-  "TrialConfig_ProjectNotStarted": "项目没有进入启动状态，不能设置为停止或完成状态",
-  //TrialExternalUserService
-  "TrialExternalUser_Inconsistency": "该邮件地址在系统中所对应的用户为 {0}, 电话号码是 {1}。请将所输入的信息修改为与系统一致后，再保存。",
-  "TrialExternalUser_EmailTypeDuplicate": "系统已经存在与列表中填写的邮箱和用户类型相同的账户，请确认。",
-  "TrialExternalUser_TestUserNotAllowed": "正式类型 、培训类型的项目 不允许加入测试用户 ",
-  "TrialExternalUser_FormalUserNotAllowed": "测试项目  不允许加入正式用户 ",
-  "TrialExternalUser_NotEditable": "人员信息不支持编辑，请删除后重新添加。",
-  "TrialExternalUser_CannotDelete": "当前用户已参与到项目，不允许删除",
-  "TrialExternalUser_IRCInvitation": " 您好，展影医疗作为 实验方案号：{0} 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！",
-  "TrialExternalUser_ViewAndConfirm": "查看并确认",
-  "TrialExternalUser_InvitationExpired": "邀请加入时间已过期，重新被邀请后才可以进行确认操作",
-  "TrialExternalUser_AccountInfo": "[来自展影IRC] [{0}] 账户信息",
-  "TrialExternalUser_Welcome": "您好，欢迎您参加项目  实验方案号：{0}IRC相关工作。该项目采用电子化工作流，系统及您的账号信息如下：",
-  "TrialExternalUser_ProjectNumber": "项目编号: {0}",
-  "TrialExternalUser_ExperimentPlanNumber": "试验方案号: {0}",
-  "TrialExternalUser_ExperimentName": "试验名称: {0}",
-  "TrialExternalUser_Username": "用户名: {0}",
-  "TrialExternalUser_Password": "密码: ({0})(请在登录后进行修改) : ***(您已有账号, 若忘记密码, 请通过邮箱找回)",
-  "TrialExternalUser_Role": "角色: {0}",
-  "TrialExternalUser_LoginUrl": "系统登录地址: {0} ",
-  "TrialExternalUser_ReinvitationRequired": "邀请加入时间已过期，重新被邀请后才可以进行确认操作",
-  "TrialExternalUser_UserIdStorageProblem": "调研表系统用户Id 存储有问题",
-  "TrialExternalUser_IRCAccountInfo": "[来自展影IRC] [{0}] 账户信息",
-  //TrialMaintenanceService
-  "TrialMaint_PersonnelJoined": "人员已加入现场维护",
-  //TrialService
-  "Trial_PMApmPermission": "只有PM/APM拥有操作权限!",
-  "Trial_TestUserCreateOnlyNonFormal": "测试用户 只能创建非正式项目",
-  "Trial_DuplicateProjectNumber": "已经存在相同的项目编号。",
-  "Trial_InvalidProjectStatus": "项目状态只有处于：初始化或者进行中时，才允许操作。",
-  "Trial_CannotDeleteProject": "当前运行环境下，不允许删除项目数据。",
-  //TrialSiteService
-  "TrialSite_ParticipantJoined": "已有受试者加入中心，无法禁用",
-  "TrialSite_CodeDuplicate": "代码不能重复",
-  "TrialSite_CannotDeleteAssociatedCRC": "中心已经和CRC关联，不能删除",
-  "TrialSite_CannotDeleteAssociatedSubject": "受试者已经添加,不能删除",
-  "TrialSite_CannotDeleteUploadedData": "中心已经上传调研，无法删除",
-
-  // ------------------------------------------------------------Visit--------------------------------------------------------------------
-  //SubjectService
-  "Subject_NoConfirmedPlan": "项目访视计划没有确认。请联系项目经理确认项目访视计划后，再添加受试者。",
-  "Subject_DuplicateSubjectNum": "已存在具有相关受试者编号的受试者。",
-  "Subject_UploadedVisitNoDelete": "该受试者已经有访视已经上传影像，不允许删除。",
-  //SubjectVisitService
-  "Visit_DuplicateVisitNo": "该受试者的访视计划中已经包含一个具有相同访视号的访视。",
-  "Visit_LastVisitNoChange": "该受试者已经有访视设置为末次访视，不允许将当前访视设置为末次访视。",
-  "Visit_DuplicateVisitName": "该受试者的访视计划中已经包含一个具有相同访视名称的访视。",
-  "Visit_NoExtraVisitAfterLast": "设置末次评估后，不允许添加计划外访视。",
-  "Visit_FinishedTasksNoAdd": "该受试者后续访视已有任务完成阅片(有序阅片标准)，不允许在此添加，如果确实需要，请回退",
-  "Visit_NoPDStatusChangeAfterSubmission": "当前访视影像提交后，不允许修改PD确认状态。",
-  "Visit_UploadedNoLost": "当前访视已经有影像上传，不允许设置为失访。",
-  "Visit_UploadedNoDelete": "当前访视已经有影像上传，不允许删除。",
-  "Visit_PlanVisitNoDelete": "计划内的访视不允许删除。",
-  "Visit_PreviousVisitNoDelete": "当前访视已经被设置为另一访视的上一访视，不允许删除。",
-  //VisitPlanService
-  "VisitPlan_OnlyInitOrOngoing": "只有当项目状态为：初始化或进行中时，可以操作。",
-  "VisitPlan_LargerVisitNumLargerInterval": "访视计划中，访视号大的访视，其访视间隔也应该比访视号小的访视大。",
-  "VisitPlan_LargerPlanNumLargerInterval": "访视计划中，访视号大的计划访视，其访视间隔也应该比访视号小的计划访视大。",
-  "VisitPlan_ExistNameOrNumTemplate": "访视计划中已经存在具有项目访视名称或者访视号的计划访视模板。",
-  "VisitPlan_ExistBaseline": "访视计划中已经存在基线。",
-  "VisitPlan_ExistBaselineImgNoModify": "有受试者的基线已经上传了影像数据,不允许修改基线访视。",
-  "VisitPlan_OnlyInitOrOngoingModifyConfirm": "仅仅在项目初始化或者进行中时，才允许修改确认",
-  "VisitPlan_NoBaselineNotConfirm": "没有基线，不允许确认",
-  "VisitPlan_ConfigNotConfirmNotConfirm": "项目配置未确认，不允许确认访视计划",
-  "VisitPlan_BaselineNotMinDayNotConfirm": "基线VisitDay 不是最小的， 不允许确认",
-  "VisitPlan_CheckExport": "检查导出_{0}.xlsx",
-  "VisitPlan_Assigned": "访问计划已分配给受试者并已执行",
-
-  // ------------------------------------------------------------WorkLoad--------------------------------------------------------------------
-  //DoctorWorkloadService
-  "DoctorWorkload_AssignType": "已分配任务，不允许减少阅片类型",
-  "DoctorWorkload_Unique": "此类数据唯一",
-  "DoctorWorkload_FeeSettled": "费用已结算，工作量无法修改",
-  //EnrollService
-  "Enroll_NotFound": "无法找到项目{0}",
-  "Enroll_EmailFormat": "{0}邮箱格式存在问题",
-  "Enroll_CannotRollback": "已有分配的审核人员不能回退",
-
-  // ------------------------------------------------------------Triggers--------------------------------------------------------------------
-  //AddlTrialUserTrigger
-  "AddlTrialUser_NoTestUser": "正式类型 、培训类型的项目 不允许加入测试用户",
-  "AddlTrialUser_NoFormalUser": "测试项目不允许加入正式用户",
-  //SubjectStateTrigger
-  "SubjectState_CannotSetCurrentAsLastVisit": "该受试者已经有访视被设置为末次访视，不允许将当前访视设置为末次访视。",
-  "SubjectState_CannotSetAsLastVisitWithImage": "该受试者当前访视后有访视的影像已上传，当前访视不允许设置为末次访视。",
-  //SubjectVisitFinalVisitTrigger
-  "SubjectVisit_CannotSetAsLastVisit": "该受试者已有后续访视已上传影像或已提交，当前访视不允许设置为末次访视。",
-
-  // ------------------------------------------------------------BusinessFilter--------------------------------------------------------------------
-  //LimitUserRequestAuthorization
-  "LimitUser_AuthTokenMissing": "当前请求未从Header/Url取到用户Token,请联系开发者",
-  "LimitUser_AccountLoggedInElsewhere": "您的账户在其他地方已登陆，您被迫下线。",
-  //ModelActionFilter 
-  "ModelAction_InvalidAPIParameter": "提供给接口的参数无效。",
-  //ProjectExceptionFilter
-  "ProjectException_ConcurrentUpdateNotAllowed": "并发更新，当前不允许该操作",
-  "Project_ExceptionContactDeveloper": "程序异常，请联系开发人员。 ",
-  //TrialResourceFilter
-  "TrialResource_NoAccessPermission": "对不起，您的账户没有操作权限。",
-  "TrialResource_ReferTrialIdFailed": "正则取请求Refer 中trialId 失败，请联系开发人员核查",
-  "TrialResource_InterceptedProjectStatusRule": "本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改",
-  "TrialResource_MissingProjectNumber": "该接口参数中，没有传递项目编号，请核对。",
-  //UnifiedApiResultFilter
-  "UnifiedAPI_ProgramError": "程序错误，请联系开发人员。",
-
-  // ------------------------------------------------------------Helper--------------------------------------------------------------------
-  //FileStoreHelper
-  "FileStore_TemplateFileNotFound": "数据库没有找到对应的数据模板文件,请联系系统运维人员。",
-  "FileStore_TemplateFileStoragePathInvalid": "文件不存在，请联系系统管理员！",
-  //SendEmailHelper
-  "SendEmail_SendFail": "邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员",
-  "SendEmail_NoRecipient": "没有收件人",
-
-  // ------------------------------------------------------------IRaCIS.Core.Domain--------------------------------------------------------------------
-  //Trial
-  "Trial_number": "编号由5位数字组成，前2位为中心编号，后3位为顺序号，请与EDC录入的编号保持一致",
-
-  // ------------------------------------------------------------IRaCIS.Core.Infrastructure--------------------------------------------------------------------
-  //ResponseOutput
-  "RO_BizObjNotExistsOrParamIncorrect": "业务对象{0}在数据库中不存在，或被他人删除，或参数查询不正确导致",
-  "RO_ExpectChangeButNoEffect": "期望发生更改，但数据库数据没有更改",
-  "RO_SaveFailed": "保存失败"
-
 }

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Application.ViewModel
 {
@@ -60,6 +61,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsPMSetBack { get; set; }
 
+
+
         #region 标准配置
         public Guid TrialReadingCriterionId { get; set; }
 
@@ -73,6 +76,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsClinicalDataSign { get; set; }
 
 
+
+
         public CompleteClinicalDataEnum CompleteClinicalDataEnum =>
             (IsNeedClinicalDataSign && IsClinicalDataSign) ? CompleteClinicalDataEnum.Complete : (IsNeedClinicalDataSign && IsClinicalDataSign == false) ? CompleteClinicalDataEnum.NotComplete : CompleteClinicalDataEnum.NA;
 
@@ -106,35 +111,18 @@ namespace IRaCIS.Core.Application.ViewModel
         public CriterionType CriterionType { get; set; }
 
 
-
-        ///// <summary>
-        ///// 仲裁对象
-        ///// </summary>
-        //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
-
-
-        ///// <summary>
-        ///// 阅片模式
-        ///// </summary>
-        //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
-
-        ///// <summary>
-        ///// 全局阅片
-        ///// </summary>
-        //public bool IsGlobalReading { get; set; } = true;
-
-        ///// <summary>
-        ///// 仲裁阅片
-        ///// </summary>
-        //public bool IsArbitrationReading { get; set; } = true;
-
-
-        ///// <summary>
-        ///// 肿瘤学阅片  原字段 IsClinicalReading
-        ///// </summary>
-        //public bool IsOncologyReading { get; set; }
         #endregion
 
+        public PIAuditState PIAuditState { get; set; }
+        public string NotAgreeReason { get; set; }
+        public string PIAuditNote { get; set; } = string.Empty;
+
+        public bool? IsEnrollment { get; set; }
+
+        public bool? IsPDConfirm { get; set; }
+
+        public List<string> PIAuditImagePathList { get; set; }
+
     }
 
 
@@ -151,6 +139,16 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsCanEditUrgentState { get; set; }
 
 
+        public bool? IsBaseline { get; set; }
+
+        public bool? IsEnrollmentConfirm { get; set; }
+
+        public PDStateEnum? PDState { get; set; }
+
+
+
+
+
     }
 
     public class UserSimpleInfo
@@ -160,6 +158,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public string UserName { get; set; }
         public string FullName { get; set; }
 
+        public UserTypeEnum UserTypeEnum { get; set; }
+
         //public string UserTypeShortName { get; set; }
     }
 
@@ -172,6 +172,23 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
+    public class PIReaingTaskView : ReadingTaskView
+    {
+        public Guid? FirstAuditUserId { get; set; }
+
+        public string FirstAuditUserName { get; set; }
+        public DateTime? FirstAuditTime { get; set; }
+
+
+        public Guid? LatestReplyUserId { get; set; }
+
+        public string LatestReplyUserName { get; set; }
+        public DateTime? LatestReplyTime { get; set; }
+
+
+
+    }
+
     public class ReadingTaskView : VisitTaskView
     {
 
@@ -184,7 +201,15 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? SourceSubjectVisitId { get; set; }
         public Guid? SouceReadModuleId { get; set; }
 
-        //public bool IsAfterConvertedTask { get; set; }
+
+        public List<PIReadingResult> PIReadingResultList { get; set; }
+    }
+
+    public class PIReadingResult
+    {
+        public Guid QuestionId { get; set; }
+
+        public string Answer { get; set; }
     }
 
 
@@ -248,6 +273,12 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReReadingApplyState ReReadingApplyState { get; set; }
         public DateTime? SuggesteFinishedTime { get; set; }
 
+
+
+        public string UserName { get; set; }
+        public string FullName { get; set; }
+
+
     }
 
     public class IRUnReadSubjectView
@@ -257,6 +288,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SubjectId { get; set; }
         public string SubjectCode { get; set; } = String.Empty;
 
+        public Guid? ClaimUserId { get; set; }
+
+        public string? ClaimUserName { get; set; }
         public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent);
 
         public int UnReadTaskCount { get; set; }
@@ -380,13 +414,94 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public RequestReReadingResult? RequestReReadingResultEnum { get; set; }
 
+        public PIAuditState? PIAuditState { get; set; }
+
+
+
+        public string? FirstAuditUserName { get; set; }
+
+
+        public bool? IsWaitPIAudit { get; set; }
+
+
+        public string? LatestReplyUserName { get; set; }
+
+        public DateTime? FirstAuditTimeBegin { get; set; }
+        public DateTime? FirstAuditTimeEnd { get; set; }
+        public DateTime? LatestReplyTimeBegin { get; set; }
+        public DateTime? LatestReplyTimeEnd { get; set; }
+
+    }
+
+    public class PIAuditTaskEnrollOrPdCommand
+    {
+        [NotDefault]
+        public Guid VisitTaskId { get; set; }
+        public bool? IsEnrollment { get; set; }
+
+        public bool? IsPDConfirm { get; set; }
+
+    }
+
+    public class PIAuditTaskCommand
+    {
+        [NotDefault]
+        public Guid VisitTaskId { get; set; }
+        public string NotAgreeReason { get; set; }
+        public string PIAuditNote { get; set; } = string.Empty;
+
+        public List<string> PIAuditImagePathList { get; set; }
+
+        public PIAuditState PIAuditState { get; set; }
+
+
+    }
+
+    public class PIAuditTaskReplyCommand
+    {
+        [NotDefault]
+        public Guid VisitTaskId { get; set; }
+
+        public string ReplyContent { get; set; } = string.Empty;
+    }
+
+    public class PIAuditDialogQuery
+    {
+        [NotDefault]
+        public Guid VisitTaskId { get; set; }
+    }
+
+    public class ClinicalDataDialog
+    {
+        public Guid Id { get; set; }
+        public DateTime CreateTime { get; set; }
+        public string Content { get; set; }
     }
 
 
+    public class PIAuditDialogListView : PIAuditTaskCommand
+    {
+
+        public string ReplyContent { get; set; } = string.Empty;
+
+        public bool? IsEnrollment { get; set; }
+
+        public bool? IsPDConfirm { get; set; }
+
+        public bool IsCurrentUser { get; set; }
+
+        public Guid CreateUserId { get; set; }
+
+        public string CreateUserName { get; set; }
 
 
+        public DateTime CreateTime { get; set; }
 
 
+        public UserTypeEnum UserTypeEnum { get; set; }
+
+
+    }
 
 
 
@@ -413,15 +528,15 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public int FinishTaskCount { get; set; }
 
-        /// <summary>
-        /// 未完成裁判任务数量
-        /// </summary>
-        public int UnReadJudgeTaskCount { get; set; }
+        ///// <summary>
+        ///// 未完成裁判任务数量
+        ///// </summary>
+        //public int UnReadJudgeTaskCount { get; set; }
 
-        /// <summary>
-        /// 完成裁判任务数量
-        /// </summary>
-        public int FinishJudgeTaskCount { get; set; }
+        ///// <summary>
+        ///// 完成裁判任务数量
+        ///// </summary>
+        //public int FinishJudgeTaskCount { get; set; }
 
         /// <summary>
         /// 建议完成时间
@@ -794,6 +909,19 @@ namespace IRaCIS.Core.Application.ViewModel
         CancelAssign = 4,
     }
 
+    public class ClaimSubjectDto
+    {
+        public bool IsInOrder { get; set; }
+
+        public Guid? VisitTaskId { get; set; }
+
+        public Guid TrialReadingCriterionId { get; set; }
+
+        public Guid SubejctId { get; set; }
+
+        public bool IsClaim { get; set; }
+    }
+
 }
 
 

IRaCIS.Core.Application/Service/Allocation/Interface/IVisitTaskService.cs

@@ -17,5 +17,7 @@ namespace IRaCIS.Core.Application.Service
         Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService);
 
         Task<(int, List<IRUnReadSubjectView>)> GetOrderReadingIQueryable(GetOrderReadingIQueryableInDto inDto);
+
+        Task<IQueryable<VisitTask>> GetNotOrderReadingQueryableAsync(Guid trialId, Guid trialReadingCriterionId);
     }
 }

IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs

@@ -1,225 +0,0 @@
-//--------------------------------------------------------------------
-//     此代码由T4模板自动生成  byzhouhang 20210918
-//	   生成时间 2022-06-07 13:14:38 
-//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-//--------------------------------------------------------------------
-
-using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Application.Interfaces;
-using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Filter;
-
-namespace IRaCIS.Core.Application.Service
-{
-    /// <summary>
-    /// 分配规则
-    /// </summary>	
-    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TaskAllocationRuleService : BaseService, ITaskAllocationRuleService
-    {
-
-        private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
-        private readonly IRepository<User> _userRepository;
-
-        private readonly IRepository<Trial> _trialRepository;
-
-        private readonly IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository;
-
-
-
-        public TaskAllocationRuleService(IRepository<TaskAllocationRule> taskAllocationRuleRepository, IRepository<User> userRepository, IRepository<Trial> trialRepository, IRepository<SubjectCanceDoctor> subjectCanceDoctorRepository)
-        {
-            _taskAllocationRuleRepository = taskAllocationRuleRepository;
-            _userRepository = userRepository;
-            _trialRepository = trialRepository;
-            _subjectCanceDoctorRepository = subjectCanceDoctorRepository;
-        }
-
-
-
-        
-        /// <summary>
-        /// 获取计划列表  医生带阅片类型
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <returns></returns>
-        public async Task<(List<TaskAllocationRuleDTO>,object)> GetDoctorPlanAllocationRuleList(Guid trialId)
-        {
-
-            var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<TaskAllocationRuleDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-            //所有标准都是一样  后台只返回任意一个标准的就好了
-            var trialTaskConfig = _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
-
-            return (list, trialTaskConfig);
-        }
-
-
-
-
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule)
-        {
-
-
-            //冗余 存
-
-            var enrollId = _repository.Where<Enroll>(t => t.TrialId == addOrEditTaskAllocationRule.TrialId && t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId).Select(t => t.Id).FirstOrDefault();
-
-            if (enrollId == Guid.Empty)
-            {
-                //"错误，未在入组表中找到该医生得账号Id"
-                return ResponseOutput.NotOk(_localizer["TaskAllocation_DoctorIdNotFound"]);
-            }
-
-            addOrEditTaskAllocationRule.EnrollId = enrollId;
-
-            var verifyExp1 = new EntityVerifyExp<TaskAllocationRule>()
-            {
-                VerifyExp = t => t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId && t.TrialId == addOrEditTaskAllocationRule.TrialId,
-                // "已有该医生配置，不允许继续增加"
-                VerifyMsg = _localizer["TaskAllocation_DoctorConfigExists"]
-            };
-
-            var entity = await _taskAllocationRuleRepository.InsertOrUpdateAsync(addOrEditTaskAllocationRule, true, verifyExp1);
-
-            return ResponseOutput.Ok(entity.Id.ToString());
-
-        }
-
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        [HttpDelete("{taskAllocationRuleId:guid}")]
-        public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId)
-        {
-            if (await _taskAllocationRuleRepository.Where(t => t.Id == taskAllocationRuleId).AnyAsync(t => t.DoctorUser.VisitTaskList.Where(u => u.TrialId == t.TrialId).Any()))
-            {
-                //"已分配任务给该医生，不允许删除"
-                return ResponseOutput.NotOk(_localizer["TaskAllocation_TaskAssigned"]);
-            }
-
-            var success = await _taskAllocationRuleRepository.DeleteFromQueryAsync(t => t.Id == taskAllocationRuleId, true);
-
-
-            return ResponseOutput.Ok();
-        }
-
-
-        //public async Task<IResponseOutput> AddSubjectCancelDoctorNote(CancelDoctorCommand command)
-        //{
-        //    await _subjectCanceDoctorRepository.InsertOrUpdateAsync(command, true);
-
-        //    return ResponseOutput.Ok();
-        //}
-
-        public async Task<List<SubjectCancelDoctorView>> GetSubjectCancelDoctorHistoryList(Guid subjectId)
-        {
-            var list = await _subjectCanceDoctorRepository.Where(t => t.SubjectId == subjectId).ProjectTo<SubjectCancelDoctorView>(_mapper.ConfigurationProvider).ToListAsync();
-
-            return list;
-        }
-
-
-
-
-
-
-        /// <summary>
-        /// 获取项目下 医生账户信息下拉
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <param name="_enrollRepository"></param>
-        /// <returns></returns>
-        [HttpGet("{trialId:guid}")]
-        public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository)
-        {
-            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
-                        join user in _userRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
-                        select new TrialDoctorUserSelectView()
-                        {
-                            TrialId = enroll.TrialId,
-                            //ReadingType = enroll.Trial.ReadingType,
-                            DoctorUserId = user.Id,
-                            FullName = user.FullName,
-                            UserCode = user.UserCode,
-                            UserName = user.UserName,
-                            UserTypeEnum = user.UserTypeRole.UserTypeEnum,
-                            ReadingCategoryList = enroll.EnrollReadingCategoryList.Select(t => t.ReadingCategory).ToList()
-
-                        };
-
-            return  await query.ToListAsync();
-        }
-
-
-        [HttpPost]
-        public async Task<List<TrialDoctorUserSelectView>> GetDoctorSelectList(DoctorSelectQuery selectQuery, [FromServices] IRepository<Enroll> _enrollRepository)
-        {
-
-            var query = from allocationRule in _taskAllocationRuleRepository.Where(t => t.TrialId == selectQuery.TrialId && t.IsEnable)
-                                              .WhereIf(selectQuery.ReadingCategory != null && selectQuery.TrialReadingCriterionId == null, t => t.Enroll.EnrollReadingCategoryList.Any(t => t.ReadingCategory == selectQuery.ReadingCategory))
-                                              .WhereIf(selectQuery.TrialReadingCriterionId != null && selectQuery.ReadingCategory == null, t => t.Enroll.EnrollReadingCategoryList.Any(t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId))
-                                              .WhereIf(selectQuery.TrialReadingCriterionId != null && selectQuery.ReadingCategory !=null, 
-                                                   t => t.Enroll.EnrollReadingCategoryList.Any(t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId && t.ReadingCategory==selectQuery.ReadingCategory))
-                        join user in _userRepository.AsQueryable() on allocationRule.DoctorUserId equals user.Id
-                        select new TrialDoctorUserSelectView()
-                        {
-                            TrialId = allocationRule.TrialId,
-                            DoctorUserId = user.Id,
-                            FullName = user.FullName,
-                            UserCode = user.UserCode,
-                            UserName = user.UserName,
-                            UserTypeEnum = user.UserTypeRole.UserTypeEnum,
-
-                            ReadingCategoryList = selectQuery.TrialReadingCriterionId == null  ?
-                            
-                           allocationRule.Enroll.EnrollReadingCategoryList.Where(t=> (selectQuery.ReadingCategory == null ?true: t.ReadingCategory == selectQuery.ReadingCategory) ).Select(t => t.ReadingCategory).OrderBy(t => t).ToList() :
-                          
-                           allocationRule.Enroll.EnrollReadingCategoryList
-                           .Where(t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId && (selectQuery.ReadingCategory == null?true : t.ReadingCategory == selectQuery.ReadingCategory) )
-                           .Select(t => t.ReadingCategory).OrderBy(t => t).ToList()
-                        };
-
-            return await query.ToListAsync();
-        }
-
-
-        #region 废弃
-        /// <summary>
-        /// 获取访视任务   应用Subject后  医生比率情况
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [Obsolete]
-        public async Task<List<DoctorVisitTaskStatView>> GetSubjectApplyDoctorTaskStatList(ApplySubjectCommand assignConfirmCommand)
-        {
-            var taskAllocationRuleQueryable = _taskAllocationRuleRepository.Where(t => t.TrialId == assignConfirmCommand.TrialId && t.IsJudgeDoctor == assignConfirmCommand.IsJudgeDoctor)
-            .ProjectTo<DoctorVisitTaskStatView>(_mapper.ConfigurationProvider, new { subjectIdList = assignConfirmCommand.SubjectIdList, isJudgeDoctor = assignConfirmCommand.IsJudgeDoctor });
-
-            return await taskAllocationRuleQueryable.ToListAsync();
-        }
-
-
-
-        [HttpPost]
-        [Obsolete]
-        public async Task<List<DoctorVisitTaskStatView>> GetTaskAllocationRuleList(TaskAllocationRuleQuery queryTaskAllocationRule)
-        {
-            var taskAllocationRuleQueryable = _taskAllocationRuleRepository.Where(t => t.TrialId == queryTaskAllocationRule.TrialId /*&& t.IsJudgeDoctor == queryTaskAllocationRule.IsJudgeDoctor*/)
-             .ProjectTo<DoctorVisitTaskStatView>(_mapper.ConfigurationProvider);
-
-
-            //var trialTaskConfig = _trialRepository.Where(t => t.Id == queryTaskAllocationRule.TrialId).ProjectTo<TrialProcessConfigDTO>(_mapper.ConfigurationProvider, new { isJudgeDoctor = queryTaskAllocationRule.IsJudgeDoctor }).FirstOrDefault();
-
-            return await taskAllocationRuleQueryable.ToListAsync();
-        }
-
-        #endregion
-
-
-    }
-}

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -1,777 +0,0 @@
-//--------------------------------------------------------------------
-//     此代码由T4模板自动生成  byzhouhang 20210918
-//	   生成时间 2022-07-01 15:33:04 
-//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-//--------------------------------------------------------------------
-
-using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Application.Interfaces;
-using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Domain.Share;
-using System.Linq.Expressions;
-using IRaCIS.Core.Infra.EFCore.Common;
-using System.Linq;
-using Nito.AsyncEx;
-using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Application.Filter;
-
-namespace IRaCIS.Core.Application.Service
-{
-    /// <summary>
-    /// 一致性分析配置表
-    /// </summary>	
-    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TaskConsistentRuleService : BaseService, ITaskConsistentRuleService
-    {
-
-        private readonly IRepository<TaskConsistentRule> _taskConsistentRuleRepository;
-        private readonly IRepository<VisitTask> _visitTaskRepository;
-        private readonly IRepository<SubjectUser> _subjectUserRepository;
-        private readonly IRepository<Subject> _subjectRepository;
-        private readonly IRepository<Enroll> _enrollRepository;
-
-        private readonly AsyncLock _mutex = new AsyncLock();
-
-        public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository, IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository)
-        {
-            _taskConsistentRuleRepository = taskConsistentRuleRepository;
-            _visitTaskRepository = visitTaskRepository;
-            _subjectUserRepository = subjectUserRepository;
-            _subjectRepository = subjectRepository;
-            _enrollRepository = enrollRepository;
-        }
-
-        /// <summary>
-        /// 设置一致性分析任务失效
-        /// </summary>
-        /// <param name="taskIdList"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> SetAnalysisTaskInvalid(List<Guid> taskIdList)
-        {
-
-
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => taskIdList.Contains(t.Id), u => new VisitTask() { TaskState = TaskState.NotEffect },true);
-
-            await _visitTaskRepository.SaveChangesAsync();
-
-            return ResponseOutput.Ok();
-
-        }
-
-
-        /// <summary>
-        /// 一致性分析列表  (自身 组内  最后勾选 产生的任务)
-        /// </summary>
-        /// <param name="queryVisitTask"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<PageOutput<AnalysisTaskView>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
-        {
-            var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
-                .Where(t => t.IsAnalysisCreate)
-
-               .WhereIf(queryVisitTask.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == queryVisitTask.TrialReadingCriterionId)
-
-               .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
-               .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
-               .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
-               .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
-               .WhereIf(queryVisitTask.DoctorUserId != null, t => t.DoctorUserId == queryVisitTask.DoctorUserId)
-               .WhereIf(queryVisitTask.ReadingCategory != null, t => t.ReadingCategory == queryVisitTask.ReadingCategory)
-               .WhereIf(queryVisitTask.ReadingTaskState != null, t => t.ReadingTaskState == queryVisitTask.ReadingTaskState)
-               .WhereIf(queryVisitTask.TaskAllocationState != null, t => t.TaskAllocationState == queryVisitTask.TaskAllocationState)
-               .WhereIf(queryVisitTask.IsSelfAnalysis != null, t => t.IsSelfAnalysis == queryVisitTask.IsSelfAnalysis)
-               .WhereIf(queryVisitTask.ArmEnum != null, t => t.ArmEnum == queryVisitTask.ArmEnum)
-               .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TrialSiteCode), t => (t.BlindTrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.IsAnalysisCreate) || (t.Subject.TrialSite.TrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.IsAnalysisCreate == false))
-               .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskName), t => t.TaskName.Contains(queryVisitTask.TaskName) || t.TaskBlindName.Contains(queryVisitTask.TaskName))
-                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => (t.Subject.Code.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate))
-               .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)
-               .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
-               .ProjectTo<AnalysisTaskView>(_mapper.ConfigurationProvider);
-
-            var defalutSortArray = new string[] { nameof(VisitTask.IsUrgent) + " desc", nameof(VisitTask.SubjectId), nameof(VisitTask.VisitTaskNum) };
-
-            var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
-
-            //var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
-            return pageList;
-        }
-
-
-        /// <summary>
-        /// 为自身一致性分析医生，选择Subejct 列表
-        /// </summary>
-        /// <param name="inQuery"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<PageOutput<DoctorSelfConsistentSubjectView>> GetDoctorSelfConsistentRuleSubjectList(ConsistentQuery inQuery)
-        {
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.Id == inQuery.TaskConsistentRuleId);
-
-            var pagedList = await GetIQueryableDoctorSelfConsistentSubjectView(filterObj, inQuery.DoctorUserId).ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(DoctorSelfConsistentSubjectView.SubjectCode) : inQuery.SortField, inQuery.Asc);
-
-            return pagedList;
-        }
-
-
-
-        /// <summary>
-        /// 确认生成自身一致性分析任务
-        /// </summary>
-        /// <param name="inCommand"></param>
-        /// <param name="_visitTaskCommonService"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [UnitOfWork]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        public async Task<IResponseOutput> ConfirmGenerateSelfConsistentTask(ConsistentConfirmGenerateCommand inCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
-        {
-
-
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.Id == inCommand.TaskConsistentRuleId);
-            var doctorUserId = inCommand.DoctorUserId;
-            var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
-
-            var list = await GetIQueryableDoctorSelfConsistentSubjectView(filterObj, doctorUserId, inCommand.SubejctIdList).ToListAsync();
-
-            //var (group, query) = GetIQueryableDoctorSelfConsistentRuleSubjectView(filterObj, inCommand.SubejctIdList);
-
-            //var list = query.OrderByDescending(t => t.IsHaveGeneratedTask).ToList();
-
-            using (await _mutex.LockAsync())
-            {
-                int maxCodeInt = 0;
-
-                foreach (var subject in list)
-                {
-                    //处理 Subject 编号 
-
-                    var blindSubjectCode = string.Empty;
-
-                    var subjectTask = _visitTaskRepository.Where(t => t.SubjectId == subject.SubjectId && t.TrialReadingCriterionId==trialReadingCriterionId && t.IsSelfAnalysis == true).OrderByDescending(t => t.BlindSubjectCode).FirstOrDefault();
-
-                    if (subjectTask!=null &&  subjectTask.BlindSubjectCode != String.Empty)
-                    {
-                        blindSubjectCode = subjectTask.BlindSubjectCode;
-                    }
-                    else
-                    {
-                        var maxCodeStr = _visitTaskRepository.Where(t => t.TrialId == subject.TrialId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis == true).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault();
-
-                        if ( !string.IsNullOrEmpty(maxCodeStr))
-                        {
-                            int.TryParse(maxCodeStr.Substring(maxCodeStr.Length - filterObj.BlindSubjectNumberOfPlaces), out maxCodeInt);
-
-                        }                      
-
-                        blindSubjectCode = filterObj.BlindTrialSiteCode + (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
-                    }
-
-                    subject.VisitTaskList = subject.VisitTaskList.Take(filterObj.PlanVisitCount).ToList();
-
-                    subject.VisitTaskList.ForEach(t =>
-                    {
-                        t.DoctorUserId = doctorUserId;
-                        //t.TaskConsistentRuleId = filterObj.Id;
-                        t.BlindTrialSiteCode = filterObj.BlindTrialSiteCode;
-                        t.BlindSubjectCode = blindSubjectCode;
-                    });
-
-
-                    //最后一个访视添加全局
-                    if (filterObj.IsGenerateGlobalTask)
-                    {
-                        var lastTask = (subject.VisitTaskList.Take(filterObj.PlanVisitCount).Last()).Clone();
-
-                        var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId &&t.TrialReadingCriterionId==trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
-
-
-                        if (existGlobal == null)
-                        {
-                            existGlobal = new VisitTaskSimpleDTO()
-                            {
-                                SubjectId = lastTask.SubjectId,
-                                TrialId = lastTask.TrialId,
-                                ArmEnum = lastTask.ArmEnum,
-                                ReadingCategory = ReadingCategory.Global,
-                                TaskName = lastTask.TaskName + "_Global",
-                                TaskBlindName = lastTask.TaskBlindName + "_Global",
-                                TrialReadingCriterionId=trialReadingCriterionId,
-                            };
-                        }
-
-
-                        existGlobal.DoctorUserId = doctorUserId;
-                        existGlobal.BlindSubjectCode = lastTask.BlindSubjectCode;
-                        existGlobal.BlindTrialSiteCode = lastTask.BlindTrialSiteCode;
-
-                        subject.VisitTaskList.Add(existGlobal);
-                    }
-
-
-
-                    await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()
-                    {
-                        TrialId = filterObj.TrialId,
-
-                        ReadingCategory = GenerateTaskCategory.SelfConsistent,
-
-
-                        //产生的过滤掉已经生成的
-                        GenerataConsistentTaskList = subject.VisitTaskList.Where(t => t.IsHaveGeneratedTask == false).ToList()
-                    });
-
-                    await _visitTaskRepository.SaveChangesAsync();
-
-                }
-            }
-
-            return ResponseOutput.Ok();
-
-
-        }
-
-
-        /// <summary>
-        /// 组间一致性分析  选择Subejct 列表
-        /// </summary>
-        /// <param name="inQuery"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<PageOutput<DoctorGroupConsistentSubjectView>> GetGroupConsistentRuleSubjectList(GroupConsistentQuery inQuery)
-        {
-            var trialId = inQuery.TrialId;
-
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId  &&  t.IsSelfAnalysis == false);
-
-
-            if (filterObj == null)
-            {
-                return new PageOutput<DoctorGroupConsistentSubjectView>();
-            }
-
-            var query = await GetGroupConsistentQueryAsync(filterObj);
-
-
-            var pagedList = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(DoctorSelfConsistentSubjectView.SubjectCode) : inQuery.SortField, inQuery.Asc);
-
-            return pagedList;
-        }
-
-
-
-        /// <summary>
-        /// 确认生成组间一致性分析任务
-        /// </summary>
-        /// <param name="inCommand"></param>
-        /// <param name="_visitTaskCommonService"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        public async Task<IResponseOutput> ConfirmGenerateGroupConsistentTask(GroupConsistentConfirmGenrateCommand inCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
-        {
-            var trialId = inCommand.TrialId;
-
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.IsSelfAnalysis == false);
-
-            var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
-
-
-            var query = await GetGroupConsistentQueryAsync(filterObj, inCommand.SubejctIdList);
-
-            var subjectList = query.ToList();
-
-            var doctorUserIdQuery = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId).Where(t => t.EnrollReadingCategoryList.Where(t=>t.TrialReadingCriterionId==trialReadingCriterionId).Any(c => c.ReadingCategory == ReadingCategory.Global || c.ReadingCategory == ReadingCategory.Visit))
-                                    join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
-                                    select user.Id;
-
-            var configDoctorUserIdList = await doctorUserIdQuery.ToListAsync();
-
-            using (await _mutex.LockAsync())
-            {
-                int maxCodeInt = 0;
-
-                foreach (var subject in subjectList.Where(t => t.IsHaveGeneratedTask == false))
-                {
-
-                    //组间一致性分析 也用盲态SubjectCode
-                    //处理 Subject 编号 
-
-                    var blindSubjectCode = string.Empty;
-
-                    var subjectTask = _visitTaskRepository.Where(t => t.SubjectId == subject.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis==false).OrderByDescending(t => t.BlindSubjectCode).FirstOrDefault();
-                    if (subjectTask != null && subjectTask.BlindSubjectCode != String.Empty)
-                    {
-                        blindSubjectCode = subjectTask.BlindSubjectCode;
-                    }
-                    else
-                    {
-                        var maxCodeStr = _visitTaskRepository.Where(t => t.TrialId == subject.TrialId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis == false).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault();
-
-                        if (!string.IsNullOrEmpty(maxCodeStr))
-                        {
-                            int.TryParse(maxCodeStr.Substring(maxCodeStr.Length - filterObj.BlindSubjectNumberOfPlaces), out maxCodeInt);
-
-                        }
-
-                        blindSubjectCode = filterObj.BlindTrialSiteCode + (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
-                    }
-
-
-
-
-
-
-                    var subjectAddTaskList = new List<VisitTaskGroupSimpleDTO>();
-
-
-                    //需要处理的医生
-
-                    var needAddDoctorUserIdList = configDoctorUserIdList.Except(subject.VisitTaskList.Select(t => (Guid)t.DoctorUserId)).ToList();
-
-                    if (needAddDoctorUserIdList.Count == 0)
-                    {
-                        //"请配置一致性分析的医生"
-                        throw new BusinessValidationFailedException(_localizer["TaskConsistent_ConsistencyConfigExists"]);
-                    }
-
-
-                    foreach (var needAddDoctorUserId in needAddDoctorUserIdList)
-                    {
-
-                        //每个医生 都生成处理的任务
-                        foreach (var task in subject.SubjectTaskVisitList.Take(filterObj.PlanVisitCount))
-                        {
-
-                            subjectAddTaskList.Add(new VisitTaskGroupSimpleDTO()
-                            {
-                                ReadingCategory = task.ReadingCategory,
-                                ReadingTaskState = task.ReadingTaskState,
-                                TaskBlindName = task.TaskBlindName,
-                                TaskName = task.TaskName,
-                                TaskState = task.TaskState,
-                                SubjectId = task.SubjectId,
-                                VisitTaskNum = task.VisitTaskNum,
-                                TrialId = task.TrialId,
-                                DoctorUserId = needAddDoctorUserId,
-                                ArmEnum = Arm.GroupConsistentArm,
-                                SouceReadModuleId = task.SouceReadModuleId,
-                                SourceSubjectVisitId = task.SourceSubjectVisitId,
-
-                                TrialReadingCriterionId = task.TrialReadingCriterionId,
-
-                                BlindSubjectCode=blindSubjectCode,
-                                BlindTrialSiteCode=filterObj.BlindTrialSiteCode
-
-                                
-                            });
-
-                        }
-
-                        //最后一个访视添加全局
-
-                        if (filterObj.IsGenerateGlobalTask)
-                        {
-                            var lastTask = (subjectAddTaskList.Take(filterObj.PlanVisitCount).Last()).Clone();
-
-
-                            var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskGroupSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
-
-
-                            if (existGlobal == null)
-                            {
-                                existGlobal = new VisitTaskSimpleDTO()
-                                {
-                                    SubjectId = lastTask.SubjectId,
-                                    TrialId = lastTask.TrialId,
-                                    ReadingCategory = ReadingCategory.Global,
-                                    TaskName = lastTask.TaskName + "_Global",
-                                    TaskBlindName = lastTask.TaskBlindName + "_Global",
-
-                                    TrialReadingCriterionId = trialReadingCriterionId,
-
-                                    BlindSubjectCode = blindSubjectCode,
-                                    BlindTrialSiteCode = filterObj.BlindTrialSiteCode
-
-                                };
-                            }
-
-
-                            existGlobal.BlindSubjectCode = blindSubjectCode;
-                            existGlobal.BlindTrialSiteCode = filterObj.BlindTrialSiteCode;
-                            existGlobal.ArmEnum = Arm.GroupConsistentArm;
-                            existGlobal.DoctorUserId = needAddDoctorUserId;
-
-                            subjectAddTaskList.Add(existGlobal);
-                        }
-
-                    }
-
-
-                    await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()
-                    {
-                        TrialId = filterObj.TrialId,
-
-                        ReadingCategory = GenerateTaskCategory.GroupConsistent,
-
-
-                        GenerataGroupConsistentTaskList = subjectAddTaskList
-                    });
-
-
-                    await _taskConsistentRuleRepository.SaveChangesAsync();
-                }
-
-            }
-
-
-
-            return ResponseOutput.Ok();
-
-
-        }
-
-
-
-
-        /// <summary>
-        /// 仅仅自身一致性时使用（
-        /// </summary>
-        /// <param name="filterObj"></param>
-        /// <param name="doctorUserId"></param>
-        /// <param name="subejctIdList"></param>
-        /// <returns></returns>
-        private IQueryable<DoctorSelfConsistentSubjectView> GetIQueryableDoctorSelfConsistentSubjectView(TaskConsistentRule filterObj, Guid doctorUserId, List<Guid>? subejctIdList = null)
-        {
-            var trialId = filterObj.TrialId;
-
-            var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
-
-            #region Subejct 维度
-
-            Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && u.TrialReadingCriterionId== trialReadingCriterionId &&
-            u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject) && u.DoctorUserId == doctorUserId;
-
-
-
-
-            if (subejctIdList != null && subejctIdList?.Count > 0)
-            {
-                comonTaskFilter = comonTaskFilter.And(t => subejctIdList.Contains(t.SubjectId));
-            }
-
-
-            Expression<Func<VisitTask, bool>> visitTaskFilter = comonTaskFilter.And(t => t.ReadingCategory == ReadingCategory.Visit);
-
-            ////所选访视数量 的访视  其中必有一个访视后有全局任务
-            //if (filterObj.IsHaveReadingPeriod == true)
-            //{
-            //    //这里的过滤条件  不能用 where(comonTaskFilter)  会报错，奇怪的问题   只能重新写一遍
-            //    visitTaskFilter = visitTaskFilter.And(c => c.Subject.SubjectVisitTaskList.Any(t => t.VisitTaskNum == c.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] && t.ReadingCategory == ReadingCategory.Global && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned &&
-            //            t.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now && (t.ReReadingApplyState == ReReadingApplyState.Default || t.ReReadingApplyState == ReReadingApplyState.Reject)));
-
-            //}
-
-
-            var subjectQuery = _subjectRepository.Where(t => t.TrialId == trialId &&
-                 t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).Count() >= filterObj.PlanVisitCount)
-                .WhereIf(filterObj.IsHaveReadingPeriod == true, u => u.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global).OrderBy(t => t.VisitTaskNum).Take(filterObj.PlanVisitCount + 1).Any(t => t.ReadingCategory == ReadingCategory.Global))
-                ;
-
-
-
-            var query = subjectQuery.Select(t => new DoctorSelfConsistentSubjectView()
-            {
-                TrialId = t.TrialId,
-                SiteId = t.SiteId,
-                SubjectCode = t.Code,
-                TrialSiteCode = t.TrialSite.TrialSiteCode,
-                SubjectId = t.Id,
-
-                IsReReadingOrBackInfluenceAnalysis=t.IsReReadingOrBackInfluenceAnalysis,
-
-                BlindSubjectCode = t.SubjectVisitTaskList.Where(t => t.IsAnalysisCreate && t.TrialReadingCriterionId == trialReadingCriterionId).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault(),
-
-                IsHaveGeneratedTask = t.SubjectVisitTaskList.Any(c => c.DoctorUserId == doctorUserId && c.IsSelfAnalysis == true && c.TrialReadingCriterionId==trialReadingCriterionId),
-
-
-                ValidVisitCount = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).Count(),
-
-                VisitTaskList = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).OrderBy(t => t.VisitTaskNum).Select(c => new VisitTaskSimpleDTO()
-                {
-                    Id = c.Id,
-                    ReadingCategory = c.ReadingCategory,
-                    ReadingTaskState = c.ReadingTaskState,
-                    TaskBlindName = c.TaskBlindName,
-                    TaskCode = c.TaskCode,
-                    TaskName = c.TaskName,
-                    TaskState = c.TaskState,
-                    ArmEnum = c.ArmEnum,
-                    SubjectId = c.SubjectId,
-                    VisitTaskNum = c.VisitTaskNum,
-                    TrialId = c.TrialId,
-                    SourceSubjectVisitId = c.SourceSubjectVisitId,
-                    SouceReadModuleId = c.SouceReadModuleId,
-
-
-
-                    TrialReadingCriterionId=c.TrialReadingCriterionId,
-                    IsClinicalDataSign = c.IsClinicalDataSign,
-                    IsNeedClinicalDataSign = c.IsNeedClinicalDataSign,
-
-                    //自身一致性才有意义
-                    //IsHaveGeneratedTask = c.Subject.SubjectVisitTaskList.Any(t => t.ConsistentAnalysisOriginalTaskId == c.Id),
-
-                    GlobalVisitTaskList = c.Subject.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.VisitTaskNum == c.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).Select(c => new VisitTaskSimpleDTO()
-                    {
-                        Id = c.Id,
-                        ReadingCategory = c.ReadingCategory,
-                        ReadingTaskState = c.ReadingTaskState,
-                        TaskBlindName = c.TaskBlindName,
-                        TaskCode = c.TaskCode,
-                        TaskName = c.TaskName,
-                        TaskState = c.TaskState,
-                        ArmEnum = c.ArmEnum,
-                        SubjectId = c.SubjectId,
-                        VisitTaskNum = c.VisitTaskNum,
-                        TrialId = c.TrialId,
-                        SourceSubjectVisitId = c.SourceSubjectVisitId,
-                        SouceReadModuleId = c.SouceReadModuleId,
-
-                        TrialReadingCriterionId = c.TrialReadingCriterionId,
-                        IsClinicalDataSign = c.IsClinicalDataSign,
-                        IsNeedClinicalDataSign = c.IsNeedClinicalDataSign,
-                    }).ToList(),
-
-                }).ToList()
-            });
-
-            return query.OrderByDescending(t => t.IsHaveGeneratedTask);
-
-            #endregion
-        }
-
-
-
-
-        private async Task<IQueryable<DoctorGroupConsistentSubjectView>> GetGroupConsistentQueryAsync(TaskConsistentRule filterObj, List<Guid>? subejctIdList = null)
-        {
-
-            var trialId = filterObj.TrialId;
-            var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
-
-            //var trialConfig = (await _repository.Where<Trial>(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
-
-
-
-            Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && u.TrialReadingCriterionId == trialReadingCriterionId 
-            && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject);
-
-
-            if (subejctIdList != null && subejctIdList?.Count > 0)
-            {
-                comonTaskFilter = comonTaskFilter.And(t => subejctIdList.Contains(t.SubjectId));
-            }
-
-            Expression<Func<VisitTask, bool>> visitTaskFilter = comonTaskFilter.And(t => t.ReadingCategory == ReadingCategory.Visit);
-
-
-            ////所选访视数量 的访视  其中必有一个访视后有全局任务
-            //if (filterObj.IsHaveReadingPeriod == true)
-            //{
-            //    //visitTaskFilter = visitTaskFilter.And(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Any(u => u.VisitTaskNum == t.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] && u.ReadingCategory == ReadingCategory.Global));
-
-            //    //这里的过滤条件  不能用 where(comonTaskFilter)  会报错，奇怪的问题   只能重新写一遍
-            //    visitTaskFilter = visitTaskFilter.And(c => c.Subject.SubjectVisitTaskList.Any(t => t.VisitTaskNum == c.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] && t.ReadingCategory == ReadingCategory.Global && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned &&
-            //            t.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now && (t.ReReadingApplyState == ReReadingApplyState.Default || t.ReReadingApplyState == ReReadingApplyState.Reject)));
-
-            //}
-
-
-            IQueryable<Subject> subjectQuery = default;
-
-            //单重阅片没有组件一致性
-
-            subjectQuery = _subjectRepository.Where(t => t.TrialId == trialId &&
-            t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global).Select(t => t.DoctorUserId).Distinct().Count() == 2 &&
-            t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Count() >= filterObj.PlanVisitCount
-            )
-                 .WhereIf(filterObj.IsHaveReadingPeriod == true, u => u.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global).OrderBy(t => t.VisitTaskNum).Take(filterObj.PlanVisitCount * 2 + 2).Any(t => t.ReadingCategory == ReadingCategory.Global))
-
-                ;
-
-
-
-            var query = subjectQuery.Select(t => new DoctorGroupConsistentSubjectView()
-            {
-                TrialId = t.TrialId,
-                SiteId = t.SiteId,
-                SubjectCode = t.Code,
-                TrialSiteCode = t.TrialSite.TrialSiteCode,
-                SubjectId = t.Id,
-                IsReReadingOrBackInfluenceAnalysis = t.IsReReadingOrBackInfluenceAnalysis,
-
-                IsHaveGeneratedTask = t.SubjectVisitTaskList.Any(c => c.IsSelfAnalysis == false && c.TrialReadingCriterionId==trialReadingCriterionId),
-
-
-                ValidVisitCount = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Count(),
-
-                VisitTaskList = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter)
-                .Select(c => new VisitTaskGroupSimpleDTO()
-                {
-                    ReadingCategory = c.ReadingCategory,
-                    ReadingTaskState = c.ReadingTaskState,
-                    TaskBlindName = c.TaskBlindName,
-                    TaskName = c.TaskName,
-                    TaskState = c.TaskState,
-                    SubjectId = c.SubjectId,
-                    VisitTaskNum = c.VisitTaskNum,
-                    TrialId = c.TrialId,
-                    DoctorUserId = c.DoctorUserId,
-
-                    SourceSubjectVisitId = c.SourceSubjectVisitId,
-                    SouceReadModuleId = c.SouceReadModuleId,
-
-                    TrialReadingCriterionId = c.TrialReadingCriterionId,
-                    IsClinicalDataSign = c.IsClinicalDataSign,
-                    IsNeedClinicalDataSign = c.IsNeedClinicalDataSign,
-
-                }).ToList()
-
-                //
-            });
-
-            query = query.OrderByDescending(t => t.IsHaveGeneratedTask);
-
-            return query;
-        }
-
-
-
-
-        [HttpPost]
-        public async Task<TaskConsistentRuleBasic?> GetConsistentRule(TaskConsistentRuleQuery inQuery)
-        {
-            return await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-        }
-
-        /// <summary>
-        /// 自身一致性分配 配置+  统计已经生成数量统计表
-        /// </summary>
-        /// <param name="inQuery"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<List<TaskConsistentRuleView>> GetSelfConsistentDoctorStatList(TaskConsistentRuleQuery inQuery)
-        {
-            var trialId = inQuery.TrialId;
-
-            var taskConsistentRuleQueryable = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId && t.EnrollStatus==EnrollStatus.ConfirmIntoGroup)
-                                              join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
-                                              join taskConsistentRule in _repository.Where<TaskConsistentRule>(t => t.TrialId == trialId &&t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId  && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
-                                              select new TaskConsistentRuleView()
-                                              {
-                                                  Id = taskConsistentRule.Id,
-                                                  CreateTime = taskConsistentRule.CreateTime,
-                                                  BlindTrialSiteCode = taskConsistentRule.BlindTrialSiteCode,
-                                                  BlindSubjectNumberOfPlaces = taskConsistentRule.BlindSubjectNumberOfPlaces,
-                                                  CreateUserId = taskConsistentRule.CreateUserId,
-                                                  IntervalWeeks = taskConsistentRule.IntervalWeeks,
-                                                  IsEnable = taskConsistentRule.IsEnable,
-                                                  PlanSubjectCount = taskConsistentRule.PlanSubjectCount,
-                                                  Note = taskConsistentRule.Note,
-                                                  TrialId = taskConsistentRule.TrialId,
-                                                  UpdateTime = taskConsistentRule.UpdateTime,
-                                                  UpdateUserId = taskConsistentRule.UpdateUserId,
-                                                  IsGenerateGlobalTask = taskConsistentRule.IsGenerateGlobalTask,
-                                                  IsHaveReadingPeriod = taskConsistentRule.IsHaveReadingPeriod,
-                                                  PlanVisitCount = taskConsistentRule.PlanVisitCount,
-
-                                                  GeneratedSubjectCount = taskConsistentRule.Trial.VisitTaskList.Where(t => t.IsAnalysisCreate && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis == true && t.DoctorUserId == user.Id).Select(t => t.SubjectId).Distinct().Count(),
-
-                                                  AnalysisDoctorUser = new UserSimpleInfo()
-                                                  {
-                                                      UserId = user.Id,
-                                                      UserCode = user.UserCode,
-                                                      FullName = user.FullName,
-                                                      UserName = user.UserName
-                                                  }
-                                              };
-
-
-
-            //if (await _taskConsistentRuleRepository.AnyAsync(t => t.TrialId == inQuery.TrialId))
-            //{
-            //    var rule = await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId).ProjectTo<TaskConsistentRuleBatchAddOrEdit>(_mapper.ConfigurationProvider).FirstAsync();
-
-            //    rule.IsBatchAdd = true;
-
-            //    await BatchAddOrUpdateTaskConsistentRule(rule);
-            //}
-
-            //#endregion
-
-            //var taskConsistentRuleQueryable = _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId)
-            // .ProjectTo<TaskConsistentRuleView>(_mapper.ConfigurationProvider);
-
-            return await taskConsistentRuleQueryable.ToListAsync();
-        }
-
-
-
-
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        public async Task<IResponseOutput> AddOrUpdateTaskConsistentRule(TaskConsistentRuleAddOrEdit addOrEditTaskConsistentRule)
-        {
-
-            var verifyExp1 = new EntityVerifyExp<TaskConsistentRule>()
-            {
-                VerifyExp = t => t.TrialId == addOrEditTaskConsistentRule.TrialId && t.IsSelfAnalysis == addOrEditTaskConsistentRule.IsSelfAnalysis && t.TrialReadingCriterionId==addOrEditTaskConsistentRule.TrialReadingCriterionId,
-                //"已有该项目配置，不允许继续增加"
-                VerifyMsg = _localizer["TaskConsistent_TaskGenerated"]
-            };
-
-            if (await _visitTaskRepository.AnyAsync(t => t.IsSelfAnalysis == addOrEditTaskConsistentRule.IsSelfAnalysis && t.TrialId == addOrEditTaskConsistentRule.TrialId && t.TrialReadingCriterionId == addOrEditTaskConsistentRule.TrialReadingCriterionId))
-            {
-                //"该标准已有Subject 生成了任务，不允许修改配置"
-                return ResponseOutput.NotOk(_localizer["TaskConsistent_MedicalAuditTaskExists"]);
-            }
-
-            var entity = await _taskConsistentRuleRepository.InsertOrUpdateAsync(addOrEditTaskConsistentRule, true, verifyExp1);
-
-            return ResponseOutput.Ok(entity.Id.ToString());
-
-        }
-
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-
-        [HttpDelete("{taskConsistentRuleId:guid}")]
-        public async Task<IResponseOutput> DeleteTaskConsistentRule(Guid taskConsistentRuleId)
-        {
-            var config = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.Id == taskConsistentRuleId);
-
-
-            if (await _visitTaskRepository.AnyAsync(t => t.IsAnalysisCreate && t.TrialId == config.TrialId && t.IsSelfAnalysis == config.IsSelfAnalysis && t.TrialReadingCriterionId==config.TrialReadingCriterionId))
-            {
-                //"该标准已产生一致性分析任务，不允许删除"
-                throw new BusinessValidationFailedException(_localizer["TaskConsistent_SignedTaskCannotBeInvalidated"]);
-            }
-
-
-
-            var success = await _taskConsistentRuleRepository.DeleteFromQueryAsync(t => t.Id == taskConsistentRuleId, true);
-            return ResponseOutput.Ok();
-        }
-
-
-
-
-
-    }
-}

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -17,6 +17,7 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using System.Linq.Expressions;
 using IRaCIS.Core.Domain.Share.Reading;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -34,8 +35,6 @@ namespace IRaCIS.Core.Application.Service
         private readonly IEasyCachingProvider _provider;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository;
-        private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
-        private readonly IRepository<SubjectUser> _subjectUserRepository;
         private readonly IRepository<ReadModule> _readModuleRepository;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
@@ -51,10 +50,9 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<ClinicalDataTrialSet> _trialClinicalDataSetRepository;
         private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
 
-        private readonly IRepository<SubjectCriteriaEvaluation> _subjectCriteriaEvaluationRepository;
 
 
-        public VisitTaskHelpeService(IRepository<VisitTask> visitTaskRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Trial> trialRepository, IEasyCachingProvider provider,
+        public VisitTaskHelpeService(IRepository<VisitTask> visitTaskRepository, IRepository<Trial> trialRepository, IEasyCachingProvider provider,
              IRepository<SubjectVisit> subjectVisitRepository,
              IRepository<ReadModule> readModuleRepository,
              IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
@@ -63,9 +61,9 @@ namespace IRaCIS.Core.Application.Service
                            IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
                              IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
              IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
-             IRepository<TaskAllocationRule> taskAllocationRuleRepository, IMapper mapper, IUserInfo userInfo, IRepository<VisitTaskReReading> visitTaskReReadingRepository,
-             IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository, IRepository<ClinicalDataTrialSet> trialClinicalDataSetRepository, IRepository<ReadingClinicalData> readingClinicalDataRepository,
-              IRepository<SubjectCriteriaEvaluation> subjectCriteriaEvaluationRepository)
+             IMapper mapper, IUserInfo userInfo, IRepository<VisitTaskReReading> visitTaskReReadingRepository,
+             IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository, IRepository<ClinicalDataTrialSet> trialClinicalDataSetRepository, IRepository<ReadingClinicalData> readingClinicalDataRepository
+            )
         {
             _readingClinicalDataRepository = readingClinicalDataRepository;
             _trialClinicalDataSetRepository = trialClinicalDataSetRepository;
@@ -81,12 +79,9 @@ namespace IRaCIS.Core.Application.Service
             _provider = provider;
             _subjectVisitRepository = subjectVisitRepository;
             this._readingJudgeInfoRepository = readingJudgeInfoRepository;
-            _taskAllocationRuleRepository = taskAllocationRuleRepository;
-            _subjectUserRepository = subjectUserRepository;
             _mapper = mapper;
             _userInfo = userInfo;
             _visitTaskReReadingRepository = visitTaskReReadingRepository;
-            _subjectCriteriaEvaluationRepository = subjectCriteriaEvaluationRepository;
             _trialReadingCriterionRepository = trialReadingCriterionRepository;
         }
 
@@ -186,7 +181,6 @@ namespace IRaCIS.Core.Application.Service
 
             foreach (var subjectGroup in needGenerateVisit.GroupBy(t => t.SubjectId).Select(g => new { SubjectId = g.Key, SubjectVisitList = g.ToList() }))
             {
-                var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectGroup.SubjectId && t.OrignalSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
 
 
 
@@ -314,24 +308,6 @@ namespace IRaCIS.Core.Application.Service
 
                         var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
-                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                        {
-                            task1.TaskAllocationState = defaultState;
-                            //分配给对应Arm的人
-                            task1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1).DoctorUserId;
-                            task1.AllocateTime = DateTime.Now;
-
-                            task1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                        }
-
-                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
-                        {
-                            task2.TaskAllocationState = defaultState;
-                            task2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2).DoctorUserId;
-                            task2.AllocateTime = DateTime.Now;
-                            task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                        }
-
                     }
                     else if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single)
                     {
@@ -374,20 +350,6 @@ namespace IRaCIS.Core.Application.Service
 
                         var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
-                        if (assignConfigList.Any(t => t.ArmEnum == Arm.SingleReadingArm))
-                        {
-                            singleTask.TaskAllocationState = defaultState;
-
-                            singleTask.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.SingleReadingArm).DoctorUserId;
-
-                            singleTask.AllocateTime = DateTime.Now;
-
-                            singleTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                        }
-
-
-
-
                     }
                     await _visitTaskRepository.SaveChangesAsync();
 
@@ -459,6 +421,13 @@ namespace IRaCIS.Core.Application.Service
             var haveSignedCount = _readingClinicalDataRepository
                 .Where(t => t.TrialId == trialId && t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
 
+
+            var readModule = _readModuleRepository.Where(t => t.Id == readingId).FirstOrDefault();
+            //CRC 阅片期自定义结构化录入是否签名
+            bool crcReadModuleSign = true;
+
+
+
             //访视
             if (readingCategory == ReadingCategory.Visit)
             {
@@ -478,16 +447,37 @@ namespace IRaCIS.Core.Application.Service
             {
 
             }
+
             //阅片期
             else if (readingCategory == ReadingCategory.Global)
             {
                 needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId) && t.ClinicalDataLevel == ClinicalLevel.ImageRead && t.UploadRole == UploadRole.PM).Count();
 
+                if (readModule != null)
+                {
+                    // 不存在需要CRC上传的临床数据 或者 PM已确认
+                    crcReadModuleSign =
+                    !trialClinicalDataSetList.Any(x =>
+                     x.UploadRole == UploadRole.CRC
+                    && x.ClinicalDataLevel == ClinicalLevel.ImageRead
+                    && x.ClinicalUploadType == ClinicalUploadType.Structuring
+                    && x.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId)) || readModule.IsPMConfirm;
+                }
             }
             // 肿瘤学
             else if (readingCategory == ReadingCategory.Oncology)
             {
-                return trialClinicalDataSetList.Any(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead);
+                needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead && t.UploadRole == UploadRole.PM).Count();
+                if (readModule != null)
+                {
+                    // 不存在需要CRC上传的临床数据 或者 PM已确认
+                    crcReadModuleSign =
+                    !trialClinicalDataSetList.Any(x =>
+                     x.UploadRole == UploadRole.CRC
+                    && x.ClinicalDataLevel == ClinicalLevel.OncologyRead
+                    && x.ClinicalUploadType == ClinicalUploadType.Structuring
+                    && x.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId)) || readModule.IsPMConfirm;
+                }
             }
             else
             {
@@ -495,7 +485,7 @@ namespace IRaCIS.Core.Application.Service
             }
 
             //可能仅仅CRC 基线   没有PM
-            if (needSignCount == haveSignedCount /*&& needSignCount != 0*/)
+            if (needSignCount == haveSignedCount && crcReadModuleSign)
             {
                 isClinicalDataSign = true;
 
@@ -617,23 +607,18 @@ namespace IRaCIS.Core.Application.Service
 
                             var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId && t.IsLostVisit == false).OrderBy(t => t.VisitNum).Select(t => t.VisitNum).ToList();
 
-
                             foreach (var trialReadingCriterionConfig in trialReadingCriterionConfigList)
                             {
+                                var trialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId;
 
-                                //var subjectCriteriaEvaluation = _subjectCriteriaEvaluationRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.IsJoinEvaluation && t.SubjectId == subjectVisit.SubjectId).FirstOrDefault();
-
-                                if (trialReadingCriterionConfig.IsAutoCreate == true /*|| (trialReadingCriterionConfig.IsAutoCreate == false && subjectCriteriaEvaluation != null && subjectCriteriaEvaluation?.IsJoinEvaluation == true)*/)
-
+                                if (trialReadingCriterionConfig.IsAutoCreate == true)
                                 {
 
-                                    var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.OrignalSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
-
 
                                     var blindTaskName = string.Empty;
 
-                                    var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList);
-                                    var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
+                                    var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionId, clinicalDataConfirmList);
+                                    var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
 
 
                                     if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
@@ -653,371 +638,7 @@ namespace IRaCIS.Core.Application.Service
                                     }
 
 
-                                    //每个访视 根据项目配置生成任务  双审生成两个 
-
-                                    //双重 可能有一个人的任务没分配，然后影像回退不会影响未分配的任务，所以生成的时候 要进行判断 不能每次都生成两个
-                                    if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
-                                    {
-
-                                        var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
-                                        && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.TaskState == TaskState.Effect
-                                        && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
-
-                                        VisitTask? task1 = null;
-                                        VisitTask? task2 = null;
-
-
-                                        if (!existCurrentVisitTaskList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1))
-                                        {
-                                            currentMaxCodeInt = currentMaxCodeInt + 1;
-
-                                            task1 = await _visitTaskRepository.AddAsync(new VisitTask()
-                                            {
-                                                TrialId = trialId,
-                                                SubjectId = subjectVisit.SubjectId,
-                                                TaskBlindName = blindTaskName,
-
-                                                IsUrgent = subjectVisit.IsUrgent,
-                                                TaskUrgentType = taskUrgentType,
-                                                IsCanEditUrgentState = isCanEditUrgentState,
-                                                TaskName = subjectVisit.VisitName,
-                                                VisitTaskNum = subjectVisit.VisitNum,
-                                                //CheckPassedTime = subjectVisit.CheckPassedTime,
-                                                ArmEnum = Arm.DoubleReadingArm1,//特殊
-                                                Code = currentMaxCodeInt,
-                                                SourceSubjectVisitId = subjectVisit.Id,
-                                                TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt, nameof(VisitTask)),
-                                                ReadingCategory = ReadingCategory.Visit,
-
-                                                TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
-                                                IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                                IsClinicalDataSign = isClinicalDataSign
-                                            });
-                                        }
-
-                                        if (!existCurrentVisitTaskList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2))
-                                        {
-                                            currentMaxCodeInt = currentMaxCodeInt + 1;
-                                            task2 = await _visitTaskRepository.AddAsync(new VisitTask()
-                                            {
-                                                TrialId = trialId,
-                                                SubjectId = subjectVisit.SubjectId,
-                                                TaskBlindName = blindTaskName,
-                                                TaskName = subjectVisit.VisitName,
-                                                IsUrgent = subjectVisit.IsUrgent,
-
-                                                TaskUrgentType = taskUrgentType,
-                                                IsCanEditUrgentState = isCanEditUrgentState,
-                                                VisitTaskNum = subjectVisit.VisitNum,
-                                                //CheckPassedTime = subjectVisit.CheckPassedTime,
-                                                ArmEnum = Arm.DoubleReadingArm2,//特殊
-                                                Code = currentMaxCodeInt,
-                                                SourceSubjectVisitId = subjectVisit.Id,
-                                                TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt, nameof(VisitTask)),
-                                                ReadingCategory = ReadingCategory.Visit,
-
-                                                TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
-                                                IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                                IsClinicalDataSign = isClinicalDataSign
-                                            });
-                                        }
-
-
-                                        _provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30));
-
-
-                                        #region 分配
-                                        if (isAssignSubjectToDoctor)
-                                        {
-
-
-                                            if (trialReadingCriterionConfig.TaskAllocateObjEnum == TaskAllocateObj.Subject)
-                                            {
-                                                var allocateSubjectArmList = _visitTaskRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
-                                                       .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
-
-                                                //当前任务没有分配医生，初次分配  不处理 只生成任务，后续根据生成的任务 再进行分配
-                                                if (allocateSubjectArmList.Count == 0)
-                                                {
-
-                                                }
-                                                else
-                                                {
-                                                    //并且配置了医生 
-                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
-                                                    {
-
-                                                        #region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务  (PM 有序退回  或者PM  有序 申请重阅)
-
-
-                                                        if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
-                                                        {
-                                                            //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
-
-                                                            var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
-
-                                                            //之前有回退的，那么当前访视任务生成但是不分配
-                                                            if (beforeBackVisitTask != null)
-                                                            {
-                                                                //不用进行额外处理
-
-                                                                //访视2 PM 回退 基线回退  访视2先一致性核查通过，生成访视2任务，但是不分配
-                                                            }
-                                                            else
-                                                            {
-                                                                #region 当前访视根据配置规则分配出去
-
-                                                                var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
-
-                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                                                                {
-                                                                    task1.TaskAllocationState = defaultState;
-                                                                    //分配给对应Arm的人
-                                                                    task1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1).DoctorUserId;
-                                                                    task1.AllocateTime = DateTime.Now;
-
-                                                                    task1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                }
-
-                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
-                                                                {
-                                                                    task2.TaskAllocationState = defaultState;
-                                                                    task2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2).DoctorUserId;
-                                                                    task2.AllocateTime = DateTime.Now;
-                                                                    task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                }
-
-                                                                #endregion
-                                                            }
-
-                                                            //后续最近的未一致性核查通过的访视任务
-                                                            var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
-
-                                                            //大于当前访视  同时小于最近的未一致性核查通过的访视任务分配 或者生成
-
-                                                            //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
-                                                            var followVisitTaskList = await _visitTaskRepository
-                                                                 .Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
-                                                                 .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask.VisitTaskNum)
-                                                                 .ToListAsync();
-
-                                                            var followVisitGroup = followVisitTaskList.GroupBy(t => t.VisitTaskNum);
-
-                                                            //每个访视去判断  是分配还是生成（因为影响哪里有些是取消分配，有些是重阅重置需要重新生成）
-                                                            foreach (var visitGroup in followVisitGroup)
-                                                            {
-
-                                                                var visit = await _subjectVisitRepository.Where(x => x.Id == visitGroup.First().SourceSubjectVisitId).Select(x => new
-                                                                {
-                                                                    x.PDState,
-                                                                    x.IsEnrollmentConfirm,
-                                                                    x.IsUrgent,
-                                                                }).FirstNotNullAsync();
-
-
-                                                                TaskUrgentType? urgentType = null;
-
-                                                                if (subjectVisitInfo.PDState == PDStateEnum.PDProgress)
-                                                                {
-                                                                    urgentType = TaskUrgentType.PDProgress;
-                                                                }
-                                                                else if (subjectVisitInfo.IsEnrollmentConfirm)
-                                                                {
-                                                                    urgentType = TaskUrgentType.EnrollmentConfirm;
-                                                                }
-                                                                else if (subjectVisitInfo.IsUrgent)
-                                                                {
-                                                                    urgentType = TaskUrgentType.VisitUrgent;
-                                                                }
-
-                                                                bool isCanEdit = urgentType == TaskUrgentType.EnrollmentConfirm || urgentType == TaskUrgentType.PDProgress ? false : true;
-
-                                                                //如果后续访视已分配有效 就不用处理
-                                                                if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.DoubleReadingArm1))
-                                                                {
-                                                                    //不做处理
-                                                                }
-                                                                else
-                                                                {
-                                                                    var arm1 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm1);
-
-                                                                    if (arm1 != null)
-                                                                    {
-
-                                                                        //有可能仅仅只分配了一个Subject   未分配  那么
-                                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                                                                        {
-                                                                            arm1.IsUrgent = visit.IsUrgent;
-                                                                            arm1.TaskUrgentType = urgentType;
-                                                                            arm1.IsCanEditUrgentState = isCanEdit;
-                                                                            arm1.TaskAllocationState = TaskAllocationState.Allocated;
-                                                                            arm1.AllocateTime = DateTime.Now;
-                                                                            arm1.DoctorUserId = task1.DoctorUserId;
-                                                                            arm1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                        }
-
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm1).OrderByDescending(t => t.CreateTime).First();
-
-
-
-
-                                                                        var taskOne = await _visitTaskRepository.AddAsync(new VisitTask()
-                                                                        {
-                                                                            TrialId = trialId,
-                                                                            SubjectId = subjectVisit.SubjectId,
-                                                                            IsUrgent = visit.IsUrgent,
-                                                                            TaskUrgentType = urgentType,
-                                                                            IsCanEditUrgentState = isCanEdit,
-                                                                            ArmEnum = Arm.DoubleReadingArm1,//特殊
-                                                                            Code = currentMaxCodeInt + 1,
-                                                                            TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
-                                                                            ReadingCategory = ReadingCategory.Visit,
-
-                                                                            SourceSubjectVisitId = latestTask.SourceSubjectVisitId,
-                                                                            VisitTaskNum = latestTask.VisitTaskNum,
-                                                                            TaskBlindName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(latestTask.VisitTaskNum),
-                                                                            TaskName = latestTask.TaskName,
-
-                                                                            BlindSubjectCode = latestTask.BlindSubjectCode,
-                                                                            BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
-                                                                            IsAnalysisCreate = latestTask.IsAnalysisCreate,
-                                                                            IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                            TaskAllocationState = TaskAllocationState.Allocated,
-                                                                            AllocateTime = DateTime.Now,
-                                                                            DoctorUserId = task1.DoctorUserId,
-                                                                            SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
-                                                                            TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
-                                                                            IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
-                                                                            IsClinicalDataSign = latestTask.IsClinicalDataSign
-                                                                        });
-
-                                                                        currentMaxCodeInt = currentMaxCodeInt + 1;
-
-                                                                        _provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30));
-                                                                    }
-
-                                                                }
-
-                                                                //如果后续访视已分配有效 就不用处理
-                                                                if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.DoubleReadingArm2))
-                                                                {
-                                                                    //不做处理
-                                                                }
-                                                                else
-                                                                {
-                                                                    var arm2 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm2);
-                                                                    if (arm2 != null)
-                                                                    {
-                                                                        //有可能仅仅只分配了一个Subject
-                                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
-                                                                        {
-                                                                            arm2.IsUrgent = visit.IsUrgent;
-                                                                            arm2.TaskUrgentType = urgentType;
-                                                                            arm2.IsCanEditUrgentState = isCanEdit;
-                                                                            arm2.TaskAllocationState = TaskAllocationState.Allocated;
-                                                                            arm2.AllocateTime = DateTime.Now;
-                                                                            arm2.DoctorUserId = task2.DoctorUserId;
-                                                                            arm2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                        }
-
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm2).OrderByDescending(t => t.CreateTime).First();
-
-                                                                        var taskTwo = await _visitTaskRepository.AddAsync(new VisitTask()
-                                                                        {
-                                                                            TrialId = trialId,
-                                                                            SubjectId = subjectVisit.SubjectId,
-                                                                            IsUrgent = visit.IsUrgent,
-                                                                            TaskUrgentType = urgentType,
-                                                                            IsCanEditUrgentState = isCanEdit,
-
-                                                                            //CheckPassedTime = subjectVisit.CheckPassedTime,
-                                                                            ArmEnum = Arm.DoubleReadingArm2,//特殊
-                                                                            Code = currentMaxCodeInt + 1,
-                                                                            TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
-                                                                            ReadingCategory = ReadingCategory.Visit,
-
-                                                                            SourceSubjectVisitId = latestTask.SourceSubjectVisitId,
-                                                                            VisitTaskNum = latestTask.VisitTaskNum,
-                                                                            TaskBlindName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(latestTask.VisitTaskNum),
-                                                                            TaskName = latestTask.TaskName,
-
-                                                                            BlindSubjectCode = latestTask.BlindSubjectCode,
-                                                                            BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
-                                                                            IsAnalysisCreate = latestTask.IsAnalysisCreate,
-                                                                            IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                            TaskAllocationState = TaskAllocationState.Allocated,
-
-                                                                            AllocateTime = DateTime.Now,
-                                                                            DoctorUserId = task2.DoctorUserId,
-                                                                            SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
-
-                                                                            TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
-                                                                            IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
-                                                                            IsClinicalDataSign = latestTask.IsClinicalDataSign
-                                                                        });
-
-                                                                        currentMaxCodeInt = currentMaxCodeInt + 1;
-
-                                                                        _provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30));
-                                                                    }
-                                                                }
-
-                                                            }
-
-
-                                                        }
-                                                        //无序的时候    生成任务并分配出去
-                                                        else
-                                                        {
-                                                            var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
-
-                                                            if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                                                            {
-                                                                task1.TaskAllocationState = defaultState;
-                                                                //分配给对应Arm的人
-                                                                task1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1).DoctorUserId;
-                                                                task1.AllocateTime = DateTime.Now;
-
-                                                                task1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                            }
-
-                                                            if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
-                                                            {
-                                                                task2.TaskAllocationState = defaultState;
-                                                                task2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2).DoctorUserId;
-                                                                task2.AllocateTime = DateTime.Now;
-                                                                task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                            }
-
-                                                        }
-
-
-                                                        #endregion
-
-                                                    }
-                                                    else
-                                                    //后续访视不自动分配，或者配置的医生数量不足，就不进行分配
-                                                    {
-
-                                                    }
-
-                                                }
-
-
-                                            }
-
-
-                                        }
-                                        #endregion
-
-                                    }
-                                    else if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single)
+                                    if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single)
                                     {
 
 
@@ -1048,70 +669,30 @@ namespace IRaCIS.Core.Application.Service
 
                                         _provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30));
 
-                                        #region 分配
-
-                                        if (isAssignSubjectToDoctor)
-                                        {
-
-                                            if (trialReadingCriterionConfig.TaskAllocateObjEnum == TaskAllocateObj.Subject)
-                                            {
-
-                                                if (trialReadingCriterionConfig.IsFollowVisitAutoAssign)
-                                                {
 
 
-                                                    //该Subject 之前是否有已分配的   如果改变配置  可能会出现  一个Subject 分配的同一个医生 有的在Arm1 有的在Arm2
-                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
-                                                        .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
 
-                                                    //不是初次分配
-                                                    if (allocateSubjectArmList.Count != 0)
-                                                    {
-                                                        //if (_taskAllocationRuleRepository.Where(t => t.TrialId == trialId && t.IsEnable).Count() < 2)
-                                                        //{
-                                                        //    throw new BusinessValidationFailedException("能参与读片的医生数量必须>=2,自动分配任务中止");
 
-                                                        //}
 
-                                                        //配置了医生 
-                                                        if (assignConfigList.Count > 0)
-                                                        {
-
-                                                            #region 重阅/退回的时候，需要将取消分配的访视类型的  任务重新分配
+                                        #region 重阅/退回的时候，需要后续任务生成
 
                                         if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
                                         {
                                             //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
-                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                            var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId== trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
 
                                             if (beforeBackVisitTask == null)
                                             {
-                                                                    #region 访视2 PM 回退  基线回退  访视2先一致性核查通过，生成访视2任务，但是不分配
-
-                                                                    var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
-
-
-                                                                    if (assignConfigList.Any(t => t.ArmEnum == Arm.SingleReadingArm))
-                                                                    {
-                                                                        singleTask.TaskAllocationState = defaultState;
-
-                                                                        singleTask.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.SingleReadingArm).DoctorUserId;
-
-                                                                        singleTask.AllocateTime = DateTime.Now;
 
                                                 singleTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                    }
 
 
-                                                                    #endregion
-
-
-                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
                                                 //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
                                                 var followVisitTaskList = await _visitTaskRepository
-                                                                         .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
+                                                     .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
                                                      .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask.VisitTaskNum)
                                                      .ToListAsync();
 
@@ -1123,19 +704,17 @@ namespace IRaCIS.Core.Application.Service
                                                 foreach (var visitGroup in followVisitGroup)
                                                 {
                                                     //如果后续访视已分配有效 就不用处理
-                                                                        if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.SingleReadingArm))
+                                                    if (visitGroup.Any(t => t.TaskState == TaskState.Effect  && t.ArmEnum == Arm.SingleReadingArm))
                                                     {
                                                         //不做处理
                                                     }
 
                                                     else
                                                     {
-                                                                            var arm = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.SingleReadingArm);
+                                                        var arm = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect  && t.DoctorUserId == null && t.ArmEnum == Arm.SingleReadingArm);
                                                         if (arm != null)
                                                         {
-                                                                                arm.TaskAllocationState = TaskAllocationState.Allocated;
-                                                                                arm.AllocateTime = DateTime.Now;
-                                                                                arm.DoctorUserId = singleTask.DoctorUserId;
+                                                                                                                    
                                                             arm.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                         }
                                                         else
@@ -1161,9 +740,8 @@ namespace IRaCIS.Core.Application.Service
                                                                 BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
                                                                 IsAnalysisCreate = latestTask.IsAnalysisCreate,
                                                                 IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                                    TaskAllocationState = TaskAllocationState.Allocated,
-                                                                                    AllocateTime = DateTime.Now,
-                                                                                    DoctorUserId = singleTask.DoctorUserId,
+
+                                                              
                                                                 SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
 
                                                                 TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
@@ -1182,55 +760,21 @@ namespace IRaCIS.Core.Application.Service
                                                 }
 
                                             }
-                                                                //之前有回退的    后续访视不生成或者分配   当前访视生成但是不分配出去
-                                                                else
-                                                                {
 
-                                                                    //不用进行额外处理
-                                                                }
 
 
 
                                         }
-                                                            //无序的时候    生成任务并分配出去
-                                                            else
-                                                            {
-                                                                var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
 
-                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.SingleReadingArm))
-                                                                {
-                                                                    singleTask.TaskAllocationState = defaultState;
-
-                                                                    singleTask.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.SingleReadingArm).DoctorUserId;
-
-                                                                    singleTask.AllocateTime = DateTime.Now;
-
-                                                                    singleTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                }
-
-
-                                                            }
-
                                         #endregion
 
-                                                        }
-                                                    }
-                                                }
-                                                else
-                                                {
-                                                    //后续Subect  不自动分配  不处理
-                                                }
 
 
 
 
-                                            }
 
 
-                                        }
-                                        #endregion
-
 
                                     }
 
@@ -1465,7 +1009,7 @@ namespace IRaCIS.Core.Application.Service
                 case GenerateTaskCategory.Judge:
                     var firstTask = await _visitTaskRepository.Where(x => generateTaskCommand.JudgeVisitTaskIdList.Contains(x.Id)).FirstOrDefaultAsync();
 
-                    var subjectUser = await _subjectUserRepository.Where(x => x.SubjectId == firstTask.SubjectId && x.ArmEnum == Arm.JudgeArm && x.IsConfirmed && x.TrialReadingCriterionId == firstTask.TrialReadingCriterionId).FirstOrDefaultAsync();
+
 
                     VisitTask visitTask = new VisitTask()
                     {
@@ -1484,10 +1028,6 @@ namespace IRaCIS.Core.Application.Service
                         TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
                         TaskState = TaskState.Effect,
                         TaskBlindName = firstTask.TaskBlindName,
-                        DoctorUserId = subjectUser == null ? null : subjectUser.DoctorUserId,
-                        TaskAllocationState = subjectUser == null ? TaskAllocationState.NotAllocate : TaskAllocationState.Allocated,
-                        AllocateTime = subjectUser == null ? null : DateTime.Now,
-                        SuggesteFinishedTime = subjectUser == null ? null : GetSuggessFinishTime(true, UrgentType.NotUrget),
 
                         TrialReadingCriterionId = firstTask.TrialReadingCriterionId,
 
@@ -1570,8 +1110,7 @@ namespace IRaCIS.Core.Application.Service
 
                     foreach (var item in generateTaskCommand.ReadingGenerataTaskList)
                     {
-                        //需要 根据标准筛选
-                        var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed && x.TrialReadingCriterionId == originalTaskInfo.TrialReadingCriterionId).FirstOrDefaultAsync();
+
 
                         item.VisitNum = await _readModuleRepository.Where(x => x.Id == item.ReadModuleId).Select(x => x.SubjectVisit.VisitNum).FirstOrDefaultAsync();
 
@@ -1590,10 +1129,7 @@ namespace IRaCIS.Core.Application.Service
                             SouceReadModuleId = item.ReadModuleId,
                             TaskBlindName = item.ReadingName,
 
-                            DoctorUserId = oncologySubjectUser == null ? null : oncologySubjectUser.DoctorUserId,
-                            AllocateTime = oncologySubjectUser == null ? null : DateTime.Now,
-                            TaskAllocationState = oncologySubjectUser == null ? TaskAllocationState.NotAllocate : TaskAllocationState.Allocated,
-                            SuggesteFinishedTime = oncologySubjectUser == null ? null : GetSuggessFinishTime(true, UrgentType.NotUrget),
+
 
                             TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
                             ReadingCategory = item.ReadingCategory,

IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs

@@ -18,93 +18,31 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ConvertedRowInfo, ReadingTableAnswerRowInfo>();
 
 
-            CreateMap<TaskAllocationRule, TaskAllocationRuleView>()
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
-                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
 
             List<Guid> subjectIdList = new List<Guid>();
             bool isJudgeDoctor = false;
 
-
-            CreateMap<TaskAllocationRule, DoctorVisitTaskStatView>()
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
-                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
-                 //.ForMember(o => o.ArmList, t => t.MapFrom(u => u.DoctorVisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct()))
-                 .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
-                 .ForMember(o => o.SelfUndoTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId && t.ReadingTaskState != ReadingTaskState.HaveSigned)))
-                 .ForMember(o => o.TotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count()))
-                 .ForMember(o => o.SelfApplyedTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId)))
-                 .ForMember(o => o.ApplyedTotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId != null)))
-
-                 //.ForMember(o => o.SelfApplyedSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && t.SubjectArmVisitTaskList.Any(c => c.DoctorUserId != null)).Count()))
-                 .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId).Count()))
-
-                 .ForMember(o => o.ApplyedTotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count(c => c.SubjectVisitTaskList.Any(d => d.DoctorUserId != null))))
-
-
-
-                 //该医生未应用Subject 数量
-                 //.ForMember(o => o.WaitApplySelfSubjectCount, t => t.MapFrom(u =>
-                 // subjectIdList.Count == 0 ? u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
-                 // : u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId && subjectIdList.Contains(t.SubjectId) && t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
-                 // ))
-
-
-                 .ForMember(o => o.WaitApplyTotalSubjectCount, t => t.MapFrom(u =>
-                  subjectIdList.Count == 0 ? u.Trial.SubjectList.Where(t => t.SubjectVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
-                  : u.Trial.SubjectList.Where(t => subjectIdList.Contains(t.Id) && t.SubjectVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any(c => c.DoctorUserId == null)).Count()
-                 ))
-
-                 //.ForMember(o => o.WaitApplySelfTaskCount, t => t.MapFrom(u =>
-                 //subjectIdList.Count == 0 ? u.Trial.SubjectDoctorUserList.Where(d => d.DoctorUserId == u.DoctorUserId).SelectMany(t => t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null)).Count()
-                 //: u.Trial.SubjectDoctorUserList.Where(d => d.DoctorUserId == u.DoctorUserId && subjectIdList.Contains(d.SubjectId)).SelectMany(t => t.SubjectArmVisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null)).Count()
-                 //                                               ))
-
-                  .ForMember(o => o.WaitApplyTotalTaskCount, t => t.MapFrom(u =>
-                         subjectIdList.Count == 0 ? u.Trial.VisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null).Count()
-                 : u.Trial.VisitTaskList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Where(t => t.DoctorUserId == null && subjectIdList.Contains(t.SubjectId)).Count()))
-
-                 ;
-
             var trialReadingCriterionId = Guid.Empty;
-            CreateMap<TaskAllocationRule, TaskAllocationRuleDTO>()
-            .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.Enroll.DoctorUser))
-            .ForMember(o => o.CriterionReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId })))
-            .ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm)))
-            .ForMember(o => o.ReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Where(t=>t.TrialReadingCriterionId== trialReadingCriterionId).OrderBy(t => t.ReadingCategory).Select(t => t.ReadingCategory).ToList()))
-            ;
 
             CreateMap<ReadingQuestionCriterionTrial, TrialReadingCriterionDto>()
                 .ForMember(t => t.TrialReadingCriterionId, u => u.MapFrom(c => c.Id))
                 .ForMember(t => t.TrialReadingCriterionName, u => u.MapFrom(c => c.CriterionName));
 
-            CreateMap<TaskAllocationRule, AssignDoctorStatView>().IncludeBase<TaskAllocationRule, TaskAllocationRuleDTO>()
-                 .ForMember(o => o.AssignedSubjectCount, t => t.MapFrom(u => u.DoctorUser.VisitTaskList.Where(t => t.TrialId == u.TrialId).Select(t => t.SubjectId).Distinct().Count()))
-                 .ForMember(o => o.WaitDealTrialTaskCount, t => t.MapFrom(u => u.DoctorUser.VisitTaskList.Where(t => t.TrialId == u.TrialId).Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect).Count()))
-                 .ForMember(o => o.WaitDealAllTaskCount, t => t.MapFrom(u => u.DoctorUser.VisitTaskList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect).Count()));
-          
-            
             CreateMap<Subject, SubjectAssignStat>()
 
                  .ForMember(o => o.SubjectId, t => t.MapFrom(u => u.Id))
                  .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.TrialSite.TrialSiteCode))
                  .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Code))
-                 .ForMember(o => o.VisitTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Visit && t.TrialReadingCriterionId==trialReadingCriterionId && t.TaskState==TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()))
+                 .ForMember(o => o.VisitTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Visit && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()))
                  .ForMember(o => o.GlobalTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Global && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()))
                  .ForMember(o => o.OncologyTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Oncology && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()))
-                 .ForMember(o => o.JudgeTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()))
-                 .ForMember(o => o.DoctorUserList, t => t.MapFrom(u => u.SubjectDoctorList.Where(t=>t.TrialReadingCriterionId== trialReadingCriterionId)));
-
-            CreateMap<SubjectUser, SubjectUserView>()
-                 .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.DoctorUser));
+                 .ForMember(o => o.JudgeTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()));
 
 
-            CreateMap<SubjectUser, SubjectUserDTO>().IncludeBase<SubjectUser, SubjectUserView>()
-             .ForMember(o => o.IsHaveReading, t => t.MapFrom(u => u.Subject.SubjectVisitTaskList.Any(t => t.ReadingTaskState != ReadingTaskState.WaitReading && t.TrialReadingCriterionId==u.TrialReadingCriterionId && t.DoctorUserId==u.DoctorUserId)));
+
+            
+
+              CreateMap<SubjectVisitClinicalDialog, ClinicalDataDialog>();
 
 
             CreateMap<SubjectVisit, VisitGenerataTaskDTO>();
@@ -131,11 +69,12 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
                  .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
                  .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
-                 //.ForMember(o => o.IsClinicalDataSigned, t => t.MapFrom(u => u.Subject.ClinicalDataList.Any(c => c.IsSign && (c.ReadingId == u.SouceReadModuleId || c.ReadingId == u.SourceSubjectVisitId))))
-                                  ;
-
+                 .ForMember(o => o.IsBaseline, t => t.MapFrom(u => u.SourceSubjectVisit.IsBaseLine))
+                 .ForMember(o => o.IsEnrollmentConfirm, t => t.MapFrom(u => u.SourceSubjectVisit.IsEnrollmentConfirm))
+                 .ForMember(o => o.PDState, t => t.MapFrom(u => u.SourceSubjectVisit.PDState)) ;
 
 
+            var isEn_Us = true;
 
             CreateMap<VisitTask, JudgeVisitTaskView>().IncludeBase<VisitTask, VisitTaskView>()
 
@@ -143,17 +82,19 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList));
 
             CreateMap<VisitTask, ReadingTaskView>().IncludeBase<VisitTask, VisitTaskView>()
+                .ForMember(t=>t.PIReadingResultList,u=>u.MapFrom(c=>c.ReadingTaskQuestionAnswerList
+                .Where(t=>t.ReadingQuestionTrial.IsJudgeQuestion==true ).Select(d=>new PIReadingResult() { QuestionId= d.ReadingQuestionTrialId,Answer=d.Answer})));
 
-                 ;
+            CreateMap<VisitTask, PIReaingTaskView>().IncludeBase<VisitTask, ReadingTaskView>()
+                 .ForMember(o => o.FirstAuditUserName, t => t.MapFrom(u => u.FirstAuditUser.UserName))
+                  .ForMember(o => o.LatestReplyUserName, t => t.MapFrom(u => u.LatestReplyUser.UserName));
 
             CreateMap<VisitTask, AnalysisTaskView>().IncludeBase<VisitTask, VisitTaskView>()
                  .ForMember(o => o.IsReReadingOrBackInfluenceAnalysis, t => t.MapFrom(u => u.Subject.IsReReadingOrBackInfluenceAnalysis));
 
             
 
-           CreateMap<CancelDoctorCommand, SubjectCanceDoctor>();
      
-            CreateMap<SubjectCanceDoctor, SubjectCancelDoctorView>();
 
 
             
@@ -169,7 +110,9 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<VisitTask, IRHaveReadView>().IncludeBase<VisitTask, VisitTaskViewBasic>()
                   .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
                  .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode))
-                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code));
+                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code))
+                  .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName));
 
 
 
@@ -186,22 +129,17 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.SubjectId, t => t.MapFrom(u => u.Id))
                  .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.TrialSite.TrialSiteCode))
                  .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Code))
-                 .ForMember(o => o.IsJudge, t => t.MapFrom(u => isJudgeDoctor))
-                 .ForMember(o => o.IsAssignedDoctorUser, t => t.MapFrom(u => u.SubjectDoctorList.Where(t => isJudgeDoctor ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Any()))
-
-
-                 .ForMember(o => o.TotalDoctorUserList, t => t.MapFrom(u => u.SubjectDoctorList.Where(t => isJudgeDoctor ? true : t.ArmEnum != Arm.JudgeArm).OrderBy(t => t.ArmEnum)));
-
-            CreateMap<SubjectUser, AssignDoctorView>()
-                //.ForMember(o => o.AssignTime, t => t.MapFrom(u => u.AssignTime))
-                .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
-                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
+                 .ForMember(o => o.IsJudge, t => t.MapFrom(u => isJudgeDoctor));
+              
+
+
+                
+
+
+
 
 
        
-            CreateMap<TaskAllocationRuleAddOrEdit, TaskAllocationRule>();
 
 
             CreateMap<User, TrialDoctorUserSelectView>()
@@ -289,11 +227,6 @@ namespace IRaCIS.Core.Application.Service
             //CreateMap<TaskConsistentRule, TaskConsistentRuleView>()
             //     .ForMember(o => o.GeneratedSubjectCount, t => t.MapFrom(u => u.DoctorVisitTaskList.Where(t => t.IsAnalysisCreate && t.TaskConsistentRuleId == u.Id).Select(t => t.SubjectId).Distinct().Count())) ;
 
-            CreateMap<TaskConsistentRule, TaskConsistentRuleBasic>();
-
-            CreateMap<TaskConsistentRuleAddOrEdit, TaskConsistentRule>();
-
-            CreateMap<TaskConsistentRuleBatchAddOrEdit, TaskConsistentRule>().ForMember(t => t.Id, u => u.Ignore()).ReverseMap();
 
 
             CreateMap<VisitTask, VisitTaskSimpleView>()
@@ -313,6 +246,13 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.Id, t => t.MapFrom(u => u.InfluenceTask.Id));
 
 
+            CreateMap<PIAuditTaskCommand, PIAudit>();
+
+            CreateMap<PIAudit, PIAuditDialogListView>()
+                  .ForMember(o => o.CreateUserName, t => t.MapFrom(u => u.CreateUser.UserName))
+                  .ForMember(o => o.UserTypeEnum, t => t.MapFrom(u => u.CreateUser.UserTypeEnum))
+                   .ForMember(o => o.PIAuditState, t => t.MapFrom(u => u.VisitTask.PIAuditState))
+                  ;
 
             
         }

IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs

@@ -3,10 +3,16 @@
 //	   生成时间 2022-02-15 11:55:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
 namespace IRaCIS.Core.Application.Contracts
 {
+    public class TrialSelectEmailNoticeConfigView: EmailNoticeConfigView
+    {
+        public bool IsHaveSelected { get; set; }
+    }
+
     /// <summary> EmailNoticeConfigView  列表视图模型 </summary>
     public class EmailNoticeConfigView : EmailNoticeConfigAddOrEdit
     {
@@ -19,6 +25,12 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
+        public List<EmailUserTypeDto> EmailNoticeUserList { get; set; }
+
+
+        public new List<UserTypeEnum> ToUserTypeList => EmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.To).Select(t => t.UserType).ToList();
+        public new List<UserTypeEnum> CopyUserTypeList => EmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(t => t.UserType).ToList();
+
         //[JsonIgnore]
         //public SystemBasicDataSelect Scenario { get; set; }
         ////public Guid? ScenarioParentId => Scenario.ParentId;
@@ -28,6 +40,13 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class EmailUserTypeDto
+    {
+        public UserTypeEnum UserType { get; set; }
+
+        public EmailUserType EmailUserType { get; set; }
+    }
+
     ///<summary>EmailNoticeConfigQuery  列表查询参数模型</summary>
     public class EmailNoticeConfigQuery:PageInput
     {
@@ -36,9 +55,14 @@ namespace IRaCIS.Core.Application.Contracts
         public CommonDocumentBusinessScenario? BusinessScenarioEnum { get; set; }
 
         public bool? IsReturnRequired { get; set; }
-        public bool? IsUrgent { get; set; }
         public bool? IsEnable { get; set; }
 
+        public CriterionType? CriterionTypeEnum { get; set; }
+
+        public Guid? TrialId { get; set; }
+
+        public bool? IsDistinguishCriteria { get; set; }
+
     }
 
     ///<summary> EmailNoticeConfigAddOrEdit  列表查询参数模型</summary>
@@ -47,7 +71,6 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid? Id { get; set; }
         public string Code { get; set; } = String.Empty;
 
-
         public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
 
         /// <summary>
@@ -55,23 +78,59 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsDistinguishCriteria { get; set; }
 
-
-        //public string AuthorizationCode { get; set; } = String.Empty;
-        //public Guid ScenarioId { get; set; }
-        //public string Title { get; set; } = String.Empty;
-        //public string Body { get; set; } = String.Empty;
-        //public string FromEmail { get; set; } = String.Empty;
-        //public string ReceiveEmail { get; set; } = String.Empty;
-        //public string CopyEmail { get; set; } = String.Empty;
         public bool IsReturnRequired { get; set; }
-        public bool IsUrgent { get; set; }
         public bool IsEnable { get; set; }
         public bool IsAutoSend { get; set; }
 
         public bool IsDeleted { get; set; }
+
+
+
+        public CriterionType? CriterionTypeEnum { get; set; }
+
+        /// <summary> 业务模块 /// </summary>
+        public int BusinessModuleEnum { get; set; }
+
+        /// <summary> 业务层级 /// </summary>
+        public int BusinessLevelEnum { get; set; }
+
+        /// <summary> 邮件类型 /// </summary>
+        public int EmailTypeEnum { get; set; }
+
+        /// <summary> 邮件加急类型 /// </summary>
+        public int EmailUrgentEnum { get; set; }
+        public string Description { get; set; } = string.Empty;
+
+
+        /// <summary> 定时周期 /// </summary>
+        public string EmailCron { get; set; } = string.Empty;
+
+        /// <summary> 邮件主题 /// </summary>
+        public string EmailTopic { get; set; } = string.Empty;
+
+        public string EmailTopicCN { get; set; } = string.Empty;
+
+
+        public string AttachPath { get; set; } = string.Empty;
+
+        public string AttachCNPath { get; set; } = string.Empty;
+
+        public string EmailHtmlContent { get; set; } = string.Empty;
+
+        public string EmailHtmlContentCN { get; set; } = string.Empty;
+
+        public string AttachName { get; set; }
+        public string AttachNameCN { get; set; }
+
+
+        public List<UserTypeEnum> ToUserTypeList { get; set; }
+        public List<UserTypeEnum> CopyUserTypeList { get; set; }
+
     }
 
 
+
+
 }
 
 

IRaCIS.Core.Application/Service/Common/DictionaryService.cs

@@ -16,9 +16,7 @@ namespace IRaCIS.Application.Services
     public class DictionaryService : BaseService, IDictionaryService
     {
         private readonly IRepository<Dictionary> _dicRepository;
-        private readonly IRepository<DoctorDictionary> _doctorDictionaryRepository;
         private readonly IRepository<TrialDictionary> _trialDictionaryRepository;
-        private readonly IRepository<Doctor> _doctorRepository;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCodeRepository;
         private readonly IRepository<TrialCriterionDictionaryCode> _trialCriterionDictionaryCodeRepository;
@@ -29,8 +27,8 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
         private readonly IReadingQuestionService _readingQuestionService;
 
-        public DictionaryService(IRepository<Dictionary> sysDicRepository, IRepository<DoctorDictionary> doctorDictionaryRepository, IRepository<TrialDictionary> trialDictionaryRepository,
-            IRepository<Doctor> doctorRepository, IRepository<Trial> trialRepository,
+        public DictionaryService(IRepository<Dictionary> sysDicRepository, IRepository<TrialDictionary> trialDictionaryRepository,
+           IRepository<Trial> trialRepository,
 
              IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCodeRepository,
                    IRepository<TrialCriterionDictionaryCode> trialCriterionDictionaryCodeRepository,
@@ -44,9 +42,9 @@ namespace IRaCIS.Application.Services
             )
         {
             _dicRepository = sysDicRepository;
-            _doctorDictionaryRepository = doctorDictionaryRepository;
+         
             _trialDictionaryRepository = trialDictionaryRepository;
-            _doctorRepository = doctorRepository;
+       
             _trialRepository = trialRepository;
             this._systemCriterionDictionaryCodeRepository = systemCriterionDictionaryCodeRepository;
             this._trialCriterionDictionaryCodeRepository = trialCriterionDictionaryCodeRepository;
@@ -229,14 +227,6 @@ namespace IRaCIS.Application.Services
                 return ResponseOutput.NotOk(_localizer["Dictionary_SubitemDeletion"]);
             }
 
-            if ((await _doctorDictionaryRepository.AnyAsync(t => t.DictionaryId == id)) ||
-                (await _doctorRepository.AnyAsync(t => t.SpecialityId == id || t.PositionId == id || t.DepartmentId == id || t.RankId == id))
-
-               )
-            {
-                //---当前条目已经在阅片人的简历中被引用。
-                return ResponseOutput.NotOk(_localizer["Dictionary_ResumeReference"]);
-            }
 
             if (await _trialDictionaryRepository.AnyAsync(t => t.DictionaryId == id) ||
                 await _trialRepository.AnyAsync(t => t.ReviewModeId == id))

IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs

@@ -17,19 +17,22 @@ namespace IRaCIS.Core.Application.Contracts
     public class EmailNoticeConfigService : BaseService, IEmailNoticeConfigService
     {
         private readonly IRepository<EmailNoticeConfig> _emailNoticeConfigrepository;
+        private readonly IRepository<EmailNoticeUserType> _emailNoticeUserTypeRepository;
 
-        public EmailNoticeConfigService(IRepository<EmailNoticeConfig> repository)
+        public EmailNoticeConfigService(IRepository<EmailNoticeConfig> repository, IRepository<EmailNoticeUserType> emailNoticeUserTypeRepository)
         {
             _emailNoticeConfigrepository = repository;
+            _emailNoticeUserTypeRepository = emailNoticeUserTypeRepository;
         }
 
         [HttpPost]
         public async Task<PageOutput<EmailNoticeConfigView>> GetEmailNoticeConfigList(EmailNoticeConfigQuery queryEmailNoticeConfig)
         {
             var emailNoticeConfigQueryable = _emailNoticeConfigrepository
+            .WhereIf(queryEmailNoticeConfig.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == queryEmailNoticeConfig.IsDistinguishCriteria)
+            .WhereIf(queryEmailNoticeConfig.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryEmailNoticeConfig.CriterionTypeEnum)
             .WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
             .WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired)
-            .WhereIf(queryEmailNoticeConfig.IsUrgent != null, t => t.IsUrgent == queryEmailNoticeConfig.IsUrgent)
             .WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable)
             .ProjectTo<EmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
@@ -38,11 +41,56 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         public async Task<IResponseOutput> AddOrUpdateEmailNoticeConfig(EmailNoticeConfigAddOrEdit addOrEditEmailNoticeConfig)
+        {
+            if (addOrEditEmailNoticeConfig.Id == null)
             {
 
-            var entity = await _emailNoticeConfigrepository.InsertOrUpdateAsync(addOrEditEmailNoticeConfig, true);
+                var entity = _mapper.Map<EmailNoticeConfig>(addOrEditEmailNoticeConfig);
+
+
+                foreach (var item in addOrEditEmailNoticeConfig.ToUserTypeList)
+                {
+                    entity.EmailNoticeUserTypeList.Add(new EmailNoticeUserType() { EmailUserType = EmailUserType.To, UserType = item });
+
+                }
+
+                foreach (var item in addOrEditEmailNoticeConfig.CopyUserTypeList)
+                {
+                    entity.EmailNoticeUserTypeList.Add(new EmailNoticeUserType() { EmailUserType = EmailUserType.Copy, UserType = item });
+
+                }
+
+
+                await _emailNoticeConfigrepository.AddAsync(entity, true);
 
                 return ResponseOutput.Ok(entity.Id.ToString());
+            }
+            else
+            {
+                var emailNoticeConfigId = addOrEditEmailNoticeConfig.Id;
+                await _emailNoticeUserTypeRepository.BatchDeleteNoTrackingAsync(t => t.EmailNoticeConfigId == emailNoticeConfigId);
+
+
+                foreach (var item in addOrEditEmailNoticeConfig.ToUserTypeList)
+                {
+                 await   _emailNoticeUserTypeRepository.AddAsync(new EmailNoticeUserType() { EmailUserType = EmailUserType.To, UserType = item,EmailNoticeConfigId= (Guid)emailNoticeConfigId });
+
+                }
+
+                foreach (var item in addOrEditEmailNoticeConfig.CopyUserTypeList)
+                {
+                    await _emailNoticeUserTypeRepository.AddAsync(new EmailNoticeUserType() { EmailUserType = EmailUserType.Copy, UserType = item, EmailNoticeConfigId = (Guid)emailNoticeConfigId });
+
+                }
+
+
+                var entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true);
+
+                return ResponseOutput.Ok(entity.Id.ToString());
+
+
+            }
+
 
         }
 

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -155,9 +155,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 .Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
                 .WhereIf(queryParam.UserTypeId != null, t => t.UserTypeId == queryParam.UserTypeId)
                 .WhereIf(queryParam.IsGenerateAccount != null, t => t.IsGenerateAccount == queryParam.IsGenerateAccount)
-                .WhereIf(queryParam.TrialRoleNameId != null, t => t.TrialRoleNameId == queryParam.TrialRoleNameId)
                 .WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)
-                .WhereIf(queryParam.State != null && queryParam.State == TrialSiteUserStateEnum.OverTime, t => t.InviteState == TrialSiteUserStateEnum.HasSend && t.ExpireTime < DateTime.Now)
                 .WhereIf(!string.IsNullOrEmpty(queryParam.UserName), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserName))
                 .WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
                 .ProjectTo<TrialSiteUserSummaryDto>(_mapper.ConfigurationProvider);

IRaCIS.Core.Application/Service/Common/FileService.cs

@@ -11,180 +11,25 @@ namespace IRaCIS.Application.Services
     public class FileService : IFileService
     {
 
-        private readonly IDoctorService _doctorService;
-        private readonly IAttachmentService _attachmentService;
+
         private readonly IWebHostEnvironment _hostEnvironment;
         private string defaultUploadFilePath = string.Empty;
         private readonly ILogger<FileService> _logger;
-        public FileService(IDoctorService doctorService, IAttachmentService attachmentService,
+        public FileService(
             IWebHostEnvironment hostEnvironment, ILogger<FileService> logger)
         {
-            _doctorService = doctorService;
-            _attachmentService = attachmentService;
+       
             _hostEnvironment = hostEnvironment;
 
             defaultUploadFilePath = FileStoreHelper.GetIRaCISRootPath(_hostEnvironment);
             _logger = logger;
         }
 
-        /// <summary>
-        ///  打包医生官方简历
-        /// </summary>
-        /// <param name="language"></param>
-        /// <param name="doctorIds"></param>
-        /// <returns></returns>
-        public async Task<string> CreateOfficialResumeZip(int language, Guid[] doctorIds)
-        {
-
-            //准备下载文件的临时路径
-            var guidStr = Guid.NewGuid().ToString();
-
-            string uploadFolderPath = Path.Combine(FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment), "UploadFile");
     
 
 
-            var tempSavePath = Path.Combine(uploadFolderPath, "temp", guidStr); //待压缩的文件夹，将需要下载的文件拷贝到此文件夹
-            if (!Directory.Exists(tempSavePath))
-            {
-                Directory.CreateDirectory(tempSavePath);
-            }
-
-            //找到服务器简历路径 循环拷贝简历到临时路径
-            foreach (var doctorId in doctorIds)
-            {
-                var doctor = await _doctorService.GetBasicInfo(doctorId);
-                var doctorName = doctor.FirstName + "_" + doctor.LastName;
-
-                //找官方简历存在服务器的相对路径
-                var sourceCvPath = await _attachmentService.GetDoctorOfficialCV(language, doctorId);
-                if (!string.IsNullOrWhiteSpace(sourceCvPath))
-                {
-                    //服务器简历文件实际路径
-                    //var sourceCvFullPath = HostingEnvironment.MapPath(sourceCvPath);
-                    var sourceCvPathTemp = sourceCvPath.Substring(1, sourceCvPath.Length - 1);//.Replace('/','\\');
-                    string sourceCvFullPath = Path.Combine(defaultUploadFilePath, sourceCvPathTemp);
-
-                    var arr = sourceCvPath.Split('.');
-                    string extensionName = arr[arr.Length - 1]; //得到扩展名
-
-                    //需要拷贝到的路径
-                    var doctorPath = Path.Combine(tempSavePath, doctor.ReviewerCode.ToString() + "_" + doctorName + "." + extensionName);
-
-                    if (File.Exists(sourceCvFullPath))
-                    {
-                        File.Copy(sourceCvFullPath, doctorPath, true);
-                    }
-                }
-            }
-
-            //创建ZIP
-            DateTime now = DateTime.Now;
-            StringBuilder sb = new StringBuilder();
-            sb.Append(now.Year).Append(now.Month.ToString().PadLeft(2, '0')).Append(now.Day.ToString().PadLeft(2, '0'))
-                .Append(now.Hour.ToString().PadLeft(2, '0')).Append(now.Minute.ToString().PadLeft(2, '0'))
-                .Append(now.Second.ToString().PadLeft(2, '0')).Append(now.Millisecond.ToString().PadLeft(3, '0'));
-
-            string targetZipPath = Path.Combine(uploadFolderPath, "CV_" + sb.ToString() + ".zip");
-            ZipHelper.CreateZip(tempSavePath, targetZipPath);
-
-            //返回Zip路径
-            return Path.Combine("/IRaCISData/UploadFile/", "CV_" + sb.ToString() + ".zip");
-        }
-
-        /// <summary>
-        /// 打包医生的所有附件
-        /// </summary>
-        /// <param name="doctorIds"></param>
-        /// <returns></returns>
-        public async Task<string> CreateDoctorsAllAttachmentZip(Guid[] doctorIds)
-        {
-            //准备下载文件的临时路径
-            var guidStr = Guid.NewGuid().ToString();
-            //string uploadFolderPath = HostingEnvironment.MapPath("/UploadFile/");
-            string uploadFolderPath = Path.Combine(FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment), "UploadFile");
-            var tempSavePath = Path.Combine(uploadFolderPath, "temp", guidStr); //待压缩的文件夹，将需要下载的文件拷贝到此文件夹
-            if (!Directory.Exists(tempSavePath))
-            {
-                Directory.CreateDirectory(tempSavePath);
-            }
 
       
-            foreach (var doctorId in doctorIds)
-            {
-                //获取医生基本信息
-                var doctor = await _doctorService.GetBasicInfo(doctorId);
-                var doctorName = doctor.FirstName + "_" + doctor.LastName;
-                var doctorCode = doctor.ReviewerCode;
-
-                var doctorDestPath = Path.Combine(tempSavePath, doctorCode + "_" + doctorName);
-                if (!Directory.Exists(doctorDestPath))
-                {
-                    Directory.CreateDirectory(doctorDestPath);
-                }
-
-                //服务器上传后的源路径
-                string doctorFileSourcePath = Path.Combine(uploadFolderPath, doctorId.ToString());
-
-                if (Directory.Exists(doctorFileSourcePath))
-                {
-                    CopyDirectory(doctorFileSourcePath, doctorDestPath);
-                }
-            }
-            string target = Guid.NewGuid().ToString();
-            string targetPath = Path.Combine(uploadFolderPath, target + ".zip");
-            ZipHelper.CreateZip(tempSavePath, targetPath);
-            return Path.Combine("/IRaCISData/UploadFile/", target + ".zip");
-        }
-
-
-        public async Task<string> CreateZipPackageByAttachment(Guid doctorId, Guid[] attachmentIds)
-        {
-            var doctor = await _doctorService.GetBasicInfo(doctorId);
-            var doctorName = doctor.FirstName + "_" + doctor.LastName;
-
-            Guid temp = Guid.NewGuid();
-            //string root = HostingEnvironment.MapPath("/UploadFile/"); //文件根目录
-            string root = Path.Combine(defaultUploadFilePath, "UploadFile");
-
-            var tempPath = Path.Combine(root, "temp", temp.ToString(), doctor.ReviewerCode + doctorName); //待压缩的文件夹，将需要下载的文件拷贝到此文件夹
-            var packagePath = Path.Combine(root, "temp", temp.ToString()); //打包目录
-            if (!Directory.Exists(tempPath))
-            {
-                Directory.CreateDirectory(tempPath);
-            }
-            var attachemnts = (await _attachmentService.GetAttachments(doctorId)).Where(a => attachmentIds.Contains(a.Id));
-
-            foreach (var item in attachemnts)
-            {
-                var arr = item.Path.Trim().Split('/');
-                var myPath = string.Empty;
-                var myFile = string.Empty;
-                //需要改进
-                if (arr.Length > 0)
-                {
-                    myFile = arr[arr.Length - 1];
-                    foreach (var arrItem in arr)
-                    {
-                        if (arrItem != string.Empty && !"UploadFile".Equals(arrItem))
-                        {
-                            myPath += (arrItem + "/");
-                        }
-                    }
-                    myPath = myPath.TrimEnd('/');
-                }
-                var sourcePath = Path.Combine(root, myPath);
-
-                if (!string.IsNullOrWhiteSpace(sourcePath) && File.Exists(sourcePath))
-                {
-                    File.Copy(sourcePath, Path.Combine(tempPath, myFile), true);
-                }
-            }
-            string target = Guid.NewGuid().ToString();
-            string targetPath = Path.Combine(root, target + ".zip");
-            ZipHelper.CreateZip(packagePath, targetPath);
-
-            return Path.Combine("/IRaCISData/UploadFile/", target + ".zip");
-        }
 
         private static void CopyDirectory(string srcPath, string destPath)
         {

IRaCIS.Core.Application/Service/Common/Interface/IFileService.cs

@@ -8,10 +8,10 @@ namespace IRaCIS.Application.Interfaces
         //IResponseOutput<UploadFileInfo> DownloadOfficialResume(Guid[] doctorIds);
 
 
-        Task<string> CreateOfficialResumeZip(int language, Guid[] doctorIds);
     
-        Task<string> CreateDoctorsAllAttachmentZip(Guid[] doctorIds);
 
-        Task<string> CreateZipPackageByAttachment(Guid doctorId, Guid[] attachmentIds);
+     
+
+       
     }
 }

IRaCIS.Core.Application/Service/Common/InternationalizationService.cs

@@ -88,7 +88,6 @@ namespace IRaCIS.Core.Application.Service
             await _internationalizationRepository.SaveChangesAsync();
 
 
-
             return ResponseOutput.Ok();
         }
 
@@ -106,7 +105,7 @@ namespace IRaCIS.Core.Application.Service
 
             if (addOrEditInternationalization.InternationalizationType == 1)
             {
-                await InternationalizationHelper.AddOrUpdateJsonKeyValueAsync(entity.Code, entity.Value, entity.ValueCN);
+                await InternationalizationHelper.AddOrUpdateJsonKeyValueAsync(entity.Code, addOrEditInternationalization.Value, addOrEditInternationalization.ValueCN);
 
             }
 

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -32,7 +32,7 @@ namespace IRaCIS.Application.Services
 
         Task ExternalUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl);
 
-        Task<Guid> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl);
+     
 
 
     }
@@ -53,7 +53,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<UserType> _userTypeRepository;
 
-        private readonly IRepository<Doctor> _doctorTypeRepository;
+
 
         private readonly AsyncLock _mutex = new AsyncLock();
 
@@ -68,7 +68,6 @@ namespace IRaCIS.Application.Services
             ITokenService tokenService,
             IRepository<Trial> trialRepository,
              IRepository<UserType> userTypeRepository,
-             IRepository<Doctor> doctorTypeRepository,
             IMapper mapper, IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig)
         {
             _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -84,7 +83,6 @@ namespace IRaCIS.Application.Services
             _trialRepository = trialRepository;
 
             _userTypeRepository = userTypeRepository;
-            _doctorTypeRepository = doctorTypeRepository;
 
         }
 
@@ -598,122 +596,6 @@ namespace IRaCIS.Application.Services
         }
 
 
-        //医生生成账号加入  或者已存在账号加入到项目中
-        public async Task<Guid> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl)
-        {
-            var doctor = await _doctorTypeRepository.FindAsync(doctorId);
-            User sysUserInfo = null;
-
-            var userType = await _userTypeRepository.FirstAsync(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer);
-
-            using (await _mutex.LockAsync())
-            {
-                var isDoctorHaveAccount = await _userRepository.AnyAsync(t => t.DoctorId == doctorId);
-
-
-                if (!isDoctorHaveAccount)
-                {
-
-                    var saveItem = new User() { FirstName = doctor.FirstName, LastName = doctor.LastName, EMail = doctor.EMail };
-
-                    var trialType = await _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialType).FirstOrDefaultAsync();
-
-                    if (trialType == TrialType.NoneOfficial)
-                    {
-                        saveItem.IsTestUser = true;
-                    }
-
-
-                    saveItem.Code = _userRepository.Select(t => t.Code).DefaultIfEmpty().Max() + 1;
-
-                    saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(User));
-
-                    saveItem.UserName = saveItem.UserCode;
-
-                    saveItem.UserTypeEnum = UserTypeEnum.IndependentReviewer;
-
-                    saveItem.DoctorId = doctorId;
-                    saveItem.UserTypeId = userType.Id;
-
-                    var savedUser = await _userRepository.AddAsync(saveItem);
-
-                    //下面获取Token 需要这部分信息
-                    sysUserInfo = savedUser.Clone();
-
-                    sysUserInfo.UserTypeRole = userType;
-
-                    await _userRepository.SaveChangesAsync();
-
-                }
-                else
-                {
-                    sysUserInfo = (await _userRepository.Where(t => t.DoctorId == doctorId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
-                }
-            }
-
-
-            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
-
-            var messageToSend = new MimeMessage();
-            //发件地址
-            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            //收件地址
-            messageToSend.To.Add(new MailboxAddress(doctor.FullName, doctor.EMail));
-            //主题
-            // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
-            messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo];
-
-
-            var builder = new BodyBuilder();
-
-
-            var basicInfo = IRaCISClaims.Create(_mapper.Map<UserBasicInfo>(sysUserInfo));
-
-            ////第一次添加的时候  注意赋值
-            //basicInfo.PermissionStr = userType.PermissionStr;
-            //basicInfo.UserTypeShortName = userType.UserTypeShortName;
-
-            var token = _tokenService.GetToken(basicInfo);
-
-            if (sysUserInfo.IsFirstAdd)
-            {
-                await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });
-            }
-
-
-            var pathToFile = _hostEnvironment.WebRootPath
-                     + Path.DirectorySeparatorChar.ToString()
-                     + "EmailTemplate"
-                     + Path.DirectorySeparatorChar.ToString()
-                     + (sysUserInfo.IsFirstAdd ? (_userInfo.IsEn_Us ? "TrialDoctorFirstJoin_US.html" : "TrialDoctorFirstJoin.html")  : (_userInfo.IsEn_Us ? "TrialDoctorExistJoin_US.html" : "TrialDoctorExistJoin.html") );
-
-            using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
-            {
-                var templateInfo = SourceReader.ReadToEnd();
-
-                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + userType.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
-
-                var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
-
-                var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
-
-                builder.HtmlBody = string.Format(templateInfo,
-                    sysUserInfo.FullName,
-                    trialInfo.ExperimentName,
-                    trialInfo.ResearchProgramNo,
-                    trialInfo.TrialCode,
-                    sysUserInfo.UserName,
-                    userType.UserTypeShortName,
-                    sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
-                    );
-            }
-
-            messageToSend.Body = builder.ToMessageBody();
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
-
-            return sysUserInfo.Id;
-        }
 
 
 

IRaCIS.Core.Application/Service/Common/PublishLogService.cs

@@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Service
 
             if (!Version.TryParse(addOrEditPublishLog.Version, out version))
             {
-                return ResponseOutput.NotOk("版本号不符合要求");
+                return ResponseOutput.NotOk(_localizer["PublishLog_VersionNotMatch"]);
             }
                      
             var verifyExp1 = new EntityVerifyExp<PublishLog>()

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -3,6 +3,7 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -20,9 +21,21 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<FrontAuditConfig, FrontAuditConfigAddOrEdit>().ReverseMap();
 
             CreateMap<EmailNoticeConfigAddOrEdit, EmailNoticeConfig>().ReverseMap();
-            CreateMap<EmailNoticeConfig, EmailNoticeConfigView>();
 
 
+            CreateMap<EmailNoticeUserType, EmailUserTypeDto>();
+
+
+            var trialId = Guid.Empty;
+            CreateMap<EmailNoticeConfig, TrialSelectEmailNoticeConfigView>().IncludeBase<EmailNoticeConfig, EmailNoticeConfigView>()
+                 .ForMember(o => o.IsHaveSelected, t => t.MapFrom(u => u.TrialEmailNoticeConfigList.Any(c=>c.TrialId==trialId && c.SysEmailNoticeConfigId==u.Id)))
+                ;
+
+            CreateMap<EmailNoticeConfig, EmailNoticeConfigView>()
+                .ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList)); 
+
+            CreateMap<Dictionary, DicView>()
+            .ForMember(t => t.ParentCode, u => u.MapFrom(c => c.Parent.Code));
             CreateMap<SystemBasicData, SystemBasicDataView>();
 
             var isEn_Us = false;

IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs

@@ -1,254 +0,0 @@
-using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Mvc;
-using Panda.DynamicWebApi.Attributes;
-
-namespace IRaCIS.Application.Services
-{
-    /// <summary>
-    /// 医生文档关联关系维护
-    /// </summary>
-    [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class AttachmentService : BaseService, IAttachmentService
-    {
-        private readonly IRepository<Attachment> _attachmentrepository;
-
-        public AttachmentService(IRepository<Attachment> attachmentrepository)
-        {
-            this._attachmentrepository = attachmentrepository;
-        }
-
-        /// <summary>
-        /// 删除附件
-        /// </summary>
-        /// <param name="param"></param>
-        /// <returns></returns>
-
-        public async Task<IResponseOutput> DeleteAttachment([FromBody]AttachementCommand param)
-        {
-            //var attachment = _doctorAttachmentApp.GetDetailById(id);
-            //string file = HostingEnvironment.MapPath(attachment.Path);
-
-            //if (File.Exists(file))
-            //{
-            //    File.Delete(file);
-            //}
-            //var temp = HostingEnvironment.MapPath(param.Path);
-            //if (File.Exists(temp))
-            //{
-            //    File.Delete(temp);
-            //}
-
-            var success =await _attachmentrepository.BatchDeleteNoTrackingAsync(a => a.Id == param.Id);
-            return ResponseOutput.Result(success);
-        }
-
-
-        /// <summary>
-        /// 根据医生Id 和 附件类型，获取记录
-        /// </summary>
-        /// <param name="doctorId">医生Id</param>
-        /// <param name="type">附件类型</param>
-        /// <returns></returns>
-        [HttpGet("{doctorId:guid}/{type}")]
-        public async Task<IEnumerable<AttachmentDTO>> GetAttachmentByType(Guid doctorId, string type)
-        {
-            var attachmentList = await _attachmentrepository.Where(a => a.DoctorId == doctorId && a.Type.Equals(type)).ProjectTo<AttachmentDTO>(_mapper.ConfigurationProvider).ToListAsync();
-            attachmentList.ForEach(t => t.FullPath =  t.Path + "?access_token=" + _userInfo.UserToken);
-
-            return attachmentList;
-        }
-
-        /// <summary>
-        /// 获取单个医生的多种证书附件
-        /// </summary>
-        /// <param name="doctorId">医生Id</param>
-        /// <param name="types">类型数组</param>
-        /// <returns></returns>
-        [HttpPost("{doctorId:guid}")]
-        public  async Task<IEnumerable<AttachmentDTO>> GetAttachmentByTypes(Guid doctorId, string[] types)
-        {
-
-            var attachmentList =await _attachmentrepository.Where(a => a.DoctorId == doctorId && types.Contains(a.Type)).OrderBy(s => s.Type).ThenBy(m => m.CreateTime).ProjectTo<AttachmentDTO>(_mapper.ConfigurationProvider).ToListAsync();
-            attachmentList.ForEach(t => t.FullPath =  t.Path + "?access_token=" + _userInfo.UserToken);
-
-            return attachmentList;
-        }
-
-        /// <summary>
-        /// 根据医生Id获取医生附件
-        /// </summary>
-        /// <param name="doctorId">医生Id</param>
-        /// <returns></returns>
-        [HttpGet("{doctorId:guid}")]
-        public async Task<IEnumerable<AttachmentDTO>> GetAttachments(Guid doctorId)
-        {
-            var attachmentList =await _attachmentrepository.Where(a => a.DoctorId == doctorId).OrderBy(s => s.Type).ThenBy(m => m.CreateTime).ProjectTo<AttachmentDTO>(_mapper.ConfigurationProvider).ToListAsync();
-            attachmentList.ForEach(t => t.FullPath =  t.Path + "?access_token=" + _userInfo.UserToken);
-
-            return attachmentList;
-        }
-
-        [NonDynamicMethod]
-        public async Task<AttachmentDTO> GetDetailById(Guid attachmentId)
-        {
-            var attachment = await _attachmentrepository.FirstOrDefaultAsync(a => a.Id == attachmentId).IfNullThrowException();
-            var temp= _mapper.Map<AttachmentDTO>(attachment);
-            temp.FullPath =  temp.Path + "?access_token=" + _userInfo.UserToken;
-            return temp;
-        }
-
-        /// <summary>
-        /// 保存多个附件
-        /// </summary>
-        /// <param name="attachmentList"></param>
-        /// <returns></returns>
-        public async Task<IEnumerable<AttachmentDTO>> SaveAttachments(IEnumerable<AttachmentDTO> attachmentList)
-        {
-            var attachments = _mapper.Map<IEnumerable<Attachment>>(attachmentList).ToList();
-
-            //1 是中文  2是英文  中英文第一份简历默认设置为官方
-
-            var zhCount = attachments.Count(t => t.Language == 1);
-            var usCount = attachments.Count(t => t.Language == 2);
-
-            if (zhCount == 1)
-            {
-                var k = attachments.First(t => t.Language == 1);
-                k.IsOfficial = true;
-            }
-            if (usCount == 1)
-            {
-                var k = attachments.First(t => t.Language == 2);
-                k.IsOfficial = true;
-            }
-
-
-            //处理重传
-            var reUpload = attachmentList.FirstOrDefault(t => t.ReUpload == true);
-            if (reUpload != null)
-            {
-                //因为界面现实的列表用了 接口返回的列表，所以要把返回的模型对应的字段也要更改
-                var attach = attachments.First(t => t.Id == reUpload.Id);
-                attach.CreateTime = DateTime.Now;
-                
-
-                //重传的时候，发现 相同语言的官方简历数量为2  那么将重传的简历设置为非官方
-                if (attachments.Count(t => t.Language == reUpload.Language && t.IsOfficial) == 2)
-                {
-                   await _attachmentrepository.BatchUpdateNoTrackingAsync(t => t.Id == reUpload.Id, u => new Attachment()
-                    {
-                        Path = reUpload.Path,
-                        CreateTime = DateTime.Now,
-                        Language = reUpload.Language,
-                        IsOfficial = false
-                    });
-                    attach.IsOfficial = false;
-                }
-                else  //相同语言的重传  
-                {
-                    await _attachmentrepository.BatchUpdateNoTrackingAsync(t => t.Id == reUpload.Id, u => new Attachment()
-                    {
-                        Path = reUpload.Path,
-                        CreateTime = DateTime.Now,
-                        Language = reUpload.Language
-                    });
-
-                }
-
-            }
-
-
-            var newAttachment = attachments.Where(t => t.Id == Guid.Empty);
-
-            await _repository.AddRangeAsync(newAttachment);
-            await _repository.SaveChangesAsync();
-
-            //_doctorAttachmentRepository.AddRange(newAttachment);
-            //_doctorAttachmentRepository.SaveChanges();
-
-            var list = _mapper.Map<IEnumerable<AttachmentDTO>>(attachments).ToList();
-
-            list.ForEach(t => t.FullPath =  t.Path + "?access_token=" + _userInfo.UserToken);
-
-            return list;
-        }
-
-        public async Task<IResponseOutput<AttachmentDTO>> AddAttachment(AttachmentDTO attachment)
-        {
-
-            var newAttachment = _mapper.Map<Attachment>(attachment);
-            //如果这个医生不存在 这个语言的官方简历  就设置为官方简历
-            if (! await _attachmentrepository.AnyAsync(t => t.Type == "Resume" && t.DoctorId == attachment.DoctorId && t.Language == attachment.Language && t.IsOfficial))
-            {
-                newAttachment.IsOfficial = true;
-
-                attachment.IsOfficial = true;
-            }
-
-            await _repository.AddAsync(newAttachment);
-            var success = await _repository.SaveChangesAsync();
-            return ResponseOutput.Result(success, attachment);
-        }
-
-
-        [NonDynamicMethod]
-        public async Task<string> GetDoctorOfficialCV(int language, Guid doctorId)
-        {
-            var result = await _attachmentrepository.FirstOrDefaultAsync(a => a.DoctorId == doctorId &&
-           a.IsOfficial && a.Type.Equals("Resume") && a.Language == language);
-            if (result != null)
-            {
-                return result.Path;
-            }
-            return string.Empty;
-        }
-
-
-        /// <summary>
-        /// 将简历设置为官方简历
-        /// </summary>
-        /// <param name="doctorId"></param>
-        /// <param name="attachmentId"></param>
-        /// <param name="language"></param>
-        /// <returns></returns>
-       
-        [HttpPost("{doctorId:guid}/{attachmentId:guid}/{language}")]
-        public async Task<IResponseOutput> SetOfficial(Guid doctorId, Guid attachmentId, int language)
-        {
-            var resumeList = await _attachmentrepository.Where(t => t.DoctorId == doctorId && t.Type == "Resume" && t.Language == language).ToListAsync();
-            foreach (var item in resumeList)
-            {
-                if (item.Id == attachmentId) item.IsOfficial = true;
-                else item.IsOfficial = false;
-                await _repository.UpdateAsync(item);
-            }
-           
-            return ResponseOutput.Result(await _repository.SaveChangesAsync());
-        }
-
-        /// <summary>
-        /// 设置简历的语言类型
-        /// </summary>
-        /// <param name="doctorId"></param>
-        /// <param name="attachmentId"></param>
-        /// <param name="language">0-未设置，1-中文，2-英文</param>
-        /// <returns></returns>
-       
-        [HttpPost("{doctorId:guid}/{attachmentId:guid}/{language}")]
-        public async Task<IResponseOutput> SetLanguage(Guid doctorId, Guid attachmentId, int language)
-        {
-            bool result =await _attachmentrepository.BatchUpdateNoTrackingAsync(t => t.Id == attachmentId, a => new Attachment
-            {
-                Language = language,
-                IsOfficial = false
-            });
-            return ResponseOutput.Result(result);
-        }
-
-
-    }
-}

IRaCIS.Core.Application/Service/Doctor/DTO/AttachmentModel.cs

@@ -1,64 +0,0 @@
-namespace IRaCIS.Application.Contracts
-{
-    public class AttachmentDTO
-    {
-        public Guid Id { get; set; }
-        public Guid DoctorId { get; set; }
-        public bool IsOfficial { get; set; }
-        public string Type { get; set; } = string.Empty;
-        public string Path { get; set; } = string.Empty;
-        public string FullPath { get; set; } = string.Empty;
-        public string FileName { get; set; } = string.Empty;
-        public DateTime? CreateTime { get; set; }
-        public int Language { get; set; }
-
-        public bool ReUpload { get; set; } = false;
-    }
-
-    public class ReviewerAckDTO
-    {
-        public Guid Id { get; set; }
-        public Guid DoctorId { get; set; }
-        public string Type { get; set; } = string.Empty;
-        public string Path { get; set; } = string.Empty;
-        public string FullPath =>  Path;
-        public string FileName { get; set; } = string.Empty;
-    }
-
-
-
-
-
-    public class TrialSOWPathDTO
-    {
-        public Guid TrialId { get; set; }
-
-        public string SowName { get; set; } = string.Empty;
-        public string SowPath { get; set; } = string.Empty;
-    }
-
-    public class DeleteSowPathDTO
-    {
-        public Guid TrialId { get; set; }
-        public string Path { get; set; } = string.Empty;
-
-    }
-
-    public class UploadAgreementAttachmentDTO
-    {
-        public Guid Id { get; set; }
-
-        public Guid DoctorId { get; set; }
-        public string Type { get; set; } = string.Empty;
-        public string Path { get; set; } = string.Empty;
-        public string FullPath =>  Path;
-
-        public string FileName { get; set; } = string.Empty;
-    }
-
-    public class AttachementCommand
-    {
-        public Guid Id { get; set; }
-        public string Path { get; set; } = string.Empty;
-    }
-}

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorAccountRegisterModel.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace IRaCIS.Application.Contracts
-{
-    public class DoctorAccountRegisterModel : DoctorAccountLoginDTO
-    {
-        public string FirstName { get; set; } = string.Empty;
-        public string LastName { get; set; } = string.Empty;
-        public string EMail { get; set; } = string.Empty;
-        public DateTime RegisterTime { get; set; }
-    }
-}

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -244,12 +244,10 @@ namespace IRaCIS.Application.Contracts
         public DoctorBasicInfoDTO BasicInfoView { get; set; }
         public EmploymentDTO EmploymentView { get; set; }
         public SpecialtyDTO SpecialtyView { get; set; }
-        public IEnumerable<EducationInfoViewModel> EducationList { get; set; }
-        public IEnumerable<PostgraduateViewModel> PostgraduateList { get; set; }
-        public ResearchPublicationDTO ResearchPublicationView { get; set; }
-        public TrialExperienceModel TrialExperienceView { get; set; }
+       
+      
         public ResumeConfirmDTO AuditView { get; set; }
-        public IEnumerable<AttachmentDTO> AttachmentList { get; set; }
+    
 
         public List<SowDTO> SowList { get; set; }
         public List<SowDTO> AckSowList { get; set; }
@@ -262,12 +260,9 @@ namespace IRaCIS.Application.Contracts
             BasicInfoView = new DoctorBasicInfoDTO();
             EmploymentView = new EmploymentDTO();
             SpecialtyView = new SpecialtyDTO();
-            EducationList = new List<EducationInfoViewModel>();
-            PostgraduateList = new List<PostgraduateViewModel>();
-            ResearchPublicationView = new ResearchPublicationDTO();
-            TrialExperienceView = new TrialExperienceModel();
+          
             AuditView = new ResumeConfirmDTO();
-            AttachmentList = new List<AttachmentDTO>();
+         
             IntoGroupInfo = new DoctorEnrollInfoDTO();
             SowList = new List<SowDTO>();
             AckSowList = new List<SowDTO>();

IRaCIS.Core.Application/Service/Doctor/DTO/EducationModel.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace IRaCIS.Application.Contracts
-{
-    public class EducationCommand
-    {
-        public Guid? Id { get; set; }
-        public Guid DoctorId { get; set; }
-        public DateTime BeginDate { get; set; }
-        public DateTime EndDate { get; set; }
-        public string Degree { get; set; } = String.Empty;
-        public string Major { get; set; } = String.Empty;
-        public string Organization { get; set; } = String.Empty;
-        public string Country { get; set; } = String.Empty;
-        public string Province { get; set; } = String.Empty;
-        public string City { get; set; } = String.Empty;
-
-        public string DegreeCN { get; set; } = String.Empty;
-        public string MajorCN { get; set; } = String.Empty;
-        public string OrganizationCN { get; set; } = String.Empty;
-        public string CountryCN { get; set; } = String.Empty;
-        public string ProvinceCN { get; set; } = String.Empty;
-        public string CityCN { get; set; } = String.Empty;
-
-    }
-
-    public class EducationInfoViewModel : EducationCommand
-    {
-        public DateTime? CreateTime { get; set; }
-        public string BeginDateStr  => BeginDate.ToString("yyyy-MM");
-        public string EndDateStr => EndDate.ToString("yyyy-MM");
-
-    }
-    public class PostgraduateCommand
-    {
-        public Guid? Id { get; set; }
-        public Guid DoctorId { get; set; }
-       
-        public DateTime BeginDate { get; set; }
-       
-        public DateTime EndDate { get; set; }
-
-        public string Training { get; set; } = String.Empty;
-
-        public string Major { get; set; } = String.Empty;
-
-        public string Hospital { get; set; } = String.Empty;
-
-        public string School { get; set; } = String.Empty;
-
-        public string Country { get; set; } = String.Empty;
-
-        public string Province { get; set; } = String.Empty;
-
-        public string City { get; set; } = String.Empty;
-
-        public string TrainingCN { get; set; } = String.Empty;
-
-        public string MajorCN { get; set; } = String.Empty;
-
-        public string HospitalCN { get; set; } = String.Empty;
-
-        public string SchoolCN { get; set; } = String.Empty;
-
-        public string CountryCN { get; set; } = String.Empty;
-
-        public string ProvinceCN { get; set; } = String.Empty;
-
-        public string CityCN { get; set; } = String.Empty;
-
-    }
-
-
-    public class PostgraduateViewModel: PostgraduateCommand
-    {
-        public DateTime? CreateTime { get; set; }
-        public string BeginDateStr => BeginDate.ToString("yyyy-MM");
-
-        public string EndDateStr => EndDate.ToString("yyyy-MM");
-    }
-    public class DoctorEducationExperienceDTO
-    {
-      public  IEnumerable<EducationInfoViewModel> EducationList=new List<EducationInfoViewModel>();
-
-      public IEnumerable<PostgraduateViewModel> PostgraduateList = new List<PostgraduateViewModel>();
-    }
-
-}

IRaCIS.Core.Application/Service/Doctor/DTO/HolidayModel.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace IRaCIS.Application.Contracts
-{
-    public class VacationCommand
-    {
-        public Guid? Id { get; set; }
-        public Guid DoctorId { get; set; }
-        public DateTime StartDate { get; set; }
-        public DateTime EndDate { get; set; }
-        public int Status { get; set; } = 1;
-    }
-}

IRaCIS.Core.Application/Service/Doctor/DTO/ResearchPublicationModel.cs

@@ -1,21 +0,0 @@
-using System;
-
-namespace IRaCIS.Application.Contracts
-{
-    public class ResearchPublicationDTO
-    {
-        public Guid? Id { get; set; }
-        public Guid DoctorId { get; set; }
-        public string Research { get; set; } = String.Empty;
-        public string Grants { get; set; } = String.Empty;
-        public string Publications { get; set; } = String.Empty;
-        public string AwardsHonors { get; set; } = String.Empty;
-
-        public string ResearchCN { get; set; } = String.Empty;
-        public string GrantsCN { get; set; } = String.Empty;
-        public string PublicationsCN { get; set; } = String.Empty;
-        public string AwardsHonorsCN { get; set; } = String.Empty;
-
-
-    }
-}

IRaCIS.Core.Application/Service/Doctor/DTO/TrialExperienceModel.cs

@@ -1,87 +0,0 @@
-namespace IRaCIS.Application.Contracts
-{
-    public class TrialExperienceCommand
-    {
-        public Guid? Id { get; set; }
-
-        public Guid DoctorId { get; set; }
-
-        public Guid? PhaseId { get; set; }
-
-        public DateTime? StartTime { get; set; }
-
-        public DateTime? EndTime { get; set; }
-
-        public string EvaluationContent { get; set; } = String.Empty;
-
-        public int VisitReadingCount { get; set; }
-
-        //public string Term { get; set; }
-
-        //public string EvaluationCriteria { get; set; }
-
-        public List<Guid> EvaluationCriteriaIdList { get; set; } = new List<Guid>();
-
-
-    }
-
-    public class TrialExperienceListDTO: TrialExperienceCommand
-    {
-        public string Phase { get; set; } = String.Empty;
-
-        public List<string> EvaluationCriteriaList { get; set; } = new List<string>();
-
-    }
-
-    //public class EvaluationCriteriaDTO
-    //{
-    //    public Guid EvaluationCriteriaId { get; set; }
-    //    public string EvaluationCriteria { get; set; }
-    //}
-
-
-    public class TrialExperienceModel : GcpAndOtherExperienceDTO
-    {
-        public List<TrialExperienceListDTO> ClinicalTrialExperienceList = new List<TrialExperienceListDTO>();
-
-        public string ExpiryDateStr { get; set; } = string.Empty;
-        public string GCPFullPath { get; set; } = String.Empty;
-
-    }
-
-
-    public class GcpAndOtherExperienceDTO
-    {
-        public Guid Id { get; set; }
-
-        public int GCP { get; set; }
-
-        public Guid? GCPId { get; set; }
-
-        public string OtherClinicalExperience { get; set; }=String.Empty;
-        public string OtherClinicalExperienceCN { get; set; } = String.Empty;
-
-        public string Type { get; set; } = string.Empty;
-
-        public string Path { get; set; } = string.Empty;
-
-        public string FileName { get; set; } = string.Empty;
-
-    }
-
-    public class GCPExperienceCommand
-    {
-        public Guid Id { get; set; }
-        public int GCP { get; set; }
-
-        public Guid? GCPId { get; set; } 
-    }
-
-    public class ClinicalExperienceCommand
-    {
-        public Guid DoctorId { get; set; }
-
-        public string OtherClinicalExperience { get; set; } = String.Empty;
-        public string OtherClinicalExperienceCN { get; set; } = String.Empty;
-    }
-}

IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs

@@ -1,279 +0,0 @@
-using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Domain.Share;
-using System.Linq.Dynamic.Core;
-using IRaCIS.Core.Infra.EFCore;
-using Microsoft.AspNetCore.Mvc;
-
-namespace IRaCIS.Application.Services
-{
-    [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class DoctorListService : BaseService, IDoctorListQueryService
-    {
-        private readonly IRepository<Doctor> _doctorRepository;
-
-        public DoctorListService(IRepository<Doctor> doctorRepository)
-        {
-            _doctorRepository = doctorRepository;
-        }
-
-        /// <summary>
-        /// Reviewer列表分页查询
-        /// </summary>       
-        [HttpPost]
-        public async Task<PageOutput<DoctorDTO>> GetDoctorSearchList(DoctorSearchDTO doctorSearch)
-        {
-
-            // 项目经验 多选
-            var evaluationCriteriaCount = doctorSearch.EvaluationCriteriaIdList.Count();
-
-            //  搜索条件 ReadingType 、Subspeciality、Title  多选
-            var count = doctorSearch.ReadingTypeIdList.Count + doctorSearch.TitleIdList.Count + doctorSearch.SubspecialityIdList.Count;
-
-            var guidList = doctorSearch.ReadingTypeIdList.Concat(doctorSearch.SubspecialityIdList).Concat(doctorSearch.TitleIdList);
-
-
-            var query = _doctorRepository.AsQueryable()
-                   .WhereIf(doctorSearch.DepartmentId != null, t => t.DepartmentId == doctorSearch.DepartmentId)
-                   .WhereIf(doctorSearch.SpecialityId != null, t => t.SpecialityId == doctorSearch.SpecialityId)
-                   .WhereIf(doctorSearch.HospitalId != null, t => t.HospitalId == doctorSearch.HospitalId)
-                   .WhereIf(doctorSearch.PositionId != null, t => t.PositionId == doctorSearch.PositionId)
-                   .WhereIf(doctorSearch.RankId != null, t => t.RankId == doctorSearch.RankId)
-                   .WhereIf(doctorSearch.ContractorStatus != null, t => t.CooperateStatus == doctorSearch.ContractorStatus)
-                   .WhereIf(doctorSearch.InformationConfirmed != null, t => t.ResumeStatus == doctorSearch.InformationConfirmed)
-                   .WhereIf(doctorSearch.AcceptingNewTrial != null, t => t.AcceptingNewTrial == doctorSearch.AcceptingNewTrial)
-                   .WhereIf(!string.IsNullOrWhiteSpace(doctorSearch.Name), t => t.ChineseName.Contains(doctorSearch.Name) || (t.LastName + t.FirstName).Contains(doctorSearch.Name))
-                   .WhereIf(doctorSearch.Nation != null, t => t.Nation == doctorSearch.Nation)
-                   .WhereIf(evaluationCriteriaCount > 0, t => t.TrialExperienceCriteriaList.Count(t => doctorSearch.EvaluationCriteriaIdList.Contains(t.EvaluationCriteriaId)) == evaluationCriteriaCount)
-                   ////用户类型  看到简历的范围这里需要确认  
-                   //.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ReviewerCoordinator, t => t.UserList.Any(u => u.UserId == _userInfo.Id))
-                   .WhereIf(count > 0, t => t.DoctorDicRelationList.Count(u => guidList.Contains(u.DictionaryId)) == count)
-                   .WhereIf(doctorSearch.EnrollStatus != null && doctorSearch.EnrollStatus == (int)ReviewerEnrollStatus.Yes, t => t.EnrollList.Any(u => u.EnrollStatus == EnrollStatus.DoctorReading))
-
-                   .ProjectTo<DoctorDTO>(_mapper.ConfigurationProvider);
-
-            return await query.ToPagedListAsync(doctorSearch.PageIndex, doctorSearch.PageSize, doctorSearch.SortField == string.Empty ? "CreateTime" : doctorSearch.SortField, doctorSearch.Asc);
-
-
-        }
-
-
-        #region 入组查询相关
-        /// <summary>
-        /// 获取可筛选筛选及已经筛选的医生列表
-        /// </summary>
-        [HttpPost]
-        public async Task<PageOutput<SelectionReviewerDTO>> GetSelectionReviewerList(
-            ReviewerSelectionQueryDTO selectionQuery)
-        {
-            //项目配置需要的医生过滤  2表示混合
-            var trialConfig = await _repository.Where<Trial>(s => s.Id == selectionQuery.TrialId).Select(t=>new { t.AttendedReviewerTypeEnumList ,t.TrialType} ).FirstOrDefaultAsync().IfNullThrowException();
-
-            //var nation = trialConfig.AttendedReviewerType;
-            // 临床项目经验 多选
-            var evaluationCriteriaCount = selectionQuery.EvaluationCriteriaIdList.Count();
-
-            //  搜索条件 ReadingType 、Subspeciality、Title  多选
-            var count = selectionQuery.ReadingTypeIdList.Count + selectionQuery.TitleIdList.Count + selectionQuery.SubspecialityIdList.Count;
-
-            var guidList = selectionQuery.ReadingTypeIdList.Concat(selectionQuery.SubspecialityIdList).Concat(selectionQuery.TitleIdList);
-
-            var query = _doctorRepository/*.WhereIf(nation != AttendedReviewerType.USAndCN,  t => t.Nation ==(int) nation)*/
-            
-             .WhereIf(selectionQuery.DepartmentId != null, t => t.DepartmentId == selectionQuery.DepartmentId)
-             .WhereIf(selectionQuery.SpecialityId != null, t => t.SpecialityId == selectionQuery.SpecialityId)
-             .WhereIf(trialConfig.TrialType == TrialType.NoneOfficial, t => t.IsVirtual ==true)
-             .WhereIf(trialConfig.TrialType != TrialType.NoneOfficial, t => t.IsVirtual == false)
-             .WhereIf(selectionQuery.HospitalId != null, t => t.HospitalId == selectionQuery.HospitalId)
-             .WhereIf(selectionQuery.PositionId != null, t => t.PositionId == selectionQuery.PositionId)
-             .WhereIf(selectionQuery.RankId != null, t => t.RankId == selectionQuery.RankId)
-             .WhereIf(selectionQuery.ContractorStatus != null, t => t.CooperateStatus == selectionQuery.ContractorStatus )
-             .WhereIf(selectionQuery.InformationConfirmed != null, t => t.ResumeStatus == selectionQuery.InformationConfirmed)
-             .WhereIf(selectionQuery.AcceptingNewTrial != null, t => t.AcceptingNewTrial == selectionQuery.AcceptingNewTrial)
-             .WhereIf(!string.IsNullOrWhiteSpace(selectionQuery.Name), t => t.ChineseName.Contains(selectionQuery.Name) || (t.LastName + t.FirstName).Contains(selectionQuery.Name))
-             .WhereIf(evaluationCriteriaCount > 0, t => t.TrialExperienceCriteriaList.Count(t => selectionQuery.EvaluationCriteriaIdList.Contains(t.EvaluationCriteriaId)) == evaluationCriteriaCount)
-             //用户类型  看到简历的范围这里需要确认  
-             //.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ReviewerCoordinator, t => t.UserList.Any(u => u.UserId == _userInfo.Id))
-             .WhereIf(count > 0, t => t.DoctorDicRelationList.Count(u => guidList.Contains(u.DictionaryId)) == count)
-             .WhereIf(selectionQuery.EnrollStatus != null && selectionQuery.EnrollStatus == (int)ReviewerEnrollStatus.Yes, t => t.EnrollList.Any(u => u.EnrollStatus == EnrollStatus.DoctorReading))
-
-             .ProjectTo<SelectionReviewerDTO>(_mapper.ConfigurationProvider);
-
-            var result = await query.ToPagedListAsync(selectionQuery.PageIndex, selectionQuery.PageSize, selectionQuery.SortField == string.Empty ? "ReviewerCode" : selectionQuery.SortField, selectionQuery.Asc);
-
-            //是否已申请   申请时间 申请人
-            var doctorStateList =  await _repository.Where<EnrollDetail>(x => x.TrialId == selectionQuery.TrialId && x.EnrollStatus == EnrollStatus.HasApplyDownloadResume)
-               .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-            result.CurrentPageData.ToList().ForEach(doctor =>
-              {
-                  //简历申请列表  --处理已经申请的
-                  var doctorState = doctorStateList.FirstOrDefault(t => t.DoctorId == doctor.Id && t.IntoGroupState == (int)EnrollStatus.HasApplyDownloadResume);
-                  if (doctorState != null)
-                  {
-                      doctor.DoctorTrialState = (int)EnrollStatus.HasApplyDownloadResume;
-                      doctor.OptTime = doctorState.OptTime;
-                      doctor.OptUserName = doctorState.OptUserName;
-                  }
-              });
-
-            return result;
-
-
-        }
-
-        /// <summary>
-        /// 获取提交CRO或者CRO审核的Reviewer列表
-        /// </summary>
-        /// <summary>
-        /// 根据状态获取医生列表，入组 相关接口  （提交CRO-1） CRO确认-4  
-        /// </summary>
-        [HttpPost]
-        public async Task<PageOutput<ConfirmationReviewerDTO>> GetSubmissionOrApprovalReviewerList(
-            ReviewerSubmissionQueryDTO param)
-        {
-
-            var doctorQuery = _repository.Where<Enroll>(x => x.TrialId == param.TrialId)
-                  //提交CRO  以及下载简历列表  
-                  .WhereIf(param.IntoGroupSearchState == 1, t => t.EnrollStatus >= EnrollStatus.HasApplyDownloadResume)
-                  //CRO确认列表  状态为 已提交CRO
-                  .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus >= EnrollStatus.HasCommittedToCRO)
-                  .ProjectTo<ConfirmationReviewerDTO>(_mapper.ConfigurationProvider);
-
-            var doctorPageList = await doctorQuery.ToPagedListAsync(param.PageIndex, param.PageSize, param.SortField == "" ? "Code" : param.SortField, param.Asc);
-
-
-            var enrollStateList = await _repository.Where<EnrollDetail>(x => x.TrialId == param.TrialId)
-                   //提交CRO  以及下载简历列表  
-                   .WhereIf(param.IntoGroupSearchState == 1, t => t.EnrollStatus == EnrollStatus.HasCommittedToCRO)
-                   //CRO确认列表  状态为 已提交CRO
-                   .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus == EnrollStatus.InviteIntoGroup)
-                   .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-
-         
-
-            doctorPageList.CurrentPageData.ToList().ForEach(u =>
-            {
-                var opt = enrollStateList.FirstOrDefault(t => t.DoctorId == u.Id);
-                if (opt != null)
-                {
-                    u.DoctorTrialState = param.IntoGroupSearchState == 1 ? (int)EnrollStatus.HasCommittedToCRO : (int)EnrollStatus.InviteIntoGroup;
-                    u.OptTime = opt.OptTime;
-                    u.OptUserName = opt.OptUserName;
-                }
-                else
-                {
-                    u.DoctorTrialState = param.IntoGroupSearchState == 1 ? (int)EnrollStatus.HasDownloadResume : (int)EnrollStatus.HasCommittedToCRO;
-                }
-            });
-
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM)
-            {
-                //SPM 要看到提交的时间 提交人
-                var enrollCommitList = await _repository.Where<EnrollDetail>(x => x.TrialId == param.TrialId)
-                     //提交CRO  以及下载简历列表  
-                     .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus == EnrollStatus.HasCommittedToCRO)
-                     .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-
-                doctorPageList.CurrentPageData.ToList().ForEach(u =>
-                {
-                    var opt = enrollCommitList.FirstOrDefault(t => t.DoctorId == u.Id);
-                    if (opt != null)
-                    {
-                       
-                        u.SubmmitTime = opt.OptTime;
-                        u.SubmmitUserName = opt.OptUserName;
-                    }
-                });
-
-            }
-
-            return doctorPageList;
-
-
-
-        }
-
-
-        //public async  Task<PageOutput<ConfirmationReviewerDTO>> GetSPMSubmissionOrApprovalReviewerList(
-        //    ReviewerSubmissionQueryDTO param)
-        //{
-        //    var doctorQuery = _repository.Where<Enroll>(x => x.TrialId == param.TrialId)
-        //          //提交CRO  以及下载简历列表  
-        //          .WhereIf(param.IntoGroupSearchState == 1, t => t.EnrollStatus >= (int)EnrollStatus.HasApplyDownloadResume)
-        //          //CRO确认列表  状态为 已提交CRO
-        //          .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus >= (int)EnrollStatus.HasCommittedToCRO)
-        //          .ProjectTo<ConfirmationReviewerDTO>(_mapper.ConfigurationProvider);
-
-        //    var doctorPageList = await doctorQuery.ToPagedListAsync(param.PageIndex, param.PageSize, param.SortField == "" ? "Code" : param.SortField, param.Asc);
-
-
-        //    var enrollStateList = await _repository.Where<EnrollDetail>(x => x.TrialId == param.TrialId)
-        //           //提交CRO  以及下载简历列表  
-        //           .WhereIf(param.IntoGroupSearchState == 1, t => t.EnrollStatus == (int)EnrollStatus.HasCommittedToCRO)
-        //           //CRO确认列表  状态为 已提交CRO
-        //           .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus == (int)EnrollStatus.InviteIntoGroup)
-        //           .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-
-        //    doctorPageList.CurrentPageData.ToList().ForEach(u =>
-        //    {
-        //        var opt = enrollStateList.FirstOrDefault(t => t.DoctorId == u.Id);
-        //        if (opt != null)
-        //        {
-        //            u.DoctorTrialState = param.IntoGroupSearchState == 1 ? (int)EnrollStatus.HasCommittedToCRO : (int)EnrollStatus.InviteIntoGroup;
-        //            u.OptTime = opt.OptTime;
-        //            u.OptUserName = opt.OptUserName;
-        //        }
-        //    });
-
-        //    return doctorPageList;
-        //}
-
-        /// <summary>
-        /// 获取项目下医生入组状态列表[Confirmation]
-        /// </summary>
-        [HttpPost]
-        public async Task<PageOutput<ConfirmationReviewerDTO>> GetConfirmationReviewerList(
-            ReviewerConfirmationQueryDTO param)
-        {
-
-
-            var doctorQuery =  _repository.Where<Enroll>(x => x.TrialId == param.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)
-               .ProjectTo<ConfirmationReviewerDTO>(_mapper.ConfigurationProvider);
-
-            var doctorPageList = await doctorQuery.ToPagedListAsync(param.PageIndex, param.PageSize, param.SortField == "" ? "Code" : param.SortField, param.Asc);
-
-            var enrollStateList = await _repository.Where<EnrollDetail>(x => x.TrialId == param.TrialId && x.EnrollStatus > EnrollStatus.InviteIntoGroup)
-                 .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-
-
-            doctorPageList.CurrentPageData.ToList().ForEach(u =>
-            {
-                u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup;
-                var opt = enrollStateList.FirstOrDefault(t => t.DoctorId == u.Id);
-                if (opt != null)
-                {
-                    u.DoctorTrialState = opt.IntoGroupState;
-                    u.OptTime = opt.OptTime;
-                    u.OptUserName = opt.OptUserName;
-                }
-            });
-
-            return doctorPageList;
-
-        }
-
-
-
-        #endregion
-
-
-
-
-    }
-}
-

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -1,628 +0,0 @@
-using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure;
-using Microsoft.AspNetCore.Mvc;
-using System.Linq.Expressions;
-
-namespace IRaCIS.Application.Services
-{
-    [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class DoctorService : BaseService, IDoctorService
-    {
-        private readonly IRepository<Doctor> _doctorRepository;
-        private readonly IRepository<Message> _messageRepository;
-        private readonly IRepository<Enroll> _enrollRepository;
-        private readonly IRepository<DoctorDictionary> _doctorDictionaryRepository;
-        private readonly IRepository<Attachment> _attachmentRepository;
-        private readonly IRepository<DoctorCriterionFile> _doctorCriterionFileRepository;
-        private readonly IRepository<UserDoctor> _userDoctorRepository;
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<TrialPaymentPrice> _trialExtRepository;
-        private readonly IRepository<Vacation> _vacationRepository;
-
-
-
-        public DoctorService(IRepository<Doctor> doctorInfoRepository,
-            IRepository<Dictionary> dictionaryRepository,
-            IRepository<Message> sysMessageRepository, IRepository<Enroll> intoGroupRepository,
-            IRepository<DoctorDictionary> doctorDictionaryRepository,
-            IRepository<Attachment> attachmentRepository,
-              IRepository<DoctorCriterionFile> doctorCriterionFileRepository,
-            IRepository<UserDoctor> userDoctorRepository,
-            IRepository<Trial> trialRepository,
-            IRepository<TrialPaymentPrice> trialExtRepository, IRepository<Vacation> vacationRepository)
-        {
-            _doctorRepository = doctorInfoRepository;
-            _messageRepository = sysMessageRepository;
-            _enrollRepository = intoGroupRepository;
-            _doctorDictionaryRepository = doctorDictionaryRepository;
-            _attachmentRepository = attachmentRepository;
-            this._doctorCriterionFileRepository = doctorCriterionFileRepository;
-            _userDoctorRepository = userDoctorRepository;
-            _trialRepository = trialRepository;
-            _trialExtRepository = trialExtRepository;
-            _vacationRepository = vacationRepository;
-        }
-
-
-
-
-        #region 医生基本信息--查询、新增、更新
-
-        /// <summary>
-        /// 添加/更新 医生基本信息 BasicInfo
-        /// </summary>
-
-        [HttpPost]
-        public async Task<IResponseOutput<DoctorBasicInfoCommand>> AddOrUpdateDoctorBasicInfo(DoctorBasicInfoCommand basicInfoModel)
-        {
-            Expression<Func<Doctor, bool>> verifyExp = t => t.Phone == basicInfoModel.Phone || t.EMail == basicInfoModel.EMail;
-
-                //---current phone or email number already existed
-            var verifyPair = new KeyValuePair<Expression<Func<Doctor, bool>>, string>(verifyExp, _localizer["Doctor_DupPhoneOrEmail"]);
-
-            if (basicInfoModel.Id == Guid.Empty || basicInfoModel.Id == null)
-            {
-
-                var doctor = _mapper.Map<Doctor>(basicInfoModel);
-
-                //验证用户手机号
-                if (await _doctorRepository.AnyAsync(t => t.Phone == doctor.Phone))
-                {
-                //---The current phone number already existed!
-                    return ResponseOutput.NotOk(_localizer["Doctor_DupPhone"], new DoctorBasicInfoCommand());
-                }
-
-                if (await _doctorRepository.AnyAsync(t => t.EMail == doctor.EMail))
-                {
-                //---The current email already existed!
-                    return ResponseOutput.NotOk(_localizer["Doctor_DupEmail"], new DoctorBasicInfoCommand());
-                }
-
-                doctor.Code = (await _doctorRepository.MaxAsync(t => t.Code)) + 1;
-
-                doctor.ReviewerCode = AppSettings.GetCodeStr(doctor.Code, nameof(Doctor));
-
-                doctor.Password = MD5Helper.Md5(doctor.Phone);
-
-                //插入中间表
-                basicInfoModel.TitleIds.ForEach(titleId => doctor.DoctorDicRelationList.Add(new DoctorDictionary() { DoctorId = doctor.Id, KeyName = StaticData.Title, DictionaryId = titleId }));
-
-
-                await _doctorRepository.AddAsync(doctor);
-                //_doctorRepository.Add(doctor);
-
-                //await _repository.AddAsync(new UserDoctor() { DoctorId = doctor.Id, UserId = _userInfo.Id });
-                //_userDoctorRepository.Add(new UserDoctor() { DoctorId = doctor.Id, UserId = _userInfo.Id });
-
-                var success = await _repository.SaveChangesAsync();
-                return ResponseOutput.Result(success, _mapper.Map<DoctorBasicInfoCommand>(doctor));
-
-            }
-            else
-            {
-                var updateModel = basicInfoModel;
-
-                var phone = updateModel.Phone.Trim();
-                if ((await _doctorRepository.FirstOrDefaultAsync(t => t.Phone == phone && t.Id != updateModel.Id)) != null)
-                {
-                //---The current phone number already existed!
-                    return ResponseOutput.NotOk(_localizer["Doctor_DupPhone"], new DoctorBasicInfoCommand());
-                }
-                var email = updateModel.EMail.Trim();
-                if (await _doctorRepository.AnyAsync(t => t.EMail == email && t.Id != updateModel.Id))
-                {
-                //---The current email already existed!
-                    return ResponseOutput.NotOk(_localizer["Doctor_DupEmail"], new DoctorBasicInfoCommand());
-                }
-
-                var doctor = await _doctorRepository.FirstOrDefaultAsync(t => t.Id == updateModel.Id).IfNullThrowException();
-
-                //删除中间表  Title对应的记录
-                await _repository.BatchDeleteAsync<DoctorDictionary>(t => t.DoctorId == updateModel.Id && t.KeyName == StaticData.Title);
-
-
-                var adddata = new List<DoctorDictionary>();
-                //重新插入新的 Title记录
-                updateModel.TitleIds.ForEach(titleId => adddata.Add(new DoctorDictionary() { DoctorId = updateModel.Id.Value, KeyName = StaticData.Title, DictionaryId = titleId }));
-
-                await _repository.AddRangeAsync(adddata);
-
-                _mapper.Map(basicInfoModel, doctor);
-
-                var success = await _repository.SaveChangesAsync();
-
-                return ResponseOutput.Result(success, basicInfoModel);
-
-            }
-
-        }
-
-
-        /// <summary>
-        ///详情、编辑-获取 医生基本信息 BasicInfo
-        /// </summary>
-        /// <param name="doctorId">ReviewerID</param>
-        /// <returns></returns>
-
-        [HttpGet("{doctorId:guid}")]
-        public async Task<DoctorBasicInfoDTO> GetBasicInfo(Guid doctorId)
-        {
-
-            #region 用导航属性直接查询  
-
-            //SELECT[t].[Id], [t].[Code], [t].[ChineseName], [t].[EMail], [t].[FirstName], [t].[Introduction], [t].[LastName], [t].[Phone], [t].[Sex], [t].[WeChat], [t].[Nation], [t0].[Title], [t0].[TitleCN], [t0].[TitleId], [t0].[ShowOrder], [t0].[Id], [t0].[Id0]
-            //FROM(
-            //    SELECT TOP(1)[d].[Id], [d].[Code], [d].[ChineseName], [d].[EMail], [d].[FirstName], [d].[Introduction], [d].[LastName], [d].[Phone], [d].[Sex], [d].[WeChat], [d].[Nation]
-            //    FROM[Doctor] AS[d] WITH(NOLOCK)
-            //    WHERE[d].[Id] = @__doctorId_0
-            //) AS[t]
-            //LEFT JOIN(
-            //    SELECT[d1].[Value] AS[Title], [d1].[ValueCN] AS[TitleCN], [d0].[DictionaryId] AS[TitleId], [d1].[ShowOrder], [d0].[Id], [d1].[Id] AS[Id0], [d0].[DoctorId]
-            //    FROM [DoctorDictionary] AS [d0] WITH (NOLOCK)
-            //    INNER JOIN[Dictionary] AS [d1] WITH (NOLOCK) ON [d0].[DictionaryId] = [d1].[Id]
-            //    WHERE[d0].[KeyName] = N'Title'
-            //) AS[t0] ON[t].[Id] = [t0].[DoctorId]
-            //ORDER BY[t].[Id], [t0].[ShowOrder], [t0].[Id]
-
-            //var doctorQueryable = _doctorRepository
-            //  .Find(t => t.Id == doctorId)
-            //  .Select(doctor => new DoctorBasicInfoDTO()
-            //  {
-            //      Id = doctor.Id,
-            //      Code = doctor.Code,
-            //      ChineseName = doctor.ChineseName,
-            //      EMail = doctor.EMail,
-            //      FirstName = doctor.FirstName,
-            //      Introduction = doctor.Introduction,
-            //      LastName = doctor.LastName,
-            //      Phone = doctor.Phone,
-            //      Sex = doctor.Sex,
-            //      WeChat = doctor.WeChat,
-            //      Nation = doctor.Nation,
-
-            //      //不要分三个属性查询，会做三次左连接，这样 只会一个左连接
-            //      TempObjList = doctor.DoctorDicList.Where(t => t.KeyName == StaticData.Title)
-            //      .Select(t => new TempObj { Title = t.Dictionary.Value, TitleCN = t.Dictionary.ValueCN, TitleId = t.DictionaryId, ShowOrder = t.Dictionary.ShowOrder }).OrderBy(k => k.ShowOrder).ToList(),
-            //  });
-
-            //var doctorBasicInfo = doctorQueryable.FirstOrDefault();
-
-
-
-
-            #endregion
-
-            var doctorBasicInfo = (await _doctorRepository.Where(t => t.Id == doctorId)
-                .ProjectTo<DoctorBasicInfoDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
-
-            return doctorBasicInfo;
-
-
-        }
-
-        #endregion
-
-        #region Employment信息--查询和更新
-        /// <summary>
-        /// 详情、编辑-获取医生工作信息 Employment
-        /// </summary>
-        [HttpGet("{doctorId:Guid}")]
-        public async Task<EmploymentDTO> GetEmploymentInfo(Guid doctorId)
-        {
-
-            #region init EF select  废弃
-            //var dic = GetDictionary();
-
-            //var employmentQueryable = from doctorItem in _doctorRepository
-            //       .Where(t => t.Id == doctorId)
-            //                          join hospitalItem in _hospitalRepository.AsQueryable() on doctorItem.HospitalId equals hospitalItem.Id into g
-            //                          from hospital in g.DefaultIfEmpty()
-            //                          select new EmploymentDTO()
-            //                          {
-            //                              Id = doctorItem.Id,
-            //                              //部门
-            //                              DepartmentId = doctorItem.DepartmentId,
-            //                              DepartmentOther = doctorItem.DepartmentOther,
-            //                              DepartmentOtherCN = doctorItem.DepartmentOtherCN,
-
-            //                              //医院
-            //                              HospitalId = doctorItem.HospitalId,
-
-            //                              PositionId = doctorItem.PositionId,
-            //                              PositionOther = doctorItem.PositionOther,
-            //                              PositionOtherCN = doctorItem.PositionOtherCN,
-
-            //                              RankId = doctorItem.RankId,
-            //                              RankOther = doctorItem.RankOther,
-            //                              RankOtherCN = doctorItem.RankOtherCN,
-
-            //                              City = hospital.City,
-            //                              Country = hospital.Country,
-            //                              UniversityAffiliated = hospital.UniversityAffiliated,
-            //                              HospitalName = hospital.HospitalName,
-            //                              Province = hospital.Province,
-
-            //                              CityCN = hospital.CityCN,
-            //                              CountryCN = hospital.CountryCN,
-            //                              UniversityAffiliatedCN = hospital.UniversityAffiliatedCN,
-            //                              HospitalNameCN = hospital.HospitalNameCN,
-            //                              ProvinceCN = hospital.ProvinceCN
-            //                          };
-
-            //var employmentInfo = employmentQueryable.FirstOrDefault();
-
-            //if (employmentInfo != null)
-            //{
-            //    //医院信息设置
-            //    if (employmentInfo.HospitalId == Guid.Empty)
-            //    {
-            //        employmentInfo.City = string.Empty;
-            //        employmentInfo.Country = string.Empty;
-            //        employmentInfo.UniversityAffiliated = string.Empty;
-            //        employmentInfo.HospitalName = string.Empty;
-            //        employmentInfo.Province = string.Empty;
-            //    }
-            //    employmentInfo.Department = employmentInfo.DepartmentId == Guid.Empty ? employmentInfo.DepartmentOther : dic.FirstOrDefault(o => o.Id == employmentInfo.DepartmentId)?.Value ?? "";
-
-            //    employmentInfo.Rank = employmentInfo.RankId == Guid.Empty ? employmentInfo.RankOther : dic.FirstOrDefault(o => o.Id == employmentInfo.RankId)?.Value ?? "";
-
-            //    employmentInfo.Position = employmentInfo.PositionId == Guid.Empty ? employmentInfo.PositionOther : dic.FirstOrDefault(o => o.Id == employmentInfo.PositionId)?.Value ?? "";
-
-
-            //    employmentInfo.DepartmentCN = employmentInfo.DepartmentId == Guid.Empty ? employmentInfo.DepartmentOther : dic.FirstOrDefault(o => o.Id == employmentInfo.DepartmentId)?.ValueCN ?? "";
-
-            //    employmentInfo.RankCN = employmentInfo.RankId == Guid.Empty ? employmentInfo.RankOther : dic.FirstOrDefault(o => o.Id == employmentInfo.RankId)?.ValueCN ?? "";
-
-            //    employmentInfo.PositionCN = employmentInfo.PositionId == Guid.Empty ? employmentInfo.PositionOther : dic.FirstOrDefault(o => o.Id == employmentInfo.PositionId)?.ValueCN ?? "";
-            //}
-            #endregion
-
-            var query = _doctorRepository.Where(t => t.Id == doctorId)
-                .ProjectTo<EmploymentDTO>(_mapper.ConfigurationProvider);
-
-            var employmentInfo = (await query.FirstOrDefaultAsync()).IfNullThrowException();
-
-            return employmentInfo;
-        }
-
-        [HttpPost]
-
-        public async Task<IResponseOutput> UpdateEmploymentInfo(EmploymentCommand doctorWorkInfoModel)
-        {
-            #region 废弃
-            //var success = _doctorRepository.Update(d => d.Id == doctorWorkInfoModel.Id, u => new Doctor()
-            //{
-            //    DepartmentId = doctorWorkInfoModel.DepartmentId,
-            //    DepartmentOther = doctorWorkInfoModel.DepartmentOther,
-            //    DepartmentOtherCN = doctorWorkInfoModel.DepartmentOtherCN,
-
-            //    SpecialityId = doctorWorkInfoModel.DepartmentId,
-            //    SpecialityOther = doctorWorkInfoModel.DepartmentOther,
-            //    SpecialityOtherCN = doctorWorkInfoModel.DepartmentOtherCN,
-
-            //    RankId = doctorWorkInfoModel.RankId,
-            //    RankOther = doctorWorkInfoModel.RankOther,
-            //    RankOtherCN = doctorWorkInfoModel.RankOtherCN,
-
-            //    PositionId = doctorWorkInfoModel.PositionId,
-            //    PositionOther = doctorWorkInfoModel.PositionOther,
-            //    PositionOtherCN = doctorWorkInfoModel.PositionOtherCN,
-
-            //    HospitalId = doctorWorkInfoModel.HospitalId,
-            //    UpdateTime = DateTime.Now
-            //});
-
-            //var doctor = _doctorRepository.FirstOrDefault(d => d.Id == doctorWorkInfoModel.Id);
-            //_mapper.Map(doctorWorkInfoModel, doctor);
-            //var success = _doctorRepository.SaveChanges();
-            #endregion
-
-
-            var entity = await _repository.InsertOrUpdateAsync<Doctor, EmploymentCommand>(doctorWorkInfoModel, true);
-
-
-            return ResponseOutput.Ok();
-        }
-
-        #endregion
-
-
-        #region 医生技能信息  查询和 更新
-        [HttpGet, Route("{doctorId:Guid}")]
-        public async Task<SpecialtyDTO> GetSpecialtyInfo(Guid doctorId)
-        {
-
-            #region  利用导航属性直接查询出来  生成的sql ok 废弃
-
-            //var specialtyQueryable = _doctorRepository
-            //    .Where(t => t.Id == doctorId).Include(u => u.DoctorDicRelationList)
-            //    .Select(specialty => new SpecialtyDTO()
-            //    {
-            //        Id = specialty.Id,
-            //        ReadingTypeOther = specialty.ReadingTypeOther,
-            //        ReadingTypeOtherCN = specialty.ReadingTypeOtherCN,
-
-            //        SubspecialityOther = specialty.SubspecialityOther,
-            //        SubspecialityOtherCN = specialty.SubspecialityOtherCN,
-
-
-            //        DictionaryList = specialty.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality)
-            //        .Select(t => new SpecialtyDTO.DoctorDictionaryView() { DictionaryId = t.DictionaryId, Value = t.Dictionary.Value, ValueCN = t.Dictionary.ValueCN, ShowOrder = t.Dictionary.ShowOrder, KeyName = t.Dictionary.KeyName })
-            //        .OrderBy(t => t.ShowOrder).ToList(),
-
-            //        SpecialityId = specialty.SpecialityId,
-            //        Speciality = specialty.Speciality.Value,
-            //        SpecialityCN = specialty.Speciality.ValueCN,
-
-            //        SpecialityOther = specialty.SpecialityOther,
-            //        SpecialityOtherCN = specialty.SpecialityOtherCN
-            //    });
-
-            //var specialtyInfo = specialtyQueryable.FirstOrDefault();
-
-            //return specialtyInfo;
-
-            #endregion
-
-
-            var test = await (_doctorRepository.Where(t => t.Id == doctorId)
-                   .ProjectTo<SpecialtyDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
-
-            return test;
-        }
-
-
-        [HttpPost]
-        public async Task<IResponseOutput> UpdateSpecialtyInfo(SpecialtyCommand specialtyUpdateModel)
-        {
-            var doctor = await _doctorRepository.FirstOrDefaultAsync(t => t.Id == specialtyUpdateModel.Id);
-
-            if (doctor == null) return Null404NotFound(doctor);
-
-
-
-            ////删除中间表  
-            //_doctorDictionaryRepository.Delete(t =>
-            //    t.DoctorId == specialtyUpdateModel.Id && t.KeyName == StaticData.Subspeciality);
-            //_doctorDictionaryRepository.Delete(t =>
-            //    t.DoctorId == specialtyUpdateModel.Id && t.KeyName == StaticData.ReadingType);
-
-            await _repository.BatchDeleteAsync<DoctorDictionary>(t =>
-                t.DoctorId == specialtyUpdateModel.Id && (t.KeyName == StaticData.Subspeciality || t.KeyName == StaticData.ReadingType));
-
-
-
-
-
-            //重新插入新的 
-            var adddata = new List<DoctorDictionary>();
-            specialtyUpdateModel.ReadingTypeIds.ForEach(readingTypeId => adddata.Add(
-                new DoctorDictionary()
-                {
-                    DoctorId = specialtyUpdateModel.Id,
-                    KeyName = StaticData.ReadingType,
-                    DictionaryId = readingTypeId
-                }));
-            specialtyUpdateModel.SubspecialityIds.ForEach(subspecialityId => adddata.Add(
-                new DoctorDictionary()
-                {
-                    DoctorId = specialtyUpdateModel.Id,
-                    KeyName = StaticData.Subspeciality,
-                    DictionaryId = subspecialityId
-                }));
-
-            await _repository.AddRangeAsync(adddata);
-
-            _mapper.Map(specialtyUpdateModel, doctor);
-
-            var success = await _repository.SaveChangesAsync();
-            return ResponseOutput.Result(success);
-
-
-        }
-        #endregion
-
-        #region 简历审核
-
-        [HttpPost]
-        public async Task<IResponseOutput> UpdateAuditResume(ResumeConfirmCommand auditResumeParam)
-        {
-            var userId = _userInfo.Id;
-            //判断 合作协议、正式简历 是否有。如果没有，显示提示信息，并且不能保存
-            var attachmentList = await _attachmentRepository.Where(u => u.DoctorId == auditResumeParam.Id)
-                .Select(u => u.Type).ToListAsync();
-            if (auditResumeParam.ResumeStatus == ResumeStatusEnum.Pass && ((!attachmentList.Contains("Resume")) || (!attachmentList.Contains("Consultant Agreement"))))
-            {
-                //---Resume & Consultant Agreement must be upload 
-                return ResponseOutput.NotOk(_localizer["Doctor_RequiredDocumentsError"]);
-            }
-            var success = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.Id == auditResumeParam.Id, u => new Doctor()
-            {
-                CooperateStatus = auditResumeParam.CooperateStatus,
-                ResumeStatus = auditResumeParam.ResumeStatus,
-                AdminComment = auditResumeParam.AdminComment,
-                ReviewStatus = auditResumeParam.ReviewStatus,
-                AcceptingNewTrial = auditResumeParam.AcceptingNewTrial,
-                ActivelyReading = auditResumeParam.ActivelyReading,
-                IsVirtual = auditResumeParam.IsVirtual,
-                BlindName = auditResumeParam.BlindName,
-                BlindNameCN = auditResumeParam.BlindNameCN,
-                BlindPublications = auditResumeParam.BlindPublications,
-                AuditTime = DateTime.Now,
-                AuditUserId = userId
-            });
-
-            if (success)
-            {
-                if (!string.IsNullOrWhiteSpace(auditResumeParam.MessageContent))
-                {
-                    var message = new Message
-                    {
-                        FromUserId = userId,
-                        ToDoctorId = auditResumeParam.Id,
-                        Title = "Resume review results",
-                        Content = auditResumeParam.MessageContent,
-                        HasRead = false,
-                        MessageTime = DateTime.Now
-                    };
-                    await _repository.AddAsync(message);
-                    success = await _repository.SaveChangesAsync();
-                }
-            }
-
-            return ResponseOutput.Result(success);
-        }
-
-        /// <summary>
-        /// 添加修改医生标准文件
-        /// </summary>
-        /// <param name="inDto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> AddDoctorCriterionFile(AddDoctorCriterionFileDto inDto)
-        {
-
-            if (await _doctorCriterionFileRepository.AnyAsync(x => inDto.IsEnable && x.DoctorId == inDto.DoctorId && x.FileType == inDto.FileType && x.TrialId==inDto.TrialId &&x.TrialReadingCriterionId==inDto.TrialReadingCriterionId && x.IsEnable && x.CriterionType == inDto.CriterionType && x.Id != inDto.Id))
-            {
-                //-----------当前标准已添加过此类型文件
-                throw new BusinessValidationFailedException(_localizer["Doctor_StandardDuplicateFileTypeError"]);
-            }
-
-
-            var entity = await _doctorCriterionFileRepository.InsertOrUpdateAsync(inDto);
-
-            if (inDto.TrialId != null)
-            {
-                entity.Remark = await _trialRepository.Where(t => t.Id == inDto.TrialId).Select(t => t.TrialCode).FirstOrDefaultAsync();
-            }
-
-
-            await _doctorCriterionFileRepository.SaveChangesAsync();
-
-            return ResponseOutput.Ok(entity.Id.ToString());
-
-        }
-
-        /// <summary>
-        /// 删除医生标准文件
-        /// </summary>
-        /// <param name="inDto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> DeleteDoctorCriterionFile(DeleteDoctorCriterionFile inDto)
-        {
-            var result = await _doctorCriterionFileRepository.DeleteFromQueryAsync(inDto.Id, true);
-            return ResponseOutput.Ok(result.Id.ToString());
-        }
-
-        /// <summary>
-        /// 获取医生标准文件
-        /// </summary>
-        /// <param name="inDto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<List<GetDoctorCriterionFileOutDto>> GetDoctorCriterionFile(GetDoctorCriterionFileInDto inDto)
-        {
-            var result = await _doctorCriterionFileRepository.Where(x => x.DoctorId == inDto.DoctorId)
-                .WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType)
-                .WhereIf(inDto.FileType != null, x => x.FileType == inDto.FileType)
-                .ProjectTo<GetDoctorCriterionFileOutDto>(_mapper.ConfigurationProvider)
-                .ToListAsync();
-            return result;
-        }
-
-
-        [HttpGet("{doctorId:guid}")]
-        public async Task<ResumeConfirmDTO> GetAuditState(Guid doctorId)
-        {
-            var doctor = (await _doctorRepository
-                .ProjectTo<ResumeConfirmDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync(t => t.Id == doctorId)).IfNullThrowException();
-
-            doctor.InHoliday = (await _repository.CountAsync<Vacation>(x => x.DoctorId == doctorId && x.EndDate <= DateTime.Now && x.StartDate <= DateTime.Now)) > 0;
-
-            return doctor;
-        }
-
-
-        /// <summary>
-        /// 获取医生入组信息  正在提交的数量   已同意入组项目个数  正在读的
-        /// </summary>
-        [HttpPost, Route("{doctorId:guid}")]
-        public DoctorEnrollInfoDTO GetDoctorIntoGroupInfo(Guid doctorId)
-        {
-            var doctorQueryable =
-                from doctor in _doctorRepository.Where(t => t.Id == doctorId)
-                join intoGroupItem in _enrollRepository.AsQueryable() on doctor.Id equals intoGroupItem.DoctorId
-                 into t
-                from intoGroupItem in t.DefaultIfEmpty()
-                group intoGroupItem by intoGroupItem.DoctorId
-                into g
-                select new DoctorEnrollInfoDTO
-                {
-                    DoctorId = g.Key,
-
-                    //Submitted = g.Sum(t =>
-                    //    t.EnrollStatus == (int)EnrollStatus.HasCommittedToCRO ? 1 : 0),
-                    //Approved = g.Sum(t =>
-                    //    t.EnrollStatus == (int)EnrollStatus.InviteIntoGroup ? 1 : 0),
-                    //Reading = g.Sum(t =>
-                    //    t.EnrollStatus == (int)EnrollStatus.DoctorReading ? 1 : 0)
-
-                    Submitted = g.Count(t =>
-                        t.EnrollStatus == EnrollStatus.HasCommittedToCRO),
-                    Approved = g.Count(t =>
-                        t.EnrollStatus == EnrollStatus.InviteIntoGroup),
-                    Reading = g.Count(t =>
-                        t.EnrollStatus == EnrollStatus.DoctorReading)
-                };
-
-            return doctorQueryable.FirstOrDefault().IfNullThrowException();
-        }
-
-
-        /// <summary>
-        /// Get Statement of Work list.[New]
-        /// </summary>
-        [HttpGet("{doctorId:guid}")]
-        public List<SowDTO> GetDoctorSowList(Guid doctorId)
-        {
-            var query = from enroll in _enrollRepository.Where(u => u.DoctorId == doctorId && u.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
-                        join trialExt in _trialExtRepository.AsQueryable() on enroll.TrialId equals trialExt.TrialId
-                        join trial in _trialRepository.AsQueryable() on enroll.TrialId equals trial.Id
-                        select new SowDTO
-                        {
-                            FileName = trialExt.SowName,
-                            FilePath = trialExt.SowPath,
-                            TrialCode = trial.TrialCode,
-                            CreateTime = trialExt.CreateTime
-                        };
-            return query.ToList().Where(u => !string.IsNullOrWhiteSpace(u.FileName)).ToList();
-        }
-
-        /// <summary>
-        /// Get Ack Statement of Work[New]
-        /// </summary>
-        [HttpGet("{doctorId:guid}")]
-        public List<SowDTO> GetDoctorAckSowList(Guid doctorId)
-        {
-            var query = from enroll in _enrollRepository.Where(u => u.DoctorId == doctorId)
-                        join attachment in _attachmentRepository.Where(u => u.DoctorId == doctorId)
-                        on enroll.AttachmentId equals attachment.Id
-                        join trial in _trialRepository.AsQueryable() on enroll.TrialId equals trial.Id
-                        select new SowDTO
-                        {
-                            FileName = attachment.FileName,
-                            FilePath = attachment.Path,
-                            TrialCode = trial.TrialCode,
-                            CreateTime = attachment.CreateTime
-                        };
-            return query.ToList();
-        }
-
-        #endregion
-
-    }
-}

IRaCIS.Core.Application/Service/Doctor/EducationService.cs

@@ -1,140 +0,0 @@
-
-using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Filter;
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Mvc;
-
-namespace IRaCIS.Application.Services
-{
-    [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class EducationService : BaseService, IEducationService
-    {
-        private readonly IRepository<Postgraduate> _postgraduateRepository;
-        private readonly IRepository<Education> _educationRepository;
-
-        public EducationService(IRepository<Education> doctorNormalEducationRepository,
-            IRepository<Postgraduate> doctorContinueLearningRepository)
-        {
-            _educationRepository = doctorNormalEducationRepository;
-            _postgraduateRepository = doctorContinueLearningRepository;
-        }
-
-        /// <summary>
-        /// 根据医生Id获取医生教育经历和继续学习经历列表
-        /// </summary>
-        [HttpGet("{doctorId:Guid}")]
-        public async Task<DoctorEducationExperienceDTO> GetEducation(Guid doctorId)
-        {
-            var educationList = await _educationRepository.Where(o => o.DoctorId == doctorId)
-                .OrderBy(t => t.CreateTime).ProjectTo<EducationInfoViewModel>(_mapper.ConfigurationProvider).ToListAsync();
-
-            var postgraduateList = await _postgraduateRepository.Where(o => o.DoctorId == doctorId)
-                .OrderBy(t => t.CreateTime).ProjectTo<PostgraduateViewModel>(_mapper.ConfigurationProvider).ToListAsync();
-
-
-            return new DoctorEducationExperienceDTO()
-            {
-                EducationList = educationList,
-                PostgraduateList = postgraduateList
-            };
-
-        }
-        /// <summary>
-        /// 新增医生教育经历
-        /// </summary>
-        /// <param name="educationInfoViewModel"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateEducationInfo(EducationCommand educationInfoViewModel)
-        {
-            if (educationInfoViewModel.Id == Guid.Empty || educationInfoViewModel.Id == null)
-            {
-                var doctorEducationInfo = _mapper.Map<Education>(educationInfoViewModel);
-                switch (educationInfoViewModel.Degree)
-                {
-                    case StaticData.ReviewerDegree.Bachelor:
-                        doctorEducationInfo.ShowOrder = 1;
-                        break;
-                    case StaticData.ReviewerDegree.Master:
-                        doctorEducationInfo.ShowOrder = 2;
-                        break;
-                    case StaticData.ReviewerDegree.Doctorate:
-                        doctorEducationInfo.ShowOrder = 3;
-                        break;
-                }
-                await _educationRepository.AddAsync(doctorEducationInfo);
-                var success = await _repository.SaveChangesAsync();
-
-                return ResponseOutput.Result(success, doctorEducationInfo.Id.ToString());
-            }
-
-            else
-            {
-                var needUpdate = await _educationRepository.FirstOrDefaultAsync(t => t.Id == educationInfoViewModel.Id);
-
-                if (needUpdate == null) return Null404NotFound(needUpdate);
-
-                _mapper.Map(educationInfoViewModel, needUpdate);
-
-                var success = await _repository.SaveChangesAsync();
-
-                return ResponseOutput.Ok(success);
-
-            }
-            //_educationRepository.Update(needUpdate);
-
-
-        }
-       
-        [HttpDelete, Route("{doctorId:guid}")]
-        public async Task<IResponseOutput> DeleteEducationInfo(Guid id)
-        {
-            var success = await _educationRepository.BatchDeleteNoTrackingAsync(o => o.Id == id);
-
-            return ResponseOutput.Result(success);
-        }
-        /// <summary> 添加/更新医生继续学习经历</summary>
-       
-        [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdatePostgraduateInfo(PostgraduateCommand postgraduateViewModel)
-        {
-            #region 封装前
-
-            //if (postgraduateViewModel.Id == Guid.Empty || postgraduateViewModel.Id == null)
-            //{
-            //    var doctorContinueLearning = _mapper.Map<Postgraduate>(postgraduateViewModel);
-            //    _postgraduateRepository.Add(doctorContinueLearning);
-            //    var success = _postgraduateRepository.SaveChanges();
-
-            //    return ResponseOutput.Result(success, doctorContinueLearning.Id.ToString());
-            //}
-            //else
-            //{
-            //    _postgraduateRepository.Update(_mapper.Map<Postgraduate>(postgraduateViewModel));
-            //    var success = _postgraduateRepository.SaveChanges();
-
-            //    return ResponseOutput.Result(success);
-
-            //}
-            #endregion
-
-            var entity =  await _repository.InsertOrUpdateAsync<Postgraduate, PostgraduateCommand>(postgraduateViewModel, true);
-            return ResponseOutput.Ok(entity.Id);
-        }
-        /// <summary>
-        /// 删除医生继续学习经历
-        /// </summary>
-        /// <param name="doctorId">医生Id</param>
-        /// <returns></returns>
-       
-        [HttpDelete("{doctorId:guid}")]
-        public async Task<IResponseOutput> DeletePostgraduateInfo(Guid doctorId)
-        {
-            var success = await _repository.BatchDeleteAsync<Postgraduate>(o => o.Id == doctorId);
-            return ResponseOutput.Result(success);
-        }
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IAttachmentService.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using IRaCIS.Application.Contracts;
-
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IAttachmentService
-    {
-        Task<IEnumerable<AttachmentDTO>> SaveAttachments(IEnumerable<AttachmentDTO> attachmentList);
-
-
-        Task<IResponseOutput<AttachmentDTO>>  AddAttachment(AttachmentDTO attachment);
-        Task<IResponseOutput> DeleteAttachment(AttachementCommand param);
-        Task<AttachmentDTO> GetDetailById(Guid attachmentId);
-        Task<IEnumerable<AttachmentDTO>> GetAttachmentByType(Guid doctorId, string type);
-        Task<IEnumerable<AttachmentDTO>> GetAttachmentByTypes(Guid doctorId, string[] types);
-        Task<IEnumerable<AttachmentDTO>> GetAttachments(Guid doctorId);
-        Task<string> GetDoctorOfficialCV(int language, Guid doctorId);
-
-        Task<IResponseOutput> SetOfficial(Guid doctorId, Guid attachmentId, int language);
-
-        Task<IResponseOutput> SetLanguage(Guid doctorId, Guid attachmentId, int language);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IDoctorAccountService.cs

@@ -1,14 +0,0 @@
-using System;
-
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IDoctorAccountService
-    {
-        IResponseOutput Register(DoctorAccountRegisterModel doctorAccount);
-        DoctorAccountDTO Login(DoctorAccountLoginDTO doctorAccount);
-        IResponseOutput UpdatePassword(DoctorAccountUpdatePasswordCommand doctorAccount);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IDoctorListQueryService.cs

@@ -1,32 +0,0 @@
-using IRaCIS.Application.Contracts;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IDoctorListQueryService
-    {
-        /// <summary>
-        /// 医生多条件查询
-        /// </summary>
-         Task<PageOutput<DoctorDTO>> GetDoctorSearchList(DoctorSearchDTO param);
-
-        /// <summary>
-        /// 筛选医生列表
-        /// </summary>
-        /// <param name="doctorSearchModel"></param>
-        /// <returns></returns>
-        //
-         Task<PageOutput<SelectionReviewerDTO>> GetSelectionReviewerList(
-            ReviewerSelectionQueryDTO doctorSearchModel);
-
-        /// <summary>
-        /// //入组 相关接口   （提交CRO-1）   CRO确认-4 
-        /// </summary>
-         Task<PageOutput<ConfirmationReviewerDTO>> GetSubmissionOrApprovalReviewerList(
-            ReviewerSubmissionQueryDTO doctorIntoGroupSearchModel);
-
-
-        //医生确认状态列表
-         Task<PageOutput<ConfirmationReviewerDTO>> GetConfirmationReviewerList(
-            ReviewerConfirmationQueryDTO trialIdPageModel);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IDoctorService.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IDoctorService
-    {
-        #region  医生 基本信息
-
-        /// <summary>
-        /// 基本信息详情展示、编辑使用
-        /// </summary>
-        /// <param name="doctorId"></param>
-        /// <returns></returns>
-        Task<DoctorBasicInfoDTO> GetBasicInfo(Guid doctorId);
-
-        /// <summary>                                                                                   
-        /// 添加医生基本信息
-        /// </summary>
-        /// <param name="addBasicInfoParam"></param>
-        /// <returns></returns>
-        Task<IResponseOutput<DoctorBasicInfoCommand>>  AddOrUpdateDoctorBasicInfo(DoctorBasicInfoCommand addBasicInfoParam);
-
-        #endregion
-
-        #region 医生 工作信息
-
-        /// <summary>
-        /// 获取医生 工作信息
-        /// </summary>
-        /// <param name="doctorId"></param>
-        /// <returns></returns>
-        Task<EmploymentDTO> GetEmploymentInfo(Guid doctorId);
-        /// <summary>
-        /// 更新医生 工作信息
-        /// </summary>
-        /// <param name="updateDoctorWorkInfoViewModel"></param>
-        /// <returns></returns>
-        Task<IResponseOutput> UpdateEmploymentInfo(EmploymentCommand updateDoctorWorkInfoViewModel);
-
-        #endregion
-
-        /// <summary>
-        /// 获取医生技能信息
-        /// </summary>
-        Task<SpecialtyDTO> GetSpecialtyInfo(Guid doctorId);
-
-        /// <summary>
-        /// 更新医生技能信息
-        /// </summary>
-        Task<IResponseOutput> UpdateSpecialtyInfo(SpecialtyCommand specialtyUpdateModel);
-
-        /// <summary>
-        /// 获取医生 审核状态
-        /// </summary>
-        Task<ResumeConfirmDTO> GetAuditState(Guid doctorId);
-
-        /// <summary>
-        /// 审核简历 和合作关系
-        /// </summary>
-        Task<IResponseOutput> UpdateAuditResume(ResumeConfirmCommand auditResumeParam);
-
-        /// <summary> 医生详情  入组信息 </summary>
-        DoctorEnrollInfoDTO GetDoctorIntoGroupInfo(Guid doctorId);
-
-        /// <summary>  获取医生参与项目的Sow协议  </summary>
-        List<SowDTO> GetDoctorSowList(Guid doctorId);
-
-        /// <summary>  获取医生入组的 ack Sow  </summary>
-        List<SowDTO> GetDoctorAckSowList(Guid doctorId);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IEducationService.cs

@@ -1,26 +0,0 @@
-using System;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IEducationService
-    {
-
-        Task<DoctorEducationExperienceDTO> GetEducation(Guid doctorId);
-
-        #region  教育经历
-        Task<IResponseOutput> AddOrUpdateEducationInfo(EducationCommand doctorEducationInfoViewModel);
-
-        Task<IResponseOutput> DeleteEducationInfo(Guid doctorId);
-
-        #endregion
-
-        #region 继续教育经历
-        Task<IResponseOutput> AddOrUpdatePostgraduateInfo(PostgraduateCommand doctorContinueLearningViewModel);
-        Task<IResponseOutput> DeletePostgraduateInfo(Guid doctorId);
-
-        #endregion
-
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IResearchPublicationService.cs

@@ -1,13 +0,0 @@
-using System;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IResearchPublicationService
-    {
-        Task<ResearchPublicationDTO> GetResearchPublication(Guid doctorId);
-
-        Task<IResponseOutput> AddOrUpdateResearchPublication(ResearchPublicationDTO param);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/ITrialExperienceService.cs

@@ -1,15 +0,0 @@
-using System;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface ITrialExperienceService
-    {
-        Task<TrialExperienceModel> GetTrialExperience(Guid doctorId);
-        Task<IResponseOutput> AddOrUpdateTrialExperience(TrialExperienceCommand model);
-        Task<IResponseOutput> DeleteTrialExperience(Guid id);
-        Task<IResponseOutput> UpdateGcpExperience(GCPExperienceCommand model);
-        Task<IResponseOutput> UpdateOtherExperience(ClinicalExperienceCommand updateOtherClinicalExperience);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/Interface/IVacationService.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using IRaCIS.Application.Contracts;
-
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Application.Interfaces
-{
-    public interface IVacationService
-    {
-        Task<IResponseOutput> AddOrUpdateVacation(VacationCommand vacationViewModel);
-        Task<IResponseOutput> DeleteVacation(Guid id);
-        Task<PageOutput<VacationCommand>> GetVacationList(Guid doctorId, int pageIndex, int pageSize);
-        
-        /// <summary> 判断当前时间是否在休假 </summary>
-        Task<IResponseOutput> OnVacation(Guid reviewerId);
-    }
-}

IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs

@@ -1,41 +0,0 @@
-using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
-using Microsoft.AspNetCore.Mvc;
-
-namespace IRaCIS.Application.Services
-{
-    [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class ResearchPublicationService : BaseService, IResearchPublicationService
-    {
-        private readonly IRepository<ResearchPublication> researchPublicationRepository;
-
-        public ResearchPublicationService(IRepository<ResearchPublication> _researchPublicationRepository)
-        {
-            researchPublicationRepository = _researchPublicationRepository;
-        }
-
-        /// <summary>
-        /// 查询-医生科学研究信息
-        /// </summary>
-        /// <param name="doctorId">医生Id</param>
-        /// <returns></returns>
-        [HttpGet("{doctorId:guid}")]
-        public async Task<ResearchPublicationDTO> GetResearchPublication(Guid doctorId)
-        {
-            var doctorScientificResearchInfo = await researchPublicationRepository.Where(o => o.DoctorId == doctorId)
-                .ProjectTo<ResearchPublicationDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-
-            return doctorScientificResearchInfo;
-        }
-
-       
-        [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateResearchPublication(ResearchPublicationDTO param)
-        {
-
-            var entity = await _repository.InsertOrUpdateAsync<ResearchPublication, ResearchPublicationDTO>(param, true);
-
-            return ResponseOutput.Ok(entity.Id);
-        }
-    }
-}

IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs

@@ -1,179 +0,0 @@
-using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Contracts;
-using Microsoft.AspNetCore.Mvc;
-
-namespace IRaCIS.Application.Services
-{
-    [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class TrialExperienceService : BaseService, ITrialExperienceService
-    {
-        private readonly IRepository<TrialExperience> _trialExperienceRepository;
-        private readonly IRepository<Doctor> _doctorRepository;
-        private readonly IRepository<Attachment> _attachmentRepository;
-        private readonly IRepository<TrialExperienceCriteria> _trialExperienceCriteriaRepository;
-
-
-
-        public TrialExperienceService(IRepository<TrialExperience> trialExperienceRepository, IRepository<Doctor> doctorRepository, IRepository<Attachment> attachmentRepository,
-            IRepository<TrialExperienceCriteria> trialExperienceCriteriaRepository)
-        {
-            _trialExperienceRepository = trialExperienceRepository;
-            _doctorRepository = doctorRepository;
-            _attachmentRepository = attachmentRepository;
-            _trialExperienceCriteriaRepository = trialExperienceCriteriaRepository;
-
-        }
-
-
-        /// <summary>
-        /// 根据医生Id，获取临床试验经历 界面所有数据
-        /// </summary>
-        [HttpGet("{doctorId:guid}")]
-        public async Task<TrialExperienceModel> GetTrialExperience(Guid doctorId)
-        {
-            var trialExperience = new TrialExperienceModel();
-
-            var doctor = await _doctorRepository.Where(o => o.Id == doctorId)
-                .ProjectTo<TrialExperienceModel>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-
-            trialExperience.ClinicalTrialExperienceList = await GetTrialExperienceList(doctorId);
-
-            if (doctor != null)
-            {
-                trialExperience.GCP = doctor.GCP;
-                trialExperience.Id = doctor.Id;
-                trialExperience.OtherClinicalExperience = doctor.OtherClinicalExperience ?? "";
-                trialExperience.OtherClinicalExperienceCN = doctor.OtherClinicalExperienceCN ?? "";
-                var attachment = await _attachmentRepository.FirstOrDefaultAsync(t => t.Id == doctor.GCPId);
-                if (attachment != null)
-                {
-                    trialExperience.ExpiryDateStr = attachment.ExpiryDate == null ? "" : attachment.ExpiryDate.Value.ToString("yyyy-MM-dd HH:mm");
-
-                    trialExperience.Path = attachment.Path;
-                    trialExperience.GCPFullPath =  attachment.Path + "?access_token=" + _userInfo.UserToken;
-                    trialExperience.Type = attachment.Type;
-                    trialExperience.FileName = attachment.FileName;
-                    trialExperience.GCPId = attachment.Id;
-                }
-            }
-
-            return trialExperience;
-        }
-
-        private async Task<List<TrialExperienceListDTO>> GetTrialExperienceList(Guid doctorId)
-        {
-            var doctorClinicalTrialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == doctorId).OrderBy(t => t.CreateTime)
-                .ProjectTo<TrialExperienceListDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-            return doctorClinicalTrialExperienceList;
-     
-        }
-        /// <summary> 添加或更新医生临床经验列表项</summary>
-       
-        [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateTrialExperience(TrialExperienceCommand trialExperienceViewModel)
-        {
-            if (trialExperienceViewModel.Id == Guid.Empty || trialExperienceViewModel.Id == null)
-            {
-                var trialExperience =
-                _mapper.Map<TrialExperience>(trialExperienceViewModel);
-
-                trialExperience = await _repository.AddAsync(trialExperience);
-
-                List<TrialExperienceCriteria> criteriaList = new List<TrialExperienceCriteria>();
-                trialExperienceViewModel.EvaluationCriteriaIdList.ForEach(t => criteriaList.Add(new TrialExperienceCriteria()
-                {
-                    DoctorId = trialExperienceViewModel.DoctorId,
-                    //EvaluationCriteria = t.EvaluationCriteria,
-                    EvaluationCriteriaId = t,
-                    TrialExperienceId = trialExperience.Id
-                }));
-
-                await _repository.AddRangeAsync(criteriaList);
-
-
-                var success = await _repository.SaveChangesAsync();
-                return ResponseOutput.Result(success, trialExperience.Id);
-            }
-            else
-            {
-                var needUpdate = await _trialExperienceRepository.FirstOrDefaultAsync(t => t.Id == trialExperienceViewModel.Id);
-
-                if (needUpdate == null) return Null404NotFound(needUpdate);
-
-                _mapper.Map(trialExperienceViewModel, needUpdate);
-                await _repository.UpdateAsync(needUpdate);
-
-                await _repository.BatchDeleteAsync<TrialExperienceCriteria>(t => t.TrialExperienceId == needUpdate.Id);
-
-                List<TrialExperienceCriteria> criteriaList = new List<TrialExperienceCriteria>();
-
-                trialExperienceViewModel.EvaluationCriteriaIdList.ForEach(t => criteriaList.Add(new TrialExperienceCriteria()
-                {
-                    DoctorId = trialExperienceViewModel.DoctorId,
-                    EvaluationCriteriaId = t,
-                    TrialExperienceId = needUpdate.Id
-                }));
-
-                await _repository.AddRangeAsync<TrialExperienceCriteria>(criteriaList);
-
-
-                var success = await _repository.SaveChangesAsync();
-                return ResponseOutput.Result(success, trialExperienceViewModel.Id);
-            }
-        }
-
-        /// <summary>
-        /// 删除临床经验
-        /// </summary>
-       
-        [HttpDelete, Route("{doctorId:guid}")]
-        public async Task<IResponseOutput> DeleteTrialExperience(Guid doctorId)
-        {
-            var success = await _repository.BatchDeleteAsync<TrialExperience>(o => o.Id == doctorId);
-            return ResponseOutput.Result(success);
-        }
-        /// <summary>
-        /// 更新-GCP和其他临床经验
-        /// </summary>
-        /// <param name="updateGCPExperienceParam"></param>
-        /// <returns></returns>
-       
-        [HttpPost]
-        public async Task<IResponseOutput> UpdateGcpExperience(GCPExperienceCommand updateGCPExperienceParam)
-        {
-            //_attachmentRepository.Delete(t => t.DoctorId == updateGCPExperienceParam.Id && t.Type == StaticData.GCP);
-
-            var successs = await _repository.BatchUpdateAsync<Doctor>(o => o.Id == updateGCPExperienceParam.Id, u => new Doctor()
-            {
-                GCP = updateGCPExperienceParam.GCP,
-                GCPId = updateGCPExperienceParam.GCP==0&&updateGCPExperienceParam.GCPId==null?Guid.Empty: updateGCPExperienceParam.GCPId!.Value
-            });
-
-            if (updateGCPExperienceParam.GCP == 0 && updateGCPExperienceParam.GCPId != null) 
-            {
-                await _repository.BatchDeleteAsync<Attachment>(a => a.Id == updateGCPExperienceParam.GCPId);
-            }
-
-            return ResponseOutput.Result(successs, updateGCPExperienceParam.GCPId.ToString());
-
-        }
-
-        /// <summary>
-        /// 更新其他技能经验
-        /// </summary>
-       
-        [HttpPost]
-        public async Task<IResponseOutput> UpdateOtherExperience(ClinicalExperienceCommand updateOtherClinicalExperience)
-        {
-            var success = await _repository.BatchUpdateAsync<Doctor>(o => o.Id == updateOtherClinicalExperience.DoctorId, u => new Doctor()
-            {
-                OtherClinicalExperience = updateOtherClinicalExperience.OtherClinicalExperience ?? string.Empty,
-                OtherClinicalExperienceCN = updateOtherClinicalExperience.OtherClinicalExperienceCN ?? string.Empty
-            });
-
-            return ResponseOutput.Result(success);
-        }
-
-    }
-}