diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index d7992506c..96ded117f 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -106,30 +106,60 @@ Always + + Always + + + Always + Always + + Always + Always + + Always + + + Always + + + Always + Always + + Always + Always + + Always + Always Always - + Always Always + + Always + + + Always + Always diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html new file mode 100644 index 000000000..0cfd47bf6 --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html @@ -0,0 +1,40 @@ + + + + + Title + + +
+
+
+ Dear {0} , +
+
+ Extimaging has added an account for you. The account information is as follows: +
+ +
+
+ User name: {1} +
+
+ Role: {2} +
+
+ Before logging in for the first time, please modify your account information by this link： + + Initialize the account information + +
+
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser_US.html new file mode 100644 index 000000000..274ee9053 --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser_US.html @@ -0,0 +1,37 @@ + + + + + Title + + +
+
+
+ Dear {0} , +
+
+ Extimaging has reset your account password, and the account information is as follows: +
+ +
+
+ User name: {1} +
+
+ Role: {2} +
+
+ Password: {3} +
+
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest_US.html new file mode 100644 index 000000000..183b8a835 --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest_US.html @@ -0,0 +1,27 @@ + + + + + Title + + +
+
+
+ Dear： +
+
+ Thank you for using Extensive Imaging Cloud System. +
+
+ {0}。 +
+ +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html new file mode 100644 index 000000000..aaf96e71f --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html @@ -0,0 +1,27 @@ + + + + + Title + + +
+
+
+ Dear： +
+
+ Thank you for using Extensive Imaging Cloud System. +
+
+ {0}。 +
+ +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + \ No newline at end of file diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html new file mode 100644 index 000000000..572e2a5df --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html @@ -0,0 +1,49 @@ + + + + + Title + + +
+
+
+ Dear {0}, +
+
+ Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome. +
+
+ This project adopts electronic workflow. The system and your account information are as follows： +
+ +
+
+ Trial ID: {3} +
+
+ Protocol ID: {2} +
+
+ Study name: {1} +
+
+ User name: {4} +
+
+ Role: {5} +
+
+ System login address:{6} +
+
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html new file mode 100644 index 000000000..ba80405ee --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html @@ -0,0 +1,52 @@ + + + + + Title + + +
+
+
+ Dear {0}, +
+
+ Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome. +
+
+ This project adopts electronic workflow. The system and your account information are as follows： +
+ +
+
+ Trial ID: {3} +
+
+ Protocol ID: {2} +
+
+ Study name: {1} +
+
+ User name: {4} +
+
+ Role: {5} +
+
+ Before logging in for the first time, please modify your account information by this link： + + Initialize the account information + +
+
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html new file mode 100644 index 000000000..0deb87dad --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html @@ -0,0 +1,49 @@ + + + + + Title + + +
+
+
+ Dear {0} , +
+
+ Hello, the center survey form you filled in has been rejected. The details are as follows： +
+ +
+
+ Trial ID: {1} +
+
+ Protocol ID: {2} +
+
+ Study name: {3} +
+
+ Site ID: {4} +
+
+ Site name: {5} +
+
+ Reason for rejection: {6} +
+ +
+ + Login and view + + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html new file mode 100644 index 000000000..572e2a5df --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html @@ -0,0 +1,49 @@ + + + + + Title + + +
+
+
+ Dear {0}, +
+
+ Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome. +
+
+ This project adopts electronic workflow. The system and your account information are as follows： +
+ +
+
+ Trial ID: {3} +
+
+ Protocol ID: {2} +
+
+ Study name: {1} +
+
+ User name: {4} +
+
+ Role: {5} +
+
+ System login address:{6} +
+
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html new file mode 100644 index 000000000..ba80405ee --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html @@ -0,0 +1,52 @@ + + + + + Title + + +
+
+
+ Dear {0}, +
+
+ Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome. +
+
+ This project adopts electronic workflow. The system and your account information are as follows： +
+ +
+
+ Trial ID: {3} +
+
+ Protocol ID: {2} +
+
+ Study name: {1} +
+
+ User name: {4} +
+
+ Role: {5} +
+
+ Before logging in for the first time, please modify your account information by this link： + + Initialize the account information + +
+
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html index 90dbb7d41..e114d9fa9 100644 --- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html @@ -8,7 +8,7 @@
- {0}您好： + Dear {0},
感谢您使用展影云平台。 diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html new file mode 100644 index 000000000..f9bc2f21b --- /dev/null +++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html @@ -0,0 +1,28 @@ + + + + + Title + + +
+
+
+ Dear {0}, +
+
+ Thank you for using Extensive Imaging Cloud System. +
+
+ {1}, the verification code is {2}. Enter the verification code within 3 minutes for subsequent operations. Please ignore this email if not by yourself. +
+ + +
+
Best Regards
+
Shanghai Extensive Imaging Medical Technology Co., LTD
+
+
+
+ + diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 2fb174888..f6cf2a275 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -110,7 +110,8 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "UserOptCommon.html"; + //+ "UserOptCommon.html"; + +(_userInfo.IsEn_Us ? "UserOptCommon_US.html" : "UserOptCommon.html"); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -176,7 +177,8 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "UserOptCommon.html"; + //+ "UserOptCommon.html"; + + (_userInfo.IsEn_Us ? "UserOptCommon_US.html" : "UserOptCommon.html"); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -244,7 +246,7 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "UserOptCommon.html"; + + (_userInfo.IsEn_Us ? "UserOptCommon_US.html": "UserOptCommon.html" ); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -310,7 +312,8 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "UserOptCommon.html"; + //+ "UserOptCommon.html"; + + (_userInfo.IsEn_Us ? "UserOptCommon_US.html" : "UserOptCommon.html"); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -388,7 +391,8 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "AdminAddUser.html"; + //+ "AdminAddUser.html"; + + (_userInfo.IsEn_Us ? "AdminAddUser_US.html" : "AdminAddUser.html"); var token = _tokenService.GetToken(IRaCISClaims.Create(_mapper.Map(sysUserInfo))); @@ -443,7 +447,8 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "AdminResetUser.html"; + //+ "AdminResetUser.html"; + + (_userInfo.IsEn_Us ? "AdminResetUser_US.html" : "AdminResetUser.html"); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) @@ -501,7 +506,7 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + (sysUserInfo.IsFirstAdd ? "TrialUserFirstJoin.html" : "TrialUserExistJoin.html"); + + (sysUserInfo.IsFirstAdd ? (_userInfo.IsEn_Us ? "TrialUserFirstJoin_US.html" : "TrialUserFirstJoin.html") : (_userInfo.IsEn_Us ? "TrialUserExistJoin_US.html" : "TrialUserExistJoin.html")); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -563,7 +568,7 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + (sysUserInfo.IsFirstAdd ? "TrialUserFirstJoin.html" : "TrialUserExistJoin.html"); + + (sysUserInfo.IsFirstAdd ? (_userInfo.IsEn_Us ? "TrialUserFirstJoin_US.html" : "TrialUserFirstJoin.html") : (_userInfo.IsEn_Us ? "TrialUserExistJoin_US.html" : "TrialUserExistJoin.html") ); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -683,7 +688,7 @@ namespace IRaCIS.Application.Services + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + (sysUserInfo.IsFirstAdd ? "TrialDoctorFirstJoin.html" : "TrialDoctorExistJoin.html"); + + (sysUserInfo.IsFirstAdd ? (_userInfo.IsEn_Us ? "TrialDoctorFirstJoin_US.html" : "TrialDoctorFirstJoin.html") : (_userInfo.IsEn_Us ? "TrialDoctorExistJoin_US.html" : "TrialDoctorExistJoin.html") ); using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 1330b369b..0abc0654d 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -431,7 +431,8 @@ namespace IRaCIS.Core.Application.Service + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "SubjectEnrollConfirmOrPDProgress.html"; + //+ "SubjectEnrollConfirmOrPDProgress.html"; + + (_userInfo.IsEn_Us ? "SubjectEnrollConfirmOrPDProgress_US.html" : "SubjectEnrollConfirmOrPDProgress.html"); #endregion @@ -1458,7 +1459,9 @@ namespace IRaCIS.Core.Application.Service + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "EmailConfigTest.html"; + //+ "EmailConfigTest.html"; + + + (_userInfo.IsEn_Us ? "EmailConfigTest_US.html" : "EmailConfigTest.html"); //---项目邮件测试 diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index 9c9ca883b..3dd2e1d52 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -217,12 +217,9 @@ namespace IRaCIS.Core.Application.Contracts public class AddOrUpdateStudyDto { - public Guid? Id { get; set; } public string StudyId { get; set; } = string.Empty; - - - + //public int Code { get; set; } = 0; //public string StudyCode { get; set; } = string.Empty; @@ -257,7 +254,6 @@ namespace IRaCIS.Core.Application.Contracts public class AddOrUpdateSeriesDto { - public Guid? Id { get; set; } public string StudyInstanceUid { get; set; } public string SeriesInstanceUid { get; set; } public int SeriesNumber { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index ac3691d2e..db6cb1b7e 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc else { - var studyId = incommand.Study.Id; + var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());; var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId); @@ -214,7 +214,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc //特殊处理逻辑 SpecialArchiveStudyDeal(study); - //await _dicomSeriesRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == incommand.Study.Id); // 少了整个序列 @@ -245,9 +244,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc dicomSeries= await _dicomSeriesRepository.AddAsync(series); //新的序列 那么 检查的序列数量+1 - study.SeriesCount += 1; - - + study.SeriesCount += 1; } else {