Segment添加字段 查询修改

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

@@ -16962,17 +16962,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            质疑
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            一致性核查
+            һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            复制
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">

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

@@ -52,6 +52,8 @@ public class SegmentAddOrEdit
     public decimal? Variance { get; set; }
     
     public decimal? Volume { get; set; }
+
+    public Guid VisitTaskId { get; set; }
 }
 
 public class SegmentQuery:PageInput
@@ -78,6 +80,8 @@ public class SegmentQuery:PageInput
     
     public Guid? SegmentationId { get; set; }
 
+    public Guid? VisitTaskId { get; set; }
+
     public decimal?  ShortAxis { get; set; }
     
     public decimal?  TLG { get; set; }

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

@@ -39,7 +39,7 @@ public class SegmentationAddOrEdit
     
     public Guid TrialId { get; set; }
     
-    public Guid VisitTaksId { get; set; }
+    public Guid VisitTaskId { get; set; }
     }
 
 public class SegmentationQuery:PageInput
@@ -60,7 +60,7 @@ public class SegmentationQuery:PageInput
     
     public Guid? TrialId { get; set; }
     
-    public Guid? VisitTaksId { get; set; }
+    public Guid? VisitTaskId { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs

@@ -37,6 +37,13 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
 	{
 			
 		    var segmentationQueryable =_segmentationRepository
+            .WhereIf(inQuery.SegmentationName.IsNotNullOrEmpty(),x=>x.SegmentationName.Contains(inQuery.SegmentationName))
+            .WhereIf(inQuery.TrialId != null, x => x.TrialId == inQuery.TrialId)
+            .WhereIf(inQuery.SeriesId != null, x => x.SeriesId == inQuery.SeriesId)
+            .WhereIf(inQuery.StudyId != null, x => x.StudyId == inQuery.StudyId)
+            .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
+            .WhereIf(inQuery.SubjectVisitId != null, x => x.TrialId == inQuery.SubjectVisitId)
+            .WhereIf(inQuery.VisitTaskId != null, x => x.VisitTaskId == inQuery.VisitTaskId)
             .ProjectTo<SegmentationView>(_mapper.ConfigurationProvider);
 
             var pageList= await segmentationQueryable.ToPagedListAsync(inQuery);
@@ -86,6 +93,10 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
     {
 
         var segmentQueryable = _segmentRepository
+           
+            .WhereIf(inQuery.SegmentationId != null, x => x.SegmentationId == inQuery.SegmentationId)
+             .WhereIf(inQuery.SegmentName.IsNotNullOrEmpty(), x => x.SegmentName.Contains(inQuery.SegmentName))
+            .WhereIf(inQuery.VisitTaskId != null, x => x.VisitTaskId == inQuery.VisitTaskId)
                                     .ProjectTo<SegmentView>(_mapper.ConfigurationProvider);
 
         var pageList = await segmentQueryable.ToPagedListAsync(inQuery);

IRaCIS.Core.Domain/Reading/Segment/Segment.cs

@@ -22,6 +22,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public Guid SegmentationId { get; set; }
 
+        /// <summary>
+        /// 任务Id
+        /// </summary>
+        public Guid VisitTaskId { get; set; }
+
         /// <summary>
         /// 分割的序号
         /// </summary>

IRaCIS.Core.Domain/Reading/Segment/Segmentation.cs

@@ -26,7 +26,7 @@ public class Segmentation : BaseFullDeleteAuditEntity
     /// <summary>
     /// 任务Id
     /// </summary>
-    public Guid VisitTaksId { get; set; }
+    public Guid VisitTaskId { get; set; }
 
     /// <summary>
     /// 检查Id

IRaCIS.Core.Infra.EFCore/Migrations/20260316010155_Segmentat1.cs

@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class Segmentat1 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "VisitTaksId",
+                table: "Segmentation",
+                newName: "VisitTaskId");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "VisitTaskId",
+                table: "Segment",
+                type: "uniqueidentifier",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "VisitTaskId",
+                table: "Segment");
+
+            migrationBuilder.RenameColumn(
+                name: "VisitTaskId",
+                table: "Segmentation",
+                newName: "VisitTaksId");
+        }
+    }
+}

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

@@ -9207,6 +9207,109 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         });
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.Segment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<decimal?>("AvgValue")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("ColorRgb")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleteUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletedTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<decimal?>("MTV")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal?>("MajorAxis")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal?>("MaxValue")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal?>("Median")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal?>("MinValue")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal?>("Peak")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("SegmentMumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SegmentName")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<Guid>("SegmentationId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<decimal?>("ShortAxis")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal?>("TLG")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("UpdateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("UpdateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<decimal?>("Variance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("VisitTaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<decimal?>("Volume")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.HasKey("Id");
+
+                    SqlServerKeyBuilderExtensions.IsClustered(b.HasKey("Id"), false);
+
+                    b.HasIndex("CreateTime");
+
+                    SqlServerIndexBuilderExtensions.IsClustered(b.HasIndex("CreateTime"));
+
+                    b.ToTable("Segment", t =>
+                        {
+                            t.HasComment("分割");
+                        });
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.Segmentation", b =>
                 {
                     b.Property<Guid>("Id")
@@ -9261,7 +9364,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("UpdateUserId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("VisitTaksId")
+                    b.Property<Guid>("VisitTaskId")
                         .HasColumnType("uniqueidentifier");
 
                     b.HasKey("Id");
@@ -16527,106 +16630,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         });
                 });
 
-            modelBuilder.Entity("IRaCIS.Core.Domain.Reading.Segment.Segment", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<decimal?>("AvgValue")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<string>("ColorRgb")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
-                    b.Property<DateTime>("CreateTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("CreateUserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("DeleteUserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("DeletedTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("bit");
-
-                    b.Property<decimal?>("MTV")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("MajorAxis")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("MaxValue")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("Median")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("MinValue")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("Peak")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<int>("SegmentMumber")
-                        .HasColumnType("int");
-
-                    b.Property<string>("SegmentName")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
-
-                    b.Property<Guid>("SegmentationId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<decimal?>("ShortAxis")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("TLG")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime>("UpdateTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("UpdateUserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<decimal?>("Variance")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<decimal?>("Volume")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("decimal(18,2)");
-
-                    b.HasKey("Id");
-
-                    SqlServerKeyBuilderExtensions.IsClustered(b.HasKey("Id"), false);
-
-                    b.HasIndex("CreateTime");
-
-                    SqlServerIndexBuilderExtensions.IsClustered(b.HasIndex("CreateTime"));
-
-                    b.ToTable("Segment", t =>
-                        {
-                            t.HasComment("分割");
-                        });
-                });
-
             modelBuilder.Entity("IRaCIS.Core.Infra.EFCore.TestLength", b =>
                 {
                     b.Property<Guid>("Id")
@@ -19003,6 +19006,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("TrialSite");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.Segment", b =>
+                {
+                    b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
+                        .WithMany()
+                        .HasForeignKey("CreateUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreateUserRole");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.Segmentation", b =>
                 {
                     b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
@@ -21397,17 +21411,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("CreateUserRole");
                 });
 
-            modelBuilder.Entity("IRaCIS.Core.Domain.Reading.Segment.Segment", b =>
-                {
-                    b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
-                        .WithMany()
-                        .HasForeignKey("CreateUserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("CreateUserRole");
-                });
-
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.AuditDocument", b =>
                 {
                     b.Navigation("AncestorList");