修改

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/TumorAssessmentService.cs

@@ -16,13 +16,16 @@ namespace IRaCIS.Core.Application.Service.TA
     public class ReadingQuestionService : BaseService
     {
         private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository1Point1;
+        private readonly IRepository<TumorAssessment_IRECIST1Point1> _tumorAssessmentIRepository1Point1;
         private readonly IRepository<TumorAssessment_RECIST1Point1BM> _tumorAssessmentRepository1Point1BM;
 
         public ReadingQuestionService(      IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository1Point1,
+             IRepository<TumorAssessment_IRECIST1Point1> tumorAssessmentIRepository1Point1,
              IRepository<TumorAssessment_RECIST1Point1BM> tumorAssessmentRepository1Point1BM
             )
         {
             this._tumorAssessmentRepository1Point1 = tumorAssessmentRepository1Point1;
+            this._tumorAssessmentIRepository1Point1 = tumorAssessmentIRepository1Point1;
             this._tumorAssessmentRepository1Point1BM = tumorAssessmentRepository1Point1BM;
         }
 
@@ -75,6 +78,16 @@ namespace IRaCIS.Core.Application.Service.TA
                         new  ColumnInfo(){ ColumnName="整体疗效",ColumnKey=nameof(TumorAssessment_RECIST1Point1.OverallEfficacy),DictionaryKey=typeof(OverallAssessment).Name },
                     };
                     break;
+                case CriterionType.IRECIST1Point1:
+                    result = await _tumorAssessmentIRepository1Point1.AsQueryable().ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TumorAssessmentView.Id) : inQuery.SortField, inQuery.Asc);
+                    columnList = new List<ColumnInfo>()
+                    {
+                        new  ColumnInfo(){ ColumnName="靶病灶",ColumnKey=nameof(TumorAssessment_RECIST1Point1.TargetLesion),DictionaryKey=typeof(TargetAssessment).Name },
+                        new  ColumnInfo(){ ColumnName="非靶病灶",ColumnKey=nameof(TumorAssessment_RECIST1Point1.NonTargetLesions),DictionaryKey=typeof(NoTargetAssessment).Name },
+                        new  ColumnInfo(){ ColumnName="新病灶",ColumnKey=nameof(TumorAssessment_RECIST1Point1.NewLesion),DictionaryKey=typeof(NewLesionAssessment).Name },
+                        new  ColumnInfo(){ ColumnName="整体疗效",ColumnKey=nameof(TumorAssessment_RECIST1Point1.OverallEfficacy),DictionaryKey=typeof(OverallAssessment).Name },
+                    };
+                    break;
             }
 
             return (result, columnList);

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

@@ -19,7 +19,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {CriterionType.RECIST1Point1,typeof(RECIST1Point1CalculateService) }, //RECIST1.1
             {CriterionType.PCWG3,typeof(PCWG3CalculateService) },
             {CriterionType.SelfDefine,typeof(SelfDefineCalculateService) },
-            {CriterionType.RECIST1Pointt1_MB,typeof(RECIST1Point1_BMCalculateService) }
+            {CriterionType.RECIST1Pointt1_MB,typeof(RECIST1Point1_BMCalculateService) },
+            {CriterionType.IRECIST1Point1,typeof(IRECIST1Point1CalculateService) }
         };
 
        

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

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 {
 
     [ApiExplorerSettings(GroupName = "Reading")]
-    public class RECIST1Point1CalculateService : BaseService, ICriterionCalculateService
+    public class IRECIST1Point1CalculateService : BaseService, ICriterionCalculateService
     {
         private readonly IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
@@ -26,11 +26,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
+        private readonly IRepository<TumorAssessment_IRECIST1Point1> _tumorAssessmentRepository;
         private readonly IGeneralCalculateService _generalCalculateService;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
-        public RECIST1Point1CalculateService(
+        public IRECIST1Point1CalculateService(
             IRepository<ReadingTableQuestionAnswer> readingTableQuestionAnswerRepository,
             IRepository<VisitTask> visitTaskRepository,
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
@@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
             IRepository<OrganInfo> organInfoRepository,
             IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
+            IRepository<TumorAssessment_IRECIST1Point1> tumorAssessmentRepository,
             IGeneralCalculateService generalCalculateService,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )

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

@@ -267,9 +267,9 @@ namespace IRaCIS.Core.Domain.Share
         Lugano2014 = 2,
 
         /// <summary>
-        /// iRECIST
+        /// iRECIST1Point1
         /// </summary>
-        iRECIST = 3,
+        IRECIST1Point1 = 3,
 
         /// <summary>
         /// RANO-BM

IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs

@@ -0,0 +1,40 @@
+
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2022-08-22 10:06:13 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+	///<summary>
+	///IRECIST1Point1肿瘤评估(系统标准)
+	///</summary>
+	[Table("TumorAssessment_IRECIST1Point1")]	
+	 public class TumorAssessment_IRECIST1Point1 : Entity
+	 {
+	 
+		/// <summary>
+        /// 靶病灶
+        /// </summary>
+		public TargetAssessment TargetLesion { get; set; }
+	
+		/// <summary>
+        /// 非靶病灶
+        /// </summary>
+		public NoTargetAssessment NonTargetLesions { get; set; }
+	
+		/// <summary>
+        /// 新病灶
+        /// </summary>
+		public NewLesionAssessment NewLesion { get; set; }
+	
+		/// <summary>
+        /// 整体疗效
+        /// </summary>
+		public OverallAssessment OverallEfficacy { get; set; }
+	}
+
+}	 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -266,6 +266,8 @@ namespace IRaCIS.Core.Infra.EFCore
         public virtual DbSet<TumorAssessment_RECIST1Point1BM> TumorAssessment_RECIST1Point1BM { get; set; }
         public virtual DbSet<TumorAssessment_RECIST1Point1> TumorAssessment_RECIST1Point1 { get; set; }
 
+        public virtual DbSet<TumorAssessment_IRECIST1Point1> TumorAssessment_IRECIST1Point1 { get; set; }
+        
         public virtual DbSet<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriterion { get; set; }
 
         public virtual DbSet<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentType { get; set; }