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

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

@@ -15374,6 +15374,11 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.UserWLTemplateQuery">
             <summary>UserWLTemplateQuery  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.SetAutoCutNextTaskInDto.IsDoubleScreen">
+            <summary>
+            是否双屏
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.UserWLTemplateAddOrEdit">
             <summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>
         </member>

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

@@ -30,6 +30,11 @@ namespace IRaCIS.Core.Application.ViewModel
     public class SetAutoCutNextTaskInDto
     {
         public bool AutoCutNextTask { get; set; }
+
+        /// <summary>
+        /// 是否双屏
+        /// </summary>
+        public bool IsDoubleScreen { get; set; } = false;
     }
 
     ///<summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>

IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs

@@ -87,7 +87,8 @@ namespace IRaCIS.Core.Application.Service
 
             return await _userRoleRepository.Where(x => x.Id == _userInfo.UserRoleId).Select(x => new
             {
-                AutoCutNextTask = x.AutoCutNextTask
+                AutoCutNextTask = x.AutoCutNextTask,
+                IsDoubleScreen = x.IsDoubleScreen,
             }).FirstNotNullAsync();
         }
 
@@ -103,7 +104,8 @@ namespace IRaCIS.Core.Application.Service
             await _userRoleRepository.UpdatePartialFromQueryAsync(_userInfo.UserRoleId, x => new UserRole()
             {
 
-                AutoCutNextTask = inDto.AutoCutNextTask
+                AutoCutNextTask = inDto.AutoCutNextTask,
+                IsDoubleScreen = inDto.IsDoubleScreen
             });
 
             await _userRoleRepository.SaveChangesAsync();

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

@@ -33,6 +33,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {CriterionType.RECIST1Pointt1_MB,typeof(RECIST1Point1_BMCalculateService) },
             {CriterionType.IRECIST1Point1,typeof(IRECIST1Point1CalculateService) },
             {CriterionType.Lugano2014,typeof(LuganoCalculateService) },
+            {CriterionType.Lugano2014WithoutPET,typeof(LuganoWithoutPETCalculateService) },
             {CriterionType.IVUS,typeof(IVUSCalculateService) },
             {CriterionType.OCT,typeof(OCTCalculateService) },
             {CriterionType.mRECISTHCC,typeof(MRECISTHCCCalculateService) },

IRaCIS.Core.Domain/Management/User.cs

@@ -44,6 +44,11 @@ public class UserRole : BaseFullAuditEntityNoNavigat
     [Comment("自动切换下一个任务")]
     public bool AutoCutNextTask { get; set; }
 
+    /// <summary>
+    /// 是否双屏
+    /// </summary>
+    public bool IsDoubleScreen { get; set; } = false;
+
 
 
     [Comment("医生生成账号后，会有值")]

IRaCIS.Core.Infra.EFCore/Migrations/20250825064023_doublescreen.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class doublescreen : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsDoubleScreen",
+                table: "User",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsDoubleScreen",
+                table: "User");
+        }
+    }
+}

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

@@ -13377,6 +13377,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("IdentityUserId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<bool>("IsDoubleScreen")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsFirstAdd")
                         .HasColumnType("bit")
                         .HasComment("首次登录需要修改密码");