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

IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs

@@ -44,7 +44,7 @@ public class TrialTrianingRecordAddOrEdit
     
     public int? TrianingCount { get; set; }
     
-    public DateOnly TrianingDate { get; set; }
+    public DateOnly? TrianingDate { get; set; }
     
     public int? TrianingState { get; set; }
     }

IRaCIS.Core.Application/Service/Document/TrialNormalRecordService.cs

@@ -33,6 +33,7 @@ public class TrialNormalRecordService(IRepository<TrialNormalRecord> _trialNorma
 
         var trialNormalRecordQueryable = _trialNormalRecordRepository
                 .Where(x => x.TrialFileTypeId == inDto.TrialFileTypeId)
+                     .WhereIf(inDto.IsAuthorizedView != null, x => x.IsAuthorizedView == inDto.IsAuthorizedView)
                  .WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => x.TrialFileRecord.FileName.Contains(inDto.FileName))
                 .ProjectTo<TrialNormalRecordView>(_mapper.ConfigurationProvider);
 

IRaCIS.Core.Application/Service/Document/TrialTrianingRecordService.cs

@@ -38,6 +38,7 @@ public class TrialTrianingRecordService(IRepository<
 
         var trialTrianingRecordQueryable = _trialTrianingRecordRepository
              .Where(x => x.TrialFileTypeId == inDto.TrialFileTypeId)
+                   .WhereIf(inDto.IsAuthorizedView != null, x => x.IsAuthorizedView == inDto.IsAuthorizedView)
              .WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => x.TrialFileRecord.FileName.Contains(inDto.FileName))
              .WhereIf(inDto.TrianingDateStartTime != null, x => x.TrianingDate >= inDto.TrianingDateStartTime)
              .WhereIf(inDto.TrianingDateEndTime != null, x => x.TrianingDate <= inDto.TrianingDateEndTime)

IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs

@@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
-            var list = await noneDicomStudyQueryable.ToListAsync();
+            var list = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();
 
             var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync();
             return ResponseOutput.Ok(list, config) ;

IRaCIS.Core.Domain/FileRecord/TrialRecord.cs

@@ -151,7 +151,7 @@ public class TrialTrianingRecord : BaseFullAuditEntity
     public Guid TrialFileTypeId { get; set; }
 
     #region 培训记录相关字段
-    public DateOnly TrianingDate { get; set; }
+    public DateOnly? TrianingDate { get; set; }
 
     public int? TrianingCount { get; set; }
 

IRaCIS.Core.Infra.EFCore/Migrations/20250305032415_trialDateOnly.cs

@@ -0,0 +1,37 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class trialDateOnly : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateOnly>(
+                name: "TrianingDate",
+                table: "TrialTrianingRecord",
+                type: "date",
+                nullable: true,
+                oldClrType: typeof(DateOnly),
+                oldType: "date");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateOnly>(
+                name: "TrianingDate",
+                table: "TrialTrianingRecord",
+                type: "date",
+                nullable: false,
+                defaultValue: new DateOnly(1, 1, 1),
+                oldClrType: typeof(DateOnly),
+                oldType: "date",
+                oldNullable: true);
+        }
+    }
+}

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

@@ -13175,7 +13175,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<int?>("TrianingCount")
                         .HasColumnType("int");
 
-                    b.Property<DateOnly>("TrianingDate")
+                    b.Property<DateOnly?>("TrianingDate")
                         .HasColumnType("date");
 
                     b.Property<int?>("TrianingState")