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

修改

Browse Source
This commit is contained in:
he
2022-08-31 10:49:39 +08:00
parent ccd6935dcb
commit 5f86ea555a
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+22 -21
View File
@@ -113,6 +113,7 @@ namespace IRaCIS.Application.Services
/// </summary>
/// <param name="indto"></param>
/// <returns></returns>
[HttpPost]
public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto)
{
GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
@@ -170,10 +171,10 @@ namespace IRaCIS.Application.Services
{
RowIndex = 0,
OrderMark = String.Empty,
OrderMark = string.Empty,
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,
TableQuestionId = x.Id,
ShowOrder = x.ShowOrder,
@@ -1813,25 +1814,25 @@ namespace IRaCIS.Application.Services
/// <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();
}
//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();
//}
}
/// <summary>