Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -1425,7 +1425,7 @@ namespace IRaCIS.Core.Application.Service
 
                     var taskState = exsitPDF ? TaskState.NotEffect : TaskState.Effect;
 
-                    var clinicalDataList = _readingClinicalDataRepository.Where(t => t.SubjectId == subjectId).Include(t => t.ReadingClinicalDataPDFList).Include(t=>t.ClinicalDataTrialSet).ToList();
+                    var clinicalDataList = _readingClinicalDataRepository.Where(t => t.SubjectId == subjectId&&t.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF).Include(t => t.ReadingClinicalDataPDFList).Include(t=>t.ClinicalDataTrialSet).ToList();
 
                     foreach (var clinicalData in clinicalDataList)
                     {

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -18,6 +18,7 @@ using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
 using IRaCIS.Core.Application.Auth;
 using BeetleX.Redis.Commands;
 using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Helper;
 
 namespace IRaCIS.Application.Services
 {
@@ -676,7 +677,8 @@ namespace IRaCIS.Application.Services
 
             await _mailVerificationService.SenMFAVerifyEmail(userId, userInfo.FullName, userInfo.EMail, verificationCode, (UserMFAType)mfaType);
 
-            return ResponseOutput.Ok();
+            var hiddenEmail = EmailMaskHelper.MaskEmail(userInfo.EMail);
+            return ResponseOutput.Ok(hiddenEmail);
         }
 
         /// <summary>

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

@@ -1071,7 +1071,56 @@ namespace IRaCIS.Application.Services
         }
 
         #endregion
-         
+
+
+        #region 一致性分析
+        /// <summary>
+        /// 获取阅片临床数据列表
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<(List<GetReadingClinicalDataListOutDto>, object)> GetConsistencyAnalysisReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
+        {
+          
+
+      
+
+            var isBaseLine = await _subjectVisitRepository.AnyAsync(x => x.Id == inDto.ReadingId && x.IsBaseLine);
+
+
+            var result = await this.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
+            {
+                ClinicalDataTrialSetId = inDto.ClinicalDataTrialSetId,
+                GetClinicalType = inDto.GetClinicalType,
+                SubjectId = inDto.SubjectId,
+                TrialId = inDto.TrialId,
+                SelectIsSign = false,
+                ReadingId = inDto.ReadingId,
+                TrialReadingCriterionId = inDto.TrialReadingCriterionId,
+            });
+            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(),
+                };
+
+            }
+
+            return (result, new
+            {
+                IsCanAddClinicalData = false,
+            });
+        }
+        #endregion
 
         #region 阅片临床数据PDF