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

IRaCIS.Core.Application/Service/Document/DTO/UserAgreementViewModel.cs

@@ -26,7 +26,9 @@ public class UserAgreementAddOrEdit
     public DateTime EffectiveDate { get; set; }
     
     public string FileContent { get; set; }
-    
+
+    public string FileEnContent { get; set; } 
+
     public string FileName { get; set; }
     
     public string FileVersion { get; set; }

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

@@ -1120,7 +1120,8 @@ namespace IRaCIS.Core.Application.Service
                 {
                     UserAgreementTypeEnum = UserAgreementType.UserAgreement,
                     FileVersion=userAgreement.FileVersion,
-                    UserAgreementId=userAgreement.Id
+                    UserAgreementId=userAgreement.Id,
+                    IsEn_Us= _userInfo.IsEn_Us,
                 };
               
 

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

@@ -1350,6 +1350,10 @@ namespace IRaCIS.Core.Application.Service
             }
 
 
+            var isHaveBindingQuestion=(await _readingQuestionTrialRepository.AnyAsync(x=>x.ReadingQuestionCriterionTrialId==taskInfo.TrialReadingCriterionId&&x.ImageToolAttribute!=string.Empty))
+
+                || (await _readingTableQuestionTrialRepository.AnyAsync(x=>x.ReadingQuestionTrial.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId && x.ImageToolAttribute != string.Empty));
+
             return (await GetReadingTableQuestion(
                 new GetReadingTableQuestionOrAnswerInDto()
                 {
@@ -1364,6 +1368,7 @@ namespace IRaCIS.Core.Application.Service
                 }
               ), new
               {
+                  IsHaveBindingQuestion= isHaveBindingQuestion,
                   IsBaseline = taskInfo.SourceSubjectVisit != null && taskInfo.SourceSubjectVisit.IsBaseLine,
                   ReadingTaskState = taskInfo.ReadingTaskState,
                   QuestionMarkInfoList = tableQuestionMarkList,

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

@@ -291,12 +291,14 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> AddNoneDicomMark(AddNoneDicomMarkInDto inDto)
         {
            
-            var entity = await _readingNoneDicomMarkRepository.InsertOrUpdateAsync(inDto, true);
+            var entity = await _readingNoneDicomMarkRepository.InsertOrUpdateAsync(inDto,true);
 
             if (inDto.Proportion != null)
             {
                 await this.ChangePlottingScale(entity.Id, inDto.Proportion.Value);
             }
+
+            await _visitTaskRepository.SaveChangesAsync();
             return ResponseOutput.Ok(entity.Id);
         }