diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6d15cb18f..6f64259b6 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2278,6 +2278,11 @@
单位
+
+
+ 问题英文分组
+
+
序号标记
@@ -4079,11 +4084,21 @@
问题类型
+
+
+ Parent问题类型
+
+
字典code
+
+
+ Parent字典code
+
+
系统标准Id
@@ -4259,6 +4274,11 @@
问题类型
+
+
+ Parent问题类型
+
+
全局阅片显示类型
@@ -4274,6 +4294,11 @@
字典code
+
+
+ Parent字典code
+
+
关联ID
@@ -4424,6 +4449,16 @@
问题名称
+
+
+ 字典code
+
+
+
+
+ 问题类型
+
+
类型值
@@ -7014,6 +7049,16 @@
父问题名称
+
+
+ Parent字典code
+
+
+
+
+ Parent问题类型
+
+
问题名称
@@ -9072,20 +9117,6 @@
-
-
- 更改项目标准（老）
-
-
-
-
-
-
- 更改项目标准（新）
-
-
-
-
验证是否要同步标准
@@ -9099,26 +9130,6 @@
-
-
- 设置父子关系
-
- 项目标准ID
- 项目Id
- 系统问题
- 需要添加list
-
-
-
- 递归处理父子关系
-
-
-
-
-
-
-
-
全局阅片
@@ -9146,6 +9157,13 @@
+
+
+ 批量提交全局阅片信息
+
+
+
+
保存全局阅片结果
@@ -9160,6 +9178,13 @@
+
+
+ 修改计算问题
+
+
+
+
阅读临床数据
diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
index 54d6a9773..b71db865f 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
@@ -197,8 +197,8 @@ namespace IRaCIS.Core.Application.Services
var unionQuery = systemDocumentQueryable.Union(trialDocQueryable)
.WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
.WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
- .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmUserId != null)
- .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmUserId == null);
+ .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
+ .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null);
var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);
diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index f9f268e31..2002c5b25 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -1178,7 +1178,6 @@ namespace IRaCIS.Core.Application.Image.QA
-
var config = await _repository.Where(t => t.Id == visitSearchDTO.TrialId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
return (pageList, config);
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index a41fe8f52..d841dd3c8 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -54,7 +54,8 @@ namespace IRaCIS.Core.Application
HaveSignedTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
? 0
- : await _trialDocumentRepository.Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
+ //废除了 已经签署了也要算进去
+ : await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
.Where( t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
.SelectMany(t => t.TrialDocConfirmedUserList)
@@ -146,9 +147,10 @@ namespace IRaCIS.Core.Application
}
else
{
- var trialDocStat = await _trialRepository.Where(t=>t.TrialStatusStr != StaticData.TrialState.TrialStopped)
+ var trialDocStat = await _trialRepository/*.AsQueryable(true)*/.Where(t=>t.TrialStatusStr != StaticData.TrialState.TrialStopped)
.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
- .WhereIf(!_userInfo.IsAdmin, c => c.TrialDocumentList.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime!=null)).Count() > 0)
+ .WhereIf(!_userInfo.IsAdmin, c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime!=null))
+ .Count() > 0)
.ProjectTo(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id, userTypeId = _userInfo.UserTypeId })
.OrderByDescending(t => t.WaitSignCount)
.ToPagedListAsync(query.PageIndex, query.PageSize , query.SortField, query.Asc);
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 34e45f8fc..5b00a512d 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -295,7 +295,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(t => t.WaitSignCount, u =>
u.MapFrom(c => userTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? 0
- : c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == userTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == userId)).Count())
+ : c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == userTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == userId && t.ConfirmTime!=null)).Count())
);