修改一版

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -175,7 +175,8 @@
             <summary>
             上传临床数据
             </summary>
-            <param name="clinicalDataId"></param>
+            <param name="id"></param>
+            <param name="isVisit"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(Microsoft.AspNetCore.Http.IFormCollection,System.Guid,System.Guid)">

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

@@ -552,6 +552,41 @@
             排序字段
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.TrialId">
+            <summary>
+            项目ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.ReadingPeriodName">
+            <summary>
+            阅片期名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.ReadingScope">
+            <summary>
+            阅片范围
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.ExpirationDate">
+            <summary>
+            截止日期
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.ExpirationVisit">
+            <summary>
+            截止访视
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.VisitStageId">
+            <summary>
+            访视计划ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.IsTakeEffect">
+            <summary>
+            是否生效
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect.Id">
             <summary>
             项目ID

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

@@ -1,4 +1,5 @@
-using System;
+using IRaCIS.Core.Domain.Share.Reading;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,10 +7,48 @@ using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
-    public class ReadingPeriodSetAddOrEdit : ReadingPeriodSet
+    public class ReadingPeriodSetAddOrEdit 
     {
         public new Guid? Id { get; set; }
 
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public Guid? TrialId { get; set; }
+
+        /// <summary>
+        /// 阅片期名称
+        /// </summary>
+        public string ReadingPeriodName { get; set; }
+
+        /// <summary>
+        /// 阅片范围
+        /// </summary>
+        public ReadingScopeEnum? ReadingScope { get; set; }
+
+        /// <summary>
+        /// 截止日期
+        /// </summary>
+        public DateTime ExpirationDate { get; set; }
+
+        /// <summary>
+        /// 截止访视
+        /// </summary>
+        public decimal? ExpirationVisit { get; set; }
+
+        /// <summary>
+        /// 访视计划ID
+        /// </summary>
+        public Guid? VisitStageId { get; set; }
+
+        /// <summary>
+        /// 是否生效
+        /// </summary>
+        public int? IsTakeEffect { get; set; }
+
+
+        public  List<Guid> SiteIds { get; set; }  = new List<Guid>();
+
     }
 
 

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

@@ -65,6 +65,7 @@ namespace IRaCIS.Application.Services
                    x.FileName,
                    x.UploadType,
                    x.Id,
+                  
                 }).ToListAsync();
             return list;
         }

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

@@ -38,8 +38,31 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingPeriodSet(ReadingPeriodSetAddOrEdit addOrEditReadingPeriodSet)
         {
-            var entity = await _repository.InsertOrUpdateAsync<ReadingPeriodSet, ReadingPeriodSetAddOrEdit>(addOrEditReadingPeriodSet, true);
+            if (addOrEditReadingPeriodSet.Id == null)
-            return ResponseOutput.Ok(entity.Id.ToString());
+            {
+                var entity = _mapper.Map<ReadingPeriodSet>(addOrEditReadingPeriodSet);
+                entity.ReadingPeriodSites = addOrEditReadingPeriodSet.SiteIds.Select(x => new ReadingPeriodSite()
+                {
+                    ReadingPeriodSetId = entity.Id,
+                    SiteId = x,
+                }).ToList();
+
+                await _readingPeriodSetRepository.AddAsync(entity, true);
+                return ResponseOutput.Ok();
+            }
+            else
+            {
+                var entity = (await _readingPeriodSetRepository.Where(t => t.Id == addOrEditReadingPeriodSet.Id, true).Include(t => t.ReadingPeriodSites).FirstOrDefaultAsync()).IfNullThrowException();
+                _mapper.Map(addOrEditReadingPeriodSet, entity);
+                entity.ReadingPeriodSites = addOrEditReadingPeriodSet.SiteIds.Select(x => new ReadingPeriodSite()
+                {
+                    ReadingPeriodSetId = entity.Id,
+                    SiteId = x,
+                }).ToList();
+                var success = await _readingPeriodSetRepository.SaveChangesAsync();
+                return ResponseOutput.Ok();
+
+            }
         }
 
         /// <summary>

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

@@ -11,7 +11,8 @@ namespace IRaCIS.Core.Application.Service
     {
         public ReadingConfig()
         {
-            CreateMap<ReadingPeriodSet, ReadingPeriodSetAddOrEdit>().ReverseMap();
+            CreateMap<ReadingPeriodSetAddOrEdit, ReadingPeriodSet>();
+              
 
             CreateMap<ReadingPeriodSet, ReadingPeriodSetView>();
 
@@ -23,6 +24,11 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<PreviousPDF, PreviousPDFView>();
 
+
+
+
+           
+
         }
     }
    

IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs

@@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Share.Reading;
+using System.Collections.Generic;
 
 namespace IRaCIS.Core.Domain.Models
 {
@@ -30,11 +31,6 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public ReadingScopeEnum? ReadingScope { get; set; }
 
-		/// <summary>
-		/// 中心ID
-		/// </summary>
-		public Guid? SiteId { get; set; }
-
 		/// <summary>
 		/// 截止日期
 		/// </summary>
@@ -65,6 +61,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
+		public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
 
 	}
 

IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs

@@ -16,8 +16,9 @@ namespace IRaCIS.Core.Domain.Models
 	{
 
 		/// <summary>
-		/// 项目ID
+		///阅片期配置ID
 		/// </summary>
+		
 		public Guid? ReadingPeriodSetId { get; set; }
 
 		/// <summary>
@@ -35,6 +36,8 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
+		public ReadingPeriodSet ReadingPeriodSet { get; set; }
+
 	}