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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2025-12-12 13:31:50 +08:00
parent 6ee51a7f43 aed8a77e13
commit df7022b2e3
14 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs
+1
View File
@@ -7,6 +7,7 @@ namespace IRaCIS.Core.Domain.Share;
[Description("多环境 配置环境实体")]
public class ServiceVerifyConfigOption
{
public bool QCRiskControl { get; set; }
public bool OpenUserComplexPassword { get; set; }
public bool OpenSignDocumentBeforeWork { get; set; }
IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
+1
View File
@@ -265,6 +265,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
{
public bool ExistsManual { get; set; }
public bool IsHaveStudyClinicalData { get; set; }
public bool QCRiskControl { get; set; }
public SubjectClinicalDataDto SubjectClinicalData { get; set; } = new SubjectClinicalDataDto();
public List<NoneDicomStudyView> NoneDicomStudyList { get; set; } = new List<NoneDicomStudyView>();
IRaCIS.Core.Application/Service/QC/QCListService.cs
+3 -1
View File
@@ -7,6 +7,7 @@ using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Infrastructure.Extention;
using MassTransit.Initializers;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using NPOI.SS.Formula.Functions;
using System.Linq;
@@ -25,6 +26,7 @@ namespace IRaCIS.Core.Application.Image.QA
IRepository<DicomSeries> _dicomSeriesRepository,
IRepository<NoneDicomStudy> _noneDicomStudyRepository,
IRepository<QCChallenge> _qcChallengeRepository,
IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
IRepository<SubjectVisitImageBackRecord> _subjectVisitImageBackRecordReposiotry,
IRepository<UserRole> _userRoleReposiotry,
IReadingImageTaskService _IReadingImageTaskService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IQCListService
@@ -456,7 +458,7 @@ namespace IRaCIS.Core.Application.Image.QA
return new TrialVisitQADTO
{
QCQuestionAnswerList = qacheckList,
QCRiskControl = _verifyConfig.CurrentValue.QCRiskControl,
SecondReviewList = secondReviewList,
IsHaveStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialId == sv.TrialId && x.ClinicalDataLevel == ClinicalLevel.Study),
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+30 -9
View File
@@ -1953,10 +1953,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var baseLineSpleenLength = await GetBaseLineSpleenLength(inDto);
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturnNull();
if (presentSpleenLength == null)
{
return string.Empty;
}
if (baseLineSpleenLength - 130 > 0 && presentSpleenLength > 130)
{
return ReserveDecimal((presentSpleenLength - 130 - (baseLineSpleenLength - 130)) * 100 / (baseLineSpleenLength - 130), inDto.DigitPlaces);
return ReserveDecimal((presentSpleenLength.Value - 130 - (baseLineSpleenLength - 130)) * 100 / (baseLineSpleenLength - 130), inDto.DigitPlaces);
}
else
{
@@ -1981,11 +1986,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
if (TaskAnswer.Count() == 0)
{
return "0";
return string.Empty;
}
var presentSpd = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturnNull();
if (presentSpd == null)
{
return string.Empty;
}
var presentSpd = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var lowSplenoncus = TaskAnswer.OrderBy(x => x.SpleenLength).Select(x => x.SpleenLength).FirstOrDefault();
return (presentSpd - lowSplenoncus).ToString();
return (presentSpd.Value - lowSplenoncus).ToString();
}
@@ -2011,8 +2020,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
return "NA";
}
var lowSplenoncus = taskAnswer.OrderBy(x => x.SpleenLength).FirstOrDefault();
return lowSplenoncus.BlindName;
var lowSplenoncus = taskAnswer.Where(x=>x.SpleenLength!=0).OrderBy(x => x.SpleenLength).FirstOrDefault();
if (lowSplenoncus != null)
{
return lowSplenoncus.BlindName;
}
else
{
return string.Empty;
}
}
@@ -3015,10 +3032,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
var baseLineTaskId = await GetBaseLineTaskId(inDto);
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturnNull();
if(presentSpleenLength==null)
{
return string.Empty;
}
var baseLineSpleenLength = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
return (presentSpleenLength - baseLineSpleenLength).ToString();
return (presentSpleenLength.Value - baseLineSpleenLength).ToString();
}
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
+30 -9
View File
@@ -1953,10 +1953,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var baseLineSpleenLength = await GetBaseLineSpleenLength(inDto);
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturnNull();
if (presentSpleenLength == null)
{
return string.Empty;
}
if (baseLineSpleenLength - 130 > 0 && presentSpleenLength > 130)
{
return ReserveDecimal((presentSpleenLength - 130 - (baseLineSpleenLength - 130)) * 100 / (baseLineSpleenLength - 130), inDto.DigitPlaces);
return ReserveDecimal((presentSpleenLength.Value - 130 - (baseLineSpleenLength - 130)) * 100 / (baseLineSpleenLength - 130), inDto.DigitPlaces);
}
else
{
@@ -1981,11 +1986,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
if (TaskAnswer.Count() == 0)
{
return "0";
return string.Empty;
}
var presentSpd = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturnNull();
if (presentSpd == null)
{
return string.Empty;
}
var presentSpd = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var lowSplenoncus = TaskAnswer.OrderBy(x => x.SpleenLength).Select(x => x.SpleenLength).FirstOrDefault();
return (presentSpd - lowSplenoncus).ToString();
return (presentSpd.Value - lowSplenoncus).ToString();
}
@@ -2011,8 +2020,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
return "NA";
}
var lowSplenoncus = taskAnswer.OrderBy(x => x.SpleenLength).FirstOrDefault();
return lowSplenoncus.BlindName;
var lowSplenoncus = taskAnswer.Where(x => x.SpleenLength != 0).OrderBy(x => x.SpleenLength).FirstOrDefault();
if (lowSplenoncus != null)
{
return lowSplenoncus.BlindName;
}
else
{
return string.Empty;
}
}
@@ -3015,10 +3032,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
var baseLineTaskId = await GetBaseLineTaskId(inDto);
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturnNull();
if (presentSpleenLength == null)
{
return string.Empty;
}
var baseLineSpleenLength = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
return (presentSpleenLength - baseLineSpleenLength).ToString();
return (presentSpleenLength.Value - baseLineSpleenLength).ToString();
}
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+3 -1
View File
@@ -593,13 +593,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
TableQuestionId = x.TableQuestionId,
TrialId = x.TrialId,
VisitTaskId = visitTaskId,
});
}).ToList();
var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
await _generalCalculateService.CopyHistoryAnswer(taskinfo, addList, tableAnswers);
await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);