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

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -55,6 +55,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var file = request.Form.Files[0];
             Guid visitTaskId = Guid.Parse(request.Form["VisitTaskId"]);
 
+            string tableName = request.Form["TableName"].ToString();
+
             var service = await this.GetService(visitTaskId);
             if (service != null)
             {
@@ -77,7 +79,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     SubjectId = visitTaskInfo.SubjectId,
                     SubjectVisitId = visitTaskInfo.SourceSubjectVisitId,
                     TrialReadingCriterionId = visitTaskInfo.TrialReadingCriterionId,
-                   
+                    TableName= tableName,
+
                 });
 
 

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

@@ -17,4 +17,5 @@ public class ReadingImportFile : BaseAddAuditEntity
 
     public string FilePath { get; set; }=string.Empty;
 
+    public string TableName { get; set; } = string.Empty;
 }

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -261,6 +261,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var entity = item.Entity as ReadingImportFile;
 
+
+                var visitTaskInfo = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Include(x=>x.DoctorUser).FirstOrDefaultAsync();
+
                 await InsertInspection<ReadingImportFile>(entity, type, x => new InspectionConvertDTO()
                 {
                     VisitTaskId = entity.VisitTaskId,
@@ -268,7 +271,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     SubjectVisitId = entity.SubjectVisitId,
                     SubjectId = entity.SubjectId,
                     TrialId = entity.TrialId,
-                    ObjectRelationParentId = entity.VisitTaskId,
+                    ObjectRelationParentId = entity.VisitTaskId
 
                 });
             }
@@ -3858,7 +3861,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 }
 
-                entity.RowMark = entity.OrderMark;
+                entity.RowMark = entity.OrderMark+ entity.RowIndex.GetLesionMark();
 
 
 

IRaCIS.Core.Infra.EFCore/Migrations/20250804093254_tableName.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class tableName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterTable(
+                name: "ReadingImportFile",
+                comment: "阅片导入表",
+                oldComment: "阅片导出表");
+
+            migrationBuilder.AddColumn<string>(
+                name: "TableName",
+                table: "ReadingImportFile",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "TableName",
+                table: "ReadingImportFile");
+
+            migrationBuilder.AlterTable(
+                name: "ReadingImportFile",
+                comment: "阅片导出表",
+                oldComment: "阅片导入表");
+        }
+    }
+}

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

@@ -5012,6 +5012,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("SubjectVisitId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("TableName")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
                     b.Property<Guid>("TrialId")
                         .HasColumnType("uniqueidentifier");
 
@@ -5027,7 +5032,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.ToTable("ReadingImportFile", t =>
                         {
-                            t.HasComment("阅片导出表");
+                            t.HasComment("阅片导入表");
                         });
                 });