中心调研二次修改-增加日志查询参数

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

@@ -767,6 +767,7 @@ namespace IRaCIS.Core.Application.Service
                                                 TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt, nameof(VisitTask)),
                                                 ReadingCategory = ReadingCategory.Visit,
 
+
                                                 TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                                 IsNeedClinicalDataSign = isNeedClinicalDataSign,
                                                 IsClinicalDataSign = isClinicalDataSign,
@@ -1421,6 +1422,7 @@ namespace IRaCIS.Core.Application.Service
                         // AllocateTime = DateTime.Now,
                         //DoctorUserId = reReadingVisitTask.DoctorUserId,
 
+                        IsIRImageDownloaded= reReadingVisitTask.IsIRImageDownloaded,
                     });
 
                     generateTaskCommand.Action(newTask);

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -454,10 +454,13 @@ namespace IRaCIS.Core.Application.Contracts
     {
         [NotDefault]
         public Guid TrialSiteSurveyId { get; set; }
+
+        public Guid? Id { get; set; }
     }
 
     public class SiteSurveyLogDTO
     {
+        public Guid Id { get; set; }
         public Guid TrialSiteSurveyId { get; set; }
 
         public string Name { get; set; }

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -660,7 +660,7 @@ namespace IRaCIS.Core.Application.Contracts
                 //找到最新的调研表
 
                 var currentLatest = await _trialSiteSurveyRepository.Where(t => t.TrialId == userInfo.TrialId && t.TrialSiteId == userInfo.TrialSiteId, true)
-                     .Include(u => u.TrialSiteEquipmentSurveyList).Include(u => u.TrialSiteUserSurveyList).OrderByDescending(t => t.CreateTime).FirstOrDefaultAsync();
+                     .Include(u => u.TrialSiteEquipmentSurveyList).Include(u => u.TrialSiteUserSurveyList).Include(t => t.SiteSurveyLogList).OrderByDescending(t => t.CreateTime).FirstOrDefaultAsync();
 
                 if (currentLatest == null)
                 {
@@ -687,7 +687,7 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
                 //更新调研表日志 - 老的调研表
-                currentLatest.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Over });
+                //currentLatest.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Over });
 
                 var copy = currentLatest.Clone();
 
@@ -706,6 +706,7 @@ namespace IRaCIS.Core.Application.Contracts
                     copy.Phone = String.Empty;
 
                     //更新调研表日志
+
                     var info = await GetSiteSurveyInfo(currentLatest.Id, currentLatest.TrialId);
                     copy.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Update, OriginTrialSiteSurveyId = currentLatest.Id, Json = info.ToJsonStr() });
                 }
@@ -1454,7 +1455,9 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpPost]
         public async Task<List<SiteSurveyLogDTO>> GetSiteSurveyLogList(SiteSurveyLogQuery inQuery)
         {
-            return _siteSurveyLogRepository.Where(t => t.TrialSiteSurveyId == inQuery.TrialSiteSurveyId).ProjectTo<SiteSurveyLogDTO>(_mapper.ConfigurationProvider).ToList();
+            return _siteSurveyLogRepository.Where(t => t.TrialSiteSurveyId == inQuery.TrialSiteSurveyId)
+                 .WhereIf(inQuery.Id != null, t => t.Id == inQuery.Id)
+                .ProjectTo<SiteSurveyLogDTO>(_mapper.ConfigurationProvider).ToList();
         }
 
         /// <summary>