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-10-20 17:41:02 +08:00
parent 7f050a1dd6 e5e2a0394b
commit 8cabc8c96a
10 changed files with 20458 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+1 -11
View File
@@ -2002,7 +2002,7 @@
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.UserAgreementService.SetCurrentVersion(IRaCIS.Core.Application.Service.DTO.SetCurrentVersionInDto)">
<member name="M:IRaCIS.Core.Application.Service.UserAgreementService.SetCurrentVersion(IRaCIS.Core.Application.Service.DTO.SetUserAgreementCurrentVersionInDto)">
<summary>
设置为当前版本
</summary>
@@ -11081,11 +11081,6 @@
系统标准Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.IsCopyLesions">
<summary>
是否复制病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.Type">
<summary>
类型
@@ -11966,11 +11961,6 @@
分类问题Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.IsCopyLesions">
<summary>
是否复制病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.GlobalReadingShowType">
<summary>
全局阅片显示类型
IRaCIS.Core.Application/Service/Document/DTO/UserAgreementViewModel.cs
+1 -1
View File
@@ -39,7 +39,7 @@ public class UserAgreementAddOrEdit
}
public class SetCurrentVersionInDto
public class SetUserAgreementCurrentVersionInDto
{
public Guid Id { get; set; }
}
IRaCIS.Core.Application/Service/Document/UserAgreementService.cs
+2 -1
View File
@@ -55,7 +55,8 @@ public class UserAgreementService(IRepository<UserAgreement> _userAgreementRepos
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task<IResponseOutput> SetCurrentVersion(SetCurrentVersionInDto inDto)
[HttpPost]
public async Task<IResponseOutput> SetCurrentVersion(SetUserAgreementCurrentVersionInDto inDto)
{
var userAgreement=await _userAgreementRepository.Where(x=>x.Id==inDto.Id).FirstNotNullAsync();
await _userAgreementRepository.UpdatePartialFromQueryAsync(
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
-9
View File
@@ -1061,10 +1061,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid ReadingQuestionCriterionTrialId { get; set; }
/// <summary>
/// 是否复制病灶
/// </summary>
public bool IsCopyLesions { get; set; } = false;
public Guid TrialId { get; set; }
@@ -2463,11 +2459,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? ClassifyQuestionId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 是否复制病灶
/// </summary>
public bool IsCopyLesions { get; set; } = false;
/// <summary>
/// 全局阅片显示类型
/// </summary>
IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+2 -2
View File
@@ -433,7 +433,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingQuestionTrial.IsCopyLesions).Select(x => new CopyTableAnswerDto()
var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingTableQuestionTrial.IsCopy).Select(x => new CopyTableAnswerDto()
{
Answer = x.Answer,
QuestionId = x.QuestionId,
@@ -445,7 +445,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
TrialId = x.TrialId,
}).ToListAsync();
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingQuestionTrial.IsCopyLesions).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId && x.ReadingQuestionTrial.ReadingTableQuestionTrialList.Any(x=>x.IsCopy)).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
tableRowAnswers.ForEach(x =>
{