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

修改

Uat_Study
he 2022-10-20 17:44:25 +08:00
parent 45f7a2c0c7
commit 777249bf7a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
View File

@ -98,6 +98,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public bool IsAnalysisCreate { get; set; }
public bool? IsSelfAnalysis { get; set; }
public bool IsBaseLine { get; set; } public bool IsBaseLine { get; set; }
/// <summary> /// <summary>

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -350,7 +350,9 @@ namespace IRaCIS.Application.Services
// 失效的只查看自己 // 失效的只查看自己
.WhereIf(visitTaskInfo.TaskState != TaskState.Effect,x=>x.Id== indto.VisitTaskId) .WhereIf(visitTaskInfo.TaskState != TaskState.Effect,x=>x.Id== indto.VisitTaskId)
.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect .Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
&&x.ArmEnum== visitTaskInfo.ArmEnum &&x.IsAnalysisCreate==visitTaskInfo.IsAnalysisCreate
&&x.IsSelfAnalysis== visitTaskInfo.IsSelfAnalysis
&& x.ArmEnum== visitTaskInfo.ArmEnum
&&x.TrialReadingCriterionId==visitTaskInfo.TrialReadingCriterionId &&x.TrialReadingCriterionId==visitTaskInfo.TrialReadingCriterionId
&& x.ReadingCategory == ReadingCategory.Visit && !x.IsAnalysisCreate && x.ReadingTaskState == ReadingTaskState.HaveSigned) || x.Id == indto.VisitTaskId && x.ReadingCategory == ReadingCategory.Visit && !x.IsAnalysisCreate && x.ReadingTaskState == ReadingTaskState.HaveSigned) || x.Id == indto.VisitTaskId
).OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo() ).OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo()

4
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -421,6 +421,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
QuestionInfo = questionInfos, QuestionInfo = questionInfos,
CriterionId = visitTask.TrialReadingCriterionId, CriterionId = visitTask.TrialReadingCriterionId,
TrialId = visitTask.TrialId, TrialId = visitTask.TrialId,
IsAnalysisCreate=visitTask.IsAnalysisCreate,
IsSelfAnalysis=visitTask.IsSelfAnalysis,
IsBaseLine = subjectVisit!.IsBaseLine, IsBaseLine = subjectVisit!.IsBaseLine,
DoctorUserId = visitTask.DoctorUserId, DoctorUserId = visitTask.DoctorUserId,
TrialReadingCriterionId= visitTask.TrialReadingCriterionId, TrialReadingCriterionId= visitTask.TrialReadingCriterionId,
@ -1041,6 +1043,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
// 查询的时候要把自己排除 因为查询出来的可能不是计算出的最新的 // 查询的时候要把自己排除 因为查询出来的可能不是计算出的最新的
visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit
&& x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
&& x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
&& x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD) && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
.Select(x => new VisitTaskAnswerInfo .Select(x => new VisitTaskAnswerInfo
{ {