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

@@ -1002,11 +1002,12 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.VerifyIRStudyAllowUpload(IRaCIS.Core.Application.Contracts.TaskStudyAchivePreConfirmCommand)">
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.VerifyIRStudyAllowUpload(IRaCIS.Core.Application.Contracts.TaskStudyAchivePreConfirmCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy})">
             <summary>
             在调用预归档前验证 这些检查是否可以全新上传还是已存在补充 目前前端允许  IsAllowUpload==true 全新、IsAllowReUpload==true 补充的study   ，全部丢到后端，后端判断存在，就删除之前的检查，全新插入
             </summary>
             <param name="inCommand"></param>
+            <param name="_dicomStudyRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetIRUploadTaskNoneDicomStudyList(IRaCIS.Core.Application.Contracts.IRUploadStudyQuery)">
@@ -6871,6 +6872,11 @@
             答案分组
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.Unit">
+            <summary>
+            单位
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.AnswerCombination">
             <summary>
             答案组合

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -527,6 +527,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         [NotDefault]
         public string SubjectCode { get; set; }
+
+        public Guid? VisitTaskId { get; set; }
     }
 
 
@@ -554,6 +556,6 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid SubjectVisitId { get; set; }
 
-        public Guid VisitTaskId { get; set; }
+        public Guid TaskId { get; set; }
     }
 }

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -256,18 +256,28 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         /// 在调用预归档前验证 这些检查是否可以全新上传还是已存在补充 目前前端允许  IsAllowUpload==true 全新、IsAllowReUpload==true 补充的study   ，全部丢到后端，后端判断存在，就删除之前的检查，全新插入
         /// </summary>
         /// <param name="inCommand"></param>
+        /// <param name="_dicomStudyRepository"></param>
         /// <returns></returns>
-        public async Task<List<TaskStudyArchiveConfirmResult>> VerifyIRStudyAllowUpload(TaskStudyAchivePreConfirmCommand inCommand)
+        public async Task<List<TaskStudyArchiveConfirmResult>> VerifyIRStudyAllowUpload(TaskStudyAchivePreConfirmCommand inCommand, [FromServices] IRepository<DicomStudy> _dicomStudyRepository)
         {
 
 
-            var notAllowedUidList = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
+            var notAllowedUidList1 = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
             {
                 t.StudyInstanceUid,
                 t.SubjectId,
                 SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code
             }).ToList();
 
+            var notAllowedUidList2 = _dicomStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
+            {
+                t.StudyInstanceUid,
+                t.SubjectId,
+                SubejectCode = t.Subject.Code
+            }).ToList();
+
+            var notAllowedUidList = notAllowedUidList1.Union(notAllowedUidList2);
+
             var result = new List<TaskStudyArchiveConfirmResult>();
 
             foreach (var studyUid in inCommand.StudyInstanceUidList)
@@ -275,6 +285,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var findStudy = notAllowedUidList.Where(t => t.StudyInstanceUid == studyUid).FirstOrDefault();
                 if (findStudy != null)
                 {
+
                     //同一个subject 同一份影响
                     if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
                     {
@@ -574,7 +585,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
             else
             {
-                await _noneDicomStudyFileReposiotry.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.NoneDicomStudyId == noneDicomStudyId);
+                await _noneDicomStudyFileReposiotry.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
             }
 
             return ResponseOutput.Ok();
@@ -590,9 +601,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         [HttpPost]
         public async Task<List<TaskNoneDicomStudyDTO>> GetIRUploadTaskNoneDicomStudyList(IRUploadStudyQuery inQuery)
         {
+            var info = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
+                 .Select(t => new { t.IsImageFilter, t.CriterionModalitys }).FirstNotNullAsync();
+
             var query = from u in _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
-                        join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId) on u.SourceSubjectVisitId equals ns.SubjectVisitId
+                        join ns in _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId).WhereIf(info.IsImageFilter,t=> ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
+                        on u.SourceSubjectVisitId equals ns.SubjectVisitId
 
                         select new TaskNoneDicomStudyDTO()
                         {
@@ -723,9 +738,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         [HttpPost]
         public async Task<List<SubjectCRCImageUploadedStudyDto>> GetSubjectImageDownloadSelectList(IRReadingDownloadQuery inQuery)
         {
+            var doctorUserId = _userInfo.Id;
+
+            //医学审核查看下载按钮，这个时候需要知道医生
+            if (inQuery.VisitTaskId != null && inQuery.VisitTaskId!=Guid.Empty)
+            {
+                doctorUserId = await _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId).Select(t => (Guid)t.DoctorUserId).FirstNotNullAsync();
+            }
 
             var query = _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
-                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == doctorUserId && t.TaskState == TaskState.Effect)
                 .ProjectTo<SubjectCRCImageUploadedDto>(_mapper.ConfigurationProvider);
 
 
@@ -801,10 +823,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var isQueryDicom = inQuery.DicomStudyIdList.Count > 0;
             var isQueryNoneDicom = inQuery.NoneDicomStudyIdList.Count > 0;
 
+            var taskIdList = inQuery.SubjectVisitTaskList.Select(t => t.TaskId).ToList();
+
             var subjectVisitIdList = inQuery.SubjectVisitTaskList.Select(t => t.SubjectVisitId).ToList();
 
+            //var a = _visitTaskRepository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id);
+
             var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id)))
