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

修改

Uat_Study
he 2022-08-31 10:49:39 +08:00
parent ccd6935dcb
commit 5f86ea555a
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7067,6 +7067,13 @@
IR影像阅片 IR影像阅片
</summary> </summary>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
<summary>
获取阅片报告
</summary>
<param name="indto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetTableAnswerRowInfoList(IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoInDto)"> <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetTableAnswerRowInfoList(IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoInDto)">
<summary> <summary>
获取表格答案行信息 获取表格答案行信息

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

@ -113,6 +113,7 @@ namespace IRaCIS.Application.Services
/// </summary> /// </summary>
/// <param name="indto"></param> /// <param name="indto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost]
public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto) public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto)
{ {
GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto(); GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
@ -170,10 +171,10 @@ namespace IRaCIS.Application.Services
{ {
RowIndex = 0, RowIndex = 0,
OrderMark = String.Empty, OrderMark = string.Empty,
TableQuestionList = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).OrderBy(x => x.ShowOrder).Select(x => new VistTaskTableQuestionInfo() TableQuestionList = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).OrderBy(x => x.ShowOrder).Select(x => new VistTaskTableQuestionInfo()
{ {
Answer = String.Empty, Answer = string.Empty,
QuestionId = question.QuestionId, QuestionId = question.QuestionId,
TableQuestionId = x.Id, TableQuestionId = x.Id,
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
@ -1813,25 +1814,25 @@ namespace IRaCIS.Application.Services
/// <returns></returns> /// <returns></returns>
private async Task FinishReadUpdateState(Guid visitTaskId) private async Task FinishReadUpdateState(Guid visitTaskId)
{ {
var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync(); //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 (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned))
{ //{
if (taskInfo.SouceReadModuleId != null) // if (taskInfo.SouceReadModuleId != null)
{ // {
await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule // await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule
{ // {
ReadingStatus = ReadingStatusEnum.ReadCompleted // ReadingStatus = ReadingStatusEnum.ReadCompleted
}); // });
} // }
else if (taskInfo.SourceSubjectVisitId != null) // else if (taskInfo.SourceSubjectVisitId != null)
{ // {
await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit // await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit
{ // {
ReadingStatus = ReadingStatusEnum.ReadCompleted // ReadingStatus = ReadingStatusEnum.ReadCompleted
}); // });
} // }
await _subjectVisitRepository.SaveChangesAsync(); // await _subjectVisitRepository.SaveChangesAsync();
} //}
} }
/// <summary> /// <summary>