修改一版

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

@@ -467,39 +467,14 @@
             排序字段
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.SubjectId">
-            <summary>
-            受试者ID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.ModuleType">
-            <summary>
-            模块类型
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.ModuleName">
-            <summary>
-            模块名称
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.IsUrgent">
-            <summary>
-            是否加急
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.SubjectVisitId">
-            <summary>
-            访视ID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.Id">
             <summary>
-            Id
+            Id(阅片期Id 或者 访视ID)
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.Name">
+            <summary>
+            名称
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SubjectId">
@@ -512,11 +487,6 @@
             模块类型
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.ModuleName">
-            <summary>
-            模块名称
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.IsUrgent">
             <summary>
             是否加急
@@ -527,6 +497,31 @@
             访视ID
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SubjectVisitName">
+            <summary>
+            访视名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.CutOffVisitId">
+            <summary>
+            截止访视
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.CutOffVisitName">
+            <summary>
+            截止访视名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.ReadModuleId">
+            <summary>
+            对应阅片期
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.ReadModuleName">
+            <summary>
+            对应Name
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.Status">
             <summary>
             状态
@@ -537,6 +532,51 @@
             创建时间
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SubjectCode">
+            <summary>
+            受试者Code
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SiteCode">
+            <summary>
+            中心Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.IsFinalVisit">
+            <summary>
+            是否为末次访视
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.OutPlanPreviousVisitId">
+            <summary>
+            上一访视
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.OutPlanPreviousVisitName">
+            <summary>
+            上一访视名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SiteId">
+            <summary>
+            中心ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.IsVisit">
+            <summary>
+            是否为访视
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.PDState">
+            <summary>
+            是否为PD进展
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.IsEnrollmentConfirm">
+            <summary>
+            入组确认评估
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleResultDto.PageIndex">
             <summary>
             当前页索引

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

@@ -11,6 +11,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class GetReadModuleDto:PageInput
     {
         public Guid? TrialId { get; set; }
+
+        public Guid? SubjectId { get; set; }
     }
 
 
@@ -22,6 +24,43 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+    public class GetReadModuleSingleIndto
+    {
+        public  Guid Id { get; set; }
+
+        public Guid SubjectId { get; set; }
+
+       
+    }
+
+
+    public class GetReadModuleSingleOutdto
+    {
+        public Guid Id { get; set; }
+
+      
+
+        /// <summary>
+        /// 模块类型
+        /// </summary>
+        public ModuleTypeEnum ModuleType { get; set; }
+
+        /// <summary>
+        /// 访视ID
+        /// </summary>
+        public Guid? SubjectVisitId { get; set; }
+
+
+        /// <summary>
+        /// 访视名称
+        /// </summary>
+        public string SubjectVisitName { get; set; }
+
+        /// <summary>
+        /// 干系人
+        /// </summary>
+        public string Stakeholders { get; set; }
+    }
 
     public class GetReadModuleOutDto 
     {

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

@@ -40,7 +40,9 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<(PageOutput<GetReadModuleDtoOut>,object)> GetReadModule(GetReadModuleDto dto)
         {
-            var subjectquery =  _subjectRepository.WhereIf(dto.TrialId!=null, x => x.TrialId == dto.TrialId).Include(x => x.SubjectVisitList).Include(x=>x.Site)
+            var subjectquery =  _subjectRepository.WhereIf(dto.TrialId!=null, x => x.TrialId == dto.TrialId)
+                .WhereIf(dto.SubjectId != null, x => x.Id == dto.SubjectId)
+                .Include(x => x.SubjectVisitList).Include(x=>x.Site)
                .Select(x => new GetReadModuleDtoOut
                {
                    SiteCode = x.Site.SiteCode,
@@ -91,20 +93,50 @@ namespace IRaCIS.Application.Services
                         Status=y.Status,
                         SubjectCode= x.SubjectCode,
                         SiteCode=x.SiteCode,
+                        SubjectVisitId= y.SubjectVisitId,
+                        SubjectVisitName=y.SubjectVisit.VisitName,  // 截止访视名称
                         CutOffVisitId = y.SubjectVisitId,  // 截止访视
-                        CutOffVisitName = y.SubjectVisit.VisitName  // 截止访视名称
+                        CutOffVisitName = y.SubjectVisit.VisitName,  // 截止访视名称
                         ReadModuleId=y.ReadModuleId,
                         ReadModuleName=y.ReadModuleModel.ModuleName,
+                        IsUrgent = y.IsUrgent
 
                     }));
+
+               x.Data.OrderBy(y => y.ModuleType);
             });
 
+        
             return (pageList, new
             {
                 MaxLength = pageList.CurrentPageData.ToList().Max(x => x.Data.Count)
             });
         }
 
+        /// <summary>
+        /// 获取单条信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetReadModuleSingleOutdto> GetReadModuleSingle(GetReadModuleSingleIndto dto)
+        {
+            var data = await GetReadModule(new GetReadModuleDto()
+            {
+                SubjectId = dto.SubjectId,
+            });
+
+            var GetReadModuleOutDto = data.Item1.CurrentPageData.FirstOrDefault().Data.Where(x => x.Id == dto.Id).Select(x => new GetReadModuleSingleOutdto()
+            {
+                Id = x.Id.Value,
+                ModuleType = x.ModuleType,
+                SubjectVisitId = x.SubjectVisitId,
+                SubjectVisitName = x.SubjectVisitName,
+                Stakeholders = string.Empty
+            }).FirstOrDefault();
+
+            return GetReadModuleOutDto;
+        }
 
         /// <summary>
         /// 新增或者修改