改为阿里云

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -79,7 +79,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
-    <PackageReference Include="Serilog.Sinks.Email" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
   </ItemGroup>

IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Serilog;
 using Serilog.Events;
-using Serilog.Sinks.Email;
+//using Serilog.Sinks.Email;
 using System;
 using System.Net;
 

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -12,7 +12,7 @@
   },
   "ObjectStoreService": {
 
-    "ObjectStoreUse": "MinIO",
+    "ObjectStoreUse": "AliyunOSS",
 
     "AliyunOSS": {
       "regionId": "cn-shanghai",
@@ -27,12 +27,12 @@
 
     "MinIO": {
       "endPoint": "hir-oss.uat.extimaging.com",
-      "port": "80",
-      "useSSL": false,
-      "viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
-      //"port": "443",
-      //"useSSL": true,
-      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
+      //"port": "80",
+      //"useSSL": false,
+      //"viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
+      "port": "443",
+      "useSSL": true,
+      "viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
       "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
       "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
       "bucketName": "irc-uat"

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -78,9 +78,9 @@
 		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.2" />
 		<PackageReference Include="fo-dicom.Codecs" Version="5.12.0" />
 		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
-		<PackageReference Include="MailKit" Version="4.5.0" />
+		<PackageReference Include="MailKit" Version="4.2.0" />
 		<PackageReference Include="MediatR" Version="12.2.0" />
-		<PackageReference Include="MimeKit" Version="4.5.0" />
+		<PackageReference Include="MimeKit" Version="4.2.0" />
 		<PackageReference Include="MiniExcel" Version="1.32.0" />
 		<PackageReference Include="Minio" Version="6.0.2" />
 		<PackageReference Include="MiniWord" Version="0.8.0" />

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

@@ -726,15 +726,15 @@ namespace IRaCIS.Core.Application.Contracts
                 t.Email,
             }).ToListAsync();
 
-            var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
+            //var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
 
 
-            if (!currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator))
+            if (!siteUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA))
             {
                 throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_MissingAccount"]);
             }
 
-            if (currentUserList.Where(t => t.IsGenerateAccount && t.UserTypeId != null).GroupBy(t => new { t.UserTypeId, t.Email })
+            if (siteUserList.Where(t => t.IsGenerateAccount && t.UserTypeId != null).GroupBy(t => new { t.UserTypeId, t.Email })
                 .Any(g => g.Count() > 1))
             {
                 throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_DuplicateEmail"]);

IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs

@@ -194,13 +194,14 @@ namespace IRaCIS.Application.Services
 
             var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
+            var hasSPMOrCPM = await _repository.Where<TrialUser>(t => t.TrialId == trialId).AnyAsync(t=>  t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM);
 
             if (trial != null)
             {
                 if (commitState == 1) //确认提交CRO
                 {
                     //更新项目状态
-                    trial.TrialEnrollStatus = (int)TrialEnrollStatus.HasCommitCRO;
+                    trial.TrialEnrollStatus = hasSPMOrCPM ? (int)TrialEnrollStatus.HasCommitCRO : (int)TrialEnrollStatus.HasConfirmedDoctorNames;
 
                     //添加项目详细记录
                     var trialDetail = new TrialStatusDetail()
@@ -217,17 +218,30 @@ namespace IRaCIS.Application.Services
                     {
                         if (doctorIdArray.Contains(intoGroupItem.DoctorId))
                         {
-                            intoGroupItem.EnrollStatus = EnrollStatus.HasCommittedToCRO;
-                            //_enrollRepository.Update(intoGroupItem);
+                            intoGroupItem.EnrollStatus = hasSPMOrCPM ? EnrollStatus.HasCommittedToCRO : EnrollStatus.InviteIntoGroup;
 
                             await _enrollDetailRepository.AddAsync(new EnrollDetail()
                             {
                                 TrialDetailId = trialDetail.Id,
                                 DoctorId = intoGroupItem.DoctorId,
                                 TrialId = trialId,
-                                EnrollStatus = EnrollStatus.HasCommittedToCRO,
+                                EnrollStatus = hasSPMOrCPM ? EnrollStatus.HasCommittedToCRO : EnrollStatus.InviteIntoGroup,
                                 OptUserType = (int)SystemUserType.AdminUser, //后台用户
                             });
+
+                            if (!hasSPMOrCPM)
+                            {
+                                await _enrollDetailRepository.AddAsync(new EnrollDetail()
+                                {
+                                    TrialDetailId = trialDetail.Id,
+                                    DoctorId = intoGroupItem.DoctorId,
+                                    TrialId = trialId,
+                                    EnrollStatus = EnrollStatus.HasCommittedToCRO,
+                                    OptUserType = (int)SystemUserType.AdminUser, //后台用户
+                                });
+                            }
+
+                           
                         }
                     }