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

修复错误

Uat_Study
hang 2022-07-21 15:01:13 +08:00
parent afb72a4662
commit 01aabd5454
3 changed files with 70 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -90,6 +90,13 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitGlobalReadingInfo(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SubmitGlobalReadingInfoInDto})">
<summary>
提交全局阅片任务
</summary>
<param name="opt"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.TrialReadingInfoSign(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.TrialReadingInfoSignInDto})">
<summary>
项目阅片信息签名

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

@ -1444,6 +1444,26 @@
文件路径
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetGlobalReadingInfoInDto.UsingOriginalData">
<summary>
当新答案为空的时候 是否是有原数据
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.AnswerGroup">
<summary>
答案分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.AnswerCombination">
<summary>
答案组合
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.JudgeType">
<summary>
裁判类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.TypeValue">
<summary>
类型值
@ -5770,13 +5790,20 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.SaveGlobalReadingInfoInDto)">
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitGlobalReadingInfo(IRaCIS.Core.Application.Service.Reading.Dto.SubmitGlobalReadingInfoInDto)">
<summary>
提交全局阅片结果
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitTaskChangeState(System.Guid)">
<summary>
签名提交任务修改状态
</summary>
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FinishReadUpdateState(System.Guid)">
<summary>
完成阅片修改状态
@ -5789,6 +5816,13 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GlobalTriggerJudgeQuestion(System.Guid)">
<summary>
全局阅片裁判触发
</summary>
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.TriggerJudgeQuestion(System.Guid)">
<summary>
触发裁判任务(新)
@ -5796,6 +5830,13 @@
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ComputeJudgeResult(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.GroupTaskAnswerDto})">
<summary>
计算返回的结果 为True表示不相等
</summary>
<param name="groupTasks"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveJudgeTask(IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeTaskDto)">
<summary>
添加裁判任务

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

@ -1187,15 +1187,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
{
//有序 如果先同意访视2 再同意访视3 把访视3改为同意
if (trialConfig.IsReadingTaskViewInOrder)
{
await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == visitTaskReReadingAppply.OriginalReReadingTask.SubjectId && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum, u => new VisitTaskReReading()
{
RequestReReadingConfirmUserId = _userInfo.Id,
RequestReReadingResultEnum = RequestReReadingResult.Agree,
});
}
////有序 如果先同意访视2 再同意访视3 把访视3改为同意
//if (trialConfig.IsReadingTaskViewInOrder)
//{
// await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == visitTaskReReadingAppply.OriginalReReadingTask.SubjectId && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum, u => new VisitTaskReReading()
// {
// RequestReReadingConfirmUserId = _userInfo.Id,
// RequestReReadingResultEnum = RequestReReadingResult.Agree,
// });
//}
//PM申请 SPM / CPM审批 回退访视，在此不生成访视任务
if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM))
@ -1797,6 +1797,17 @@ namespace IRaCIS.Core.Application.Service.Allocation
foreach (var influenceTask in influenceTaskList)
{
//同意的访视
if (influenceTask.Id == task.Id)
{
influenceTaskList.ForEach(t =>
{
//记录实际影像的任务
influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id });
});
}
//申请的访视 要不是重阅重置，要不就是失效 不会存在取消分配
if (influenceTask.ReadingCategory == ReadingCategory.Visit && influenceTask.VisitTaskNum != task.VisitTaskNum)
{
@ -1829,15 +1840,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{
influenceTask.TaskState = TaskState.Adbandon;
}
influenceTaskList.ForEach(t =>
{
//记录实际影像的任务
influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id });
});
}
}