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

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

@@ -4521,6 +4521,11 @@
             是否是第一次转化的任务
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.IsExistsClinicalData">
+            <summary>
+            是否存在临床数据
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetGlobalReadingInfoInDto.UsingOriginalData">
             <summary>
             当新答案为空的时候 是否是有原数据

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

@@ -227,7 +227,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         public async Task<IResponseOutput<PageOutput<PIReaingTaskView>>> GetPIReadingAuditList(VisitTaskQuery queryVisitTask)
         {
 
-            CriterionType? criterionType = _trialReadingCriterionRepository.Where(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t=>t.CriterionType).FirstOrDefault(); 
+            //CriterionType? criterionType = _trialReadingCriterionRepository.Where(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t=>t.CriterionType).FirstOrDefault(); 
 
             var visitTaskQueryable = GetReadingTaskQueryable(queryVisitTask)
                .ProjectTo<PIReaingTaskView>(_mapper.ConfigurationProvider);
@@ -239,9 +239,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
             var trialTaskConfig = _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialUrgentConfig>(_mapper.ConfigurationProvider).FirstOrDefault();
 
             var questionList = _readingQuestionTrialRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.ReadingQuestionCriterionTrialId == queryVisitTask.TrialReadingCriterionId)
-              //.Where(t => t.IsJudgeQuestion == true)
+              .Where(t => t.IsJudgeQuestion == true)
-              .WhereIf(criterionType!=null&& criterionType!=CriterionType.SelfDefine,t=>t.IsJudgeQuestion==true)
+              //.WhereIf(criterionType!=null&& criterionType!=CriterionType.SelfDefine,t=>t.IsJudgeQuestion==true)
-               .WhereIf(criterionType != null && criterionType == CriterionType.SelfDefine, t => t.AssessmentResultEnum == AssessmentResultType.AssessmentResult)
+              // .WhereIf(criterionType != null && criterionType == CriterionType.SelfDefine, t => t.AssessmentResultEnum == AssessmentResultType.AssessmentResult)
               .Select(t => new { QuestionId = t.Id, QuestionName = _userInfo.IsEn_Us ? t.QuestionEnName : t.QuestionName ,t.DictionaryCode}).ToList();
 
             trialTaskConfig!.OtherObj = questionList;

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

@@ -84,7 +84,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<VisitTask, ReadingTaskView>().IncludeBase<VisitTask, VisitTaskView>()
                 .ForMember(t=>t.PIReadingResultList,u=>u.MapFrom(c=>c.ReadingTaskQuestionAnswerList
-                .Where(t=> t.ReadingQuestionCriterionTrial.CriterionType==CriterionType.SelfDefine? t.ReadingQuestionTrial.AssessmentResultEnum == AssessmentResultType.AssessmentResult: t.ReadingQuestionTrial.IsJudgeQuestion==true)
+                .Where(t=> /*t.ReadingQuestionCriterionTrial.CriterionType==CriterionType.SelfDefine? t.ReadingQuestionTrial.AssessmentResultEnum == AssessmentResultType.AssessmentResult:*/ t.ReadingQuestionTrial.IsJudgeQuestion==true)
                 .Select(d=>new PIReadingResult() { QuestionId= d.ReadingQuestionTrialId,Answer=d.Answer})));
 
             CreateMap<VisitTask, PIReaingTaskView>().IncludeBase<VisitTask, ReadingTaskView>()

IRaCIS.Core.Application/Service/Common/InternationalizationService.cs

@@ -144,7 +144,8 @@ namespace IRaCIS.Core.Application.Service
 
             await _internationalizationRepository.SaveChangesAsync();
 
-
+            //清理缓存
+            _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
             return ResponseOutput.Ok();
         }
 
@@ -183,6 +184,9 @@ namespace IRaCIS.Core.Application.Service
 
             }
 
+            //清理缓存
+            _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
+
             return ResponseOutput.Ok(entity.Id.ToString());
 
         }
@@ -192,6 +196,9 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> DeleteInternationalization(Guid internationalizationId)
         {
             var success = await _internationalizationRepository.DeleteFromQueryAsync(t => t.Id == internationalizationId, true);
+
+            //清理缓存
+            _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
             return ResponseOutput.Ok();
         }
 

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -1322,13 +1322,14 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="queryEmailNoticeConfig"></param>
         /// <returns></returns>
+        [HttpPost]
         public async Task<PageOutput<TrialSelectEmailNoticeConfigView>> GetSysEmailNoticeConfigList(EmailNoticeConfigQuery queryEmailNoticeConfig)
         {
             var emailNoticeConfigQueryable = _emailNoticeConfigRepository
            .WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
            .WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired)
            .WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable)
