Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

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

@@ -541,6 +541,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             var query = _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
+                .WhereIf(inDto.ReadModuleId==null,x=>x.TrialReadingCriterion.IsConfirm)
                 .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
                 .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)
                  .WhereIf(inDto.IsPMConfirm != null, x => x.IsPMConfirm == inDto.IsPMConfirm)

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

@@ -285,7 +285,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public decimal FristAddTaskNum { get; set; }
 
-
+        public string? OtherMeasureData { get; set; } = string.Empty;
         public string MeasureData { get; set; }
 
         public List<TableQuestionInfo> TableQuestionList { get; set; } = new List<TableQuestionInfo>();

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

@@ -1217,6 +1217,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string VisitName { get; set; }
 
+        public bool IsBaseLine { get; set; }
+
         public bool IsHaveChange { get; set; }
 
         public string VisitRemark { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/Reading/Interface/IClinicalAnswerService.cs

@@ -21,5 +21,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Interface
 
         Task<IResponseOutput> CRCCancelConfirmClinical(CRCCancelConfirmClinicalInDto inDto);
 
+        Task<PageOutput<GetCRCConfirmListOutDto>> GetCRCConfirmList(GetCRCConfirmListInDto inDto);
+
     }
 }

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

@@ -100,6 +100,7 @@ namespace IRaCIS.Application.Services
                 .OrderBy(x => x.VisitTaskNum).Select(x => new OncologyVisitTaskInfo()
                 {
                     VisitName = x.SourceSubjectVisit.VisitName,
+                    IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
                     VisitTaskId = x.Id,
                     //  QuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
                     //.Select(y => new OncologyQuestion()

IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs

@@ -158,7 +158,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     RowIndex = x.RowIndex,
                     MeasureData = x.MeasureData,
-                    FristAddTaskNum=x.FristAddTaskNum,
+                    OtherMeasureData = x.OtherMeasureData,
+                    FristAddTaskNum =x.FristAddTaskNum,
                     TableQuestionList = tableQuestion.Where(y => y.QuestionId == item.QuestionId && y.RowId == x.Id).ToList(),
 
                 }).ToList();

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -501,17 +501,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     //获取肝脏评估
                  new ReadingCalculateData (){QuestionType=QuestionType.LiverAssessment,GetStringFun=GetLiverAssessment},
 
-                    // 骨髓中是否存在局灶性 FDG亲和病灶的证据
-                  new ReadingCalculateData (){QuestionType=QuestionType.EvidenceFocalFDG,GetStringFun=GetEvidenceFocalFDG,ComputationTrigger=ComputationTrigger.Lesion},
+                  //  // 骨髓中是否存在局灶性 FDG亲和病灶的证据
+                  //new ReadingCalculateData (){QuestionType=QuestionType.EvidenceFocalFDG,GetStringFun=GetEvidenceFocalFDG,ComputationTrigger=ComputationTrigger.Lesion},
 
                 //CT/MRI
                 new ReadingCalculateData (){QuestionType=QuestionType.CTandMRI,GetStringFun=CTMRIEvaluation},
 
-                // PET 5PS评分
-                new ReadingCalculateData (){QuestionType=QuestionType.PET5PS,GetStringFun=GetPET5PS,ComputationTrigger=ComputationTrigger.Lesion},
+                //// PET 5PS评分
+                //new ReadingCalculateData (){QuestionType=QuestionType.PET5PS,GetStringFun=GetPET5PS,ComputationTrigger=ComputationTrigger.Lesion},
 
-                //与基线相比摄取值变化
-                new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetUptakeChange,ComputationTrigger=ComputationTrigger.Lesion},
+                ////与基线相比摄取值变化
+                //new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetUptakeChange,ComputationTrigger=ComputationTrigger.Lesion},
 
                 // FDG-PET 评估结果
                  new ReadingCalculateData (){QuestionType=QuestionType.FDGPET,GetStringFun=GetFDGPETOverallAssessment},
@@ -2197,7 +2197,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             var rowInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
 
-            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
+            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())
+                  || !inDto.QuestionInfo.SelectMany(x => x.TableRowInfoList).Any(x => x.OtherMeasureData != null && x.OtherMeasureData != string.Empty))
             {
                 return string.Empty;
             }
@@ -2232,7 +2233,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<decimal?> GetSuvMax(ReadingCalculateDto inDto)
         {
-            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
+
+
+
+            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())
+                 || !inDto.QuestionInfo.SelectMany(x => x.TableRowInfoList).Any(x => x.OtherMeasureData != null && x.OtherMeasureData != string.Empty))
             {
                 return null;
             }

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1,6 +1,7 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.Service.Reading.Interface;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
@@ -22,11 +23,13 @@ namespace IRaCIS.Core.Application
         private readonly IRepository<TrialDocument> _trialDocumentRepository;
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
         private readonly IRepository<ReadModule> _readModuleRepository;
+        private readonly IClinicalAnswerService _clinicalAnswerService;
         private readonly IRepository<SystemNotice> _systemNoticeRepository;
 
         public PersonalWorkstation(IRepository<Trial> trialRepository, IRepository<TrialUser> trialUserRepository, IRepository<TrialDocument> trialDocumentRepository,
             IRepository<SystemDocument> systemDocumentRepository,
              IRepository<ReadModule> readModuleRepository,
+             IClinicalAnswerService clinicalAnswerService,
             IRepository<SystemNotice> systemNoticeRepository)
         {
             _trialRepository = trialRepository;
@@ -34,6 +37,7 @@ namespace IRaCIS.Core.Application
             _trialDocumentRepository = trialDocumentRepository;
             _systemDocumentRepository = systemDocumentRepository;
             this._readModuleRepository = readModuleRepository;
+            this._clinicalAnswerService = clinicalAnswerService;
             _systemNoticeRepository = systemNoticeRepository;
         }
 
@@ -511,6 +515,21 @@ namespace IRaCIS.Core.Application
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
+            // ReadModuleCount情况太多了 暂时用之前的方法
+            foreach (var item in result.CurrentPageData)
+            {
+                item.ReadModuleCount = (await _clinicalAnswerService.GetCRCConfirmList(new Service.Reading.Dto.GetCRCConfirmListInDto()
+                {
+                    TrialId = item.TrialId,
+                    IsPMConfirm=false,
+                    PageIndex = 1,
+                    PageSize = 9999,
+
+                })).CurrentPageData.Count();
+            }
+
+
+            result.CurrentPageData = result.CurrentPageData.Where(x => x.ReadModuleCount != 0).ToList();
 
             var toBeDealedCount = _subjectVisitRepository
                  //.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))