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

修改

Uat_Study
he 2022-10-09 13:34:27 +08:00
parent c5e0ddde03
commit d3f4e024e8
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -653,6 +653,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public string VisitName { get; set; } public string VisitName { get; set; }
public string BlindName { get; set; }
public Guid VisitId { get; set; } public Guid VisitId { get; set; }
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }

16
IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
View File

@ -106,14 +106,14 @@ namespace IRaCIS.Core.Application.Service
//与基线访视相比SOD变化百分比 //与基线访视相比SOD变化百分比
new ReadingCalculateData (){QuestionType=QuestionType.SODPercent,GetDecimalNullFun=GetSODPercent}, new ReadingCalculateData (){QuestionType=QuestionType.SODPercent,GetDecimalNullFun=GetSODPercent},
//与整个访视期间SOD最低点相比增加的值（mm） 其他任务需要改 //与整个访视期间SOD最低点相比增加的值（mm） //其他任务需要改
new ReadingCalculateData (){QuestionType=QuestionType.LowestIncrease,GetDecimalNullFun=GetLowestIncrease,ChangeAllTaskFun=ChangeAllLowestIncrease}, new ReadingCalculateData (){QuestionType=QuestionType.LowestIncrease,GetDecimalNullFun=GetLowestIncrease,/*ChangeAllTaskFun=ChangeAllLowestIncrease*/},
//与整个访视期间SOD最低点相比增加的百分比 其他任务需要改 //与整个访视期间SOD最低点相比增加的百分比 //其他任务需要改
new ReadingCalculateData (){QuestionType=QuestionType.LowPercent,GetDecimalNullFun=GetLowPercent,ChangeAllTaskFun=ChangeAllLowPercent}, new ReadingCalculateData (){QuestionType=QuestionType.LowPercent,GetDecimalNullFun=GetLowPercent,/*ChangeAllTaskFun=ChangeAllLowPercent*/},
//整个访视期间SOD最低点访视名称 其他任务需要改 //整个访视期间SOD最低点访视名称 //其他任务需要改
new ReadingCalculateData (){QuestionType=QuestionType.LowVisit,GetStringFun=GetLowVisit,ChangeAllTaskFun=ChangeAllLowVisitName}, new ReadingCalculateData (){QuestionType=QuestionType.LowVisit,GetStringFun=GetLowVisit,/*ChangeAllTaskFun=ChangeAllLowVisitName*/},
//是否存在非淋巴结靶病灶 //是否存在非淋巴结靶病灶
new ReadingCalculateData (){QuestionType=QuestionType.IsLymphTarget,GetStringFun=GetIsLymphTarget}, new ReadingCalculateData (){QuestionType=QuestionType.IsLymphTarget,GetStringFun=GetIsLymphTarget},
@ -214,7 +214,7 @@ namespace IRaCIS.Core.Application.Service
} }
} }
decimal a = 1.1m;
var questionIds = needAddList.Select(x => x.ReadingQuestionTrialId).ToList(); var questionIds = needAddList.Select(x => x.ReadingQuestionTrialId).ToList();
@ -698,7 +698,7 @@ namespace IRaCIS.Core.Application.Service
x.NonTargetLesions == (NoTargetAssessment)int.Parse(noTargetLesion.IsNullOrEmpty() ? NoTargetAssessment.NA.GetEnumInt(): noTargetLesion) && x.NonTargetLesions == (NoTargetAssessment)int.Parse(noTargetLesion.IsNullOrEmpty() ? NoTargetAssessment.NA.GetEnumInt(): noTargetLesion) &&
x.NewLesion == (NewLesionAssessment)int.Parse(newLesions.IsNullOrEmpty() ? NewLesionAssessment.NA.GetEnumInt(): newLesions)).Select(x => x.OverallEfficacy).ToListAsync(); x.NewLesion == (NewLesionAssessment)int.Parse(newLesions.IsNullOrEmpty() ? NewLesionAssessment.NA.GetEnumInt(): newLesions)).Select(x => x.OverallEfficacy).ToListAsync();
return result.Count == 0 ? OverallAssessment.NA.GetEnumInt() : result[0].GetEnumInt(); return result.Count == 0 ? OverallAssessment.NE.GetEnumInt() : result[0].GetEnumInt();
} }
#endregion #endregion

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

@ -1117,6 +1117,7 @@ namespace IRaCIS.Application.Services
.OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo() .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
{ {
VisitName = x.SourceSubjectVisit.VisitName, VisitName = x.SourceSubjectVisit.VisitName,
BlindName=x.SourceSubjectVisit.BlindName,
VisitTaskId = x.Id, VisitTaskId = x.Id,
ArmEnum = taskInfo.ArmEnum, ArmEnum = taskInfo.ArmEnum,
VisitNum = x.SourceSubjectVisit.VisitNum, VisitNum = x.SourceSubjectVisit.VisitNum,