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

代码整理

Uat_Study
hang 2022-10-18 10:25:00 +08:00
parent 8c5461aa74
commit 812c82a38b
3 changed files with 122 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
View File

@ -107,8 +107,4 @@
<ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Service\Reading\ReadingCriterionQuestion\" />
</ItemGroup>
</Project>

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

@ -8109,12 +8109,6 @@
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FinishReadUpdateState(System.Guid)">
<summary>
完成阅片修改状态
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.AddReadingTask(System.Guid)">
<summary>
添加阅片期任务
@ -8127,6 +8121,12 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveJudgeTask(IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeTaskDto)">
<summary>
添加裁判任务
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.TriggerJudgeQuestion(System.Guid)">
<summary>
触发裁判任务(新)
@ -8141,12 +8141,6 @@
<param name="groupTasks"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveJudgeTask(IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeTaskDto)">
<summary>
添加裁判任务
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.VerifyTaskIsSign(System.Guid)">
<summary>
验证任务是否签名
@ -8155,6 +8149,12 @@
<returns></returns>
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FinishReadUpdateState(System.Guid)">
<summary>
完成阅片修改状态
</summary>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ReadingPeriodSetService">
<summary>
阅片期配置

112
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -2052,7 +2052,7 @@ namespace IRaCIS.Application.Services
#endregion
#region 提交问题
#region 阅片任务 提交填写表单
/// <summary>
/// 验证访视提交
@ -2420,37 +2420,14 @@ namespace IRaCIS.Application.Services
await _visitTaskRepository.SaveChangesAsync();
}
#endregion
/// <summary>
/// 完成阅片修改状态
/// </summary>
/// <returns></returns>
private async Task FinishReadUpdateState(Guid visitTaskId)
{
//var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
//if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
//{
// if (taskInfo.SouceReadModuleId != null)
// {
// await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule
// {
// ReadingStatus = ReadingStatusEnum.ReadCompleted
// });
// }
// else if (taskInfo.SourceSubjectVisitId != null)
// {
// await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit
// {
// ReadingStatus = ReadingStatusEnum.ReadCompleted
// });
// }
// await _subjectVisitRepository.SaveChangesAsync();
//}
}
#region 阅片期 -全局和肿瘤学任务的生成
/// <summary>
/// 添加阅片期任务
@ -2601,6 +2578,33 @@ namespace IRaCIS.Application.Services
}
}
#endregion
#region 阅片任务 -裁判任务的生成和触发
/// <summary>
/// 添加裁判任务
/// </summary>
/// <returns></returns>
private async Task SaveJudgeTask(SaveJudgeTaskDto inDto)
{
var trialId = await _visitTaskRepository.Where(x => inDto.VisitTaskIds.Contains(x.Id)).Select(x => x.TrialId).FirstOrDefaultAsync();
await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()
{
JudgeVisitTaskIdList = inDto.VisitTaskIds,
ReadingCategory = GenerateTaskCategory.Judge,
TrialId = trialId
});
}
/// <summary>
/// 触发裁判任务(新)
@ -2743,7 +2747,8 @@ namespace IRaCIS.Application.Services
{
noteEqual = true;
}
else {
else
{
var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x =>
x.VisitTask.IsAnalysisCreate == false &&
x.VisitTask.DoctorUserId == visitTask.DoctorUserId &&
@ -2892,23 +2897,10 @@ namespace IRaCIS.Application.Services
return noteEqual;
}
/// <summary>
/// 添加裁判任务
/// </summary>
/// <returns></returns>
private async Task SaveJudgeTask(SaveJudgeTaskDto inDto)
{
var trialId = await _visitTaskRepository.Where(x => inDto.VisitTaskIds.Contains(x.Id)).Select(x => x.TrialId).FirstOrDefaultAsync();
#endregion
await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()
{
JudgeVisitTaskIdList= inDto.VisitTaskIds,
ReadingCategory= GenerateTaskCategory.Judge,
TrialId= trialId
});
}
#region 验证
#region 阅片任务 签名验证
/// <summary>
/// 验证任务是否签名
@ -2926,5 +2918,39 @@ namespace IRaCIS.Application.Services
}
#endregion
#region 废弃
/// <summary>
/// 完成阅片修改状态
/// </summary>
/// <returns></returns>
private async Task FinishReadUpdateState(Guid visitTaskId)
{
//var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
//if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
//{
// if (taskInfo.SouceReadModuleId != null)
// {
// await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule
// {
// ReadingStatus = ReadingStatusEnum.ReadCompleted
// });
// }
// else if (taskInfo.SourceSubjectVisitId != null)
// {
// await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit
// {
// ReadingStatus = ReadingStatusEnum.ReadCompleted
// });
// }
// await _subjectVisitRepository.SaveChangesAsync();
//}
}
#endregion
}
}