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

修改一版

Uat_Study
he 2022-07-21 16:50:46 +08:00
parent b65ae6a58a
commit 182f47bbca
4 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -703,7 +703,7 @@ namespace IRaCIS.Core.Application.Service
SouceReadModuleId = firstTask.SouceReadModuleId,
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
TaskState = TaskState.Effect,
DoctorUserId = subjectUser == null ? null : subjectUser.Id,
DoctorUserId = subjectUser == null ? null : subjectUser.DoctorUserId,
TaskAllocationState = subjectUser == null ? TaskAllocationState.NotAllocate : TaskAllocationState.Allocated,
AllocateTime = subjectUser == null ? null : DateTime.Now,

24
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -261,8 +261,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<JudgeReadingInfoDto> VisitTaskInfoList { get; set; }
public ReadingTaskState ReadingTaskState { get; set; }
/// <summary>
@ -312,14 +310,30 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class JudgeReadingInfoDto
{
public string VisitName { get; set; }
public Guid VisitId { get; set; }
public Guid VisitTaskId { get; set; }
public Arm ArmEnum { get; set; }
public List<JudgeQuestionAnswerInfo> JudgeQuestionAnswerInfoList { get; set; }
public List<JudgeQuestion> JudgeQuestionList { get; set; }
}
public class JudgeQuestion
{
public Guid QuestionId { get; set; }
public string QuestionName { get; set; }
public string Answer { get; set; }
}
public List<GetTrialReadingQuestionOutDto> TaskReadingQuestionList { get; set; }
}
public class GetTrialReadingQuestionInDto
{

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

@ -632,27 +632,42 @@ namespace IRaCIS.Application.Services
JudgeResultImagePath = visitTask.JudgeResultImagePath,
VisitTaskInfoList = new List<JudgeReadingInfoDto>()
};
var firstTask = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).FirstNotNullAsync();
var visitIds = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Select(x => new
{
x.Id,
x.ArmEnum,
}).ToListAsync();
foreach (var item in visitIds)
switch (firstTask.ReadingCategory)
{
var taskReadingQuestionList = await this.GetTaskAndAnswer(item.Id);
judgeInfo.VisitTaskInfoList.Add(
new JudgeReadingInfoDto()
{
JudgeQuestionAnswerInfoList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == item.Id && x.ReadingQuestionTrial.IsJudgeQuestion).Select(x => new JudgeQuestionAnswerInfo
{
Answer = x.Answer,
QuestionName = x.ReadingQuestionTrial.QuestionName,
}).ToListAsync(),
VisitTaskId = item.Id,
ArmEnum = item.ArmEnum,
TaskReadingQuestionList = taskReadingQuestionList,
});
case ReadingCategory.Visit:
JudgeReadingInfoDto judgeReadingInfoDto = new JudgeReadingInfoDto() {
VisitId= firstTask.SourceSubjectVisitId.Value,
VisitName= firstTask.TaskBlindName,
};
break;
}
//foreach (var item in visitIds)
//{
// var taskReadingQuestionList = await this.GetTaskAndAnswer(item.Id);
// judgeInfo.VisitTaskInfoList.Add(
// new JudgeReadingInfoDto()
// {
// JudgeQuestionAnswerInfoList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == item.Id && x.ReadingQuestionTrial.IsJudgeQuestion).Select(x => new JudgeQuestionAnswerInfo
// {
// Answer = x.Answer,
// QuestionName = x.ReadingQuestionTrial.QuestionName,
// }).ToListAsync(),
// VisitTaskId = item.Id,
// ArmEnum = item.ArmEnum,
// TaskReadingQuestionList = taskReadingQuestionList,
// });
//}
return judgeInfo;
}
#endregion

5
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
View File

@ -405,6 +405,11 @@ namespace IRaCIS.Core.Application.Service
MedicalDialogCloseEnum = MedicalDialogClose.IRApplyReReading,
});
}
await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{
DoctorUserIdeaEnum = inDto.DoctorUserIdeaEnum,
});
ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
{
TaskMedicalReviewId = inDto.TaskMedicalReviewId,