Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study

IRaCIS.Core.API/appsettings.Test_Study.json

@@ -20,13 +20,13 @@
     },
 
     "MinIO": {
-      "endPoint": "192.168.3.68",
+      "endPoint": "123.56.94.154",
-      "port": "8001",
+      "port": "9001",
-      "useSSL": false,
+      "useSSL": true,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "accessKey": "fbStsVYCIPKHQneeqMwD",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "bucketName": "test",
+      "bucketName": "study-test",
-      "viewEndpoint": "http://192.168.3.68:8001/test/"
+      "viewEndpoint": "http://study.test.extimaging.com/oss/study-test"
     },
 
     "AWS": {

IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs

@@ -1095,7 +1095,8 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet]
         public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId)
         {
-            var result = await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length > 0).Select(x => new { x.Description, x.DescriptionCN, x.Sort }).OrderBy(t => t.Sort).Select(t =>  _userInfo.IsEn_Us? t.Description:t.DescriptionCN).Distinct().ToListAsync();
+            var result =( await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length > 0).Select(x => new { x.Description, x.DescriptionCN, x.Sort }).OrderBy(t => t.Sort).ToListAsync()
+                ).Select(t =>  _userInfo.IsEn_Us? t.Description:t.DescriptionCN).Distinct().ToList();
             return result;
         }
 

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -1224,7 +1224,7 @@ namespace IRaCIS.Core.Application.Image.QA
             var trialId = cRCRequestToQCCommand.TrialId;
 
             var trialConfig = (await _trialRepository
-                .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification, t.IsUrgent, t.IsHaveFirstGiveMedicineDate, t.ClinicalInformationTransmissionEnum })
+                .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification, t.IsUrgent, t.IsEnrollementQualificationConfirm,t.IsPDProgressView, t.IsHaveFirstGiveMedicineDate, t.ClinicalInformationTransmissionEnum })
                 .FirstOrDefaultAsync(t => t.TrialId == cRCRequestToQCCommand.TrialId)).IfNullThrowException();
 
             //找到符合配置的标准  确认的并且签名的、双重，有序，阅片期仲裁
@@ -1307,6 +1307,11 @@ namespace IRaCIS.Core.Application.Image.QA
                     //已确认临床数据完整性
                     dbSubjectVisit.IsConfirmedClinicalData = true;
 
+                // 根据项目配置 设置访视的入组确认和pd进展
+
+                dbSubjectVisit.IsEnrollmentConfirm= dbSubjectVisit.IsBaseLine && trialConfig.IsEnrollementQualificationConfirm ?true:false;
+
+                dbSubjectVisit.PDState = dbSubjectVisit.IsBaseLine==false && trialConfig.IsPDProgressView ? PDStateEnum.PDProgress:PDStateEnum.None;
 
                 // CRC 上传的基线数据签名
 

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

@@ -107,7 +107,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         public bool? IsGenerateAccount { get; set; }
-        public Guid? TrialRoleNameId { get; set; }
+        public int? TrialRoleCode { get; set; }
 
         public TrialSiteUserStateEnum? State { get; set; }
 

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

@@ -531,6 +531,7 @@ namespace IRaCIS.Core.Application.Contracts
             var groupSelectIdQuery =
                 _trialSiteSurveyRepository.Where(t => t.TrialId == queryParam.TrialId)
                     .WhereIf(queryParam.SiteId != null, t => t.SiteId == queryParam.SiteId)
+                   
                     .WhereIf(!string.IsNullOrEmpty(queryParam.FormWriterKeyInfo), t => (t.UserName).Contains(queryParam.FormWriterKeyInfo) || t.Email.Contains(queryParam.FormWriterKeyInfo) || t.Phone.Contains(queryParam.FormWriterKeyInfo))
                     .GroupBy(t => t.SiteId)
                     .Select(g => g.OrderByDescending(u => u.CreateTime).Select(t => t.Id).First());
@@ -538,6 +539,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             var query = _trialSiteUserSurveyRepository
                 .Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
+                 .WhereIf(queryParam.TrialRoleCode != null, t => t.TrialRoleCode == queryParam.TrialRoleCode)
                 .WhereIf(queryParam.UserTypeId != null, t => t.UserTypeId == queryParam.UserTypeId)
                 .WhereIf(queryParam.IsGenerateAccount != null, t => t.IsGenerateAccount == queryParam.IsGenerateAccount)
                 .WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)

IRaCIS.Core.Application/Triggers/VisitTaskIAfterSignTrigger.cs

@@ -52,6 +52,7 @@ namespace IRaCIS.Core.Application.Triggers
             if (context.ChangeType == ChangeType.Modified && visitTask.ReadingTaskState==ReadingTaskState.HaveSigned && visitTask.ReadingTaskState != context.UnmodifiedEntity.ReadingTaskState    &&        _userInfo.UserTypeEnumInt == (int)UserTypeEnum.PI)
             {
                 visitTask.PIAuditState = PIAuditState.PIAgree;
+                visitTask.FirstAuditUserId = _userInfo.Id;
             }
 
             if (context.ChangeType == ChangeType.Modified && visitTask.PIAuditState!=context.UnmodifiedEntity.PIAuditState  && visitTask.PIAuditState==PIAuditState.PIAgree)