-
+            .WhereIf(queryEmailNoticeConfig.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryEmailNoticeConfig.CriterionTypeEnum)
            .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = queryEmailNoticeConfig.TrialId });
 
             return await emailNoticeConfigQueryable.ToPagedListAsync(queryEmailNoticeConfig.PageIndex, queryEmailNoticeConfig.PageSize, queryEmailNoticeConfig.SortField, queryEmailNoticeConfig.Asc);

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

@@ -204,7 +204,8 @@ namespace IRaCIS.Application.Services
                     Path = x.ClinicalDataTrialSet.Path,
                     IsBlind = x.IsBlind,
                     IsComplete = x.IsComplete,
-                    ClinicalFromList=x.Subject.ClinicalFormList.Where(y=>y.ReadingId==x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y=> new ClinicalFromData() { 
+                    ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
+                    {
                         CheckDate = y.CheckDate,
                         ClinicalFormId = y.Id
                     }).ToList(),
@@ -304,8 +305,25 @@ namespace IRaCIS.Application.Services
 
             await this.iServiceProvider.GetService<IReadingImageTaskService>().AddOncologyTask(readingId);
 
+            //如果先生成了任务，再签名subject级别 PM 临床数据，那么会导致其他标准的任务签名状态无法得到维护
+
+            if (await _repository.AnyAsync<ClinicalDataTrialSet>(t => t.Id == data.ClinicalDataTrialSetId && t.UploadRole == UploadRole.PM && t.ClinicalDataLevel == ClinicalLevel.Subject))
+            {
+                var needDealTrialReadingCriterionIdList = _repository.Where<ClinicalDataTrialSet>(t => t.Id == data.ClinicalDataTrialSetId)
+                  .SelectMany(t => t.TrialClinicalDataSetCriteriaList)
+                  .Select(u => u.TrialReadingCriterionId).Distinct().ToList();
+
+                foreach (var trialReadingCriterionId in needDealTrialReadingCriterionIdList)
+                {
+                    await DealVisiTaskClinicalDataSignedAsync(data.TrialId, data.SubjectId, data.ReadingId, data.IsVisit, trialReadingCriterionId);
+                }
+            }
+            else
+            {
                 await DealVisiTaskClinicalDataSignedAsync(data.TrialId, data.SubjectId, data.ReadingId, data.IsVisit, inDto.TrialReadingCriterionId);
 
+            }
+
             return ResponseOutput.Result(result);
         }
 
@@ -710,7 +728,8 @@ namespace IRaCIS.Application.Services
 
             var readingIds = result.Select(x => x.ReadingId).ToList();
             var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
-            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
+            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x =>
+            {
 
                 x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
                 {
@@ -730,7 +749,8 @@ namespace IRaCIS.Application.Services
             {
                 var moduleCriterionFromList = await _readModuleCriterionFromRepository
                     .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
-                    .Where(x => x.ReadModuleId == readModule.Id).Select(x => new{
+                    .Where(x => x.ReadModuleId == readModule.Id).Select(x => new
+                    {
                         ClinicalFormId = x.ClinicalFormId,
                         CheckDate = x.ClinicalForm.CheckDate,
                         ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId
@@ -884,7 +904,8 @@ namespace IRaCIS.Application.Services
 
             var readingIds = result.Select(x => x.ReadingId).ToList();
             var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
-            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
+            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x =>
+            {
 
                 x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
                 {
@@ -902,7 +923,8 @@ namespace IRaCIS.Application.Services
                 var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id)
 
                      .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.TrialReadingCriterionId)
-                    .Select(x => new {
+                    .Select(x => new
+                    {
                         ClinicalFormId = x.ClinicalFormId,
                         CheckDate = x.ClinicalForm.CheckDate,
                         ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId

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

@@ -1045,7 +1045,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public List<string> RelevanceValueList { get; set; }
 		public List<CalculateInfo> CalculateQuestionList { get; set; }
 
-        public AssessmentResultType AssessmentResultEnum { get; set; }
+        
     }
 
 	public class ReadingQuestionSystemView
@@ -1986,7 +1986,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public List<string> ParentTriggerValueList { get; set; }
 		public List<string> RelevanceValueList { get; set; }
 
-        public AssessmentResultType AssessmentResultEnum { get; set; }
+        
 
     }
 

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -268,7 +268,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-		public AssessmentResultType AssessmentResultEnum { get; set; }
+		//
 
         [JsonIgnore]
 		[ForeignKey("GroupId")]