From b29ea57acd8031398706c7c533db84f7bde68378 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 21 Mar 2023 15:42:46 +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 --- .../IRaCIS.Core.Application.xml | 12 +++++++++++ .../Allocation/VisitTaskHelpeService.cs | 8 +++++++ .../Reading/Dto/ReadingQuestionViewModel.cs | 15 ++++++++++++- .../ReadingCriterionService.cs | 16 ++++++++++++++ .../Allocation/AllocationRelation.cs | 7 ++++++- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 21 +++++++++++++++++++ IRaCIS.Core.Domain/Allocation/VisitTask.cs | 10 +++++++++ .../ReadingCriterionDictionary.cs | 5 +++++ 8 files changed, 92 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 9a6216c41..4cf5ff6e1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -4707,6 +4707,11 @@ 整体疗效 + + + 标准字典分组 + + IsBaseLineUse @@ -6452,6 +6457,13 @@ + + + 设置标准字典分组 + + + + 设置标准字典 diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 6c5a31632..adbd1192d 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -89,6 +89,14 @@ namespace IRaCIS.Core.Application.Service } + public async Task AddIsPDChangeTask(Guid taskId) + { + var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync(); + taskInfo.ReadingTaskState = ReadingTaskState.WaitReading; + taskInfo.IsConvertedTask = true; + + + } //基于标准签名 产生任务 public async Task BaseCritrionGenerateVisitTask(Guid trialId, Guid confirmedTrialReadingCriterionId) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index ae71c012e..731d2be80 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -92,6 +92,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsCopyQuestion { get; set; } } + public class EditCriterionDictionaryInDto + { + public Guid Id { get; set; } + + /// + /// 标准字典分组 + /// + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; + } + public class SetCriterionDictionaryInDto { [NotDefault] @@ -156,7 +166,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class CriterionDictionaryInfo { - public Guid Id { get; set; } + + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } + + public Guid Id { get; set; } public Guid DictionaryId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index b729029dd..8c005d95a 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -575,6 +575,22 @@ namespace IRaCIS.Core.Application.Service.RC return result; } + + /// + /// 设置标准字典分组 + /// + /// + /// + [HttpPost] + public async Task EditCriterionDictionary(EditCriterionDictionaryInDto inDto) + { + await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingCriterionDictionary() { + CrterionDictionaryGroup=inDto.CrterionDictionaryGroup + }); + + return await _readingCriterionDictionaryRepository.SaveChangesAsync(); + } + /// /// 设置标准字典 /// diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs index 2d0cc2095..fd4446878 100644 --- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs +++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs @@ -285,7 +285,12 @@ namespace IRaCIS.Core.Domain.Share Adbandon = 3, //重置 （裁判任务做了，签名了 算工作量） - HaveReturned = 4 + HaveReturned = 4, + + /// + /// 转为IRECIST之后 之前任务的状态 + /// + Freeze = 5, } //阅片状态 diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 01ed99796..c3ec3beb9 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -16,6 +16,27 @@ namespace IRaCIS.Core.Domain.Share public static readonly string Group = "group"; } + /// + /// 标准字典分类 + /// + public enum CrterionDictionaryGroup + { + + /// + /// 通用 + /// + General = 0, + + /// + /// 转变前 + /// + BeforeConvert = 1, + + /// + /// 转变后 + /// + Converted = 2 + } public enum RelevanceType { diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 6017ca94a..7cc8f1e40 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -288,6 +288,16 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsAnalysisCreate { get; set; } + + /// + /// 是否是转变的任务(转为IRECIST) + /// + public bool IsConvertedTask { get; set; } = false; + + + + + public bool? IsSelfAnalysis { get; set; } public string BlindSubjectCode { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs index f899b4544..1d7f8fd3e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs @@ -54,6 +54,11 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsFollowVisitUse { get; set; } = false; + /// + /// ׼ֵ + /// + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; + [JsonIgnore] [ForeignKey("DictionaryId")] public Dictionary Dictionary { get; set; }