修改一版

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

@@ -49,23 +49,32 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(entity.Id.ToString());
         }
 
-        /// <summary>
-        /// 分页获取
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<PageOutput<ClinicalDataSetView>> GetClinicalDataSetList(ClinicalDataQuery query)
-        {
-            var readquery = _clinicalDataSetRepository.AsQueryable()
-               .Where( x => x.TrialId == query.TrialId)
-               .WhereIf(query.ClinicalDataSetName!=string.Empty,x=>x.ClinicalDataSetName.Contains(query.ClinicalDataSetName))
-               .ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider);
-            var pageList = await readquery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField,
-           query.Asc);
+        ///// <summary>
+        ///// 分页获取
+        ///// </summary>
+        ///// <param name="query"></param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //public async Task<PageOutput<ClinicalDataSetView>> GetClinicalDataSetList(ClinicalDataQuery query)
+        //{
+        //    var readquery = _clinicalDataSetRepository.AsQueryable()
+        //       .Where( x => x.TrialId == query.TrialId)
+        //       .WhereIf(query.ClinicalDataSetName!=string.Empty,x=>x.ClinicalDataSetName.Contains(query.ClinicalDataSetName))
+        //       .ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider);
+        //    var pageList = await readquery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField,
+        //   query.Asc);
 
-            return pageList;
-        }
+        //    return pageList;
+        //}
+
+        ///// <summary>
+        ///// 设置项目
+        ///// </summary>
+        ///// <returns></returns>
+        //public async Task<IResponseOutput> SetClinicalDataCheck()
+        //{
+        //    _clinicalDataSetRepository.UpdateAsync()
+        //}
 
         /// <summary>
         /// 获取系统临床数据
@@ -79,6 +88,13 @@ namespace IRaCIS.Application.Services
              .ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider).ToListAsync();
         }
 
+        /// <summary>
+        /// 获取项目的临床数据
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+
+        [HttpGet]
         public async Task<List<ClinicalDataSetView>> GetTrialClinicalDataSetList(AddTrialClinicalDataSetInDto inDto)
         {
             await this.AddTrialClinicalDataSet(inDto);

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

@@ -39,6 +39,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 上传方式
         /// </summary>
         public ClinicalUploadType ClinicalUploadType { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
+
+        /// <summary>
+        /// 是否勾选
+        /// </summary>
+        public bool IsCheck { get; set; }
     }
 
     public class ClinicalDataView : ClinicalData
@@ -139,6 +149,26 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+
+    public class SetClinicalDataCheckIndto
+    {
+        /// <summary>
+		/// 项目ID
+		/// </summary>
+		public Guid TrialId { get; set; }
+
+        List<>
+
+        /// <summary>
+        /// 勾选的ID
+        /// </summary>
+        public List<Guid> CheckIds { get; set; }
+
+        /// <summary>
+        /// 启用的ID
+        /// </summary>
+        public List<Guid> EnableIds { get; set; }
+    }
     public class AddTrialClinicalDataSetInDto
     {
         public Guid TrialId { get; set; }

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

@@ -165,7 +165,7 @@ namespace IRaCIS.Application.Services
                     SiteId = x.Key.SiteId,
                     SubjectCode = x.Key.SubjectCode,
                     SubjectId = x.Key.SubjectId,
-                    Data = x.ToList()
+                    Data = x.OrderBy(x=>x.ModuleType).ThenBy(x=>x.VisitNum).ToList(),
                 }).ToList();
 
             PageOutput<GetReadModuleDtoOut> pageOutput = new PageOutput<GetReadModuleDtoOut>()