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

@@ -22,7 +22,6 @@ namespace IRaCIS.Application.Services
         public IRepository<SubjectVisit> _subjectVisitRepository;
 
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-		private readonly IRepository<TrialClinicalDataSetCriterion> _trialClinicalDataSetCriterionRepository;
 		private readonly IRepository<ReadingQuestionCriterionTrial> _iReadingQuestionCriterionTrialRepository;
 		private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
         private readonly IRepository<PreviousPDF> _previousPDFRepository;
@@ -35,7 +34,6 @@ namespace IRaCIS.Application.Services
         public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
               IClinicalQuestionService iClinicalQuestionService,
             IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
-			  IRepository<TrialClinicalDataSetCriterion> trialClinicalDataSetCriterionRepository,
 				IRepository<ReadingQuestionCriterionTrial> iReadingQuestionCriterionTrialRepository,
 			IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
             IRepository<PreviousPDF> previousPDFRepository,
@@ -53,7 +51,6 @@ namespace IRaCIS.Application.Services
             _trialClinicalQuestionRepository = trialClinicalQuestionRepository;
             _systemClinicalQuestionRepository = systemClinicalQuestionRepository;
             _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
-			this._trialClinicalDataSetCriterionRepository = trialClinicalDataSetCriterionRepository;
 			this._iReadingQuestionCriterionTrialRepository = iReadingQuestionCriterionTrialRepository;
 			_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
             this._previousPDFRepository = previousPDFRepository;
@@ -246,10 +243,7 @@ namespace IRaCIS.Application.Services
 
             //indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|";
 
-            //var entity = _mapper.Map<TEntity>(from);
-
-            indto.CreateTime = DateTime.Now;
-			var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto);
+            var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto, true);
 
             entity.TrialClinicalDataSetCriteriaList = indto.TrialCriterionIdList.Select(t => new TrialClinicalDataSetCriterion()
             {
@@ -259,7 +253,7 @@ namespace IRaCIS.Application.Services
 
             if (indto.Id != null)
             {
-                await _trialClinicalDataSetCriterionRepository.DeleteFromQueryAsync(t => t.TrialClinicalDataSetId == entity.Id);
+                await _repository.BatchDeleteAsync<TrialClinicalDataSetCriterion>(t => t.TrialClinicalDataSetId == entity.Id);
 
                 await _repository.AddRangeAsync<TrialClinicalDataSetCriterion>(entity.TrialClinicalDataSetCriteriaList);
             }

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs

@@ -44,12 +44,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public UploadRole UploadRole { get; set; }
 
-		public DateTime CreateTime { get; set; }
-
-		/// <summary>
-		/// 是否启用
-		/// </summary>
-		public bool IsEnable { get; set; }
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
 
         /// <summary>
         /// 项目ID

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

@@ -10,7 +10,6 @@ using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using NetTopologySuite.Index.HPRtree;
 using Newtonsoft.Json;
 using SharpCompress.Common;
-using SharpCompress.Compressors.Xz;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -144,11 +143,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm":
                         extraIdentification = $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}";
                         break;
-					case "configTrialBasicInfo/ConfigTrialProcessInfoConfirm":
-						extraIdentification = $"/{oldentity.IsTrialProcessConfirmed.ToString()}";
-						break;
 
-					case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm":
+                    case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm":
                         extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}";
                         break;
 
@@ -2172,8 +2168,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 if (entity.TrialClinicalDataSetCriteriaList == null || entity.TrialClinicalDataSetCriteriaList.Count() == 0)
                 {
-					criterionNameList = await _dbContext.TrialClinicalDataSetCriterion.Where(t => t.TrialClinicalDataSetId == entity.Id).Select(t => t.TrialReadingCriterion.CriterionName).ToListAsync();
-				}
+                    criterionNameList = await _dbContext.TrialClinicalDataSetCriterion.Where(t => t.TrialClinicalDataSetId == entity.Id).Select(t => t.TrialReadingCriterion.CriterionName).ToListAsync();
+                }
                 else
                 {
                     var ids = entity.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterionId).ToList();

IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs

@@ -159,10 +159,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
         public string BlindName { get; set; } = string.Empty;
 
 
-		/// <summary>
-		/// 标识操作  是否区分接口
-		/// </summary>
-		public bool IsDistinctionInterface=true;
+        //标识操作  是否区分接口
+        public bool IsDistinctionInterface=true;
 
         public bool IsSelfDefine = false;