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

修改一版

Uat_Study
he 2022-08-01 11:33:24 +08:00
parent e7d788722c
commit ec8b79326f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,8 +143,12 @@ namespace IRaCIS.Application.Services
}; };
// 一致性分析按照doctorId 其他按照分组
result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit && result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum&&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate&&x.TaskState==TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum) x.SubjectId == taskInfo.SubjectId &&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate&&x.TaskState==TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
.WhereIf(taskInfo.ArmEnum==Arm.GroupConsistentArm,x=>x.DoctorUserId== taskInfo.DoctorUserId)
.WhereIf(taskInfo.ArmEnum!= Arm.GroupConsistentArm, x => x.ArmEnum == taskInfo.ArmEnum)
.OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo() .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
{ {
VisitName = x.SourceSubjectVisit.VisitName, VisitName = x.SourceSubjectVisit.VisitName,
@ -387,13 +391,13 @@ namespace IRaCIS.Application.Services
} }
var taskInfo = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).FirstNotNullAsync();
return (result, new return (result, new
{ {
VisitTaskId = task.VisitTaskId, VisitTaskId = task.VisitTaskId,
SubjectId = task.SubjectId, SubjectId = task.SubjectId,
SubjectCode = task.SubjectCode, SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty()? task.SubjectCode: taskInfo.BlindSubjectCode,
ReadingCategory = task.ReadingCategory, ReadingCategory = task.ReadingCategory,
TaskBlindName = task.TaskBlindName, TaskBlindName = task.TaskBlindName,
IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults, IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
@ -893,8 +897,9 @@ namespace IRaCIS.Application.Services
x.Id != inDto.VisitTaskId && x.Id != inDto.VisitTaskId &&
x.ReadingTaskState == ReadingTaskState.HaveSigned&& x.ReadingTaskState == ReadingTaskState.HaveSigned&&
x.TaskState==TaskState.Effect&& x.TaskState==TaskState.Effect&&
x.ReadingCategory== taskInfo.ReadingCategory&&
x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
.WhereIf(taskInfo.ReadingCategory==ReadingCategory.Visit,x=>x.ReadingCategory==ReadingCategory.Visit||x.ReadingCategory==ReadingCategory.Global)
.WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit,x=>x.ReadingCategory==taskInfo.ReadingCategory)
.ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync(); .ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
return readingPastResultList; return readingPastResultList;
} }

10
IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
View File

@ -71,6 +71,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public int? DigitPlaces { get; set; } = 2; public int? DigitPlaces { get; set; } = 2;
/// <summary>
/// 评估结果
/// </summary>
public string EvaluationResult { get; set; } = string.Empty;
/// <summary>
/// 评估原因
/// </summary>
public string EvaluationReason { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 项目 /// 项目
/// </summary> /// </summary>