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

IRC.Core.SCP/Service/DicomArchiveService.cs

@@ -139,7 +139,7 @@ namespace IRaCIS.Core.SCP.Service
                     findPatient.PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
                     findPatient.PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty);
                     findPatient.PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty);
-                    findPatient.PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
+                    findPatient.PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty);
 
                     if (findPatient.PatientBirthDate.Length == 8)
                     {

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

@@ -8793,6 +8793,11 @@
             是否是裁判问题
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetNextTaskInDto.EvaluateProgressEnum">
+            <summary>
+            评估进度
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.DigitPlaces">
             <summary>
             修约小数点
@@ -12648,6 +12653,20 @@
             IR影像阅片
             </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetTNMValue(IRaCIS.Core.Application.Service.Reading.Dto.TNMValueDto)">
+            <summary>
+            获取TNMValue
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SetTNMValue(IRaCIS.Core.Application.Service.Reading.Dto.TNMValueDto)">
+            <summary>
+            设置tTNMValue
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.DownLoadReadReport(IRaCIS.Core.Application.Service.Reading.Dto.DownLoadReadReportInDto)">
             <summary>
             下载阅片报告

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

@@ -301,7 +301,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
 
-  
+     public class TNMValueDto
+    {
+        public string TNMValue { get; set; }  =string.Empty;
+        public Guid VisitTaskId { get; set; }
+     
+    }
 
     public class DownLoadReadReportInDto
     {

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

@@ -1750,6 +1750,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid? TrialReadingCriterionId { get; set; }
 
         public Guid? VisitTaskId { get; set; }
+
+        /// <summary>
+        /// 评估进度
+        /// </summary>
+        public EvaluateProgress? EvaluateProgressEnum { get; set; }
     }
 
     public class GetReadingTaskDto

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

@@ -64,8 +64,39 @@ namespace IRaCIS.Core.Application.Service
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IReadingImageTaskService
     {
 
+        /// <summary>
+        /// 获取TNMValue
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<TNMValueDto?> GetTNMValue(TNMValueDto inDto)
+        {
+            var result= await _visitTaskRepository.Where(x=>x.Id==inDto.VisitTaskId).Select(x => new TNMValueDto()
+            {
+                VisitTaskId=inDto.VisitTaskId,
+                TNMValue = x.TNMValue
+            }).FirstOrDefaultAsync();
+            return result;
+        }
 
 
+        /// <summary>
+        /// 设置tTNMValue
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<TNMValueDto> SetTNMValue(TNMValueDto inDto)
+        {
+            await this.VerifyTaskIsSign(inDto.VisitTaskId);
+            await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
+            {
+                TNMValue = inDto.TNMValue
+            },true);
+            return inDto;
+        }
+
         /// <summary>
         /// 下载阅片报告
         /// </summary>
@@ -2787,6 +2818,7 @@ namespace IRaCIS.Core.Application.Service
                     TrialId = inDto.TrialId,
                     TrialReadingCriterionId = trialReadingCriterionId!.Value,
                     PageIndex = 1,
+                    EvaluateProgressEnum = inDto.EvaluateProgressEnum,
                     PageSize = 99999,
 
                 })).CurrentPageData;
@@ -2838,6 +2870,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     TrialId = inDto.TrialId,
                     TrialReadingCriterionId = trialReadingCriterionId!.Value,
+                    EvaluateProgressEnum = inDto.EvaluateProgressEnum,
                     PageIndex = 1,
                     PageSize = 99999,
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -309,6 +309,11 @@ public class VisitTask : BaseFullAuditEntity
     /// </summary>
     public EvaluateProgress EvaluateProgressEnum { get; set; } = EvaluateProgress.Default;
 
+    /// <summary>
+    /// TNM的值
+    /// </summary>
+    public string TNMValue { get; set; } = string.Empty;
+
 
     [NotMapped]
     public List<string> PIAuditImagePathList

IRaCIS.Core.Infra.EFCore/Migrations/20250828081335_TNMValue.cs

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

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

@@ -14241,6 +14241,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<DateTime?>("SuggesteFinishedTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("TNMValue")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
                     b.Property<int>("TaskAllocationState")
                         .HasColumnType("int")
                         .HasComment("分配状态");