修改

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

@@ -12206,7 +12206,7 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.OrganInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Boolean,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Nullable{System.Guid})">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.OrganInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Boolean,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionMark},System.Nullable{System.Guid})">
             <summary>
              获取子元素
             </summary>

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -501,6 +501,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string OtherMeasureData { get; set; } = string.Empty;
     }
 
+
+    public class TableQuestionMark: SaveTableQuestionMarkInDto
+    {
+        
+        public new Guid? TableQuestionId { get; set; }
+        
+        public new decimal? RowIndex { get; set; }
+    }
+
+
+
     public class GetPreviousOtherPicturePathInDto
     {
         public Guid? RowId { get; set; }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -91,7 +91,6 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto)
         {
-           
              var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x =>x.VisitTaskId==inDto.VisitTaskId&&x.QuestionId==inDto.QuestionId&& x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId);
             await _readingTableQuestionAnswerRepository.AddAsync(new ReadingTableQuestionAnswer()
@@ -1130,7 +1129,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
 
-            var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.TaskId).ProjectTo<SaveTableQuestionMarkInDto>(_mapper.ConfigurationProvider).ToListAsync();
+            var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.TaskId).ProjectTo<TableQuestionMark>(_mapper.ConfigurationProvider).ToListAsync();
             var qusetionList = await _readingQuestionTrialRepository
                 .Where(x => x.IsShowInDicom)
                 .WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify)
@@ -1350,7 +1349,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="isFirstChangeTask"></param>
         /// <param name="lastTaskTableAnswer"></param>
         /// <param name="TaskId"></param>
-        private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer, bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer, List<SaveTableQuestionMarkInDto> TableQuestionMarkList, Guid? TaskId)
+        private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer, bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer, List<TableQuestionMark> TableQuestionMarkList, Guid? TaskId)
         {
             item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (x.GroupId == item.Id && x.ParentId == null)).ToList();
             item.TableQuestions = new TrialReadTableQuestion();

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<VisitTask, VisitTaskDto>();
             CreateMap<SaveTableQuestionMarkInDto, ReadingTaskQuestionMark>();
-            CreateMap<ReadingTaskQuestionMark, SaveTableQuestionMarkInDto>();
+            CreateMap<ReadingTaskQuestionMark, TableQuestionMark>();
             CreateMap<SubmitTableQuestionInDto, ReadingTableAnswerRowInfo>()
                 .ForMember(dest => dest.CreateUser, opt => opt.Ignore())
                 .ForAllMembers(opts => opts.Condition((src, dest, srcMember) => srcMember != null));

IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs

@@ -51,7 +51,7 @@ public class ReadingTaskQuestionMark : BaseAddAuditEntity
 
     public Guid? TableQuestionId { get; set; }
 
-    public Guid? RowIndex { get; set; }
+    public decimal? RowIndex { get; set; }
 
     [MaxLength]
     public string OtherMarkTool { get; set; } = string.Empty;

IRaCIS.Core.Infra.EFCore/Migrations/20241224030556_tablemarkc.cs

@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class tablemarkc : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<decimal>(
+                name: "RowIndex",
+                table: "ReadingTaskQuestionMark",
+                type: "decimal(18,2)",
+                precision: 18,
+                scale: 2,
+                nullable: true,
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "RowIndex",
+                table: "ReadingTaskQuestionMark",
+                type: "uniqueidentifier",
+                nullable: true,
+                oldClrType: typeof(decimal),
+                oldType: "decimal(18,2)",
+                oldPrecision: 18,
+                oldScale: 2,
+                oldNullable: true);
+        }
+    }
+}

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

@@ -6956,8 +6956,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("RowId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid?>("RowIndex")
+                    b.Property<decimal?>("RowIndex")
-                        .HasColumnType("uniqueidentifier");
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
 
                     b.Property<Guid?>("SeriesId")
                         .HasColumnType("uniqueidentifier");