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

修改角色

Uat_Study
hang 2023-07-20 14:30:18 +08:00
parent a9439758c9
commit 128e3c747e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,13 +618,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
var visitQuery = _visitTaskRepository
.Where(x => x.TrialId == inDto.TrialId && x.TaskState == TaskState.Effect)
//PI 读基线的时候，subject 如果基线没阅片完，SR就不能看
//PI 读基线的时候，subject 如果PI基线没阅片完，SR就不能看
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR && piReadingScopenEnum == PIReadingScopenEnum.AllBaseline,
t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect))
t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect))
//PI 读随访的时候， subject 如果基线没阅片完，SR就不能看
//PI 读随访的时候， subject 如果SR基线没阅片完，PI就不能看
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.PI && piReadingScopenEnum == PIReadingScopenEnum.AllVisit,
t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect))
t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect))

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -100,6 +100,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string TaskBlindName { get; set; }
public string TaskName { get; set; }
public UserTypeEnum UserTypeEnum { get; set; }
/// <summary>
/// 阅片类别
/// </summary>

2
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -786,6 +786,8 @@ namespace IRaCIS.Core.Application.Service
AuditState = x.AuditState,
SubjectCode = x.VisitTask.BlindSubjectCode == string.Empty ? x.VisitTask.Subject.Code : x.VisitTask.BlindSubjectCode,
TaskBlindName = x.VisitTask.TaskBlindName,
TaskName=x.VisitTask.TaskName,
UserTypeEnum=x.VisitTask.DoctorUser.UserTypeEnum,
ReadingCategory = x.VisitTask.ReadingCategory,
FirstReplyTime = x.ReadingMedicalReviewDialogList.Min(x => x.CreateTime),
LastReplyTime = x.ReadingMedicalReviewDialogList.Max(x => x.CreateTime),