标记代码修改

IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs

@@ -42,6 +42,7 @@ public static class SendEmailHelper
 
                 await smtp.DisconnectAsync(true);
 
+
             }
         }
         catch (Exception ex)

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

@@ -2490,6 +2490,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisitTaskId { get; set; }
         public Guid? StudyId { get; set; }
 
+        public string MarkTool { get; set; }
+
+        public string OrderMarkName { get; set; }
+
         public Guid? MarkId { get; set; }
         public Guid? NoneDicomFileId { get; set; }
 

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

@@ -67,11 +67,13 @@ namespace IRaCIS.Core.Application.Service
                 var mark = await _readingNoneDicomMarkRepository.Where(x => x.MarkId == inDto.MarkId).FirstOrDefaultAsync();
                 if (mark != null)
                 {
-                    if (mark.MeasureData != inDto.MeasureData || mark.Path != inDto.Path)
+                    if (mark.MeasureData != inDto.MeasureData || mark.Path != inDto.Path|| mark.OrderMarkName != inDto.OrderMarkName || mark.MarkTool != inDto.MarkTool)
                     {
                         await _readingNoneDicomMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == mark.Id, u => new Domain.Models.ReadingNoneDicomMark()
                         {
                             MeasureData = inDto.MeasureData,
+                            MarkTool=inDto.MarkTool,
+                            OrderMarkName=inDto.OrderMarkName,
                             Path = inDto.Path
                         });
                     }
@@ -84,6 +86,8 @@ namespace IRaCIS.Core.Application.Service
                         Id = NewId.NextGuid(),
                         VisitTaskId = inDto.VisitTaskId,
                         StudyId = inDto.StudyId,
+                        MarkTool = inDto.MarkTool,
+                        OrderMarkName = inDto.OrderMarkName,
                         NoneDicomFileId = inDto.NoneDicomFileId,
                         Path = inDto.Path,
                         MeasureData = inDto.MeasureData,

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

@@ -20,6 +20,10 @@ public class ReadingNoneDicomMark : BaseAddAuditEntity
     [MaxLength]
     public string MeasureData { get; set; } = string.Empty;
 
+    public string MarkTool { get; set; }
+
+    public string OrderMarkName { get; set; }
+
     /// <summary>
     /// 标记的唯一标识符
     /// </summary>

IRaCIS.Core.Infra.EFCore/Migrations/20251022055632_NoneMark.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class NoneMark : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "MarkTool",
+                table: "ReadingNoneDicomMark",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "OrderMarkName",
+                table: "ReadingNoneDicomMark",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MarkTool",
+                table: "ReadingNoneDicomMark");
+
+            migrationBuilder.DropColumn(
+                name: "OrderMarkName",
+                table: "ReadingNoneDicomMark");
+        }
+    }
+}

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

@@ -5613,6 +5613,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("MarkId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("MarkTool")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
                     b.Property<string>("MeasureData")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
@@ -5620,6 +5625,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("NoneDicomFileId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("OrderMarkName")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
                     b.Property<string>("Path")
                         .IsRequired()
                         .HasMaxLength(400)