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

修改阅片任务

Uat_Study
hang 2023-08-07 13:28:26 +08:00
parent a1f80cdd95
commit 21ad1e908e
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

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

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

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