From 92486d83202c12b032febfb5e4151842de635951 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 22 Jan 2025 09:25:49 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingQuestionViewModel.cs | 3 +++ .../ReadingQuestionService.cs | 22 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index d6b881d70..a1e57dd8c 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -1896,6 +1896,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public List ExportResult { get; set; } + + public Guid? GroupId { get; set; } + /// /// 导出的CDISCName /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index b098f7af3..14b9c9378 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -127,10 +127,25 @@ namespace IRaCIS.Core.Application.Service List notShowType=new List() { ReadingQestionType.Group, ReadingQestionType.Screenshot, ReadingQestionType.Summary, ReadingQestionType.Upload }; var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync(); + + var groupList = await _readingQuestionTrialRepository.Where(x => x.Type== ReadingQestionType.Group && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId) + .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport() + { + QuestionId = x.Id, + QuestionName = _userInfo.IsEn_Us ? x.GroupEnName : x.GroupName, + ExportResult = x.ExportResult, + GroupId= x.GroupId, + ShowOrder = x.ShowOrder, + IsTableQuestion = false, + CDISCCode = x.CDISCCode, + }).ToListAsync(); + + var questionList = await _readingQuestionTrialRepository.Where(x => !notShowType.Contains(x.Type) && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId) .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport() { QuestionId = x.Id, + GroupId=x.GroupId, QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName, ExportResult = x.ExportResult, ShowOrder = x.ShowOrder, @@ -158,6 +173,11 @@ namespace IRaCIS.Core.Application.Service x.Children = tableQuestionList.Where(y => y.QuestionId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList(); }); + groupList.ForEach(x => + { + x.Children = questionList.Where(y => y.GroupId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList(); + }); + List dicCode = new List() { "1","2","8" }; var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult") .Where(x=> dicCode.Contains(x.Code)) @@ -175,7 +195,7 @@ namespace IRaCIS.Core.Application.Service CriterionType = criterionInfo.CriterionType, CriterionGroup = criterionInfo.CriterionGroup, DicList = dicList, - QuestionList = questionList + QuestionList = groupList }; } From d41c88beebdc44e9c775fac194c9dc55120b847a Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 22 Jan 2025 09:27:24 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingQuestionViewModel.cs | 2 ++ .../Service/Reading/ReadingCriterion/ReadingQuestionService.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index a1e57dd8c..19da4238b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -1899,6 +1899,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? GroupId { get; set; } + public bool IsGroup { get; set; } = false; + /// /// 导出的CDISCName /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 14b9c9378..bc7e18ec3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -135,6 +135,7 @@ namespace IRaCIS.Core.Application.Service QuestionName = _userInfo.IsEn_Us ? x.GroupEnName : x.GroupName, ExportResult = x.ExportResult, GroupId= x.GroupId, + IsGroup= true, ShowOrder = x.ShowOrder, IsTableQuestion = false, CDISCCode = x.CDISCCode, From 1569010d69d992f350dd1749190803122413f3e3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 10:38:39 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialMaintenanceService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index a470d02b2..4e167668a 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -161,10 +161,11 @@ namespace IRaCIS.Core.Application.Service var query = _userRoleRepository.Where(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin && t.IdentityUser.Status == UserStateEnum.Enable).IgnoreQueryFilters() //正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户 - .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false /*&& t.IdentityUser.IsZhiZhun*/) + .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false + && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC)) //测试项目 可以加入 测试用户 或者内部正式用户 - .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true /*|| (t.IdentityUser.IsTestUser == false && t.IdentityUser.IsZhiZhun)*/) + .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC))) .Where(t => userTypeEnums.Contains(t.UserTypeEnum)) .WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName)) From 6f254ca958925585eca3df7137389785169e3b2b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 10:42:29 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0MIM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialMaintenanceService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 4e167668a..6695567d1 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -162,10 +162,14 @@ namespace IRaCIS.Core.Application.Service //正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false - && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC)) + && (t.IdentityUser.IsZhiZhun + || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC + || t.UserTypeRole.UserTypeEnum==UserTypeEnum.MIM)) //测试项目 可以加入 测试用户 或者内部正式用户 - .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC))) + .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun + || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC + || t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM))) .Where(t => userTypeEnums.Contains(t.UserTypeEnum)) .WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName)) From a33b7d606be08ff69c3f304cb509ee50524f84da Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 11:19:27 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialMaintenanceService.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 6695567d1..ac870d85c 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -162,14 +162,12 @@ namespace IRaCIS.Core.Application.Service //正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false - && (t.IdentityUser.IsZhiZhun + && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC - || t.UserTypeRole.UserTypeEnum==UserTypeEnum.MIM)) + || t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM)) //测试项目 可以加入 测试用户 或者内部正式用户 - .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun - || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC - || t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM))) + .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && t.IdentityUser.IsZhiZhun)) .Where(t => userTypeEnums.Contains(t.UserTypeEnum)) .WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName)) From cfa384d02a8bb024a072f464ac32c3473c7fddbe Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 12:54:09 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=AD=BE=E7=BD=B2=E7=BB=9F=E8=AE=A1=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 7826602ac..ddeec3919 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -439,6 +439,7 @@ namespace IRaCIS.Core.Application.Services var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true) + .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter) .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .CountAsync(); From affdc3e2295a5461785a4c0e76783575c341dcfc Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 14:37:30 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/UploadDownLoadController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index e3a21dc66..a57c81b43 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -903,7 +903,7 @@ namespace IRaCIS.Core.API.Controllers } - item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).TrialSiteId; + item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.Trim().ToUpper() == item.TrialSiteCode.Trim().ToUpper()).TrialSiteId; } var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList(); From 4372202a5b38b4acd0b389f0b143e7240daf5243 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 14:42:26 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/UploadDownLoadController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index a57c81b43..3b8ab63fb 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -850,13 +850,13 @@ namespace IRaCIS.Core.API.Controllers throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]); } - foreach (var item in excelList.GroupBy(t => t.Email)) + foreach (var item in excelList.GroupBy(t => t.Email.Trim())) { var itemList = item.ToList(); var first = item.First(); - if (itemList.Any(t => t.Email != first.Email || t.Phone != first.Phone || t.OrganizationName != first.OrganizationName || t.FirstName != first.FirstName || t.LastName != first.LastName)) + if (itemList.Any(t => t.Email.Trim() != first.Email.Trim() || t.Phone.Trim() != first.Phone.Trim() || t.OrganizationName.Trim() != first.OrganizationName.Trim() || t.FirstName.Trim() != first.FirstName.Trim() || t.LastName.Trim() != first.LastName.Trim())) { //同一邮箱，用户信息应该保持一致！ @@ -886,7 +886,7 @@ namespace IRaCIS.Core.API.Controllers foreach (var item in excelList) { - switch (item.UserTypeStr.ToUpper()) + switch (item.UserTypeStr.Trim().ToUpper()) { case "CRC": From d8658dca2a01f7f4fb240eadccc86edf3a7ba9d5 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 14:51:33 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=9B=BD?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json index db7dbebd0..12951024b 100644 --- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json @@ -7,8 +7,8 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", - "Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" + "RemoteNew": "Server=us-mssql-prod,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "Hangfire": "Server=us-mssql-prod,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" //"RemoteNew": "Server=44.210.231.169,1435;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", //"Hangfire": "Server=44.210.231.169,1435;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true", }, @@ -75,7 +75,7 @@ "CompanyShortNameCN": "展影医疗", "SiteUrl": "https://lili.elevateimaging.ai/login", "IsEnv_US": true, - "IsOpenErrorNoticeEmail": true, + "IsOpenErrorNoticeEmail": false, "ErrorNoticeEmailList": [ "872297557@qq.com" ] }, From e86c255186cbfdc10be7e98ce695ec6526277779 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 15:40:38 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Properties/launchSettings.json | 8 +++++++ IRaCIS.Core.API/appsettings.Prod_IRC.json | 3 --- IRaCIS.Core.API/appsettings.Test_IRC.json | 14 ++++------- IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 24 +++++++++---------- IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 18 +++++--------- IRaCIS.Core.API/appsettings.Uat_IRC.json | 5 ++-- 6 files changed, 33 insertions(+), 39 deletions(-) diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json index 89bfb6def..ad59e795c 100644 --- a/IRaCIS.Core.API/Properties/launchSettings.json +++ b/IRaCIS.Core.API/Properties/launchSettings.json @@ -69,6 +69,14 @@ "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC" }, "applicationUrl": "http://localhost:6100" + }, + "IRaCIS.US_Prod_IRC": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "US_Prod_IRC" + }, + "applicationUrl": "http://localhost:6100" } } diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json index 5513be6f7..3d5d8917c 100644 --- a/IRaCIS.Core.API/appsettings.Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json @@ -43,17 +43,14 @@ "OpenLoginLimit": true, "LoginMaxFailCount": 5, "LoginFailLockMinutes": 30, - "AutoLoginOutMinutes": 360, "OpenLoginMFA": false, "ContinuousReadingTimeMin": 120, - "ReadingRestTimeMin": 10, "IsNeedChangePassWord": true, - "ChangePassWordDays": 90 }, diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json index 8ac7cdae1..d6b5b6553 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC.json @@ -52,28 +52,24 @@ "BasicSystemConfig": { "OpenUserComplexPassword": false, - "OpenSignDocumentBeforeWork": false, - "OpenTrialRelationDelete": true, - "OpenLoginLimit": false, - "LoginMaxFailCount": 5, - "LoginFailLockMinutes": 1, - - "AutoLoginOutMinutes": 1, + "AutoLoginOutMinutes": 10, "OpenLoginMFA": false, "ContinuousReadingTimeMin": 120, - "ReadingRestTimeMin": 10, - "IsNeedChangePassWord": true, + "IsNeedChangePassWord": true, "ChangePassWordDays": 90, + + "OpenTrialRelationDelete": true, + "ThirdPdfUrl": "http://106.14.89.110:30088/api/v1/convert/file/pdf" }, diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json index 12951024b..a070fcdc8 100644 --- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json @@ -39,25 +39,25 @@ }, "BasicSystemConfig": { - "OpenUserComplexPassword": false, - - "OpenSignDocumentBeforeWork": false, - - "OpenTrialRelationDelete": true, - - "OpenLoginLimit": false, + "OpenUserComplexPassword": true, + "OpenSignDocumentBeforeWork": true, + "OpenLoginLimit": true, "LoginMaxFailCount": 5, - "LoginFailLockMinutes": 30, - "AutoLoginOutMinutes": 60, + "AutoLoginOutMinutes": 120, + + "OpenLoginMFA": true, "ContinuousReadingTimeMin": 120, - "ReadingRestTimeMin": 10, - "IsNeedChangePassWord": true, - "ChangePassWordDays": 90 + "IsNeedChangePassWord": true, + "ChangePassWordDays": 90, + + + "OpenTrialRelationDelete": false + }, "SystemEmailSendConfig": { diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index 51a821e9b..23c571f55 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -50,26 +50,20 @@ "BasicSystemConfig": { "OpenUserComplexPassword": true, - "OpenSignDocumentBeforeWork": true, - "OpenTrialRelationDelete": true, - - "OpenLoginLimit": false, - + "OpenLoginLimit": true, "LoginMaxFailCount": 5, - "LoginFailLockMinutes": 30, - "AutoLoginOutMinutes": 60, + "AutoLoginOutMinutes": 120, + + "OpenLoginMFA": true, "ContinuousReadingTimeMin": 120, - "ReadingRestTimeMin": 10, + "IsNeedChangePassWord": true, - - "ChangePassWordDays": 90, - - "OpenLoginMFA": false + "ChangePassWordDays": 90 }, "SystemEmailSendConfig": { diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json index ebb3ea0e1..e76b4de97 100644 --- a/IRaCIS.Core.API/appsettings.Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json @@ -56,7 +56,6 @@ "BasicSystemConfig": { "OpenUserComplexPassword": true, - "OpenSignDocumentBeforeWork": true, "OpenLoginLimit": true, @@ -64,13 +63,13 @@ "LoginFailLockMinutes": 30, "AutoLoginOutMinutes": 60, + "OpenLoginMFA": false, "ContinuousReadingTimeMin": 120, - "ReadingRestTimeMin": 10, - "IsNeedChangePassWord": true, + "IsNeedChangePassWord": true, "ChangePassWordDays": 90 }, From 0b2305ae65bdaf933b94972e411210d19b0cd798 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 16:35:02 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8C=A4=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Management/UserService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 67971b4c1..03ccf893c 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -1171,6 +1171,8 @@ namespace IRaCIS.Core.Application.Service userLoginReturnModel.BasicInfo.AccountList = await _userRoleRepository.Where(t => t.IdentityUserId == identityUserId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); userLoginReturnModel.CompanyInfo = companyInfo; + await _fusionCache.SetAsync(CacheKeys.UserToken(loginUser.IdentityUserId), userLoginReturnModel.JWTStr, TimeSpan.FromDays(7)); + return ResponseOutput.Ok(userLoginReturnModel); } From 6f3a4d723c6638f8675c1851320ac0f6787681cb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 16:47:42 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index 23c571f55..0e80aebd5 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -79,7 +79,7 @@ "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", "CompanyShortNameCN": "展影医疗", - "SiteUrl": "https://lili.test.elevateimaging.ai/login", + "SiteUrl": "https://lili.uat.elevateimaging.ai/login", "IsEnv_US": true, "IsOpenErrorNoticeEmail": false, "ErrorNoticeEmailList": [ "872297557@qq.com" ] From d8eb7acf2e84b8cf7d04a2c830a5573d1e42c546 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 16:53:18 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8=E9=80=80=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Management/UserService.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 03ccf893c..4b67901d9 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -1160,18 +1160,17 @@ namespace IRaCIS.Core.Application.Service } } - else - { - await _fusionCache.SetAsync(CacheKeys.UserToken(identityUserId), userLoginReturnModel.JWTStr, TimeSpan.FromDays(7)); - await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(identityUserId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes)); - } + await _fusionCache.SetAsync(CacheKeys.UserToken(identityUserId), userLoginReturnModel.JWTStr, TimeSpan.FromDays(7)); + + await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(identityUserId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes)); + userLoginReturnModel.BasicInfo.AccountList = await _userRoleRepository.Where(t => t.IdentityUserId == identityUserId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); userLoginReturnModel.CompanyInfo = companyInfo; - await _fusionCache.SetAsync(CacheKeys.UserToken(loginUser.IdentityUserId), userLoginReturnModel.JWTStr, TimeSpan.FromDays(7)); + return ResponseOutput.Ok(userLoginReturnModel); From 4ffedb405236ff4ef7c1c3e567bee996a0c39222 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 17:40:05 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=80=E5=87=BA=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialMaintenanceService.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index ac870d85c..24db29490 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -87,11 +87,12 @@ namespace IRaCIS.Core.Application.Service if (updateTrialUserCommand.IsDeleted) { - if (await _trialSiteUserRoleRepository.AnyAsync(t => t.UserRole.IdentityUserId == trialUser.IdentityUserId && t.TrialId == trialUser.TrialId)) - { - // ----人员已加入现场维护 - return ResponseOutput.NotOk(_localizer["TrialMaint_PersonnelJoined"]); - } + //可以直接退出，不管中心下的CRC CRA 状态 + //if (await _trialSiteUserRoleRepository.AnyAsync(t => t.UserRole.IdentityUserId == trialUser.IdentityUserId && t.TrialId == trialUser.TrialId)) + //{ + // // ----人员已加入现场维护 + // return ResponseOutput.NotOk(_localizer["TrialMaint_PersonnelJoined"]); + //} var findQC = await _trialUseRoleRepository.FirstOrDefaultAsync(t => t.UserRole.IdentityUserId == trialUser.IdentityUserId && t.UserRole.UserTypeEnum == UserTypeEnum.IQC); From 1b7de79209e2610ea60be984651e5a4575647561 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 18:19:50 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E8=BF=87=E6=BB=A4=E5=88=A0=E9=99=A4=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index ff42210da..ec5ec7a0a 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.TrialSiteId, u => u.MapFrom(s => s.Id)) .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count())) - .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count())) + .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count(t=>t.IsDeleted==false))) //.ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count())) .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.UserRole.IdentityUser.FullName))); #endregion From 0b45c30d0bb696bdda070e261f7990ba7560882d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 18:22:51 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index ec5ec7a0a..c8c1bf41e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(d => d.TrialSiteId, u => u.MapFrom(s => s.Id)) - .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count())) + .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t=>t.IsDeleted==false))) .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count(t=>t.IsDeleted==false))) //.ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count())) .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.UserRole.IdentityUser.FullName))); From c607af9736924c0386c78683d9cef678cee826da Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 24 Jan 2025 09:52:08 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=90=9C=E7=B4=A0=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExploreRecommendService.cs | 8 ++++---- .../Service/Common/SystemBasicDataService.cs | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs b/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs index 59cce4aa2..b556fd445 100644 --- a/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs @@ -25,10 +25,10 @@ namespace IRaCIS.Core.Application.Service var exploreRecommendQueryable = _exploreRecommendRepository.Where().IgnoreQueryFilters() - .WhereIf(string.IsNullOrEmpty(inQuery.Title), t => t.Title.Contains(inQuery.Title)) - .WhereIf(string.IsNullOrEmpty(inQuery.FileName), t => t.Title.Contains(inQuery.FileName)) - .WhereIf(string.IsNullOrEmpty(inQuery.DownloadUrl), t => t.Title.Contains(inQuery.DownloadUrl)) - .WhereIf(string.IsNullOrEmpty(inQuery.Version), t => t.Title.Contains(inQuery.Version)) + .WhereIf(!string.IsNullOrEmpty(inQuery.Title), t => t.Title.Contains(inQuery.Title)) + .WhereIf(!string.IsNullOrEmpty(inQuery.FileName), t => t.Title.Contains(inQuery.FileName)) + .WhereIf(!string.IsNullOrEmpty(inQuery.DownloadUrl), t => t.Title.Contains(inQuery.DownloadUrl)) + .WhereIf(!string.IsNullOrEmpty(inQuery.Version), t => t.Title.Contains(inQuery.Version)) .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == t.IsDeleted) .ProjectTo(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs b/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs index bc1832680..f76d52f41 100644 --- a/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs +++ b/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs @@ -5,6 +5,7 @@ //-------------------------------------------------------------------- using IRaCIS.Core.Application.Contracts; +using IRaCIS.Core.Infrastructure.Extention; using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Services { @@ -25,7 +26,10 @@ namespace IRaCIS.Core.Application.Services [HttpPost] public async Task> GetSystemBasicDataList(SystemBasicDataQuery inQuery) { - var systemBasicDataQueryable = _systemBasicDataRepository.Where(t => t.ParentId == null) + var systemBasicDataQueryable = _systemBasicDataRepository + .Where(t => t.ParentId == null) + .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code)) + .WhereIf(inQuery.Name != null, t => t.Name.Contains(inQuery.Name)) .ProjectTo(_mapper.ConfigurationProvider); return await systemBasicDataQueryable.ToPagedListAsync(inQuery, nameof(SystemBasicDataView.Code)); From 8d3f654fe5b1d14c1f03b3d171048f69abbf3ccc Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 24 Jan 2025 10:30:08 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Prod_IRC.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json index 3d5d8917c..e3ad98834 100644 --- a/IRaCIS.Core.API/appsettings.Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json @@ -57,8 +57,8 @@ "SystemEmailSendConfig": { "Port": 465, "Host": "smtp.qiye.aliyun.com", - "FromEmail": "IRC@extimaging.com", - "FromName": "IRC", + "FromEmail": "irc@extimaging.com", + "FromName": "irc", "AuthorizationCode": "ExtImg@2022", "SiteUrl": "http://irc.extimaging.com/login", "OrganizationName": "Extlmaging",