-                        join visitTask in _visitTaskRepository.Where(t => t.TaskState == TaskState.Effect && t.DoctorUserId == _userInfo.Id && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+                        //一致性分析，导致查询出来两条数据
+                        join visitTask in _visitTaskRepository.Where(t=> taskIdList.Contains(t.Id)) /*.Where(t => t.TaskState == TaskState.Effect && t.DoctorUserId == _userInfo.Id && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)*/
+
                         on sv.Id equals visitTask.SourceSubjectVisitId
                         select new
                         {

IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs

@@ -32,11 +32,11 @@ namespace IRaCIS.Core.Application.Contracts
             [FromQuery, NotDefault] Guid subjectVisitId,
             [FromQuery] Guid? nonedicomStudyId,
             [FromQuery] bool isFilterZip,
-            [FromQuery] Guid? visiTaskId)
+            [FromQuery] Guid? visitTaskId)
         {
 
             IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
-            if (visiTaskId == null)
+            if (visitTaskId == null)
             {
                 noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
 
@@ -44,9 +44,9 @@ namespace IRaCIS.Core.Application.Contracts
             }
             else
             {
-                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == visiTaskId))
+                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == visitTaskId))
                       .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
-                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip, visiTaskId = visiTaskId });
+                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip, visiTaskId = visitTaskId });
             }
 
 

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

@@ -136,7 +136,8 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.FeedBackUserName, c => c.MapFrom(t => t.CreateUser.UserName))
                  .ForMember(d => d.FeedBackFullName, c => c.MapFrom(t => t.CreateUser.FullName))
                   .ForMember(d => d.UserTypeEnum, c => c.MapFrom(t => t.CreateUser.UserTypeEnum));
-            CreateMap<UserFeedBack, UserFeedBackAddOrEdit>().ReverseMap();
+
+            CreateMap<UserFeedBackAddOrEdit, UserFeedBack>().ReverseMap();
         }
     }
 

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -599,8 +599,9 @@ namespace IRaCIS.Core.Application.Service
 
             Guid? visiTaskId = null;
             CreateMap<NoneDicomStudy, TaskDicomStudyView>()
-                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ? s.TaskNoneDicomFileList.WhereIf(visiTaskId!=null,t=>t.VisitTaskId==visiTaskId)
-                         .Where(t => !t.FileType.Contains(StaticData.FileType.Zip)) : s.TaskNoneDicomFileList.WhereIf(visiTaskId != null, t => t.VisitTaskId == visiTaskId)))
+                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ? 
+                s.TaskNoneDicomFileList.Where(t=> visiTaskId != null?t.VisitTaskId==visiTaskId:true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip)) 
+                : s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
         }

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

@@ -1911,6 +1911,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public List<string> AnswerGroup { get; set; }
 
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public ValueUnit? Unit { get; set; }
+
         /// <summary>
         /// 答案组合
         /// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -678,6 +678,7 @@ namespace IRaCIS.Core.Application.Service.RC
                     case CriterionType.OCT:
                         criterion.IsImageFilter = true;
                         criterion.IsReadingPeriod = false;
+                        criterion.IsGlobalReading = false;
                         criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
                         criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
                         criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs

@@ -47,6 +47,7 @@ namespace IRaCIS.Application.Services
                     DictionaryCode=x.DictionaryCode,
                     JudgeType = x.JudgeType,
 					Type=x.Type,
+                    Unit= x.Unit,
                     ReadingQuestionTrialId = x.Id,
 					JudgeDifferenceValue= x.JudgeDifferenceValue,
                     JudgeDifferenceType=x.JudgeDifferenceType,

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -6,6 +6,7 @@ using Panda.DynamicWebApi.Attributes;
 using IRaCIS.Core.Application.Contracts;
 using MassTransit;
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Application.Services
 {
@@ -66,7 +67,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetReadingImageFile(GetReadingImgInDto inDto)
+        public async Task<IResponseOutput<List<NoneDicomStudyView>>> GetReadingImageFile(GetReadingImgInDto inDto)
         {
             var task = await GetNextTask(new GetNextTaskInDto()
             {
@@ -84,10 +85,26 @@ namespace IRaCIS.Application.Services
                 // 阅片期取前面所有的图像
                 visitIds.AddRange(await _subjectVisitRepository.Where(x => x.VisitNum <= task.VisitNum && x.SubjectId == task.SubjectId).Select(x => x.Id).ToListAsync());
             }
-            List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId) && t.NoneDicomFileList.Any(t=>!t.FileType.Contains(StaticData.FileType.Zip)))
-                .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true }).ToListAsync();
 
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).FirstNotNullAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).Select(t => new { t.BlindSubjectCode, t.TrialReadingCriterionId, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();
+
+
+            IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
+            if (inDto.VisistTaskId == null)
+            {
+                noneDicomStudyQueryable = _noneDicomStudyRepository
+                    .Where(t => visitIds.Contains(t.SubjectVisitId) && t.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip)))
+                    .WhereIf(taskinfo.IsImageFilter == true, t => taskinfo.CriterionModalitys.Contains(t.Modality))
+                    .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true });
+            }
+            else
+            {
+                noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == inDto.VisistTaskId))
+                          .Where(t => visitIds.Contains(t.SubjectVisitId))
+                     .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true, visiTaskId = inDto.VisistTaskId });
+            }
+            List<NoneDicomStudyView> result = await noneDicomStudyQueryable.ToListAsync();
+
 
             var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
             {
@@ -121,7 +138,7 @@ namespace IRaCIS.Application.Services
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).FirstNotNullAsync();
 
