diff --git a/IRC.Core.SCP/IRC.Core.SCP.xml b/IRC.Core.SCP/IRC.Core.SCP.xml index 71060c383..a61c822c7 100644 --- a/IRC.Core.SCP/IRC.Core.SCP.xml +++ b/IRC.Core.SCP/IRC.Core.SCP.xml @@ -4,6 +4,34 @@ IRC.Core.SCP + + + 用户登录错误 限制登录 + + + + + + + 跳过阅片 + + + + + + + 开始阅片时间 + + + + + + + 开始休息时间 + + + + 单个文件接收 归档 diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs index deabeb9e8..f4dfed1f5 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs @@ -41,7 +41,7 @@ namespace IRaCIS.Application.Contracts public DateTime CreateTime { get; set; } - + public Guid HospitalGroupId { get; set; } public List PatientList { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs index 67e019dfb..756cb4ad1 100644 --- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs +++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs @@ -3938,6 +3938,7 @@ namespace IRaCIS.Application.Services } else { + //找到该项目下的患者,以及每个患者最新的检查之后的检查 var list = await _subjectRepository.Where(t => t.TrialId == inQuery.TrialId).SelectMany(t => t.SubjectPatientList) @@ -4041,6 +4042,8 @@ namespace IRaCIS.Application.Services item.IsStudyExist = existStudyIdList.Any(t => t.StudyInstanceUid == item.StudyInstanceUID); item.HospitalGroupList = existStudyIdList.FirstOrDefault(t => t.StudyInstanceUid == item.StudyInstanceUID)?.HospitalGroupList ?? new List(); + + if (isAdminOrOA) { //不处理,默认看所有 @@ -4094,6 +4097,7 @@ namespace IRaCIS.Application.Services ExperimentName = t.ExperimentName, CreateTime = t.CreateTime, TrialStatusStr = t.TrialStatusStr, + HospitalGroupId=t.HospitalGroupId, PatientList = t.SubjectList.Where(t => t.Status == SubjectStatus.OnVisit).SelectMany(t => t.SubjectPatientList).Select(u => new TrialPatientDTO() { PatientAge = u.Patient.PatientAge,