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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-02-23 18:06:36 +08:00
parent 073ab6b16b 4e004cbe8c
commit 26c8718a39
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -289,6 +289,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string TaskBlindName { get; set; }
public Arm ArmEnum { get; set; }
public Guid? VisistId { get; set; }
public DateTime? SuggesteFinishedTime { get; set; }

1
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1033,6 +1033,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
SuggesteFinishedTime = u.SuggesteFinishedTime,
ReadingCategory = u.ReadingCategory,
IsAnalysisCreate = u.IsAnalysisCreate,
ArmEnum= u.ArmEnum,
TrialReadingCriterionId = u.TrialReadingCriterionId,
IsNeedClinicalDataSign =u.IsNeedClinicalDataSign,
IsClinicalDataSign=u.IsClinicalDataSign,

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -1232,6 +1232,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid VisitTaskId { get; set; }
public Guid VisistId { get; set; }
public Arm ArmEnum { get; set; }
public bool IsExistsClinicalData { get; set; }
public bool IsNeedReadClinicalData { get; set; }

3
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1843,6 +1843,7 @@ namespace IRaCIS.Application.Services
TaskBlindName = x.TaskBlindName,
SubjectId = x.SubjectId,
ReadingCategory = x.ReadingCategory,
ArmEnum = x.ArmEnum,
VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : default(Guid),
VisitNum = x.VisitTaskNum,
TrialReadingCriterionId = x.TrialReadingCriterionId,
@ -1883,6 +1884,7 @@ namespace IRaCIS.Application.Services
SubjectId = currentSubject.SubjectId,
TaskBlindName = x.TaskBlindName,
VisitNum = x.VisitNum,
ArmEnum = x.ArmEnum,
VisistId = x.VisistId ?? default(Guid),
VisitTaskId = x.Id,
TrialReadingCriterionId = x.TrialReadingCriterionId,
@ -1898,6 +1900,7 @@ namespace IRaCIS.Application.Services
&& x.TaskState == TaskState.Effect).Select(x => new GetReadingTaskDto()
{
VisitTaskId = x.Id,
ArmEnum= x.ArmEnum,
TaskBlindName = x.TaskBlindName,
ReadingCategory = x.ReadingCategory,
VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule == null ? default(Guid) : x.ReadModule.SubjectVisitId,