Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -5715,6 +5715,13 @@
             影像阅片临床数据签名
             </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingClinicalDataService.GetVisitClinicalDataName(IRaCIS.Core.Application.Service.Reading.Dto.GetVisitClinicalDataNameInDto)">
+            <summary>
+            获取访视临床数据名称
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingClinicalDataService.GetTrialClinicalDataSelect(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto)">
             <summary>
             获取下拉菜单
@@ -7073,6 +7080,11 @@
             是否查询所有的一致性分析临床数据 (为否只查询PDF)
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingOrTaskClinicalDataListInDto.IsGetTaskClinicalData">
+            <summary>
+            是否是阅片页面获取临床数据  (阅片其他访视任务需要获取受试者级别的)
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto">
             <summary>
             获取访视列表
@@ -7268,6 +7280,11 @@
             上传时间
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetVisitClinicalDataNameInDto">
+            <summary>
+            获取临床数据名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto.TrialId">
             <summary>
             项目ID

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -174,6 +174,8 @@ namespace IRaCIS.Application.Contracts
     public class SelectionReviewerDTO : DoctorDTO
     {
         public int DoctorTrialState { get; set; }
+
+        public bool IsEnroll { get; set; } = false;
         public string OptUserName { get; set; } = string.Empty;
         public DateTime? OptTime { get; set; }
         public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");

IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs

@@ -103,6 +103,8 @@ namespace IRaCIS.Core.Application.Service
             var doctorStateList = await _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus == EnrollStatus.HasApplyDownloadResume)
                .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
+            var doctorEnrollList =await _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)
+            .ToListAsync();
             result.CurrentPageData.ToList().ForEach(doctor =>
               {
                   //简历申请列表  --处理已经申请的
@@ -110,6 +112,7 @@ namespace IRaCIS.Core.Application.Service
                   if (doctorState != null)
                   {
                       doctor.DoctorTrialState = (int)EnrollStatus.HasApplyDownloadResume;
+                      doctor.IsEnroll = doctorEnrollList.Any(x => x.DoctorId == doctor.Id);
                       doctor.OptTime = doctorState.OptTime;
                       doctor.OptUserName = doctorState.OptUserName;
                   }

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -73,6 +73,13 @@ namespace IRaCIS.Core.Application.Service
                 //插入中间表
                 basicInfoModel.TitleIds.ForEach(titleId => doctor.DoctorDicRelationList.Add(new DoctorDictionary() { DoctorId = doctor.Id, KeyName = StaticData.Title, DictionaryId = titleId }));
 
+                // 新增给默认值
+                doctor.CooperateStatus = ContractorStatusEnum.Noncooperation;
+                doctor.ReviewStatus = ReviewerInformationConfirmStatus.ConfirmRefuse;
+                doctor.AcceptingNewTrial = false;
+                doctor.ActivelyReading = false;
+                doctor.IsVirtual = false;
+
 
                 await _doctorRepository.AddAsync(doctor);
                 //_doctorRepository.Add(doctor);

IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs

@@ -88,6 +88,7 @@ namespace IRaCIS.Core.Application.Service
                     OtherClinicalExperienceCN = systemInfoDcotor.OtherClinicalExperienceCN,
                 };
 
+                #region 概述
                 ///没有就加
                 var summarizeCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == inDto.TrialId).CountAsync();
                 if (summarizeCount == 0)
@@ -95,17 +96,48 @@ namespace IRaCIS.Core.Application.Service
                     var main = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.IsMain && x.TrialId == null).ProjectTo<SummarizeInfoDto>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
                     if (main != null)
                     {
-                        main.Id=null;
+                        main.Id = null;
                         main.TrialId = inDto.TrialId;
                         main.IsMain = false;
                         var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(main, true);
                     }
-                  
+
                 }
-              
-
-
                 doctorInfo = await _doctorRepository.AddAsync(doctor, true);
