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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-01-16 11:19:41 +08:00
parent 3d90eaf32c 4bbfacd7de
commit 127ae75b5b
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -925,7 +925,7 @@ namespace IRaCIS.Core.Application.Image.QA
return new GetNextIQCQualityOutDto() { }; return new GetNextIQCQualityOutDto() { };
break; break;
case TrialQCProcess.SingleAudit: case TrialQCProcess.SingleAudit:
visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync(); visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x=>x.VisitNum).FirstOrDefault(); subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x=>x.VisitNum).FirstOrDefault();
if(subjectVisit!=null) if(subjectVisit!=null)
@ -952,7 +952,7 @@ namespace IRaCIS.Core.Application.Image.QA
break; break;
case TrialQCProcess.DoubleAudit: case TrialQCProcess.DoubleAudit:
visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId &&
((x.CurrentActionUserId == _userInfo.Id)||(!x.IsTake&& x.AuditState != AuditStateEnum.QCPassed&& (x.PreliminaryAuditUserId != _userInfo.Id))) ((x.CurrentActionUserId == _userInfo.Id)||(!x.IsTake&& x.AuditState != AuditStateEnum.QCPassed&& (x.PreliminaryAuditUserId != _userInfo.Id)))
).Include(x => x.Subject).ToListAsync(); ).Include(x => x.Subject).ToListAsync();
if (subjectVisit != null) if (subjectVisit != null)

3
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
View File

@ -149,6 +149,9 @@ namespace IRaCIS.Application.Services
}).ToListAsync(); }).ToListAsync();
var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).ToListAsync(); var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).ToListAsync();
// 上一次肿瘤学阅片
oncologyVisits.ForEach(x => oncologyVisits.ForEach(x =>
{ {

27
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -2004,12 +2004,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// <returns></returns> /// <returns></returns>
public async Task<string> GetPET5PS(ReadingCalculateDto inDto) public async Task<string> GetPET5PS(ReadingCalculateDto inDto)
{ {
//if (inDto.IsBaseLine) //if (inDto.IsBaseLine)
//{ //{
// return SpleenAssessment.Stabilization.GetEnumInt(); // return SpleenAssessment.Stabilization.GetEnumInt();
//} //}
Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl);
if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())) if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
{ {
return PET5PSScore.NE.GetEnumInt(); return PET5PSScore.NE.GetEnumInt();
} }
@ -2040,31 +2040,34 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
// 本访视病灶的 max SUVmax（所有病灶中最大的）> 2 * 肝脏血池SUVmax // 本访视病灶的 max SUVmax（所有病灶中最大的）> 2 * 肝脏血池SUVmax
else if (maxSUVmax >2* LiverSUVmax) else if (maxSUVmax >2* LiverSUVmax&& LiverSUVmax != 0m)
{ {
result = PET5PSScore.Five; result = PET5PSScore.Five;
} }
//本访视病灶的SUVmax（所有病灶中最大的）>肝脏血池SUVmax //本访视病灶的SUVmax（所有病灶中最大的）>肝脏血池SUVmax
else if (maxSUVmax > LiverSUVmax) else if (maxSUVmax > LiverSUVmax && LiverSUVmax != 0)
{ {
result = PET5PSScore.Four; result = PET5PSScore.Four;
} }
//纵隔血池SUVmax<本访视点病灶的max SUVmax（所有病灶中最大的）≤1*肝脏血池SUVmax //纵隔血池SUVmax<本访视点病灶的max SUVmax（所有病灶中最大的）≤1*肝脏血池SUVmax
else if (MediastinumSUVmax < maxSUVmax&& maxSUVmax <= LiverSUVmax) else if (MediastinumSUVmax < maxSUVmax&& maxSUVmax <= LiverSUVmax&& MediastinumSUVmax != 0)
{ {
result = PET5PSScore.Three; result = PET5PSScore.Three;
} }
//本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax //本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax
else if (maxSUVmax < MediastinumSUVmax) else if (maxSUVmax < MediastinumSUVmax && maxSUVmax != 0)
{ {
result = PET5PSScore.Two; result = PET5PSScore.Two;
} }
//无需标记，自主选择 //无需标记，自主选择
else else
{ {
return string.Empty; Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl + "当前结果");
return string.Empty;
} }
return result.GetEnumInt();
Console.WriteLine("计算了PET5PS,当前接口" + _userInfo.RequestUrl+"当前结果"+ result.GetEnumInt());
return result.GetEnumInt();
} }
#endregion #endregion