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

@@ -18255,6 +18255,11 @@
             文件大小，单位字节
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.SegmentationAddOrEdit.SEGUpdateTime">
+            <summary>
+            SEGUpdateTime 更新时间
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.SegmentationVersionView.StartTime">
             <summary>
             版本开始时间

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

@@ -59,6 +59,11 @@ public class SegmentationAddOrEdit
     /// </summary>
     public long FileSize { get; set; } = 0;
 
+    /// <summary>
+    /// SEGUpdateTime 更新时间
+    /// </summary>
+    public DateTime? SEGUpdateTime { get; set; }
+
 }
 
 public class SegmentationQuery:PageInput

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -1174,7 +1174,7 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadModule_TumorExists"]);
             }
 
-            if (await _visitTaskRepository.AnyAsync(x => readModuleId == x.SouceReadModuleId))
+            if (await _visitTaskRepository.AnyAsync(x => readModuleId == x.SouceReadModuleId && (x.TaskState==TaskState.Effect||x.ReadingTaskState==ReadingTaskState.HaveSigned)))
             {
                 //---当前阅片已生成任务,操作失败。
                 throw new BusinessValidationFailedException(_localizer["ReadModule_TaskGenerated"]);

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

@@ -77,8 +77,17 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
 
         if (addOrEditSegmentation.Id != null)
         {
+           var data=  await  _segmentationRepository.FirstOrDefaultNoTrackingAsync(x => x.Id == addOrEditSegmentation.Id);
+            if (addOrEditSegmentation.SEGUrl != data.SEGUrl)
+            {
+                addOrEditSegmentation.SEGUpdateTime = DateTime.Now;
+            }
+            else
+            {
+                addOrEditSegmentation.SEGUpdateTime = data.SEGUpdateTime;
+            }
 
-            await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId = addOrEditSegmentation.Id.Value,SEGUrl=addOrEditSegmentation.SEGUrl });
+                await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId = addOrEditSegmentation.Id.Value, SEGUrl = addOrEditSegmentation.SEGUrl });
         }
         var entity = await _segmentationRepository.InsertOrUpdateAsync(addOrEditSegmentation, true);
         return ResponseOutput.Ok(entity.Id.ToString());
@@ -89,21 +98,30 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
     /// </summary>
     /// <param name="inDto"></param>
     /// <returns></returns>
-    private async Task SaveSegmentationVersionAsync(SaveSegmentationVersionAsyncInDto inDto)
+    public async Task SaveSegmentationVersionAsync(SaveSegmentationVersionAsyncInDto inDto)
     {
         var data = await _segmentationRepository.FirstOrDefaultNoTrackingAsync(x => x.Id == inDto.SegmentationId);
-        var segmentList = await _segmentRepository.Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
-
-        if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore))
-        {
         // 如果是新增或修改，记录一条版本信息
         var maxVersion = await _segmentationVersionRepository
             .Where(x => x.SegmentationId == data.Id)
             .OrderByDescending(x => x.Version)
             .FirstOrDefaultAsync();
 
+
+        var startTime = maxVersion != null ? maxVersion.CreateTime :(data.SEGUpdateTime==null? DateTime.MinValue: data.SEGUpdateTime.Value);
+
+        var segmentList = await _segmentRepository
+            .Where(x=>x.CreateTime<= startTime && (!x.IsDeleted||x.DeletedTime> startTime))
+          
+            .Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).IgnoreQueryFilters().ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
+
+        if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore))
+        {
+        
+
             var newVersion = maxVersion == null ? 1 : maxVersion.Version + 1;
-            var startTime = maxVersion != null ? maxVersion.CreateTime : data.UpdateTime ;
+          
+
 
             var versionEntity = new SegmentationVersion
             {
@@ -251,7 +269,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
     public async Task<IResponseOutput> DeleteSegment(Guid segmentId)
     {
         await DeleteBindingsAndAnswersAsync(null, segmentId);
-        var success = await _segmentRepository.DeleteFromQueryAsync(t => t.Id == segmentId, true);
+        var success = await _segmentRepository.SoftDeleteFromQueryAsync(t => t.Id == segmentId, true);
         return ResponseOutput.Ok();
     }
 

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

@@ -60,6 +60,11 @@ public class Segmentation : BaseFullDeleteAuditEntity
     [MaxLength]
     public string SEGUrl { get; set; } = string.Empty;
 
+    /// <summary>
+    /// SEGUpdateTime 更新时间
+    /// </summary>
+    public DateTime? SEGUpdateTime { get; set; }
+
     /// <summary>
     /// 文件大小，单位字节
     /// </summary>

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

@@ -56,6 +56,11 @@ public class SegmentationVersion : BaseAddAuditEntity
 
 public class SegmentVersionData: ISegment
 {
+    /// <summary>
+    /// 这个时间很总要要记录
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+
     /// <summary>
     /// 分割Id
     /// </summary>

IRaCIS.Core.Infra.EFCore/Migrations/20260512071158_SEGUpdateTime.cs

@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class SEGUpdateTime : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "SEGUpdateTime",
+                table: "Segmentation",
+                type: "datetime2",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SEGUpdateTime",
+                table: "Segmentation");
+        }
+    }
+}

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

@@ -9505,6 +9505,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<bool>("IsSaved")
                         .HasColumnType("bit");
 
+                    b.Property<DateTime?>("SEGUpdateTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("SEGUrl")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");