修改阅片任务

Uat_Study
hang 2023-08-07 13:28:26 +08:00
parent a1f80cdd95
commit 21ad1e908e
3 changed files with 22 additions and 12 deletions

View File

@ -9460,11 +9460,11 @@
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.SendVerifyCode(IRaCIS.Core.Application.Contracts.SiteSurveySendVerifyCode)">
<summary>
site 调研 发送验证码
</summary>
<param name="userInfo"></param>
<returns></returns>
<summary>
发送验证码
</summary>
<param name="userInfo"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.VerifySendCode(IRaCIS.Core.Application.Contracts.LoginDto,IRaCIS.Core.Application.Auth.ITokenService)">
<summary>
@ -9520,6 +9520,14 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.SubmissionRejection(System.Guid,System.Guid)">
<summary>
驳回
</summary>
<param name="trialId"></param>
<param name="trialSiteSurveyId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.TrialSurveySubmit(IRaCIS.Core.Application.Contracts.TrialSiteSurvyeSubmitDTO)">
<summary>
提交 后台自动识别是谁提交

View File

@ -1398,7 +1398,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? SubjectId { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
[NotDefault]
public Guid TrialReadingCriterionId { get; set; }
public Guid? VisitTaskId { get; set; }
}

View File

@ -2259,11 +2259,12 @@ namespace IRaCIS.Application.Services
var trialReadingCriterionId = inDto.TrialReadingCriterionId;
var trialReadingCriterion= await _readingQuestionCriterionTrialRepository.FindAsync(trialReadingCriterionId);
if (trialReadingCriterionId == null && inDto.VisitTaskId == null)
{
throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]);
}
//if (trialReadingCriterionId == null && inDto.VisitTaskId == null)
//{
// throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]);
//}
//看已阅的任务
if (inDto.VisitTaskId != null)
@ -2284,12 +2285,12 @@ namespace IRaCIS.Application.Services
trialReadingCriterionId = task.TrialReadingCriterionId;
}
else if (inDto.SubjectId != null)
else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder)
{
var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
{
TrialId = inDto.TrialId,
TrialReadingCriterionId = trialReadingCriterionId.Value,
TrialReadingCriterionId = trialReadingCriterionId,
Page = new PageInput()
{
PageIndex = 1,