From 1e94964378fc9f4e9336250be904b3b0e8f69757 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 10 Oct 2022 13:54:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTaskService.cs | 6 ++++++ .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 2 +- .../Service/TrialSiteUser/TrialConfigService.cs | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index f1f1f2c5a..d2d7c768b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -2334,6 +2334,12 @@ namespace IRaCIS.Application.Services await VerifyTaskIsSign(inDto.VisitTaskId); + + // 修改编号 + + //var taskinfo + + await this.SubmitTaskChangeState(inDto.VisitTaskId); return ResponseOutput.Ok(true); } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 44bf46725..39fc2386e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -756,7 +756,7 @@ namespace IRaCIS.Core.Application.Contracts public class SetTrialReadingCriterionInDto { - public Guid TrialCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } /// /// 表单类型 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index e9a050caa..ba1fbb858 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -294,8 +294,8 @@ namespace IRaCIS.Core.Application { if (inDto.IsSignSave) { - var criterionFormType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId).Select(x => x.FormType).FirstOrDefaultAsync(); - var count = _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialCriterionId) + var criterionFormType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.FormType).FirstOrDefaultAsync(); + var count = _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId) .WhereIf(criterionFormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null) .WhereIf(criterionFormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null).Count(); @@ -305,7 +305,7 @@ namespace IRaCIS.Core.Application } } - await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial() + await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial() { FormType = inDto.FormType, DigitPlaces = inDto.DigitPlaces,