From 6a7c15293ebcc309e1d31c5da99abc2a3c6ab138 Mon Sep 17 00:00:00 2001 From: "{872297557@qq.com}" <872297557@qq.com> Date: Fri, 2 Dec 2022 16:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=A4=B1=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/VisitTaskHelpeService.cs | 4 ++-- IRaCIS.Core.Domain/SQLFile/Sql脚本.sql | 23 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 57f0011bc..16b405353 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Service - var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId).Select(t=>t.VisitNum).ToList(); + var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId && t.IsLostVisit == false).Select(t=>t.VisitNum).ToList(); foreach (var subjectVisit in subjectGroup.SubjectVisitList) { @@ -269,7 +269,7 @@ namespace IRaCIS.Core.Application.Service foreach (var subjectVisit in subjectGroup.SubjectVisitList) { - var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId).Select(t => t.VisitNum).ToList(); + var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId && t.IsLostVisit==false).Select(t => t.VisitNum).ToList(); foreach (var trialReadingCriterionConfig in trialReadingCriterionConfigList) diff --git a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql b/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql index 153b41287..4b7edb6e9 100644 --- a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql +++ b/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql @@ -67,4 +67,25 @@ go update ReadingQuestionCriterionTrial set DigitPlaces=DigitPlaces-1 where DigitPlaces is not null -update ReadingQuestionCriterionTrial set DigitPlaces=-1 where DigitPlaces=3 \ No newline at end of file +update ReadingQuestionCriterionTrial set DigitPlaces=-1 where DigitPlaces=3 + + + +--ÎÞÐòά»¤sql +update VisitTask set TaskBlindName='Follow Up ' + from VisitTask +INNER join ReadingQuestionCriterionTrial on VisitTask.TrialReadingCriterionId=ReadingQuestionCriterionTrial.Id +INNER join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id + where SubjectVisit.IsBaseLine=0 and ReadingQuestionCriterionTrial.IsReadingTaskViewInOrder=0 + + +-- ÓÐÐòά»¤sql +update VisitTask set TaskBlindName='Follow Up '+ cast(sv.rn as varchar) + from VisitTask +join ReadingQuestionCriterionTrial on VisitTask.TrialReadingCriterionId=ReadingQuestionCriterionTrial.Id +--join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id +join ( select Id SubjectVisitId, IsBaseLine, ROW_NUMBER() over( partition by SubjectId order by VisitNum asc )-1 rn,VisitNum from SubjectVisit) sv on VisitTask.SourceSubjectVisitId=sv.SubjectVisitId +where sv.IsBaseLine=0 and ReadingQuestionCriterionTrial.IsReadingTaskViewInOrder=1 + +update VisitTask set TaskBlindName='Baseline' from VisitTask +join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id where SubjectVisit.IsBaseLine=1 \ No newline at end of file