diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs index 84490f8cf..e760eba36 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs @@ -138,6 +138,7 @@ namespace IRaCIS.Application.Services List enrollReadings = inDto.ReadingCategorys.Select(x => new EnrollReadingCategory() { + TrialReadingCriterionId= inDto.TrialReadingCriterionId, EnrollId = inDto.EnrollId, ReadingCategory = x }).ToList(); diff --git a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql b/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql index 9c7cff7e5..e2ae3c629 100644 --- a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql +++ b/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql @@ -43,8 +43,10 @@ update TrialDocUserTypeConfirmedUser set IsDeleted=0 where IsDeleted is null update SystemDocConfirmedUser set IsDeleted=0 where IsDeleted is null -update EnrollReadingCategory set TrialReadingCriterionId=(select top 1 Id from ReadingQuestionCriterionTrial where IsConfirm=1) -update VisitTask set TrialReadingCriterionId=(select top 1 Id from ReadingQuestionCriterionTrial where IsConfirm=1) +update EnrollReadingCategory set TrialReadingCriterionId= ISNUll((select top 1 Id from ReadingQuestionCriterionTrial where IsConfirm=1 and TrialId=Enroll.TrialId ) ,'00000000-0000-0000-0000-000000000000') +FROM EnrollReadingCategory INNER JOIN Enroll ON (EnrollReadingCategory.EnrollId = Enroll.Id) + +update VisitTask set TrialReadingCriterionId=(select top 1 Id from ReadingQuestionCriterionTrial where IsConfirm=1 and TrialId=VisitTask.TrialId) select * from EnrollReadingCategory where TrialReadingCriterionId is null select * from VisitTask where TrialReadingCriterionId is null