+                #endregion
+
+
+
+
+
+
+                #region 临床试验
+
+                var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
+                  .Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).Include(x => x.ExperienceCriteriaList).ToListAsync();
+                List<TrialExperienceCriteria> criteriaList = new List<TrialExperienceCriteria>();
+                foreach (var item in trialExperienceList)
+                {
+                    item.Trial = null;
+                    item.TrialId = inDto.TrialId;
+                    item.ExperienceDataType = ExperienceDataType.Trial;
+                    item.Id = NewId.NextGuid();
+                    item.ExperienceCriteriaList.ForEach(x => {
+
+                        criteriaList.Add(new TrialExperienceCriteria()
+                        {
+                            DoctorId = item.DoctorId,
+                            EvaluationCriteriaId = x.EvaluationCriteriaId,
+                            TrialExperienceId = item.Id
+                        });
+                    });
+                    item.ExperienceCriteriaList = new List<TrialExperienceCriteria>();
+                }
+                await _trialExperienceCriteriaRepository.AddRangeAsync(criteriaList);
+                await _trialExperienceRepository.AddRangeAsync(trialExperienceList);
+                await _trialExperienceRepository.SaveChangesAsync();
+                #endregion
+
             }
 
             return doctorInfo;
@@ -124,23 +156,12 @@ namespace IRaCIS.Core.Application.Service
             }
             else
             {
-                // 当前项目没有则复制
-                if (!(await _trialExperienceRepository.AnyAsync(x => x.TrialId == inDto.TrialId &&x.ExperienceDataType== ExperienceDataType.Trial)))
+                // 先添加
+                await GetTrialDoctorInfo(new GetTrialDoctorInfoInDto()
                 {
-                    var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
-                    .Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).ToListAsync();
-                    foreach (var item in trialExperienceList)
-                    {
-                        item.Trial = null;
-                        item.TrialId = inDto.TrialId;
-                        item.ExperienceDataType = ExperienceDataType.Trial;
-                        item.Id = NewId.NextGuid();
-                    }
-
-                    await _trialExperienceRepository.AddRangeAsync(trialExperienceList);
-                    await _trialExperienceRepository.SaveChangesAsync();
-                }
-
+                    DoctorId = inDto.DoctorId,
+                    TrialId = inDto.TrialId.Value,
+                });
                 var doctorClinicalTrialExperienceList = await _trialExperienceRepository
                  .Where(o => o.DoctorId == inDto.DoctorId)
                  .Where(x => x.ExperienceDataType == ExperienceDataType.Trial|| x.ExperienceDataType == ExperienceDataType.TrialAuto)

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -36,6 +36,8 @@ namespace IRaCIS.Core.Application.Service
 
         #region 临床数据基本增删改
 
+
+
         /// <summary>
         /// 新增或者修改
         /// </summary>
@@ -605,6 +607,25 @@ namespace IRaCIS.Core.Application.Service
 
 
         #region 临床数据相关查询
+
+        /// <summary>
+        /// 获取访视临床数据名称
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetVisitClinicalDataNameOutDto> GetVisitClinicalDataName(GetVisitClinicalDataNameInDto inDto)
+        {
+            var clinicalDataNames = await _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.Id).Select(x =>
+            _userInfo.IsEn_Us ? x.ClinicalDataTrialSet.ClinicalDataSetEnName : x.ClinicalDataTrialSet.ClinicalDataSetName).Distinct().ToListAsync();
+
+            return new GetVisitClinicalDataNameOutDto()
+            {
+                ClinicalDataName = string.Join(',', clinicalDataNames),
+
+            };
+        }
+
         /// <summary>
         /// 获取下拉菜单
         /// </summary>
@@ -681,6 +702,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var readingNameOrTaskBlindName = string.Empty;
             var subjectCode = string.Empty;
+            inDto.IsGetTaskClinicalData = true;
             if (inDto.ReadingId == null)
             {
                 var visitTask = await _visitTaskRepository.AsQueryable().Include(x => x.Subject)
@@ -701,23 +723,6 @@ namespace IRaCIS.Core.Application.Service
                 }
             }
 
-
-            var readingIds = result.Select(x => x.ReadingId).ToList();
-
-            var previousHistoryList = await _previousHistoryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
-            var previousOtherList = await _previousOtherRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
-            var previousSurgeryList = await _previousSurgeryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
-            foreach (var item in result)
-            {
-                item.ClinicalTableData = new ClinicalDataTable()
-                {
-                    PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
-                    PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
-                    PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
-                };
-
-            }
-
             Dictionary<ClinicalLevel, int> keys = new Dictionary<ClinicalLevel, int>() {
                 {ClinicalLevel.SubjectVisit,0 },
                 {ClinicalLevel.ImageRead,2 },
@@ -809,6 +814,27 @@ namespace IRaCIS.Core.Application.Service
                     isSelfAnalysis = true;
                 }
             }
