diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 045a819ce..2b021e5a2 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -139,6 +139,13 @@
+
+
+ CRC签名临床数据
+
+
+
+
提交阅片裁判问题
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 8ec9ae1cf..09ffad060 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2499,6 +2499,13 @@
临床答案
+
+
+ CRC签名临床数据
+
+
+
+
自动添加CRC临床数据
@@ -2542,6 +2549,13 @@
+
+
+ 获取PM待确认列表
+
+
+
+
获取CRC确认列表
@@ -2556,6 +2570,20 @@
+
+
+ 获取临床数据表格信息 查看没有表格问题的列表
+
+
+
+
+
+
+ 获取临床数据表格信息 查看有表格问题的列表
+
+
+
+
CRC 确认临床数据
@@ -2738,6 +2766,21 @@
+
+
+ 临床级别
+
+
+
+
+ 上传方式
+
+
+
+
+ 模块名称
+
+
临床级别
@@ -2748,16 +2791,16 @@
受试者ID
+
+
+ 模块名称
+
+
最晚拍片日期
-
-
- VisitId
-
-
VisitId
@@ -10687,6 +10730,13 @@
vvv
+
+
+ 获取PM核对临床数据
+
+
+
+
SPM 阅片人筛选
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
index e7022b3b6..33ccd99e4 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
@@ -112,7 +112,6 @@ namespace IRaCIS.Core.Application.Contracts
public class ReviewerSelectToBeDoneQuery : PageInput
{
-
}
public class ReviewerSelectToBeDoneDto : TrialBaseInfoDto
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 881156a8f..e58ce76c2 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -21,15 +21,19 @@ namespace IRaCIS.Core.Application
private readonly IRepository _trialUserRepository;
private readonly IRepository _trialDocumentRepository;
private readonly IRepository _systemDocumentRepository;
+ private readonly IRepository _readModuleRepository;
private readonly IRepository _systemNoticeRepository;
public PersonalWorkstation(IRepository trialRepository, IRepository trialUserRepository, IRepository trialDocumentRepository,
- IRepository systemDocumentRepository, IRepository systemNoticeRepository)
+ IRepository systemDocumentRepository,
+ IRepository readModuleRepository,
+ IRepository systemNoticeRepository)
{
_trialRepository = trialRepository;
_trialUserRepository = trialUserRepository;
_trialDocumentRepository = trialDocumentRepository;
_systemDocumentRepository = systemDocumentRepository;
+ this._readModuleRepository = readModuleRepository;
_systemNoticeRepository = systemNoticeRepository;
}
@@ -302,8 +306,9 @@ namespace IRaCIS.Core.Application
[HttpPost]
public async Task>> GetPMClinicalDataToBeDoneList(ReviewerSelectToBeDoneQuery inQuery)
{
+
var query = _trialRepository
- .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+ .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.Select(t => new GetPMClinicalDataToBeDoneListOutDto()
{
TrialId = t.Id,
@@ -317,8 +322,17 @@ namespace IRaCIS.Core.Application
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
- return ResponseOutput.Ok(result, new { ToBeApprovalCount = query.Sum(x=>x.ToBeApprovalCount) }); ;
+
+ var all =await _trialRepository
+ .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+ .Select(t => new GetPMClinicalDataToBeDoneListOutDto()
+ {
+
+
+ ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm && !u.IsPMConfirm).Count()
+ }).ToListAsync();
+
+ return ResponseOutput.Ok(result, new { ToBeApprovalCount = all.Sum(x=>x.ToBeApprovalCount) }); ;
}
#endregion