修改site 查询

IRaCIS.Core.API/appsettings.Prod_Study.json

@@ -0,0 +1,48 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AliyunOSS": {
+    "regionId": "cn-shanghai",
+    "region": "oss-cn-shanghai",
+    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+    "bucketName": "zy-sir-store",
+    "viewEndpoint": "https://zy-sir-cache.oss-cn-shanghai.aliyuncs.com"
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=47.117.165.18,1434;Database=Prod_Study;User ID=sa;Password=WHxckj@2019;TrustServerCertificate=true",
+    "Hangfire": "Server=47.117.165.18,1434;Database=Prod_Study.hangfire;User ID=sa;Password=WHxckj@2019;TrustServerCertificate=true"
+  },
+
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
+
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "study@extimaging.com",
+    "FromName": "study.extimaging",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "https://study.extimaging.com/login"
+  }
+
+}

IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs

@@ -5,25 +5,27 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using IRaCIS.Core.Application.Auth;
+using EasyCaching.Core;
 
 namespace IRaCIS.Core.Application.Services
 {
     [AllowAnonymous, ApiExplorerSettings(GroupName = "Image")]
     public class ImageShareService : BaseService, IImageShareService
     {
-
+        private readonly IEasyCachingProvider _provider;
         private readonly IRepository<ImageShare> _imageShareRepository;
         private readonly IRepository<DicomStudy> _studyRepository;
         private readonly IConfiguration _configuration;
         private readonly ITokenService _tokenService;
 
-        public ImageShareService(IRepository<ImageShare> imageShareRepository, IRepository<DicomStudy> studyRepository, IConfiguration configuration, ITokenService tokenService)
+        public ImageShareService(IRepository<ImageShare> imageShareRepository, IRepository<DicomStudy> studyRepository, IConfiguration configuration, ITokenService tokenService, IEasyCachingProvider provider)
         {
 
             _imageShareRepository = imageShareRepository;
             _studyRepository = studyRepository;
             _configuration = configuration;
             _tokenService = tokenService;
+            _provider = provider;
         }
 
         [HttpPost]
@@ -110,6 +112,7 @@ namespace IRaCIS.Core.Application.Services
                 return ResponseOutput.NotOk(_localizer["ISS_ShareExpiration"]);
             }
 
+            var vitrualUserId = Guid.NewGuid();
             var resource = new ResourceInfo()
             {
                 StudyId = imageShare.StudyId,
@@ -127,7 +130,7 @@ namespace IRaCIS.Core.Application.Services
                 }))
             };
 
-
+            await _provider.SetAsync(vitrualUserId.ToString(), resource.Token, TimeSpan.FromDays(7));
             return ResponseOutput.Ok(resource);
 
         }

IRaCIS.Core.Application/Service/Institution/SiteService.cs

@@ -27,7 +27,7 @@ namespace IRaCIS.Application.Services
         {
 
             var siteQueryable = _siteRepository
-                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName))
+                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName)||t.SiteNameCN.Contains(searchModel.SiteName))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.AliasName), t => t.AliasName.Contains(searchModel.AliasName))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country))

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -286,8 +286,16 @@ namespace IRaCIS.Application.Services
 
                 await _repository.BatchDeleteAsync<CheckChallengeDialog>(o => o.SubjectVisit.TrialId == trialId);
                 await _repository.BatchDeleteAsync<ClinicalDataTrialSet>(o => o.TrialId == trialId);
+
+                await _repository.BatchDeleteAsync<ClinicalQuestionAnswer>(o => o.ClinicalForm.TrialId == trialId);
+                await _repository.BatchDeleteAsync<ClinicalQuestionAnswer>(o => o.ClinicalForm.TrialId == trialId);
+                await _repository.BatchDeleteAsync<ClinicalForm>(o => o.TrialId == trialId);
+
                 await _repository.BatchDeleteAsync<UserUploadFile>(o => o.TrialId == trialId);
                 await _repository.BatchDeleteAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId);
+
+                await _repository.BatchDeleteAsync<CriterionNidusTrial>(o => o.TrialReadingCriterion.TrialId == trialId);
+
                 await _repository.BatchDeleteAsync<DataInspection>(o => o.TrialId == trialId);
                 await _repository.BatchDeleteAsync<DicomStudy>(t => t.TrialId == trialId);
                 await _repository.BatchDeleteAsync<StudyMonitor>(t => t.TrialId == trialId);
@@ -375,9 +383,6 @@ namespace IRaCIS.Application.Services
                 await _repository.BatchDeleteAsync<TrialQCQuestionAnswer>(t => t.TrialId == trialId);
 
 
-
-
-
                 await _repository.BatchDeleteAsync<TrialSign>(t => t.TrialId == trialId);
                 await _repository.BatchDeleteAsync<TrialSite>(t => t.TrialId == trialId);
                 await _repository.BatchDeleteAsync<TrialSiteSurvey>(t => t.TrialId == trialId);

IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs

@@ -194,7 +194,7 @@ namespace IRaCIS.Core.Application.Services
 
 
             var siteQueryable = _siteRepository.AsQueryable(true)
-                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName))
+                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName)|| t.SiteNameCN.Contains(searchModel.SiteName))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.AliasName), t => t.AliasName.Contains(searchModel.AliasName))
                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City))
                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country))

IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs

@@ -15,11 +15,14 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("CriterionNidusTrial")]	
 	 public class CriterionNidusTrial : Entity, IAuditAdd
 	 {
-	
+		[JsonIgnore]
-		/// <summary>
+		[ForeignKey("CriterionId")]
+		public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+
+        /// <summary>
         /// CriterionId
         /// </summary>
-		[Required]
+        [Required]
 		public Guid CriterionId { get; set; }
 	
 		/// <summary>