+
+            //下面改用readingIdList筛选 不然
+            List<Guid> readingIdList = new List<Guid>() {};
+            if (inDto.IsGetTaskClinicalData)
+            {
+                var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync();
+                if (subjectVisit != null && !subjectVisit.IsBaseLine)
+                {
+                    var baseId = await _subjectVisitRepository.Where(x => x.SubjectId == subjectVisit.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
+                    readingIdList.Add(baseId);
+                }
+
+                var readModuleInfo = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync();
+                if (readModuleInfo != null && readModuleInfo.ReadingSetType == ReadingSetType.ImageReading)
+                {
+                    var baseId = await _subjectVisitRepository.Where(x => x.SubjectId == readModuleInfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
+                    readingIdList.Add(baseId);
+                }
+
+            }
+
             //  一致性分析
             if (isSelfAnalysis)
             {
@@ -817,7 +843,7 @@ namespace IRaCIS.Core.Application.Service
                .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
                .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
                .WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
-               .Where(x => x.ReadingId == inDto.ReadingId)
+               .Where(x => x.ReadingId == inDto.ReadingId||(readingIdList.Contains(x.ReadingId)&&x.ClinicalDataTrialSet.ClinicalDataLevel== ClinicalLevel.Subject))
                .WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
                .Select(x => new GetReadingClinicalDataListOutDto()
                {
@@ -858,7 +884,7 @@ namespace IRaCIS.Core.Application.Service
                   .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
                       .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
                   .WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
-                  .Where(x => x.ReadingId == inDto.ReadingId)
+                  .Where(x => x.ReadingId == inDto.ReadingId || (readingIdList.Contains(x.ReadingId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject))
                   .WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
                   .Where(x => x.ClinicalDataTrialSet.ClinicalUploadType != ClinicalUploadType.PDF || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Study)
                   .Select(x => new GetReadingClinicalDataListOutDto()
@@ -901,7 +927,7 @@ namespace IRaCIS.Core.Application.Service
              .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
                  .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
              .WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
-             .Where(x => x.ReadingId == inDto.ReadingId)
+             .Where(x => x.ReadingId == inDto.ReadingId || (readingIdList.Contains(x.ReadingId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject))
              .WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
              .Select(x => new GetReadingClinicalDataListOutDto()
              {
@@ -1061,17 +1087,17 @@ namespace IRaCIS.Core.Application.Service
                 }
             }
 
-            var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
-            var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
-            var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
+            var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId || (readingIdList.Contains(x.SubjectVisitId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
+            var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId || (readingIdList.Contains(x.SubjectVisitId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
+            var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId || (readingIdList.Contains(x.SubjectVisitId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
 
             foreach (var item in result)
             {
                 item.ClinicalTableData = new ClinicalDataTable()
                 {
-                    PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
-                    PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
-                    PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+                    PreviousHistoryList = previousHistoryList.Where(x => x.SubjectVisitId == item.ReadingId).ToList(),
+                    PreviousOtherList = previousOtherList.Where(x => x.SubjectVisitId == item.ReadingId).ToList(),
+                    PreviousSurgeryList = previousSurgeryList.Where(x => x.SubjectVisitId == item.ReadingId).ToList(),
                 };
 
             }

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

@@ -259,6 +259,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsGetAllConsistencyAnalysis { get; set; } = true;
 
+        /// <summary>
+        /// 是否是阅片页面获取临床数据  (阅片其他访视任务需要获取受试者级别的)
+        /// </summary>
+        public bool IsGetTaskClinicalData { get; set; } = false;
+
     }
 
     public class GetConsistencyAnalysisReadingClinicalDataListInDto
@@ -556,6 +561,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public DateTime CreateTime { get; set; }
     }
 
+    /// <summary>
+    /// 获取临床数据名称
+    /// </summary>
+    public class GetVisitClinicalDataNameInDto
+    {
+        public Guid Id { get; set; }
+    }
+
+    public class GetVisitClinicalDataNameOutDto
+    {
+        public string ClinicalDataName { get; set; }
+    }
 
     public class GetTrialClinicalDataSelectIndto
     {