修改一版

2022-06-01 16:19:55 +08:00
parent 5ee3fc5b79
commit 6f562252e4
3 changed files with 149 additions and 38 deletions
@@ -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 
    {
@@ -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>
        /// 新增或者修改