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

修改

Uat_Study
he 2022-10-10 11:57:56 +08:00
parent 8386e2299c
commit 4c2827401b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,7 +643,7 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialReadingInfoSignInDto public class TrialReadingInfoSignInDto
{ {
[NotDefault] [NotDefault]
public Guid TrialCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
} }
public class GetTrialReadingCriterionInfoOutDto public class GetTrialReadingCriterionInfoOutDto
@ -739,7 +739,7 @@ namespace IRaCIS.Core.Application.Contracts
public class GetOncologySetInDto public class GetOncologySetInDto
{ {
public Guid TrialCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
} }
public class GetTrialReadingInfoInDto public class GetTrialReadingInfoInDto
@ -749,7 +749,7 @@ namespace IRaCIS.Core.Application.Contracts
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
[NotDefault] [NotDefault]
public Guid TrialCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
} }
@ -781,7 +781,7 @@ namespace IRaCIS.Core.Application.Contracts
/// <summary> /// <summary>
/// 项目标准ID /// 项目标准ID
/// </summary> /// </summary>
public Guid TrialCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
/// <summary> /// <summary>
/// 阅片工具 /// 阅片工具

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

@ -64,7 +64,7 @@ namespace IRaCIS.Core.Application
[HttpPost] [HttpPost]
public async Task<IResponseOutput> TrialReadingInfoSignVerify(TrialReadingInfoSignInDto inDto) public async Task<IResponseOutput> TrialReadingInfoSignVerify(TrialReadingInfoSignInDto inDto)
{ {
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync(); var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None) var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
.WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null) .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
.WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null) .WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null)
@ -103,7 +103,7 @@ namespace IRaCIS.Core.Application
[NonDynamicMethod] [NonDynamicMethod]
public async Task<IResponseOutput> TrialReadingInfoSign(TrialReadingInfoSignInDto inDto) public async Task<IResponseOutput> TrialReadingInfoSign(TrialReadingInfoSignInDto inDto)
{ {
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialCriterionId).FirstOrDefaultAsync(); var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None) var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
.WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null) .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application
throw new BusinessValidationFailedException("有裁判问题未配置产生裁判阅片任务的条件,操作失败！"); throw new BusinessValidationFailedException("有裁判问题未配置产生裁判阅片任务的条件,操作失败！");
} }
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial() await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
{ {
ReadingInfoSignTime = DateTime.Now ReadingInfoSignTime = DateTime.Now
}); });
@ -133,7 +133,7 @@ namespace IRaCIS.Core.Application
[HttpPost] [HttpPost]
public async Task<GetTrialReadingInfoOutDto> GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto) public async Task<GetTrialReadingInfoOutDto> GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto)
{ {
GetTrialReadingInfoOutDto trialInfo= await _readingQuestionCriterionTrialRepository.Where(x=>x.Id==inDto.TrialCriterionId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync(); GetTrialReadingInfoOutDto trialInfo= await _readingQuestionCriterionTrialRepository.Where(x=>x.Id==inDto.TrialReadingCriterionId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
return trialInfo; return trialInfo;
} }
@ -147,7 +147,7 @@ namespace IRaCIS.Core.Application
public async Task<GetOncologySetOutDto> GetOncologySet(GetOncologySetInDto inDto) public async Task<GetOncologySetOutDto> GetOncologySet(GetOncologySetInDto inDto)
{ {
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId).FirstOrDefaultAsync(); var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
if (trialCriterion == null) if (trialCriterion == null)
{ {
throw new BusinessValidationFailedException("请先确认一个项目标准。"); throw new BusinessValidationFailedException("请先确认一个项目标准。");
@ -195,7 +195,7 @@ namespace IRaCIS.Core.Application
[HttpPost] [HttpPost]
public async Task<(List<TrialJudgeQuestion>,object)> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto) public async Task<(List<TrialJudgeQuestion>,object)> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto)
{ {
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync(); var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
if (trialCriterion == null) if (trialCriterion == null)
{ {
throw new BusinessValidationFailedException("请先确认一个项目标准。"); throw new BusinessValidationFailedException("请先确认一个项目标准。");
@ -260,7 +260,7 @@ namespace IRaCIS.Core.Application
// 同步器官 // 同步器官
await _iOrganInfoService.SynchronizeSystemOrganToTrial(new SynchronizeSystemOrganToTrialInDto() await _iOrganInfoService.SynchronizeSystemOrganToTrial(new SynchronizeSystemOrganToTrialInDto()
{ {
TrialCriterionId = inDto.TrialCriterionId, TrialCriterionId = inDto.TrialReadingCriterionId,
SystemCriterionId = trialCriterion.ReadingQuestionCriterionSystemId SystemCriterionId = trialCriterion.ReadingQuestionCriterionSystemId
}); });
@ -268,7 +268,7 @@ namespace IRaCIS.Core.Application
await iReadingQuestionService.SynchronizeCriterion(new SynchronizeCriterionInDto() await iReadingQuestionService.SynchronizeCriterion(new SynchronizeCriterionInDto()
{ {
TrialCriterionId = inDto.TrialCriterionId, TrialCriterionId = inDto.TrialReadingCriterionId,
}); });
} }
@ -327,7 +327,7 @@ namespace IRaCIS.Core.Application
[HttpPost] [HttpPost]
public async Task<IResponseOutput> SetCriterionReadingInfo(SetCriterionReadingInfoInDto inDto) public async Task<IResponseOutput> SetCriterionReadingInfo(SetCriterionReadingInfoInDto inDto)
{ {
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial() await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
{ {
ReadingTool=inDto.ReadingTool, ReadingTool=inDto.ReadingTool,
//DigitPlaces=inDto.DigitPlaces, //DigitPlaces=inDto.DigitPlaces,