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

修改

IRC_NewDev
he 2024-09-09 14:48:13 +08:00
parent e5f8b3dc71
commit d4389e5c35
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
View File

@ -642,6 +642,7 @@ namespace IRaCIS.Core.Application.Service.RC
[NonDynamicMethod] [NonDynamicMethod]
private async Task AddSystemDataToTrila(Guid trialId) private async Task AddSystemDataToTrila(Guid trialId)
{ {
// 加系统到项目
var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null) var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null)
.Select(x => x.ReadingQuestionCriterionSystemId); .Select(x => x.ReadingQuestionCriterionSystemId);
var trialCriterionNames = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId) var trialCriterionNames = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId)

16
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -587,7 +587,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
var allMinFCT = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FCT).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList) var allMinFCT = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FCT).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList)
.Where(x => x.QuestionMark == QuestionMark.MinFCT).Select(x => x.Answer.IsNullOrEmptyReturn0()).Min(); .Where(x => x.QuestionMark == QuestionMark.MinFCT).Select(x => x.Answer.IsNullOrEmptyReturn0()).MinOrDefault();
if (allMinFCT == 0) if (allMinFCT == 0)
{ {
return null; return null;
@ -603,12 +603,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
public async Task<decimal?> GetAvgMinFCT(ReadingCalculateDto inDto) public async Task<decimal?> GetAvgMinFCT(ReadingCalculateDto inDto)
{ {
var allMinFCT = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FCT).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList) var allMinFCT = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FCT).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList)
.Where(x => x.QuestionMark == QuestionMark.MinFCT).Select(x => x.Answer.IsNullOrEmptyReturn0()).Average(); .Where(x => x.QuestionMark == QuestionMark.MinFCT).Select(x => x.Answer.IsNullOrEmptyReturn0()).ToList();
if (allMinFCT == 0) if (allMinFCT.Count() == 0)
{ {
return null; return null;
} }
return allMinFCT; return allMinFCT.Average();;
} }
@ -621,7 +621,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
var maxLipidAngle = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.LipidAngle).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList) var maxLipidAngle = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.LipidAngle).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList)
.Where(x => x.QuestionMark == QuestionMark.LipidAngle).Select(x => x.Answer.IsNullOrEmptyReturn0()).Max(); .Where(x => x.QuestionMark == QuestionMark.LipidAngle).Select(x => x.Answer.IsNullOrEmptyReturn0()).MaxOrDefault();
if (maxLipidAngle == 0) if (maxLipidAngle == 0)
{ {
return null; return null;
@ -637,12 +637,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
public async Task<decimal?> GetAvgMinLipidAngle(ReadingCalculateDto inDto) public async Task<decimal?> GetAvgMinLipidAngle(ReadingCalculateDto inDto)
{ {
var avgMinLipidAngle = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.LipidAngle).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList) var avgMinLipidAngle = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.LipidAngle).SelectMany(x => x.TableRowInfoList).SelectMany(x => x.TableQuestionList)
.Where(x => x.QuestionMark == QuestionMark.LipidAngle).Select(x => x.Answer.IsNullOrEmptyReturn0()).Average(); .Where(x => x.QuestionMark == QuestionMark.LipidAngle).Select(x => x.Answer.IsNullOrEmptyReturn0()).ToList();
if (avgMinLipidAngle == 0) if (avgMinLipidAngle.Count() == 0)
{ {
return null; return null;
} }
return avgMinLipidAngle; return avgMinLipidAngle.Average();
} }
#region 将上一次的访视病灶添加到这一次 #region 将上一次的访视病灶添加到这一次