-            return ResponseOutput.Ok (result, new
+            return ResponseOutput.Ok(result, new
             {
                 VisitTaskId = task.VisitTaskId,
                 SubjectId = task.SubjectId,

IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs

@@ -186,8 +186,11 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetReadingVisitStudyListIndto
     {
+        [NotDefault]
         public Guid TrialId { get; set; }
+        [NotDefault]
         public Guid SujectVisitId { get; set; }
+        [NotDefault]
         public Guid VisitTaskId { get; set; }
     }
 

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Services
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository
        ) : BaseService, ISubjectVisitService
     {
-       
+
 
         [HttpPost]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
@@ -541,7 +541,7 @@ namespace IRaCIS.Core.Application.Services
                         SeriesId = x.SeriesId,
                         StudyId = x.StudyId,
                         InstanceId = x.InstanceId,
-                        NumberOfFrames=x.NumberOfFrames,
+                        NumberOfFrames = x.NumberOfFrames,
                     }).ToListAsync();
 
 
@@ -594,20 +594,20 @@ namespace IRaCIS.Core.Application.Services
                                       HtmlPath = k.HtmlPath,
                                       Path = k.Path,
                                       InstanceNumber = k.InstanceNumber,
-                                      StudyId= k.StudyId,
-                                      SeriesId= k.SeriesId,
+                                      StudyId = k.StudyId,
+                                      SeriesId = k.SeriesId,
                                   }).ToListAsync();
 
                                 item.InstanceInfoList.ForEach(x =>
                                 {
 
-                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id&&y.NumberOfFrames!=0).Select(y => y.NumberOfFrames).Distinct().ToList();
+                                    var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0).Select(y => y.NumberOfFrames).Distinct().ToList();
 
                                     if (keyFramesList.Count() > 0)
                                     {
                                         x.KeyFramesList = keyFramesList;
                                     }
-                                   
+
                                     var item = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id);
                                     if (item != null)
                                     {
@@ -632,7 +632,7 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-                            studyList.Insert(0,thisVisitTaskStudy);
+                            studyList.Insert(0, thisVisitTaskStudy);
 
                         }
 
@@ -658,7 +658,7 @@ namespace IRaCIS.Core.Application.Services
             #region 非Dicom 检查查询
 
             var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId && x.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip)))
-                  .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality) ).ToListAsync();
+                  .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.Modality)).ToListAsync();
 
 
             List<VisitStudyDTO> noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()
@@ -672,11 +672,14 @@ namespace IRaCIS.Core.Application.Services
 
             }).ToList();
 
+            var isExistTaskNoneDicomFile = _noneDicomStudyFileRepository.Any(t => t.VisitTaskId == indto.VisitTaskId);
+
             foreach (var item in noDicomStudyList)
             {
                 var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
 
-                var instanceCount = await _noneDicomStudyFileRepository.Where(x => x.NoneDicomStudyId == item.StudyId).CountAsync();
+                var instanceCount = await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile,x=>x.OriginNoneDicomStudyId== item.StudyId)
+                    .WhereIf(isExistTaskNoneDicomFile==false, x=>x.NoneDicomStudyId == item.StudyId).CountAsync();
 
                 if (instanceCount == 0)
                 {
@@ -697,7 +700,9 @@ namespace IRaCIS.Core.Application.Services
                     SubjectVisitId=nodicom.SubjectVisitId,
                     SubjectId=nodicom.SubjectId,
                     SeriesNumber=1,
-                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId && !x.FileType.Contains(StaticData.FileType.Zip)).Select(x=>x.Path).FirstOrDefaultAsync(),
+                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile,x=>x.OriginNoneDicomStudyId== item.StudyId)
+                    .WhereIf(isExistTaskNoneDicomFile==false, x=>x.NoneDicomStudyId == item.StudyId)
+                    .Where(x=> !x.FileType.Contains(StaticData.FileType.Zip)).Select(x=>x.Path).FirstOrDefaultAsync(),
                     }
 
                 };