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

修改文档签署

Uat_Study
{872297557@qq.com} 2023-01-04 10:26:58 +08:00
parent 0c6b968fd5
commit 11644212c9
5 changed files with 67 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -2278,6 +2278,11 @@
单位 单位
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.GroupEnName">
<summary>
问题英文分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VistTaskTableQuestionRowInfo.OrderMark"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VistTaskTableQuestionRowInfo.OrderMark">
<summary> <summary>
序号标记 序号标记
@ -4079,11 +4084,21 @@
问题类型 问题类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ParentQuestionGenre">
<summary>
Parent问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.DictionaryCode"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.DictionaryCode">
<summary> <summary>
字典code 字典code
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ParentDictionaryCode">
<summary>
Parent字典code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ReadingQuestionCriterionTrialId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ReadingQuestionCriterionTrialId">
<summary> <summary>
系统标准Id 系统标准Id
@ -4259,6 +4274,11 @@
问题类型 问题类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ParentQuestionGenre">
<summary>
Parent问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.GlobalReadingShowType"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.GlobalReadingShowType">
<summary> <summary>
全局阅片显示类型 全局阅片显示类型
@ -4274,6 +4294,11 @@
字典code 字典code
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ParentDictionaryCode">
<summary>
Parent字典code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.RelevanceId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.RelevanceId">
<summary> <summary>
关联ID 关联ID
@ -4424,6 +4449,16 @@
问题名称 问题名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CriterionOtherQuestionOutDto.DictionaryCode">
<summary>
字典code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CriterionOtherQuestionOutDto.QuestionGenre">
<summary>
问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CriterionOtherQuestionOutDto.TypeValue"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CriterionOtherQuestionOutDto.TypeValue">
<summary> <summary>
类型值 类型值
@ -7014,6 +7049,16 @@
父问题名称 父问题名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentDictionaryCode">
<summary>
Parent字典code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentQuestionGenre">
<summary>
Parent问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName">
<summary> <summary>
问题名称 问题名称
@ -9072,20 +9117,6 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.UpdateTrialCriterion(System.Guid)">
<summary>
更改项目标准（老）
</summary>
<param name="systemCriterionId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SynchronizeSystemCriterion(System.Guid)">
<summary>
更改项目标准（新）
</summary>
<param name="systemCriterionId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.VerifyeCriterionNeedSynchronize(IRaCIS.Core.Application.Service.Reading.Dto.VerifyeCriterionNeedSynchronizeInDto)"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.VerifyeCriterionNeedSynchronize(IRaCIS.Core.Application.Service.Reading.Dto.VerifyeCriterionNeedSynchronizeInDto)">
<summary> <summary>
验证是否要同步标准 验证是否要同步标准
@ -9099,26 +9130,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetChildParentQuestion(System.Guid,System.Guid,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingQuestionSystem},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingQuestionTrial})">
<summary>
设置父子关系
</summary>
<param name="ReadingQuestionCriterionTrialId">项目标准ID</param>
<param name="trialId">项目Id</param>
<param name="systemQuesitonList">系统问题</param>
<param name="needQuestionList">需要添加list</param>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.CreateQuestionRelation(System.Guid,System.Guid,System.Guid,System.Guid,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingQuestionSystem},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingQuestionTrial})">
<summary>
递归处理父子关系
</summary>
<param name="ReadingQuestionCriterionTrialId"></param>
<param name="trialId"></param>
<param name="oldParentId"></param>
<param name="newParentId"></param>
<param name="systemQuesitonList"></param>
<param name="needQuestionList"></param>
</member>
<member name="T:IRaCIS.Application.Services.ReadingImageTaskService"> <member name="T:IRaCIS.Application.Services.ReadingImageTaskService">
<summary> <summary>
全局阅片 全局阅片
@ -9146,6 +9157,13 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.BatchSubmitGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.BatchSubmitGlobalReadingInfo)">
<summary>
批量提交全局阅片信息
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.SaveGlobalReadingInfoInDto)"> <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.SaveGlobalReadingInfoInDto)">
<summary> <summary>
保存全局阅片结果 保存全局阅片结果
@ -9160,6 +9178,13 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ChangeCalculationAnswer(IRaCIS.Core.Application.Service.Reading.Dto.ChangeCalculationAnswerInDto)">
<summary>
修改计算问题
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ReadClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.ReadClinicalDataInDto)"> <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ReadClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.ReadClinicalDataInDto)">
<summary> <summary>
阅读临床数据 阅读临床数据

4
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -197,8 +197,8 @@ namespace IRaCIS.Core.Application.Services
var unionQuery = systemDocumentQueryable.Union(trialDocQueryable) var unionQuery = systemDocumentQueryable.Union(trialDocQueryable)
.WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name)) .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
.WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId) .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
.WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmUserId != null) .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
.WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmUserId == null); .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null);
var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc); var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);

1
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -1178,7 +1178,6 @@ namespace IRaCIS.Core.Application.Image.QA
var config = await _repository.Where<Trial>(t => t.Id == visitSearchDTO.TrialId).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException(); var config = await _repository.Where<Trial>(t => t.Id == visitSearchDTO.TrialId).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
return (pageList, config); return (pageList, config);

8
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
View File

@ -54,7 +54,8 @@ namespace IRaCIS.Core.Application
HaveSignedTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin HaveSignedTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
? 0 ? 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.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
.SelectMany(t => t.TrialDocConfirmedUserList) .SelectMany(t => t.TrialDocConfirmedUserList)
@ -146,9 +147,10 @@ namespace IRaCIS.Core.Application
} }
else 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)) .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<DocSignStat>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id, userTypeId = _userInfo.UserTypeId }) .ProjectTo<DocSignStat>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id, userTypeId = _userInfo.UserTypeId })
.OrderByDescending(t => t.WaitSignCount) .OrderByDescending(t => t.WaitSignCount)
.ToPagedListAsync(query.PageIndex, query.PageSize , query.SortField, query.Asc); .ToPagedListAsync(query.PageIndex, query.PageSize , query.SortField, query.Asc);

2
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -295,7 +295,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(t => t.WaitSignCount, u => .ForMember(t => t.WaitSignCount, u =>
u.MapFrom(c => userTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? 0 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())
); );