修改bug

2023-01-16 10:29:08 +08:00
parent cae80eeeba
commit b0c9a2fee2
5 changed files with 28 additions and 348 deletions
@@ -167,6 +167,10 @@ namespace IRaCIS.Core.Application.ViewModel
        public ReReadingApplyState ReReadingApplyState { get; set; }
        public DateTime? SuggesteFinishedTime { get; set; }

+        //任务来源访视Id  方便回更访视读片状态
+        public Guid? SourceSubjectVisitId { get; set; }
+        public Guid? SouceReadModuleId { get; set; }
+

    }

@@ -39,15 +39,19 @@ namespace IRaCIS.Core.Application.Service.Allocation
        private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
        private readonly IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository;

+        private readonly IRepository<ReadingClinicalData> _readingClinicalDataReposiotry;
+

        public VisitTaskService(IRepository<SubjectVisit> subjectVisitRepository, IRepository<VisitTask> visitTaskRepository, IRepository<Trial> trialRepository,
            IRepository<Subject> subjectRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<TaskAllocationRule> taskAllocationRuleRepository,
            IRepository<ReadModule> readModuleRepository, IRepository<VisitTaskReReading> visitTaskReReadingRepository,
             IRepository<TaskMedicalReview> taskMedicalReviewRepository,
            IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
-            , IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository
+            , IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository,
+            IRepository<ReadingClinicalData> readingClinicalDataReposiotry
            )
        {
+            _readingClinicalDataReposiotry = readingClinicalDataReposiotry;
            _taskAllocationRuleRepository = taskAllocationRuleRepository;
            _visitTaskRepository = visitTaskRepository;
            _trialRepository = trialRepository;
@@ -2188,7 +2192,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
            return ResponseOutput.Ok();
        }

-
+        //包括临床数据签名状态
        private async Task VisitBackAsync(Guid? subjectVisitId)
        {
            var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
@@ -2224,6 +2228,18 @@ namespace IRaCIS.Core.Application.Service.Allocation
            sv.ReviewAuditUserId = null;


+            if (sv.IsBaseLine)
+            {
+                await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && (t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit),c=>new ReadingClinicalData() { IsSign=false,ReadingClinicalDataState=ReadingClinicalDataStatus.HaveUploaded});
+
+            }
+            else
+            {
+                await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id &&  t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit, c => new ReadingClinicalData() { IsSign = false, ReadingClinicalDataState =ReadingClinicalDataStatus.HaveUploaded });
+            }
+
+
+
            //await _repository.AddAsync(new CheckChallengeDialog() { SubjectVisitId = subjectVisitId, TalkContent = "PM/APM同意一致性核查回退。", UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt });

            await _repository.BatchDeleteAsync<TrialQCQuestionAnswer>(t => t.SubjectVisitId == subjectVisitId);