XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自动同步标准

Test.EIImageViewer
hang 2023-03-17 17:15:55 +08:00
parent 5f1ae97868
commit fd6ade6c9e
7 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.API/Controllers/FinancialChangeController.cs
View File

@ -31,19 +31,19 @@ namespace IRaCIS.Core.API.Controllers.Special
} }
//[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)] ////[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
/// <summary> 添加实验项目-返回新增Id[AUTH]</summary> ///// <summary> 添加实验项目-返回新增Id[AUTH]</summary>
/// <returns>新记录Id</returns> ///// <returns>新记录Id</returns>
[HttpPost, Route("Inspection/trial/addOrUpdateTrial")] //[HttpPost, Route("Inspection/trial/addOrUpdateTrial")]
[UnitOfWork] //[UnitOfWork]
public async Task<IResponseOutput> AddOrUpdateTrialInspection(DataInspectionDto<TrialCommand> opt) //public async Task<IResponseOutput> AddOrUpdateTrialInspection(DataInspectionDto<TrialCommand> opt)
{ //{
var fun =await AddOrUpdateTrial(opt.Data); // var fun =await AddOrUpdateTrial(opt.Data);
return fun; // return fun;
} //}
/// <summary> 添加实验项目-返回新增Id[AUTH]</summary> /// <summary> 添加实验项目-返回新增Id[AUTH]</summary>
@ -53,10 +53,10 @@ namespace IRaCIS.Core.API.Controllers.Special
[Authorize(Policy = IRaCISPolicy.PM_APM)] [Authorize(Policy = IRaCISPolicy.PM_APM)]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
public async Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand param) public async Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand param, [FromServices] ITrialConfigService _ITrialConfigService)
{ {
var userId = Guid.Parse(User.FindFirst("id").Value); var userId = Guid.Parse(User.FindFirst("id").Value);
var result = await _trialService.AddOrUpdateTrial(param); var result = await _trialService.AddOrUpdateTrial(param, _ITrialConfigService);
if (_trialService.TrialExpeditedChange) if (_trialService.TrialExpeditedChange)
{ {

6
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -32,11 +32,7 @@
<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)"> <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> <summary> 系统用户登录接口[New] </summary>
</member> </member>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})"> <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand,IRaCIS.Application.Interfaces.ITrialConfigService)">
<summary> 添加实验项目-返回新增Id[AUTH]</summary>
<returns>新记录Id</returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand)">
<summary> 添加实验项目-返回新增Id[AUTH]</summary> <summary> 添加实验项目-返回新增Id[AUTH]</summary>
<param name="param"></param> <param name="param"></param>
<returns>新记录Id</returns> <returns>新记录Id</returns>

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

@ -10286,7 +10286,7 @@
<param name="projectId"></param> <param name="projectId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.TrialService.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand)"> <member name="M:IRaCIS.Application.Services.TrialService.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand,IRaCIS.Application.Interfaces.ITrialConfigService)">
<summary> <summary>
添加项目 添加项目
</summary> </summary>

4
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -1090,7 +1090,9 @@ namespace IRaCIS.Core.Application.Image.QA
} }
//同时要根据项目有没有配置Subject 级别临床数据 //同时要根据项目有没有配置Subject 级别临床数据
if (dbSubjectVisitList.Any(t => t.IsBaseLine && !t.IsHaveClinicalData))
if (dbSubjectVisitList.Any(t => t.IsBaseLine && !t.IsHaveClinicalData) && await _repository.AnyAsync<ClinicalDataTrialSet>(t=>t.TrialId== cRCRequestToQCCommand.TrialId && t.ClinicalDataLevel==ClinicalLevel.Subject))
{ {
return ResponseOutput.NotOk($"基线没有临床数据，确认提交？", 0, ApiResponseCodeEnum.NeedTips); return ResponseOutput.NotOk($"基线没有临床数据，确认提交？", 0, ApiResponseCodeEnum.NeedTips);
} }

2
IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs
View File

@ -20,6 +20,6 @@ namespace IRaCIS.Application.Interfaces
Task<IResponseOutput> TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO); Task<IResponseOutput> TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO);
Task<IResponseOutput> AsyncTrialCriterionDictionary(AsyncTrialCriterionDictionaryInDto inDto);
} }
} }

2
IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialService.cs
View File

@ -8,7 +8,7 @@ namespace IRaCIS.Application.Interfaces
{ {
bool TrialExpeditedChange { get; set; } bool TrialExpeditedChange { get; set; }
Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand trialAddModel); Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand trialAddModel, ITrialConfigService _ITrialConfigService);
Task<IResponseOutput> DeleteTrial(Guid trialId); Task<IResponseOutput> DeleteTrial(Guid trialId);
Task<PageOutput<TrialDetailDTO>> GetReviewerTrialListByEnrollmentStatus(TrialByStatusQueryDTO param); Task<PageOutput<TrialDetailDTO>> GetReviewerTrialListByEnrollmentStatus(TrialByStatusQueryDTO param);
Task<List<Guid>> GetTrialEnrollmentReviewerIds(Guid trialId); Task<List<Guid>> GetTrialEnrollmentReviewerIds(Guid trialId);

6
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -133,7 +133,7 @@ namespace IRaCIS.Application.Services
/// <param name="trialAddModel"></param> /// <param name="trialAddModel"></param>
/// <returns></returns> /// <returns></returns>
[NonDynamicMethod] [NonDynamicMethod]
public virtual async Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand trialAddModel) public virtual async Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand trialAddModel, ITrialConfigService _ITrialConfigService)
{ {
// 到时候 策略授权 统一改 归类 // 到时候 策略授权 统一改 归类
@ -207,8 +207,10 @@ namespace IRaCIS.Application.Services
List<ReadingQuestionCriterionTrial> needAddCriterionList = List<ReadingQuestionCriterionTrial> needAddCriterionList =
await _repository.Where<ReadingQuestionCriterionSystem>(x => x.IsEnable && x.CriterionType == CriterionType.RECIST1Pointt1).ProjectTo<ReadingQuestionCriterionTrial>(_mapper.ConfigurationProvider).ToListAsync(); await _repository.Where<ReadingQuestionCriterionSystem>(x => x.IsEnable && x.CriterionType == CriterionType.RECIST1Pointt1).ProjectTo<ReadingQuestionCriterionTrial>(_mapper.ConfigurationProvider).ToListAsync();
var trialReadingCriteionId=NewId.NextGuid();
needAddCriterionList.ForEach(x => needAddCriterionList.ForEach(x =>
{ {
x.Id= trialReadingCriteionId;
x.TrialId = trial.Id; x.TrialId = trial.Id;
x.ReadingQuestionCriterionSystemId = x.Id; x.ReadingQuestionCriterionSystemId = x.Id;
x.Id = NewId.NextGuid(); x.Id = NewId.NextGuid();
@ -261,6 +263,8 @@ namespace IRaCIS.Application.Services
_provider.Set(trial.Id.ToString(), StaticData.TrialState.TrialOngoing, TimeSpan.FromDays(7)); _provider.Set(trial.Id.ToString(), StaticData.TrialState.TrialOngoing, TimeSpan.FromDays(7));
await _ITrialConfigService.AsyncTrialCriterionDictionary(new Core.Application.Contracts.AsyncTrialCriterionDictionaryInDto() { TrialReadingCriterionId = trialReadingCriteionId });
return ResponseOutput.Ok(trial); return ResponseOutput.Ok(trial);
} }
else else