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

2026-01-07 16:41:59 +08:00
parent 8eb31d0c81 051094a742
commit eca7871684
3 changed files with 40 additions and 0 deletions
@@ -1981,6 +1981,23 @@ namespace IRaCIS.Core.Application.Image.QA
                                SubjectId = dbSubjectVisit.SubjectId
                            });

+
+                            if (await _readingQuestionCriterionTrialRepository.AnyAsync(x => x.Id == trialReadingCriterionId && x.IsOncologyReading))
+                            {
+                              await _readModuleRepository.AddAsync(new ReadModule()
+                                {
+                                    TrialReadingCriterionId = trialReadingCriterionId,
+                                    ReadingSetType = ReadingSetType.TumorReading,
+                                    SubjectVisitId = dbSubjectVisit.Id,
+                                    ModuleName = $"O-{dbSubjectVisit.VisitName}",
+                                    ModuleType = ModuleTypeEnum.Oncology,
+                                    ReadModuleAddTypeEnum = dbSubjectVisit.PDState == PDStateEnum.PDProgress ? ReadModuleAddType.PDConfirmation : ReadModuleAddType.FinalVisit,
+                                    IsUrgent = dbSubjectVisit.IsUrgent,
+                                    TrialId = dbSubjectVisit.TrialId,
+                                    SubjectId = dbSubjectVisit.SubjectId
+                                });
+                            }
+
                        }

                    }
@@ -66,6 +66,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            foreach (var item in questions)
            {
                item.QuestionName = item.QuestionName.LanguageName(item.QuestionEnName, _userInfo.IsEn_Us);
+                item.GroupName = item.GroupName.LanguageName(item.GroupEnName, _userInfo.IsEn_Us);
                item.ReportLayType = ReportLayType.Group;

                item.Childrens = _mapper.Map<List<ReadingReportDto>>(questionList.Where(x => x.GroupId == item.QuestionId).OrderBy(x => x.ShowOrder));