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

修改

Uat_Study
he 2022-10-10 14:25:27 +08:00
parent 90452296cc
commit 8182055c3a
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -1478,7 +1478,7 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<(List<GetTrialCriterionJudgeQuestionListOutDto>, object)> GetTrialCriterionJudgeQuestionList(GetTrialCriterionJudgeQuestionListInDto inDto)
{
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstNotNullAsync();
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstNotNullAsync();
var result = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId && x.IsJudgeQuestion)
.WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
@ -1494,11 +1494,10 @@ namespace IRaCIS.Application.Services
ReadingQuestionTrialId = x.Id
}).ToListAsync();
var signTime = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.ReadingInfoSignTime).FirstOrDefaultAsync();
return (result, new
{
IsSign = signTime != null,
IsSign = trialCriterion.ReadingInfoSignTime != null,
});
}

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

@ -215,12 +215,12 @@ namespace IRaCIS.Core.Application
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId
}).ToListAsync();
var signTime = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.ReadingInfoSignTime).FirstOrDefaultAsync();
return (judgeQuestionList, new
{
IsSign= signTime!=null,
IsSign= trialCriterion.ReadingInfoSignTime!= null,
});
}
@ -246,8 +246,8 @@ namespace IRaCIS.Core.Application
{
GetTrialReadingCriterionInfoOutDto result = new GetTrialReadingCriterionInfoOutDto();
result.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync();
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
result.ReadingInfoSignTime = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x=>x.ReadingInfoSignTime).FirstOrDefaultAsync();
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
result.ReadingInfoSignTime = trialCriterion.ReadingInfoSignTime;
if (trialCriterion != null)
{
result.DigitPlaces = trialCriterion.DigitPlaces;

8
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -391,10 +391,10 @@ namespace IRaCIS.Core.Domain.Models
public bool IsImageIabeled { get; set; }
/// <summary>
/// 阅片信息签名时间
/// </summary>
public DateTime? ReadingInfoSignTime { get; set; }
///// <summary>
///// 阅片信息签名时间
///// </summary>
//public DateTime? ReadingInfoSignTime { get; set; }
///// <summary>
///// 敦튬묏야