From 5b63e58c1df942dfe428f99ab9107bc7b84098cd Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 12 Sep 2024 09:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E8=A1=A8?= =?UTF-8?q?=E6=A0=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/UploadDownLoadController.cs | 4 ++-- .../Service/SiteSurvey/TrialSiteSurveyService.cs | 2 ++ IRaCIS.Core.Domain/Image/TrialImageDownload.cs | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 9b350c142..70e4e83cb 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -1000,9 +1000,9 @@ namespace IRaCIS.Core.API.Controllers item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).TrialSiteId; } + var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList(); - - await _trialSiteSurveyService.ImportGenerateAccountAndJoinTrialAsync(trialId, baseUrl, routeUrl, excelList.ToList()); + await _trialSiteSurveyService.ImportGenerateAccountAndJoinTrialAsync(trialId, baseUrl, routeUrl, list); return ResponseOutput.Ok(); diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index ffef6f05a..63729ed88 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -934,6 +934,8 @@ namespace IRaCIS.Core.Application.Contracts saveItem.UserName = saveItem.UserCode; + //saveItem.UserTypeEnum = _userTypeRepository.Where(t => t.Id == saveItem.UserTypeId).Select(t => t.UserTypeEnum).First(); + var newUser = _userRepository.AddAsync(saveItem).Result; _ = _userRepository.SaveChangesAsync().Result; diff --git a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs index 12b65c1fa..72bacf5d0 100644 --- a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs +++ b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs @@ -44,7 +44,9 @@ namespace IRaCIS.Core.Domain.Models public enum ImageType { Dicom = 1, + NoneDicom = 2, + DicomAndNoneDicom = 3 }; }