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

@@ -17,7 +17,6 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using System.Linq.Expressions;
 using IRaCIS.Core.Domain.Share.Reading;
 using IRaCIS.Core.Application.Service.Reading.Dto;
-using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -27,7 +26,7 @@ namespace IRaCIS.Core.Application.Service
     /// 访视读片任务
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
-    public class VisitTaskHelpeService : BaseService, IVisitTaskHelpeService
+    public class VisitTaskHelpeService : IVisitTaskHelpeService
     {
 
         private readonly IRepository<VisitTask> _visitTaskRepository;
@@ -451,19 +450,6 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        /// <summary>
-        /// 获取GetIsClinicalDataSignTest
-        /// </summary>
-        /// <param name="visitTask"></param>
-        /// <returns></returns>
-        public async Task<bool> GetIsClinicalDataSignTest(Guid visitTask)
-        {
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTask).FirstNotNullAsync();
-            var clinicalDataConfirmList = _trialClinicalDataSetRepository.Where(t => t.TrialId == taskinfo.TrialId && t.IsConfirm).Include(t => t.TrialClinicalDataSetCriteriaList).ToList();
-
-            Guid readingid = taskinfo.SourceSubjectVisitId == null ? taskinfo.SouceReadModuleId!.Value : taskinfo.SourceSubjectVisitId.Value;
-            return IsClinicalDataSign(taskinfo.ReadingCategory, taskinfo.VisitTaskNum == 0m, taskinfo.TrialReadingCriterionId, clinicalDataConfirmList, readingid, taskinfo.TrialId); ;
-        }
 
         // 有可能在任务生成之前 就签名完了临床数据
         private bool IsClinicalDataSign(ReadingCategory readingCategory, bool isbaseLine, Guid trialReadingCriterionId, List<ClinicalDataTrialSet> trialClinicalDataSetList, Guid readingId, Guid trialId)
@@ -482,9 +468,7 @@ namespace IRaCIS.Core.Application.Service
 
             //CRC 的自动签名  不用管  只用处理PM的就好
             var haveSignedCount = _readingClinicalDataRepository
-                .Where(t => t.TrialId == trialId && t.IsSign 
+                .Where(t => t.TrialId == trialId && t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
-                && t.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(x=>x.TrialReadingCriterionId== trialReadingCriterionId)
-                && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
 
 
             var readModule = _readModuleRepository.Where(t => t.Id == readingId).FirstOrDefault();