Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -770,36 +770,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string RowMark { get; set; } = string.Empty;
 
-		/// <summary>
-		/// InstanceId
-		/// </summary>
-		public Guid? OtherInstanceId { get; set; }
-
-		/// <summary>
-		/// SeriesId
-		/// </summary>
-		public Guid? OtherSeriesId { get; set; }
-
-
-		/// <summary>
-		/// StudyId
-		/// </summary>
-		public Guid? OtherStudyId { get; set; }
-
-		public string? OtherMarkTool { get; set; }
-
-		public string? OtherPicturePath { get; set; }
-
-		public int? OtherNumberOfFrames { get; set; }
-
-
-
-
-
-
-		public string? OtherMeasureData { get; set; } = string.Empty;
-
-
 	}
 
     public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -2105,30 +2105,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
             ReadingCalculateDto inDto = await _generalCalculateService.GetReadingCalculateDto(visitTaskId);
-
-            if (spleenLength == 0)
+			var result = SpleenAssessment.NotEvaluable;
+            if (spleenLength < 0)
             {
                 return SpleenAssessment.NotEvaluable.GetEnumInt();
             }
-
-            if (inDto.IsBaseLine)
+            else if (0 < spleenLength && spleenLength <= 130)
             {
-                if (spleenLength <= 130)
-                {
-                    return SpleenAssessment.Normal.GetEnumInt();
-                }
-                else
-                {
-                    return SpleenAssessment.Swelling.GetEnumInt();
-                }
-            
-            }
+				return SpleenAssessment.Normal.GetEnumInt();
+
+			}
+            else if (inDto.IsBaseLine)
+            {
+				return SpleenAssessment.Swelling.GetEnumInt();
+			}
 
 
 			var lowSpleenLength = await this.GetLowSpleenLength(taskinfo);
 
 
-			var result = SpleenAssessment.Stabilization;
+		
 
 
             var presentSpd = spleenLength;