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

修改一版

Uat_Study
he 2022-06-27 10:12:47 +08:00
parent fd76f3a5ef
commit 14194bbb00
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1050,6 +1050,11 @@
上传方式 上传方式
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.UploadRole">
<summary>
上传角色
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.FileName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.FileName">
<summary> <summary>
模板文件名称 模板文件名称

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

@ -384,7 +384,7 @@ namespace IRaCIS.Core.Application.Service
}); });
break; break;
case ReadingCategory.ReadingPeriod: //case ReadingCategory.ReadingPeriod:
case ReadingCategory.Global: case ReadingCategory.Global:
if (trialConfig.ReadingType == ReadingMethod.Double) if (trialConfig.ReadingType == ReadingMethod.Double)

1
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -218,7 +218,6 @@ namespace IRaCIS.Application.Services
if (userTypes.Contains(_userInfo.UserTypeEnumInt)) if (userTypes.Contains(_userInfo.UserTypeEnumInt))
{ {
inDto.UploadRole = UploadRole.PM; inDto.UploadRole = UploadRole.PM;
} }

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

@ -516,13 +516,13 @@ namespace IRaCIS.Application.Services
{ {
// ****** 先生成阅片期 阅片期任务阅片完成之后生成肿瘤学的 如果没有阅片期 直接生成肿瘤学 *********//// // ****** 先生成阅片期 阅片期任务阅片完成之后生成肿瘤学的 如果没有阅片期 直接生成肿瘤学 *********////
#region 建立关系 #region 建立关系
Dictionary<ModuleTypeEnum, ReadingCategory> typeChange = new Dictionary<ModuleTypeEnum, ReadingCategory>(); Dictionary<ModuleTypeEnum, ReadingCategory> typeChangeDic = new Dictionary<ModuleTypeEnum, ReadingCategory>();
typeChange.Add(ModuleTypeEnum.InPlanSubjectVisit, ReadingCategory.Visit); typeChangeDic.Add(ModuleTypeEnum.InPlanSubjectVisit, ReadingCategory.Visit);
typeChange.Add(ModuleTypeEnum.OutPlanSubjectVisit, ReadingCategory.Visit); typeChangeDic.Add(ModuleTypeEnum.OutPlanSubjectVisit, ReadingCategory.Visit);
//typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod); //typeChange.Add(ModuleTypeEnum.Read, ReadingCategory.ReadingPeriod);
typeChange.Add(ModuleTypeEnum.Global, ReadingCategory.Global); typeChangeDic.Add(ModuleTypeEnum.Global, ReadingCategory.Global);
typeChange.Add(ModuleTypeEnum.Referee, ReadingCategory.Judge); typeChangeDic.Add(ModuleTypeEnum.Referee, ReadingCategory.Judge);
typeChange.Add(ModuleTypeEnum.Oncology, ReadingCategory.Oncology); typeChangeDic.Add(ModuleTypeEnum.Oncology, ReadingCategory.Oncology);
#endregion #endregion
var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync();
List<ReadingGenerataTaskDTO> needReadList = new List<ReadingGenerataTaskDTO>(); List<ReadingGenerataTaskDTO> needReadList = new List<ReadingGenerataTaskDTO>();
@ -539,9 +539,9 @@ namespace IRaCIS.Application.Services
SubjectId = x.SubjectId, SubjectId = x.SubjectId,
ReadingName = x.ModuleName, ReadingName = x.ModuleName,
ReadModuleId = x.Id, ReadModuleId = x.Id,
ReadingCategory = typeChange[x.ModuleType], ReadingCategory = typeChangeDic[x.ModuleType],
}).ToListAsync(); }).ToListAsync();
if (needReadList.Any(x => x.ReadingCategory == ReadingCategory.ReadingPeriod)) if (needReadList.Any(x => x.ReadingCategory == ReadingCategory.Global))
{ {
needReadList = needReadList.Where(x => x.ReadingCategory != ReadingCategory.Oncology).ToList(); needReadList = needReadList.Where(x => x.ReadingCategory != ReadingCategory.Oncology).ToList();
} }
@ -549,13 +549,13 @@ namespace IRaCIS.Application.Services
await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand() await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()
{ {
ReadingCategory = ReadingCategory.ReadingPeriod, ReadingCategory = ReadingCategory.Global,
TrialId = taskInfo.TrialId, TrialId = taskInfo.TrialId,
ReadingGenerataTaskList = needReadList ReadingGenerataTaskList = needReadList
}) ; }) ;
break; break;
// 肿瘤学 // 肿瘤学
case ReadingCategory.ReadingPeriod: case ReadingCategory.Global:
var subjectId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync(); var subjectId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
needReadList=await _readModuleRepository.Where(x => x.SubjectVisitId == subjectId&&x.ModuleType==ModuleTypeEnum.Oncology) needReadList=await _readModuleRepository.Where(x => x.SubjectVisitId == subjectId&&x.ModuleType==ModuleTypeEnum.Oncology)
.Select(x => new ReadingGenerataTaskDTO .Select(x => new ReadingGenerataTaskDTO
@ -564,7 +564,7 @@ namespace IRaCIS.Application.Services
SubjectId = x.SubjectId, SubjectId = x.SubjectId,
ReadingName = x.ModuleName, ReadingName = x.ModuleName,
ReadModuleId = x.Id, ReadModuleId = x.Id,
ReadingCategory = typeChange[x.ModuleType], ReadingCategory = typeChangeDic[x.ModuleType],
}).ToListAsync(); }).ToListAsync();
needReadList = needReadList.Where(x => _visitTaskRepository.Where(y => y.SouceReadModuleId == x.ReadModuleId).Count() == 0).ToList(); needReadList = needReadList.Where(x => _visitTaskRepository.Where(y => y.SouceReadModuleId == x.ReadModuleId).Count() == 0).ToList();
await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand() await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()

4
IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
View File

@ -7,8 +7,8 @@ namespace IRaCIS.Core.Domain.Share
//访视 //访视
Visit = 1, Visit = 1,
//阅片周期 ////阅片周期
ReadingPeriod = 2, //ReadingPeriod = 2,
//全局 //全局
Global = 3, Global = 3,