Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 =>
                     {

IRaCIS.Core.Domain/Management/UserAgreement.cs

@@ -8,7 +8,7 @@ public class UserAgreement : BaseFullAuditEntity
 {
 
     /// <summary>
-    /// 文件类型
+    /// 文件类型  字典 UserAgreementType
     /// </summary>
     public UserAgreementType UserAgreementTypeEnum { get; set; }
 

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -265,9 +265,6 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     [Comment("分类问题Id")]
     public Guid? ClassifyQuestionId { get; set; }
 
-    [Comment("是否复制病灶")]
-    public bool IsCopyLesions { get; set; } = false;
-
     [Comment("分组ID")]
     public Guid? GroupId { get; set; }
     [Comment("分组分类")]

IRaCIS.Core.Infra.EFCore/Migrations/20251020091402_IsCopyLesions.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class IsCopyLesions : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsCopyLesions",
+                table: "ReadingQuestionTrial");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsCopyLesions",
+                table: "ReadingQuestionTrial",
+                type: "bit",
+                nullable: false,
+                defaultValue: false,
+                comment: "是否复制病灶");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -6550,10 +6550,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<bool>("IsAdditional")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("IsCopyLesions")
-                        .HasColumnType("bit")
-                        .HasComment("是否复制病灶");
-
                     b.Property<bool>("IsEnable")
                         .HasColumnType("bit");