XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Browse Source
This commit is contained in:
he
2023-05-04 16:50:27 +08:00
parent 9f27d4ff11 f828a7d1e2
commit 18dfc3ca37
16 changed files with 464 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/MailService.cs
+14 -9
View File
@@ -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<UserBasicInfo>(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))
{
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+5 -2
View File
@@ -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");
//---项目邮件测试
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+1 -5
View File
@@ -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; }
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+2 -5
View File
@@ -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
{