diff --git a/IRaCIS.Core.API/NLog.config b/IRaCIS.Core.API/NLog.config
deleted file mode 100644
index bf1dbbb1..00000000
--- a/IRaCIS.Core.API/NLog.config
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs
index e58662a7..10a98ac4 100644
--- a/IRaCIS.Core.API/Program.cs
+++ b/IRaCIS.Core.API/Program.cs
@@ -76,50 +76,50 @@ namespace IRaCIS.Core.API
#region ֤
- if (!File.Exists($@"C:\ProgramData\.xingcang\config.json"))
- {
- Console.WriteLine("ǰδע");
- Log.Logger.Error("ǰδע");
- Console.ReadLine();
- return;
- }
- else
- {
- var json = File.ReadAllText($@"C:\ProgramData\.xingcang\config.json");
+ //if (!File.Exists($@"C:\ProgramData\.xingcang\config.json"))
+ //{
+ // Console.WriteLine("ǰδע");
+ // Log.Logger.Error("ǰδע");
+ // Console.ReadLine();
+ // return;
+ //}
+ //else
+ //{
+ // var json = File.ReadAllText($@"C:\ProgramData\.xingcang\config.json");
- JObject jsonObject = JObject.Parse(json);
+ // JObject jsonObject = JObject.Parse(json);
- var key = jsonObject["key"].ToString();
+ // var key = jsonObject["key"].ToString();
- var value = jsonObject["value"].ToString();
+ // var value = jsonObject["value"].ToString();
- var physicalAddressList = NetworkInterface.GetAllNetworkInterfaces().Select(t => t.GetPhysicalAddress().ToString());
+ // var physicalAddressList = NetworkInterface.GetAllNetworkInterfaces().Select(t => t.GetPhysicalAddress().ToString());
- // жļĻǷDZ
- if (!physicalAddressList.Contains(key))
- {
- Console.WriteLine("ͱӦ");
- Log.Logger.Error("ͱӦ");
- Console.ReadLine();
+ // // жļĻǷDZ
+ // if (!physicalAddressList.Contains(key))
+ // {
+ // Console.WriteLine("ͱӦ");
+ // Log.Logger.Error("ͱӦ");
+ // Console.ReadLine();
- return;
- }
+ // return;
+ // }
- var secrete = MD5Helper.Md5($"{key}_XINGCANG");
+ // var secrete = MD5Helper.Md5($"{key}_XINGCANG");
- if (value != secrete)
- {
- Console.WriteLine("ע벻ƥ");
- Log.Logger.Error("ע벻ƥ");
- Console.ReadLine();
+ // if (value != secrete)
+ // {
+ // Console.WriteLine("ע벻ƥ");
+ // Log.Logger.Error("ע벻ƥ");
+ // Console.ReadLine();
- return;
+ // return;
- }
+ // }
- }
+ //}
#endregion
diff --git a/IRaCIS.Core.API/_ServiceExtensions/Swagger/SwaggerSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/Swagger/SwaggerSetup.cs
index 4a16162e..56da182f 100644
--- a/IRaCIS.Core.API/_ServiceExtensions/Swagger/SwaggerSetup.cs
+++ b/IRaCIS.Core.API/_ServiceExtensions/Swagger/SwaggerSetup.cs
@@ -114,9 +114,11 @@ namespace IRaCIS.Core.API
//注意localhost:8001/swagger是访问不到的,去launchSettings.json把launchUrl去掉,如果你想换一个路径,直接写名字即可,比如直接写c.Route = "doc";
//options.RoutePrefix = string.Empty;
- var data = Assembly.GetExecutingAssembly().Location;
- options.IndexStream = () => Assembly.GetExecutingAssembly()
- .GetManifestResourceStream("IRaCIS.Core.API.wwwroot.swagger.ui.Index.html");
+
+
+
+ //options.IndexStream = () => Assembly.GetExecutingAssembly()
+ //.GetManifestResourceStream("IRaCIS.Core.API.wwwroot.swagger.ui.Index.html");
options.RoutePrefix = string.Empty;
diff --git a/IRaCIS.Core.API/appsettings.CertificateApply.json b/IRaCIS.Core.API/appsettings.CertificateApply.json
index aba506bc..5bccdf9d 100644
--- a/IRaCIS.Core.API/appsettings.CertificateApply.json
+++ b/IRaCIS.Core.API/appsettings.CertificateApply.json
@@ -10,7 +10,7 @@
"RemoteNew": "Server=localhost;Database=IRaCIS;User ID=sa;Password=123456;TrustServerCertificate=true"
},
"BasicSystemConfig": {
- "OpenUserComplexPassword": false,
+ "OpenUserComplexPassword": true,
"OpenSignDocumentBeforeWork": false,
"OpenTrialRelationDelete": true,
"OpenLoginLimit": false
diff --git a/IRaCIS.Core.API/sql/bin.bat b/IRaCIS.Core.API/sql/bin.bat
deleted file mode 100644
index 233fbbc3..00000000
--- a/IRaCIS.Core.API/sql/bin.bat
+++ /dev/null
@@ -1,3 +0,0 @@
- SQLCMD -i %~dp0\dbo.sql
- SQLCMD -i %~dp0\data.sql
-pause
\ No newline at end of file
diff --git a/IRaCIS.Core.API/sql/data.sql b/IRaCIS.Core.API/sql/data.sql
deleted file mode 100644
index 9bf0bbee..00000000
Binary files a/IRaCIS.Core.API/sql/data.sql and /dev/null differ
diff --git a/IRaCIS.Core.API/sql/dbo.sql b/IRaCIS.Core.API/sql/dbo.sql
deleted file mode 100644
index f05c5ab1..00000000
Binary files a/IRaCIS.Core.API/sql/dbo.sql and /dev/null differ
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html
index 9191707f..aabdcaf7 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好:
- 展影医疗为您添加了账户,账户信息如下:
+ 行藏医学影像处理软件系统为您添加了账户,账户信息如下:
@@ -32,7 +32,7 @@
祝您顺利!/Best Regards
-
上海展影医疗科技有限公司
+
武汉行藏科技有限公司
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html
index e8121618..8f8bb433 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好:
- 展影医疗将您的账户密码已重置,账户信息如下:
+ 行藏医学影像处理软件系统将您的账户密码已重置,账户信息如下:
@@ -29,7 +29,7 @@
祝您顺利!/Best Regards
-
上海展影医疗科技有限公司
+
武汉行藏科技有限公司
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest.html
index 0d184d0a..6f1d3a5d 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/EmailConfigTest.html
@@ -11,7 +11,7 @@
您好:
- 感谢您使用展影云平台。
+ 感谢您使用行藏医学影像处理软件。
{0}。
@@ -19,7 +19,7 @@
祝您顺利!/Best Regards
-
上海展影医疗科技有限公司
+
武汉行藏科技有限公司
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
index 90dbb7d4..f21fa50f 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
@@ -11,7 +11,7 @@
{0}您好:
- 感谢您使用展影云平台。
+ 感谢您使用行藏医学影像处理软件。
{1},验证码是: {2},请在3分钟内输入该验证码,进行后续操作。如非本人操作,请忽略该邮件。
@@ -19,7 +19,7 @@
祝您顺利!/Best Regards
-
上海展影医疗科技有限公司
+
武汉行藏科技有限公司
diff --git a/IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs b/IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs
index ebd09161..94011887 100644
--- a/IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs
+++ b/IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.BackGroundJob
var success = await _subjectVisitRepository.SaveChangesAsync();
- _logger.LogWarning($"任务建立时间:{startTime} 取消时间:{DateTime.Now} 取消 受试者访视:{ subjectVisitId }success:{success}");
+ _logger.LogWarning($"任务建立时间:{startTime} 取消时间:{DateTime.Now} 取消 患者检查批次:{ subjectVisitId }success:{success}");
}
catch (Exception e)
{
diff --git a/IRaCIS.Core.Application/BusinessFilter/TrialAuditFilter.cs b/IRaCIS.Core.Application/BusinessFilter/TrialAuditFilter.cs
index a614a1e6..a038ee94 100644
--- a/IRaCIS.Core.Application/BusinessFilter/TrialAuditFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/TrialAuditFilter.cs
@@ -49,7 +49,7 @@ public enum AuditOptType
AddTrialSiteCRC = 7,
DeleteTrialSiteCRC = 8,
- //访视计划
+ //检查批次计划
AddOrUpdateTrialVisitPlanItem = 9,
DeleteTrialVisitPlanItem = 10,
ConfirmTrialVisitPlan = 11,
@@ -58,7 +58,7 @@ public enum AuditOptType
AddOrUpdateTrialTemplate = 12,
DeleteTrialTemplate = 13,
- //subject 访视计划
+ //subject 检查批次计划
AddOrUpdateSubjectOutPlanVisit = 14,
DeleteSubjectOutPlanVisit = 15,
SetSVExecuted = 16,
@@ -378,7 +378,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // //添加访视计划Item
+// // //添加检查批次计划Item
// // case AuditOptType.AddOrUpdateTrialVisitPlanItem:
// // //接口参数
// // var visitPlanItem = (VisitPlanCommand)_actionArguments.Values.ToList()[0];
@@ -390,7 +390,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = visitPlanItem.TrialId,
// // SubjectId = Guid.Empty,
// // AuditType = (int)AuditType.TrialAudit,
-// // Note = visitPlanItem.Id == null ? $"{ _userRealName} 添加了访视计划项 {visitPlanItem.VisitName} " : $"{ _userRealName} 更新了访视计划项为 {visitPlanItem.VisitName} ",
+// // Note = visitPlanItem.Id == null ? $"{ _userRealName} 添加了检查批次计划项 {visitPlanItem.VisitName} " : $"{ _userRealName} 更新了检查批次计划项为 {visitPlanItem.VisitName} ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -399,7 +399,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // //删除访视计划Item
+// // //删除检查批次计划Item
// // case AuditOptType.DeleteTrialVisitPlanItem:
// // if (result.IsSuccess)
@@ -409,7 +409,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = _visitPlan.TrialId,
// // SubjectId = Guid.Empty,
// // AuditType = (int)AuditType.TrialAudit,
-// // Note = $"{ _userRealName} 移除了访视计划项 {_visitPlan.VisitName} ",
+// // Note = $"{ _userRealName} 移除了检查批次计划项 {_visitPlan.VisitName} ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -418,7 +418,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // //确认了访视计划
+// // //确认了检查批次计划
// // case AuditOptType.ConfirmTrialVisitPlan:
// // var trialId = (Guid)_actionArguments.Values.ToList()[0];
@@ -429,7 +429,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = trialId,
// // SubjectId = Guid.Empty,
// // AuditType = (int)AuditType.TrialAudit,
-// // Note = $"{ _userRealName} 确认了访视计划,不允许修改 ",
+// // Note = $"{ _userRealName} 确认了检查批次计划,不允许修改 ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -484,13 +484,13 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // //受试者审计
+// // //患者审计
// // case AuditType.SubjectAudit:
// // switch (_attr._auditOptType)
// // {
-// // // 添加或者更新受试者
+// // // 添加或者更新患者
// // case AuditOptType.AddOrUpdateSubject:
// // //接口参数
@@ -503,7 +503,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = subject.TrialId,
// // SubjectId = subject.Id == null ? Guid.Parse(result.Data) : subject.Id.Value,
// // AuditType = (int)AuditType.SubjectAudit,
-// // Note = subject.Id == null ? $"{ _userRealName} 添加了受试者 {subject.LastName + subject.FirstName} 并初始化了访视计划" : $"{ _userRealName} 对受试者 { subject.LastName + subject.FirstName} 信息进行了更新 ",
+// // Note = subject.Id == null ? $"{ _userRealName} 添加了患者 {subject.LastName + subject.FirstName} 并初始化了检查批次计划" : $"{ _userRealName} 对患者 { subject.LastName + subject.FirstName} 信息进行了更新 ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -512,7 +512,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // // 删除受试者
+// // // 删除患者
// // case AuditOptType.DeleteSubject:
// // if (result.IsSuccess)
// // {
@@ -521,7 +521,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = _subject.TrialId,
// // SubjectId = _subject.Id,
// // AuditType = (int)AuditType.SubjectAudit,
-// // Note = $"{ _userRealName} 移除了受试者 {_subject.LastName + _subject.FirstName} ",
+// // Note = $"{ _userRealName} 移除了患者 {_subject.LastName + _subject.FirstName} ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -530,7 +530,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // // 受试者计划外访视
+// // // 患者计划外检查批次
// // case AuditOptType.AddOrUpdateSubjectOutPlanVisit:
// // //接口参数
@@ -549,7 +549,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = _subject.TrialId,
// // SubjectId = _subject.Id,
// // AuditType = (int)AuditType.SubjectAudit,
-// // Note = subjectVisit.Id == null ? $"{ _userRealName} 为受试者 {_subject.LastName + _subject.FirstName} 添加了计划外访视 {subjectVisit.VisitName}" : $"{ _userRealName} 更新受试者 {_subject.LastName + _subject.FirstName} 计划外访视{subjectVisit.VisitName}",
+// // Note = subjectVisit.Id == null ? $"{ _userRealName} 为患者 {_subject.LastName + _subject.FirstName} 添加了计划外检查批次 {subjectVisit.VisitName}" : $"{ _userRealName} 更新患者 {_subject.LastName + _subject.FirstName} 计划外检查批次{subjectVisit.VisitName}",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -558,7 +558,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // }
// // break;
-// // // 删除计划外访视
+// // // 删除计划外检查批次
// // case AuditOptType.DeleteSubjectOutPlanVisit:
// // if (result.IsSuccess)
@@ -568,7 +568,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = _subjectVisit.TrialId,
// // SubjectId = _subject.Id,
// // AuditType = (int)AuditType.SubjectAudit,
-// // Note = $"{ _userRealName} 移除了受试者{_subject.LastName + _subject.FirstName} 计划外访视 {_subjectVisit.VisitName} ",
+// // Note = $"{ _userRealName} 移除了患者{_subject.LastName + _subject.FirstName} 计划外检查批次 {_subjectVisit.VisitName} ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -587,7 +587,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // TrialId = _subjectVisit.TrialId,
// // SubjectId = _subject.Id,
// // AuditType = (int)AuditType.SubjectAudit,
-// // Note = $"{ _userRealName} 将受试者 {_subject.LastName + _subject.FirstName} 访视 {_subjectVisit.VisitName} 设置为已执行 ",
+// // Note = $"{ _userRealName} 将患者 {_subject.LastName + _subject.FirstName} 检查批次 {_subjectVisit.VisitName} 设置为已执行 ",
// // Detail = string.Empty,
// // OptUserId = Guid.Parse(_userIdStr),
// // OptUser = _userRealName,
@@ -756,7 +756,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// // break;
-// // //受试者审计
+// // //患者审计
// // case AuditType.SubjectAudit:
// // switch (_auditOptType)
@@ -969,7 +969,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// break;
-// //受试者审计
+// //患者审计
// case AuditType.SubjectAudit:
// switch (_auditOptType)
@@ -1281,7 +1281,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// //添加访视计划Item
+// //添加检查批次计划Item
// case AuditOptType.AddOrUpdateTrialVisitPlanItem:
// //接口参数
// var visitPlanItem = (VisitPlanCommand)_actionArguments.Values.ToList()[0];
@@ -1293,7 +1293,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = visitPlanItem.TrialId,
// SubjectId = Guid.Empty,
// AuditType = (int)AuditType.TrialAudit,
-// Note = visitPlanItem.Id == null ? $"{ _userRealName} 添加了访视计划项 {visitPlanItem.VisitName} " : $"{ _userRealName} 更新了访视计划项为 {visitPlanItem.VisitName} ",
+// Note = visitPlanItem.Id == null ? $"{ _userRealName} 添加了检查批次计划项 {visitPlanItem.VisitName} " : $"{ _userRealName} 更新了检查批次计划项为 {visitPlanItem.VisitName} ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1302,7 +1302,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// //删除访视计划Item
+// //删除检查批次计划Item
// case AuditOptType.DeleteTrialVisitPlanItem:
// if (result.IsSuccess)
@@ -1312,7 +1312,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = _visitPlan.TrialId,
// SubjectId = Guid.Empty,
// AuditType = (int)AuditType.TrialAudit,
-// Note = $"{ _userRealName} 移除了访视计划项 {_visitPlan.VisitName} ",
+// Note = $"{ _userRealName} 移除了检查批次计划项 {_visitPlan.VisitName} ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1321,7 +1321,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// //确认了访视计划
+// //确认了检查批次计划
// case AuditOptType.ConfirmTrialVisitPlan:
// var trialId = (Guid)_actionArguments.Values.ToList()[0];
@@ -1332,7 +1332,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = trialId,
// SubjectId = Guid.Empty,
// AuditType = (int)AuditType.TrialAudit,
-// Note = $"{ _userRealName} 确认了访视计划,不允许修改 ",
+// Note = $"{ _userRealName} 确认了检查批次计划,不允许修改 ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1364,13 +1364,13 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// //受试者审计
+// //患者审计
// case AuditType.SubjectAudit:
// switch (_attr._auditOptType)
// {
-// // 添加或者更新受试者
+// // 添加或者更新患者
// case AuditOptType.AddOrUpdateSubject:
// //接口参数
@@ -1383,7 +1383,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = subject.TrialId,
// SubjectId = subject.Id == null ? Guid.Parse(result.Data) : subject.Id.Value,
// AuditType = (int)AuditType.SubjectAudit,
-// Note = subject.Id == null ? $"{ _userRealName} 添加了受试者 {subject.ShortName } 并初始化了访视计划" : $"{ _userRealName} 对受试者 { subject.ShortName } 信息进行了更新 ",
+// Note = subject.Id == null ? $"{ _userRealName} 添加了患者 {subject.ShortName } 并初始化了检查批次计划" : $"{ _userRealName} 对患者 { subject.ShortName } 信息进行了更新 ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1392,7 +1392,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// // 删除受试者
+// // 删除患者
// case AuditOptType.DeleteSubject:
// if (result.IsSuccess)
// {
@@ -1401,7 +1401,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = _subject.TrialId,
// SubjectId = _subject.Id,
// AuditType = (int)AuditType.SubjectAudit,
-// Note = $"{ _userRealName} 移除了受试者 {_subject.LastName + _subject.FirstName} ",
+// Note = $"{ _userRealName} 移除了患者 {_subject.LastName + _subject.FirstName} ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1410,7 +1410,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// // 受试者计划外访视
+// // 患者计划外检查批次
// case AuditOptType.AddOrUpdateSubjectOutPlanVisit:
// //接口参数
@@ -1429,7 +1429,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = _subject.TrialId,
// SubjectId = _subject.Id,
// AuditType = (int)AuditType.SubjectAudit,
-// Note = subjectVisit.Id == null ? $"{ _userRealName} 为受试者 {_subject.LastName + _subject.FirstName} 添加了计划外访视 {subjectVisit.VisitName}" : $"{ _userRealName} 更新受试者 {_subject.LastName + _subject.FirstName} 计划外访视{subjectVisit.VisitName}",
+// Note = subjectVisit.Id == null ? $"{ _userRealName} 为患者 {_subject.LastName + _subject.FirstName} 添加了计划外检查批次 {subjectVisit.VisitName}" : $"{ _userRealName} 更新患者 {_subject.LastName + _subject.FirstName} 计划外检查批次{subjectVisit.VisitName}",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1438,7 +1438,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// }
// break;
-// // 删除计划外访视
+// // 删除计划外检查批次
// case AuditOptType.DeleteSubjectOutPlanVisit:
// if (result.IsSuccess)
@@ -1448,7 +1448,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = _subjectVisit.TrialId,
// SubjectId = _subject.Id,
// AuditType = (int)AuditType.SubjectAudit,
-// Note = $"{ _userRealName} 移除了受试者{_subject.LastName + _subject.FirstName} 计划外访视 {_subjectVisit.VisitName} ",
+// Note = $"{ _userRealName} 移除了患者{_subject.LastName + _subject.FirstName} 计划外检查批次 {_subjectVisit.VisitName} ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
@@ -1467,7 +1467,7 @@ public class TrialAuditAttribute : Attribute,/*IActionFilter, */IAsyncActionFilt
// TrialId = _subjectVisit.TrialId,
// SubjectId = _subject.Id,
// AuditType = (int)AuditType.SubjectAudit,
-// Note = $"{ _userRealName} 将受试者 {_subject.LastName + _subject.FirstName} 访视 {_subjectVisit.VisitName} 设置为已执行 ",
+// Note = $"{ _userRealName} 将患者 {_subject.LastName + _subject.FirstName} 检查批次 {_subjectVisit.VisitName} 设置为已执行 ",
// Detail = string.Empty,
// OptUserId = Guid.Parse(_userIdStr),
// OptUser = _userRealName,
diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
index e8da8a52..19ced478 100644
--- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
@@ -491,7 +491,7 @@ public static class FileStoreHelper
{
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
- //加入访视层级 和Data
+ //加入检查批次层级 和Data
var path = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),
siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder, studyId.ToString());
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
index 829d1850..91bc5c80 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@@ -115,7 +115,6 @@
-