Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs

@@ -19,6 +19,7 @@ using IRaCIS.Core.Domain.Share.Reading;
 using System.Runtime.InteropServices;
 using DocumentFormat.OpenXml.Bibliography;
 using System.Linq.Expressions;
+using MathNet.Numerics.Statistics.Mcmc;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -495,12 +496,21 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [UnitOfWork]
-        public async Task BatchGenerateTask(BatchGenerateTaskCommand batchGenerateTaskCommand)
+        public async Task<IResponseOutput> BatchGenerateTask(BatchGenerateTaskCommand batchGenerateTaskCommand)
         {
 
-            await _subjectCriteriaEvaluationVisitFilterRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == batchGenerateTaskCommand.SubjectId
+            var trakingList= await _subjectCriteriaEvaluationVisitFilterRepository.Where(t => t.SubjectId == batchGenerateTaskCommand.SubjectId
             && t.TrialReadingCriterionId == batchGenerateTaskCommand.TrialReadingCriterionId
-            && batchGenerateTaskCommand.SubjectVisitIdList.Contains(t.SubjectVisitId), u => new SubjectCriteriaEvaluationVisitFilter { IsGeneratedTask = true });
+            && batchGenerateTaskCommand.SubjectVisitIdList.Contains(t.SubjectVisitId),true).ToListAsync();
+
+            foreach (var item in trakingList)
+            {
+                item.IsGeneratedTask = true;
+            }
+
+            //await _subjectCriteriaEvaluationVisitFilterRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == batchGenerateTaskCommand.SubjectId
+            //&& t.TrialReadingCriterionId == batchGenerateTaskCommand.TrialReadingCriterionId
+            //&& batchGenerateTaskCommand.SubjectVisitIdList.Contains(t.SubjectVisitId), u => new SubjectCriteriaEvaluationVisitFilter { IsGeneratedTask = true });
 
             //自动生成任务
 
@@ -513,6 +523,10 @@ namespace IRaCIS.Core.Application.Service
             var generateVisitIdList = idList.Except(haveGenerateVisitIdList);
 
             await _IVisitTaskHelpeService.BaseCritrionGenerateVisitTask(batchGenerateTaskCommand.TrialId, batchGenerateTaskCommand.TrialReadingCriterionId, true, generateVisitIdList.Select(t => (Guid)t).ToList());
+
+            await _subjectCriteriaEvaluationVisitFilterRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
         }
 
 
@@ -573,10 +587,35 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> BatchAddSubjectCriteriaEvaluationVisitStudyFilter(List<SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit> batchList)
         {
-            var ids = batchList.Select(t => t.Id).ToList();
-            await _subjectCriteriaEvaluationVisitStudyFilterRepository.BatchDeleteNoTrackingAsync(t => ids.Contains(t.Id));
 
+            var ids = batchList.Where(t => t.Id != null).Select(t => t.Id).ToList();
+            #region 稽查修改前
+
+            //await _subjectCriteriaEvaluationVisitStudyFilterRepository.BatchDeleteNoTrackingAsync(t => ids.Contains(t.Id));
+
+            //await _subjectCriteriaEvaluationVisitStudyFilterRepository.AddRangeAsync(_mapper.Map<List<SubjectCriteriaEvaluationVisitStudyFilter>>(batchList));
+
+            #endregion
+
+
+            #region 查询再更新
+            if (ids.Count > 0)
+            {
+                var list = await _subjectCriteriaEvaluationVisitStudyFilterRepository.Where(t => ids.Contains(t.Id), true).ToListAsync();
+
+                foreach (var item in list)
+                {
+                    item.IsReading = batchList.FirstOrDefault(t => t.Id == item.Id)?.IsReading ?? item.IsReading;
+                    item.IsConfirmed = batchList.FirstOrDefault(t => t.Id == item.Id)?.IsConfirmed ?? item.IsConfirmed;
+                }
+            }
+            else
+            {
                 await _subjectCriteriaEvaluationVisitStudyFilterRepository.AddRangeAsync(_mapper.Map<List<SubjectCriteriaEvaluationVisitStudyFilter>>(batchList));
+            }
+            #endregion
+
+
 
 
             var first = batchList.First();

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -946,6 +946,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
             }
 
+            #endregion
+
+
+            #region 热键  模板 个性化配置
+
+
+
             #endregion
 
             #region 附加评估
@@ -980,9 +987,59 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var entity = item.Entity as SubjectCriteriaEvaluationVisitFilter;
 
+
+                if (type == AuditOpt.Add)
+                {
+                    if (entity.IsGeneratedTask)
+                    {
+                        extraIdentification = "/AutoGenerate";
+                    }
+                    else
+                    {
+                        extraIdentification = "/Add";
+                    }
+                }
+
+                if (type == AuditOpt.Update)
+                {
+
+                    //手动生成任务
+
+                    if (entity.IsGeneratedTask)
+                    {
+                        //Update
+                        extraIdentification = "/ManualGenerate";
+                    }
+
+
+                    //回退接口
+                    else if (_userInfo.RequestUrl == "SubjectCriteriaEvaluation/confirmBackCriteriaVisitTask")
+                    {
+                        extraIdentification = "/Back";
+                    }
+                    else
+                    {
+                        //筛选影像保存接口
+                        //if (_userInfo.RequestUrl == "SubjectCriteriaEvaluation/batchAddSubjectCriteriaEvaluationVisitStudyFilter")
+                        //{
+                        extraIdentification = "/Update";
+                        //}
+
+                    }
+
+
+                }
+
+
+
+
+
+
                 await InsertInspection<SubjectCriteriaEvaluationVisitFilter>(entity, type, x => new InspectionConvertDTO()
                 {
                     IsDistinctionInterface = false,
+                    IsSelfDefine=true,
+                    ExtraIndentification=extraIdentification,
                     ObjectRelationParentId = x.SubjectVisitId,
                     ObjectRelationParentId2 = x.TrialReadingCriterionId,
 
@@ -998,11 +1055,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var entity = item.Entity as SubjectCriteriaEvaluationVisitStudyFilter;
 
+                if (entity.IsConfirmed == true)
+                {
+                    extraIdentification = "/Confirm";
+                }
+                else
+                {
+                    extraIdentification = "/Save";
+                }
+
                 await InsertInspection<SubjectCriteriaEvaluationVisitStudyFilter>(entity, type, x => new InspectionConvertDTO()
                 {
                     IsDistinctionInterface = false,
-                    ObjectRelationParentId = x.SeriesId,
+                    IsSelfDefine = true,
-                    ObjectRelationParentId2 = x.StudyId,
+
+                    ExtraIndentification = extraIdentification,
+
+                    ObjectRelationParentId = x.StudyId,
+                    ObjectRelationParentId2 = x.SeriesId,//序列有的稽查没有记录，所以StudyId放前面
+
                     ObjectRelationParentId3 = x.TrialReadingCriterionId,
 
                     TrialReadingCriterionId = x.TrialReadingCriterionId,