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

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

@@ -823,6 +823,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase
     {
         public Guid OriginalId { get; set; }
+
+        public LesionType? LesionType { get; set; }
     }
     public class CopyTableAnswerDto
     {

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -161,7 +161,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<CopyTableAnswerRowInfo, ReadingTableAnswerRowInfo>().ForMember(dest => dest.CreateUser, opt => opt.Ignore());
 
             CreateMap<ReadingTableAnswerRowInfo, CopyTableAnswerRowInfo>()
-                .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));
+                .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id))
+                     .ForMember(d => d.LesionType, u => u.MapFrom(s => s.ReadingQuestionTrial.LesionType));
 
             //.ForMember(dest => dest.Instance, opt => opt.Ignore())
             //.ForMember(dest => dest.ReadingQuestionTrial, opt => opt.Ignore());

IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs

@@ -106,6 +106,22 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+    public class TestOncologyDto
+    {
+
+        public Guid Id { get; set; }
+
+        public string TargetLesion { get; set; }
+
+
+        public string NonTargetLesions { get; set; }
+
+        public string NewLesion { get; set; }
+
+
+        public string OverallEfficacy { get; set; }
+    }
+
     public class AddTaskLesionAnswerFromLastTaskOutDto
     {
         public bool IsBaseLine { get; set; }

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2173,6 +2173,12 @@ public enum SUVChangeVSBaseline
         /// </summary>
         SUVmax = 20,
 
+        /// <summary>
+        /// 典型肝内病灶
+        /// </summary>
+
+        TypicalIntrahepaticLesion = 21,
+
         /// <summary>
         /// 外弹力膜面积
         /// </summary>

IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs

@@ -49,5 +49,10 @@
         /// 字符串形式  标识时区
         /// </summary>
         string TimeZoneId { get; }
+
+        /// <summary>
+        /// 稽查额外字符串
+        /// </summary>
+        string AuditIdentification { get; set; }
     }
 }