diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 9351c8505..1b8923d27 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -866,7 +866,7 @@ namespace IRaCIS.Core.Application
         {
 
 
-            var newQuery = _trialReadingCriterionRepository.Where(t => t.IsConfirm == true && t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+            var newQuery = _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm  && t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                  .Select(c => new IRImageReadingToBeDoneDto()
                  {
                      TrialId = c.TrialId,
@@ -978,7 +978,7 @@ namespace IRaCIS.Core.Application
             var toBeDealedCount = _trialRepository
                    .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                     .SelectMany(t => t.VisitTaskList)
-                   .Where(t => t.DoctorUserId == _userInfo.Id && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
+                   .Where(t => t.DoctorUserId == _userInfo.Id && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect && t.TrialReadingCriterion.IsSigned == true && t.TrialReadingCriterion.IsConfirm == true)
                    // 前序 不存在 未一致性核查未通过的
                    .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
                    //前序 不存在  未生成任务的访视
@@ -1005,7 +1005,7 @@ namespace IRaCIS.Core.Application
 
             var query = _taskMedicalReviewRepository
                 .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                .Where(t => t.IsClosedDialog == false)
+                .Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.DoctorUserId == _userInfo.Id)
                 .GroupBy(t => new
                 {
                     t.TrialId,
@@ -1204,8 +1204,8 @@ namespace IRaCIS.Core.Application
             var isIR = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer;
 
             var needSignTrialCount = await _trialRepository.Where(t => t.TrialStatusStr != StaticData.TrialState.TrialStopped).Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                .Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
-                && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)).Count() > 0).CountAsync();
+               .Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
+               && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)).Count() > 0).CountAsync();
 
             var needSignSysDocCont = await _systemDocumentRepository
                         .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null))
@@ -1245,8 +1245,8 @@ namespace IRaCIS.Core.Application
                 IsHaveSysDocNeedNeedSign = needSignSysDocCont > 0,
                 //TrialNeedSignList= trialNeedSignList,
 
-                SysWaitSignDocCount = isPM ? needSignSysDocCont : 0,
-                TrialWaitSignDocCount = isPM ? needSignTrialCount : 0,
+                SysWaitSignDocCount =  needSignSysDocCont,
+                TrialWaitSignDocCount =  needSignTrialCount ,
 
                 #region PM
 
@@ -1368,27 +1368,38 @@ namespace IRaCIS.Core.Application
 
                 #region IR
 
-                IR_IamgeWaitReadingCount = isIR ? await _trialReadingCriterionRepository.Where(t => t.IsConfirm == true && t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                .Where(c => c.VisitTaskList.Where(t => t.DoctorUserId == _userInfo.Id && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
+                IR_IamgeWaitReadingCount = isIR ?
+
+            // await _trialRepository
+            //.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+            //.Where(c=>c.VisitTaskList.Where(t => t.DoctorUserId == _userInfo.Id && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect && t.TrialReadingCriterion.IsSigned  && t.TrialReadingCriterion.IsConfirm )
+            // // 前序 不存在 未一致性核查未通过的
+            // .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
+            // //前序 不存在  未生成任务的访视
+            // .Where(t => t.TrialReadingCriterion.IsAutoCreate == false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+
+            // .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).Count()>0).CountAsync() : 0,
+
+
+            await _trialReadingCriterionRepository.Where(t => t.IsSigned == true && t.IsConfirm == true && t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+            .Where(c => c.VisitTaskList.Where(t => t.DoctorUserId == _userInfo.Id && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
                           // 前序 不存在 未一致性核查未通过的
                           .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
-
+                          //前序 不存在  未生成任务的访视
+                          //.WhereIf(g.Key.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
                           .Where(t => c.IsAutoCreate ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
 
-                          .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
-                          .Count() > 0).CountAsync() : 0,
+                          .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).Count()>0).CountAsync()
+
+                          : 0,
 
 
                 IR_MedicalReviewCount = isIR ? await _taskMedicalReviewRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                   .Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.MedicalManagerUserId == _userInfo.Id)
-                   .GroupBy(t => t.TrialId)
-                   .Select(g => new
-                   {
-                       TrialId = g.Key,
-                       ToBeReplyedCount = g.Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.MIM && u.AuditState == MedicalReviewAuditState.Auditing).Count(),
-
-                   }).Where(t => t.ToBeReplyedCount > 0).CountAsync() : 0,
+                   .Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.DoctorUserId == _userInfo.Id)
+                   .GroupBy(t => new { t.TrialId, t.VisitTask.TrialReadingCriterionId} )
+                   .Where(g=>g.Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.MIM && u.AuditState == MedicalReviewAuditState.Auditing).Count()>0).CountAsync() : 0,
 
+                  
                 #endregion
 
                 #region MIM
@@ -1503,7 +1514,7 @@ namespace IRaCIS.Core.Application
 
                  
                  IR_UnReadCount= isIR ?t.VisitTaskList
-                   .Where(c => c.DoctorUserId == _userInfo.Id && c.ReadingTaskState != ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect)
+                   .Where(c => c.DoctorUserId == _userInfo.Id && c.ReadingTaskState != ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect && c.TrialReadingCriterion.IsSigned)
                    // 前序 不存在 未一致性核查未通过的
                    .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
                    //前序 不存在  未生成任务的访视
@@ -1637,7 +1648,7 @@ namespace IRaCIS.Core.Application
                     Medical_IR_ToBeDealedCount =
                     (t.User.UserTypeEnum == UserTypeEnum.IndependentReviewer) ?
                     t.Trial.TaskMedicalReviewList
-                    .Where(c => c.IsClosedDialog == false && c.VisitTask.DoctorUserId == t.UserId)
+                    .Where(c => c.IsClosedDialog == false && c.VisitTask.DoctorUserId == t.UserId && c.IsInvalid == false)
                     .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count() : 0,
 
 
@@ -1650,7 +1661,7 @@ namespace IRaCIS.Core.Application
                     Medical_MIM_ToBeReviewedCount =
                     (t.User.UserTypeEnum == UserTypeEnum.MIM) ?
                     t.Trial.TaskMedicalReviewList
-                    .Where(t => t.IsClosedDialog == false)
+                    .Where(t => t.IsClosedDialog == false && t.IsInvalid == false)
                     .Where(u => !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count() : 0
 
                 });
diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
index 1a7fff4fb..d8c6d9e84 100644
--- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
+++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
@@ -16,12 +16,7 @@ namespace IRaCIS.Core.Domain.Models
 	 public class EnrollReadingCriterion : Entity, IAuditAdd
 	 {
 	 
-		/// <summary>
-        /// Id
-        /// </summary>
-		[Key]
-		[Required]
-		public Guid Id { get; set; }
+
 	
 		/// <summary>
         /// EnrollId
diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
index 19dccceb8..55dd9c016 100644
--- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
+++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
@@ -16,7 +16,6 @@ namespace IRaCIS.Core.Domain.Models
     public class EnrollReadingCategory : Entity, IAuditAdd
     {
 
-        public bool IsJoinAnalysis { get; set; }=true;
         /// <summary>
         /// EnrollId
         /// </summary>