修改重阅跟踪查询条件

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -57,6 +57,15 @@ namespace IRaCIS.Core.Application.ViewModel
         public string TrialReadingCriterionName { get; set; }
 
 
+        public bool IsNeedClinicalDataSign { get; set; }
+
+        public bool IsClinicalDataSign { get; set; }
+
+
+        public CompleteClinicalDataEnum CompleteClinicalDataEnum => 
+            (IsNeedClinicalDataSign && IsClinicalDataSign) ? CompleteClinicalDataEnum.Complete : (IsNeedClinicalDataSign && IsClinicalDataSign == false) ? CompleteClinicalDataEnum.NotComplete : CompleteClinicalDataEnum.NA;
+       
+
 
         /// <summary>
         /// 阅片工具
@@ -342,6 +351,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid? TrialReadingCriterionId { get; set; }
 
+        public CompleteClinicalDataEnum? CompleteClinicalDataEnum { get; set; }
+
     }
 
 

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -700,6 +700,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
                .WhereIf(queryVisitTask.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == queryVisitTask.TrialReadingCriterionId)
                .WhereIf(queryVisitTask.ReReadingApplyState != null, t => t.ReReadingApplyState == queryVisitTask.ReReadingApplyState)
 
+                .WhereIf(queryVisitTask.CompleteClinicalDataEnum == CompleteClinicalDataEnum.Complete , t => t.IsClinicalDataSign && t.IsNeedClinicalDataSign == true)
+                .WhereIf(queryVisitTask.CompleteClinicalDataEnum == CompleteClinicalDataEnum.NotComplete, t => t.IsClinicalDataSign==false && t.IsNeedClinicalDataSign==true)
+                .WhereIf(queryVisitTask.CompleteClinicalDataEnum == CompleteClinicalDataEnum.NA, t => t.IsNeedClinicalDataSign == false)
                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TrialSiteCode), t => (t.BlindTrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.IsAnalysisCreate) || (t.Subject.TrialSite.TrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.IsAnalysisCreate == false))
                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskName), t => t.TaskName.Contains(queryVisitTask.TaskName) || t.TaskBlindName.Contains(queryVisitTask.TaskName))
                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => t.Subject.Code.Contains(queryVisitTask.SubjectCode) || t.BlindSubjectCode.Contains(queryVisitTask.SubjectCode))

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -283,7 +283,7 @@ namespace IRaCIS.Application.Services
             //var confirmedCtritrialList = _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.ReadingInfoSignTime != null).Select(t => new { t.Id, t.CriterionType }).ToList();
 
              var needSignCount = 0;
