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

修改一版

Browse Source
This commit is contained in:
he
2022-06-30 17:15:04 +08:00
parent d352b83660
commit 59a28dff89
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
+2
View File
@@ -170,6 +170,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid SubjectId { get; set; }
public decimal VisitNum { get; set; }
public bool IsUrgent { get; set; }
public string ReadingName { get; set; }
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+6
View File
@@ -13,6 +13,7 @@ using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure;
using AutoMapper;
using MassTransit;
using IRaCIS.Core.Infra.EFCore.Common;
namespace IRaCIS.Core.Application.Service
{
@@ -366,6 +367,7 @@ namespace IRaCIS.Core.Application.Service
ReadingTaskState = ReadingTaskState.WaitReading,
TaskName = firstTask.TaskName,
ReadingCategory = ReadingCategory.Judge,
VisitTaskNum= firstTask.VisitTaskNum+ ReadingCommon.TaskNumDic[ReadingCategory.Judge],
TrialId = firstTask.TrialId,
Code = currentMaxCodeInt + 1,
SourceSubjectVisitId = firstTask.SourceSubjectVisitId,
@@ -409,6 +411,7 @@ namespace IRaCIS.Core.Application.Service
TrialId = trialId,
SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
TaskName = item.ReadingName,
ArmEnum = Arm.DoubleReadingArm1,//特殊
Code = currentMaxCodeInt + 1,
@@ -422,6 +425,7 @@ namespace IRaCIS.Core.Application.Service
TrialId = trialId,
SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
TaskName = item.ReadingName,
ArmEnum = Arm.DoubleReadingArm2,//特殊
Code = currentMaxCodeInt + 2,
@@ -444,6 +448,7 @@ namespace IRaCIS.Core.Application.Service
SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent,
TaskName = item.ReadingName,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
ArmEnum = Arm.SingleReadingArm, //特殊
Code = currentMaxCodeInt + 1,
SouceReadModuleId = item.ReadModuleId,
@@ -469,6 +474,7 @@ namespace IRaCIS.Core.Application.Service
SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent,
TaskName = item.ReadingName,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Oncology],
ArmEnum = Arm.TumorArm, //特殊
Code = currentMaxCodeInt + 1,
SouceReadModuleId = item.ReadModuleId,
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+2
View File
@@ -539,6 +539,7 @@ namespace IRaCIS.Application.Services
{
IsUrgent = x.IsUrgent ?? false,
SubjectId = x.SubjectId,
VisitNum=x.VisitNum,
ReadingName = x.ModuleName,
ReadModuleId = x.Id,
ReadingCategory = typeChangeDic[x.ModuleType],
@@ -565,6 +566,7 @@ namespace IRaCIS.Application.Services
IsUrgent = x.IsUrgent ?? false,
SubjectId = x.SubjectId,
ReadingName = x.ModuleName,
VisitNum = x.VisitNum,
ReadModuleId = x.Id,
ReadingCategory = typeChangeDic[x.ModuleType],
}).ToListAsync();