XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改默认值

Uat_Study
hang 2023-07-06 16:03:24 +08:00
parent 38fc05e0d9
commit 6042909915
7 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.API/_ServiceExtensions/AutofacModuleSetup.cs
View File

@ -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>();

1
IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs
View File

@ -11,6 +11,7 @@ namespace IRaCIS.Core.API
public static void AddQuartZSetup(this IServiceCollection services, IConfiguration configuration)
{
services.AddTransient<CacheTrialStatusQuartZJob>();
services.AddTransient<CancelTaskQuartZJob>();
services.AddQuartz(q =>
{

10
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -7947,16 +7947,6 @@
完成阅片量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRUnReadOutDto.UnReadJudgeTaskCount">
<summary>
未完成裁判任务数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRUnReadOutDto.FinishJudgeTaskCount">
<summary>
完成裁判任务数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRUnReadOutDto.SuggesteFinishedTime">
<summary>
建议完成时间

22
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -59,7 +59,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ReadingQuestionSystem> _readingQuestionSystem;
private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileSystem;
private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
private readonly IScheduler _scheduler;
private readonly ISchedulerFactory _schedulerFactory;
private readonly IMemoryCache _cache;
private readonly ITrialEmailNoticeConfigService _trialEmailNoticeConfigService;
@ -100,10 +100,10 @@ namespace IRaCIS.Application.Services
ITrialEmailNoticeConfigService trialEmailNoticeConfigService,
IRepository<NoneDicomStudyFile> noneDicomStudyFileSystem,
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
IScheduler scheduler
ISchedulerFactory schedulerFactory
)
{
_scheduler = scheduler;
_schedulerFactory = schedulerFactory;
base._mapper = mapper;
this._noneDicomStudyRepository = noneDicomStudyRepository;
this._visitTaskRepository = visitTaskRepository;
@ -2336,7 +2336,7 @@ namespace IRaCIS.Application.Services
if (task != null)
{
// 有序 自动领取该Subject
await ClaimOrCancelSubjectAsync(new ClaimSubjectDto() { IsClaim = true, SubejctId = task.SubjectId, IsInOrder = true }, _scheduler);
await ClaimOrCancelSubjectAsync(new ClaimSubjectDto() { IsClaim = true, SubejctId = task.SubjectId, IsInOrder = true }, _schedulerFactory);
}
}
else
@ -2362,7 +2362,7 @@ namespace IRaCIS.Application.Services
if (task != null)
{
// 有序 自动领取该Subject
await ClaimOrCancelSubjectAsync(new ClaimSubjectDto() { IsClaim = true, VisitTaskId = task.VisitTaskId, IsInOrder = false }, _scheduler);
await ClaimOrCancelSubjectAsync(new ClaimSubjectDto() { IsClaim = true, VisitTaskId = task.VisitTaskId, IsInOrder = false }, _schedulerFactory);
}
}
@ -2496,8 +2496,10 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task ClaimOrCancelSubjectAsync(ClaimSubjectDto claimSubjectDto, IScheduler _scheduler)
public async Task ClaimOrCancelSubjectAsync(ClaimSubjectDto claimSubjectDto, ISchedulerFactory _schedulerFactory)
{
IScheduler scheduler = await _schedulerFactory.GetScheduler();
if (claimSubjectDto.IsInOrder)
{
if (claimSubjectDto.IsClaim)
@ -2520,7 +2522,7 @@ namespace IRaCIS.Application.Services
.Build();
// 将任务和触发器关联起来，将任务安排到调度器中
await _scheduler.ScheduleJob(job, trigger);
await scheduler.ScheduleJob(job, trigger);
//BackgroundJob.Schedule<IObtainTaskAutoCancelJob>(t => t.CancelQCObtaion(subjectVisitId, DateTime.Now), TimeSpan.FromHours(1));
@ -2548,13 +2550,11 @@ namespace IRaCIS.Application.Services
.Build();
// 将任务和触发器关联起来，将任务安排到调度器中
await _scheduler.ScheduleJob(job, trigger);
await scheduler.ScheduleJob(job, trigger);
}
}
await scheduler.Start();
}

4
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -965,9 +965,9 @@ namespace IRaCIS.Core.Application.Contracts
public List<AddOrUpdateTrialCriterionAdditional> TrialCriterionAdditionalAssessmentTypeList { get; set; }=new List<AddOrUpdateTrialCriterionAdditional>();
public int ReadingDivisionEnum { get; set; }
public ReadingDivisionEnum ReadingDivisionEnum { get; set; }
public int PIReadingScopenEnum { get; set; }
public PIReadingScopenEnum PIReadingScopenEnum { get; set; }
}

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -598,7 +598,9 @@ namespace IRaCIS.Core.Application
IsOncologyReading = inDto.IsOncologyReading,
IsUrgent= inDto.IsUrgent,
IsAdditionalAssessment = inDto.IsAdditionalAssessment,
IsAutoCreate = inDto.IsAutoCreate
IsAutoCreate = inDto.IsAutoCreate,
PIReadingScopenEnum=inDto.PIReadingScopenEnum,
ReadingDivisionEnum=inDto.ReadingDivisionEnum,
});

2
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -126,7 +126,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IseCRFShowInDicomReading { get; set; } = false;
public ReadingDivisionEnum ReadingDivisionEnum { get; set; }
public ReadingDivisionEnum ReadingDivisionEnum { get; set; } = ReadingDivisionEnum.OnlySR;
public PIReadingScopenEnum PIReadingScopenEnum { get; set; }