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 running Details

Test_IRC_Net8
hang 2026-06-02 14:13:20 +08:00
parent 5e345418fb de19c5bc32
commit 0f55c6da9d
3 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -442,7 +442,16 @@ namespace IRaCIS.Core.Application.Service
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = identityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UnloginModifyPasswoed }, true);
await _mailVerificationService.AfterUserModifyPasswordSendEmailAsync(identityUserId);
try
{
await _mailVerificationService.AfterUserModifyPasswordSendEmailAsync(identityUserId);
}
catch (Exception)
{
}
var find = await _identityUserRepository.FindAsync(identityUserId);

57
IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs
View File

@ -517,11 +517,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
public async Task VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto)
{
ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
//ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
var markList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToListAsync();
var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
.SelectMany(x => x.TableRowInfoList).ToList();
//var markList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToListAsync();
//var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
// .SelectMany(x => x.TableRowInfoList).ToList();
//var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNotNullOrEmpty())).ToList();
@ -530,32 +530,39 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// throw new BusinessValidationFailedException(_localizer["MRIPDFF_AllNeedToBeMark"]);
//}
try
{
List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement, QuestionMark.FourthMeasurement };
var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
if (measuredValueList.Any(x => x > 100))
{
throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
}
}
catch (Exception)
{
var instanceCount = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.InstanceId != null).Select(x => x.InstanceId).Distinct().CountAsync();
throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
if (instanceCount > 1)
{
throw new BusinessValidationFailedException(_localizer["MRIPDFFAdvance_MarkMustBeSameInstance"]);
}
var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
//try
//{
// List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement, QuestionMark.FourthMeasurement };
// var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
// if (measuredValueList.Any(x => x > 100))
// {
// throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
// }
//}
//catch (Exception)
//{
// throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
//}
//var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
foreach (var item in notableQuestionList)
{
if (markList.Any(x => x.RowId == item.RowId && x.MeasureData.IsNotNullOrEmpty()))
{
throw new BusinessValidationFailedException(_localizer["MRIPDFF_NeedClearMark"]);
}
}
//foreach (var item in notableQuestionList)
//{
// if (markList.Any(x => x.RowId == item.RowId && x.MeasureData.IsNotNullOrEmpty()))
// {
// throw new BusinessValidationFailedException(_localizer["MRIPDFF_NeedClearMark"]);
// }
//}
}
}
}

5
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -3237,6 +3237,11 @@ namespace IRaCIS.Core.Domain.Share
/// 保存eCRF
/// </summary>
SaveEICRFQuestions = 12,
/// <summary>
/// 保存Advance肝脏分段
/// </summary>
SaveAdvanceLiverSegments = 13,
}
/// <summary>