-             var haveSignedCount = _readingClinicalDataRepository.Where(t => t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
+             var haveSignedCount = _readingClinicalDataRepository.Where(t => t.TrialId==trialId && t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
 
             if (isVisit)
             {

IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs

@@ -354,5 +354,13 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
+    public enum CompleteClinicalDataEnum
+    {
+        NA=-1,
+
+        NotComplete=0,
+        Complete=1,
+    }
+
 
 }

IRaCIS.Core.Domain/SQLFile/Test.sql

@@ -205,3 +205,85 @@ update  frontAuditConfig set  DictionaryCode =''   where Code='AuditState' and D
 -- 修改Hospital 的SiteId
 update Hospital set Hospital.SiteId=Site.Id from Site 
 inner join Hospital on Hospital.HospitalName=Site.SiteName 
+
+
+---2023 -1-10
+--处理访视
+    --基线
+update VisitTask set IsNeedClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join SubjectVisit on   VisitTask.SourceSubjectVisitId=SubjectVisit.Id  
+
+ where VisitTask.ReadingCategory=1  and SubjectVisit.IsBaseLine=1  and EXISTS (select * from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%' and (ClinicalDataLevel=0 or ClinicalDataLevel=1))
+    --非基线
+update VisitTask set IsNeedClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join SubjectVisit on   VisitTask.SourceSubjectVisitId=SubjectVisit.Id  
+ where VisitTask.ReadingCategory=1  and SubjectVisit.IsBaseLine=0 and EXISTS (select * from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%' and ClinicalDataLevel=1)
+	 
+--处理裁判
+
+update VisitTask set IsNeedClinicalDataSign =0,IsClinicalDataSign=0    where VisitTask.ReadingCategory=4
+
+--处理肿瘤学
+
+update VisitTask set IsNeedClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join ReadModule on   VisitTask.SouceReadModuleId=ReadModule.Id  
+ where VisitTask.ReadingCategory=5   and EXISTS (select * from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%'   and ClinicalDataLevel=3)
+ 
+--处理全局
+
+update VisitTask set IsNeedClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join ReadModule on   VisitTask.SouceReadModuleId=ReadModule.Id  
+ where VisitTask.ReadingCategory=2  and  EXISTS (select * from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%'   and ClinicalDataLevel=2)
+
+
+ -----处理  是否所有临床数据都签名的字段
+--处理访视
+    --基线
+update VisitTask set IsClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join SubjectVisit on   VisitTask.SourceSubjectVisitId=SubjectVisit.Id  
+
+ where VisitTask.ReadingCategory=1  and SubjectVisit.IsBaseLine=1  and 
+  (select  count(*) from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%' and (ClinicalDataLevel=0 or ClinicalDataLevel=1))
+ =(select count(*) from ReadingClinicalData  inner join ClinicalDataTrialSet  on ReadingClinicalData.ClinicalDataTrialSetId =ClinicalDataTrialSet.Id
+    	where ReadingClinicalData.TrialId=VisitTask.TrialId and IsSign=1 and ReadingClinicalDataState=3 and ReadingId=VisitTask.SourceSubjectVisitId and ClinicalDataTrialSet.UploadRole=1)
+   
+		--非基线
+update VisitTask set IsClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join SubjectVisit on   VisitTask.SourceSubjectVisitId=SubjectVisit.Id  
+ where VisitTask.ReadingCategory=1  and SubjectVisit.IsBaseLine=0 and
+   (select  count(*) from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%' and  ClinicalDataLevel=1)
+ =(select count(*) from ReadingClinicalData  inner join ClinicalDataTrialSet  on ReadingClinicalData.ClinicalDataTrialSetId =ClinicalDataTrialSet.Id
+    	where ReadingClinicalData.TrialId=VisitTask.TrialId and IsSign=1 and ReadingClinicalDataState=3 and ReadingId=VisitTask.SourceSubjectVisitId and ClinicalDataTrialSet.UploadRole=1)
+   
+	 
+
+--处理肿瘤学
+
+update VisitTask set IsClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join ReadModule on   VisitTask.SouceReadModuleId=ReadModule.Id  
+ where VisitTask.ReadingCategory=5   and 
+ 
+    (select  count(*) from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%' and  ClinicalDataLevel=3)
+ =(select count(*) from ReadingClinicalData  inner join ClinicalDataTrialSet  on ReadingClinicalData.ClinicalDataTrialSetId =ClinicalDataTrialSet.Id
+    	where ReadingClinicalData.TrialId=VisitTask.TrialId and IsSign=1 and ReadingClinicalDataState=3 and ReadingId=VisitTask.SourceSubjectVisitId and ClinicalDataTrialSet.UploadRole=1)
+			
+
+ 
+--处理全局
+
+update VisitTask set IsClinicalDataSign =1 from VisitTask 
+inner join ReadingQuestionCriterionTrial on   ReadingQuestionCriterionTrial.Id=VisitTask.TrialReadingCriterionId  
+inner join ReadModule on   VisitTask.SouceReadModuleId=ReadModule.Id  
+ where VisitTask.ReadingCategory=2   and 
+ 
+     (select  count(*) from ClinicalDataTrialSet where TrialId=VisitTask.TrialId and CriterionEnumListStr LIKE '%'+ CAST(ReadingQuestionCriterionTrial.CriterionType AS varchar(20))+'%' and  ClinicalDataLevel=2)
+ =(select count(*) from ReadingClinicalData  inner join ClinicalDataTrialSet  on ReadingClinicalData.ClinicalDataTrialSetId =ClinicalDataTrialSet.Id
+    	where ReadingClinicalData.TrialId=VisitTask.TrialId and IsSign=1 and ReadingClinicalDataState=3 and ReadingId=VisitTask.SourceSubjectVisitId and ClinicalDataTrialSet.UploadRole=1)
+