修改

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

@@ -15,7 +15,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid? SubjectId { get; set; }
     }
 
+    public class GetSubjectReadVisitsOutDto
+    {
+         public Guid SubjectVisitId { get; set; }
 
+         public decimal VisitNum { get; set; }
+
+         public string VisitName { get; set; }
+    }
+
+
+    public class GetSubjectReadVisitsInDto
+    {
+        /// <summary>
+        /// 阅片配置的类型
+        /// </summary>
+        public ReadingSetType ReadingSetType { get; set; }
+
+        /// <summary>
+        /// 受试者ID
+        /// </summary>
+        public Guid SubjectId { get; set; }
+    }
 
     public class ReadModuleAddDto
     {
@@ -45,6 +66,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 名称
         /// </summary>
         public string Name { get; set; }
+
+        /// <summary>
+        /// 阅片配置的类型
+        /// </summary>
+        public ReadingSetType ReadingSetType { get; set; }
     }
 
 

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

@@ -21,7 +21,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ReadingPeriodName { get; set; }
 
-        public string Remark { get; set; }
 
         /// <summary>
         /// 阅片范围

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

@@ -175,6 +175,22 @@ namespace IRaCIS.Application.Services
             return GetReadModuleOutDto;
         }
         
+        ///// <summary>
+        ///// 
+        ///// </summary>
+        ///// <param name="inDto"></param>
+        ///// <returns></returns>
+        //public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisits(GetSubjectReadVisitsInDto inDto)
+        //{
+        //    var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
+
+        //    var finalVisitNum =await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
+
+
+        //    var readModulequery = _readModuleRepository.AsQueryable();
+        //    visitquery = visitquery.WhereIf(finalVisitNum!=null,x=>x.VisitNum< finalVisitNum).Where( x=> readModulequery.Where(y=>y.SubjectVisitId==x.Id&&y.ReadingSetType==inDto.ReadingSetType).Count()==0).OrderBy(x=>finalVisitNum)
+        //}
+
         /// <summary>
         /// 添加阅片期
         /// </summary>
@@ -199,11 +215,11 @@ namespace IRaCIS.Application.Services
                 {
                     Id= NewId.NextGuid(),
                     SubjectId = dto.SubjectId,
-                    ModuleType = ModuleTypeEnum.Read,
+                    ModuleType = dto.ReadingSetType==ReadingSetType.ImageReading? ModuleTypeEnum.Read: ModuleTypeEnum.Oncology,
                     IsUrgent = visit.IsUrgent,
                     ModuleName = dto.Name,
                     SubjectVisitId = visit.Id,
-                    ReadingSetType= ReadingSetType.ImageReading,
+                    ReadingSetType= dto.ReadingSetType,
                     Status = ReadingCommon.GetVisitSubmitStateEnum(visit),
                    
                 });

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

@@ -109,7 +109,7 @@ namespace IRaCIS.Application.Services
                      ReadingPeriodSetId=readset.Id,
                      SubjectCode=x.Subject.Code,
                      SubjectId=x.SubjectId,
-                     Remark= readset.Remark
+                     //Remark= readset.Remark
                 }).ToList();
         }
 

IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs

@@ -66,12 +66,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public ReadingSetType ReadingSetType { get; set; }
 
-	    /// <summary>
-	    /// 备注
-	    /// </summary>
-	    public string Remark { get; set; } = string.Empty;
-
-
 		public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
 	}