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

修改一版

Uat_Study
he 2022-06-30 17:15:04 +08:00
parent d352b83660
commit 59a28dff89
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
View File

@ -170,6 +170,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public decimal VisitNum { get; set; }
public bool IsUrgent { get; set; } public bool IsUrgent { get; set; }
public string ReadingName { get; set; } public string ReadingName { get; set; }

6
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -13,6 +13,7 @@ using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
using AutoMapper; using AutoMapper;
using MassTransit; using MassTransit;
using IRaCIS.Core.Infra.EFCore.Common;
namespace IRaCIS.Core.Application.Service namespace IRaCIS.Core.Application.Service
{ {
@ -366,6 +367,7 @@ namespace IRaCIS.Core.Application.Service
ReadingTaskState = ReadingTaskState.WaitReading, ReadingTaskState = ReadingTaskState.WaitReading,
TaskName = firstTask.TaskName, TaskName = firstTask.TaskName,
ReadingCategory = ReadingCategory.Judge, ReadingCategory = ReadingCategory.Judge,
VisitTaskNum= firstTask.VisitTaskNum+ ReadingCommon.TaskNumDic[ReadingCategory.Judge],
TrialId = firstTask.TrialId, TrialId = firstTask.TrialId,
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
SourceSubjectVisitId = firstTask.SourceSubjectVisitId, SourceSubjectVisitId = firstTask.SourceSubjectVisitId,
@ -409,6 +411,7 @@ namespace IRaCIS.Core.Application.Service
TrialId = trialId, TrialId = trialId,
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent, IsUrgent = item.IsUrgent,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
TaskName = item.ReadingName, TaskName = item.ReadingName,
ArmEnum = Arm.DoubleReadingArm1,//特殊 ArmEnum = Arm.DoubleReadingArm1,//特殊
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
@ -422,6 +425,7 @@ namespace IRaCIS.Core.Application.Service
TrialId = trialId, TrialId = trialId,
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent, IsUrgent = item.IsUrgent,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
TaskName = item.ReadingName, TaskName = item.ReadingName,
ArmEnum = Arm.DoubleReadingArm2,//特殊 ArmEnum = Arm.DoubleReadingArm2,//特殊
Code = currentMaxCodeInt + 2, Code = currentMaxCodeInt + 2,
@ -444,6 +448,7 @@ namespace IRaCIS.Core.Application.Service
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent, IsUrgent = item.IsUrgent,
TaskName = item.ReadingName, TaskName = item.ReadingName,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
ArmEnum = Arm.SingleReadingArm, //特殊 ArmEnum = Arm.SingleReadingArm, //特殊
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
SouceReadModuleId = item.ReadModuleId, SouceReadModuleId = item.ReadModuleId,
@ -469,6 +474,7 @@ namespace IRaCIS.Core.Application.Service
SubjectId = item.SubjectId, SubjectId = item.SubjectId,
IsUrgent = item.IsUrgent, IsUrgent = item.IsUrgent,
TaskName = item.ReadingName, TaskName = item.ReadingName,
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Oncology],
ArmEnum = Arm.TumorArm, //特殊 ArmEnum = Arm.TumorArm, //特殊
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
SouceReadModuleId = item.ReadModuleId, SouceReadModuleId = item.ReadModuleId,

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -539,6 +539,7 @@ namespace IRaCIS.Application.Services
{ {
IsUrgent = x.IsUrgent ?? false, IsUrgent = x.IsUrgent ?? false,
SubjectId = x.SubjectId, SubjectId = x.SubjectId,
VisitNum=x.VisitNum,
ReadingName = x.ModuleName, ReadingName = x.ModuleName,
ReadModuleId = x.Id, ReadModuleId = x.Id,
ReadingCategory = typeChangeDic[x.ModuleType], ReadingCategory = typeChangeDic[x.ModuleType],
@ -565,6 +566,7 @@ namespace IRaCIS.Application.Services
IsUrgent = x.IsUrgent ?? false, IsUrgent = x.IsUrgent ?? false,
SubjectId = x.SubjectId, SubjectId = x.SubjectId,
ReadingName = x.ModuleName, ReadingName = x.ModuleName,
VisitNum = x.VisitNum,
ReadModuleId = x.Id, ReadModuleId = x.Id,
ReadingCategory = typeChangeDic[x.ModuleType], ReadingCategory = typeChangeDic[x.ModuleType],
}).ToListAsync(); }).ToListAsync();

2
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -192,7 +192,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public string JudgeResultRemark { get; set; } = string.Empty; public string JudgeResultRemark { get; set; } = string.Empty;
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.02 全局任务在截止访视号上+0.03 肿瘤待定 //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.001 全局任务在截止访视号上+0.01 肿瘤待定
public decimal VisitTaskNum { get; set; } public decimal VisitTaskNum { get; set; }

12
IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
View File

@ -16,11 +16,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
public static class ReadingCommon public static class ReadingCommon
{ {
public static Dictionary<ReadingCategory, dynamic> TaskNumDic = new Dictionary<ReadingCategory, dynamic>()
{
{ReadingCategory.Visit,0 },
{ReadingCategory.Global,0.01 },
{ReadingCategory.Judge,0.001 },
{ReadingCategory.ReReading,0 },
{ReadingCategory.Oncology,0 },
//public static FileStreamResult GetFileStreamResult(IWebHostEnvironment webHostEnvironment, string path,string FileName) };
//{
//}
public static bool IsNullOrEmpty(this string value) public static bool IsNullOrEmpty(this string value)
{ {