diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 89b498ac5..2566f292e 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -213,13 +213,6 @@
-
-
- 提交阅片裁判表单
-
-
-
-
配置 基础逻辑信息并确认
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b83f2209f..54c4ee799 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -10522,21 +10522,6 @@
默认SegmentName
-
-
- 仲裁模式
-
-
-
-
- 裁判规则
-
-
-
-
- 仲裁对象
-
-
返回对象
@@ -12343,21 +12328,6 @@
仲裁规则
-
-
- 仲裁模式
-
-
-
-
- 裁判规则
-
-
-
-
- 裁判任务生成
-
-
需要
@@ -14388,11 +14358,6 @@
-
-
- 编辑裁判规则配置
-
-
新增修改项目问题标准（项目）
@@ -14494,22 +14459,11 @@
阅片问题.标准
-
+
阅片问题.标准
-
-
- 获取项目阅片标准各访视的裁判规则配置。
- 未配置规则的访视问题也会返回，供前端直接进行配置。
-
-
-
-
- 编辑项目阅片标准各访视的裁判规则配置。
-
-
设置项目问题导出
@@ -14879,7 +14833,7 @@
-
+
IR影像阅片
@@ -15309,30 +15263,6 @@
-
-
- 获取单访视裁判答案
-
-
-
-
-
-
- 获取裁判表单
-
-
-
-
- 编辑裁判表单
-
-
-
-
- 提交裁判表单
-
-
-
-
获取裁判阅片任务信息
@@ -15366,16 +15296,6 @@
-
-
- 应用访视裁判规则 以及剔除排除的问题
-
-
-
-
- 应用访视裁判规则 以及剔除排除的问题
-
-
发送微信通知
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index e286a37d1..b66405778 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -3,6 +3,7 @@
// 生成时间 2021-12-23 13:20:59
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
+using DocumentFormat.OpenXml.Office2013.Excel;
using DocumentFormat.OpenXml.Spreadsheet;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Auth;
@@ -536,7 +537,7 @@ namespace IRaCIS.Core.Application.Contracts
}
var info = await GetSiteSurveyInfo(trialSiteSurveyId, trialId);
- await _siteSurveyLogRepository.AddAsync(new SiteSurveyLog() { TrialSiteSurveyId = trialSiteSurveyId, Name =$"{_userInfo.FullName} ({_userInfo.UserName})" , UserType = (UserTypeEnum)_userInfo.UserTypeEnumInt, OptType = SiteSurveyOptTyp.Reject, Reason = survey.LatestBackReason, Json = info.ToJsonStr() });
+ await _siteSurveyLogRepository.AddAsync(new SiteSurveyLog() { TrialSiteSurveyId = trialSiteSurveyId, Name = $"{_userInfo.FullName} ({_userInfo.UserName})", UserType = (UserTypeEnum)_userInfo.UserTypeEnumInt, OptType = SiteSurveyOptTyp.Reject, Reason = survey.LatestBackReason, Json = info.ToJsonStr() });
await _trialSiteSurveyRepository.SaveChangesAsync();
@@ -563,7 +564,8 @@ namespace IRaCIS.Core.Application.Contracts
survey.IsDeleted = true;
- await _siteSurveyLogRepository.AddAsync(new SiteSurveyLog() { TrialSiteSurveyId = trialSiteSurveyId, Name = $"{_userInfo.FullName} ({_userInfo.UserName})" , OptType = SiteSurveyOptTyp.Over });
+ var info = await GetSiteSurveyInfo(trialSiteSurveyId, survey.TrialId);
+ await _siteSurveyLogRepository.AddAsync(new SiteSurveyLog() { TrialSiteSurveyId = trialSiteSurveyId, Name = $"{_userInfo.FullName} ({_userInfo.UserName})", UserType = (UserTypeEnum)_userInfo.UserTypeEnumInt, OptType = SiteSurveyOptTyp.Over, Json = info.ToJsonStr() });
await _trialSiteSurveyRepository.SaveChangesAsync();
@@ -698,7 +700,8 @@ namespace IRaCIS.Core.Application.Contracts
}
//更新调研表日志 - 老的调研表
- currentLatest.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Over });
+ var info1 = await GetSiteSurveyInfo(currentLatest.Id, currentLatest.TrialId);
+ currentLatest.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Over, Json = info1.ToJsonStr() });
var copy = currentLatest.Clone();
@@ -719,8 +722,8 @@ namespace IRaCIS.Core.Application.Contracts
//更新调研表日志
var info = await GetSiteSurveyInfo(currentLatest.Id, currentLatest.TrialId);
- copy.TrialSiteEquipmentSurveyList.ForEach(t => { t.Id = Guid.Empty; });
- copy.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Update, OriginTrialSiteSurveyId = currentLatest.Id, Json = info.ToJsonStr() });
+ copy.SiteSurveyLogList.ForEach(t => { t.Id = Guid.Empty; });
+ copy.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.EmailOrPhone, OptType = SiteSurveyOptTyp.Update, OriginTrialSiteSurveyId = currentLatest.Id, Json = info.ToJsonStr() });
}
@@ -1469,7 +1472,7 @@ namespace IRaCIS.Core.Application.Contracts
{
return _siteSurveyLogRepository.Where(t => t.TrialSiteSurveyId == inQuery.TrialSiteSurveyId)
.WhereIf(inQuery.Id != null, t => t.Id == inQuery.Id)
- .ProjectTo(_mapper.ConfigurationProvider).OrderBy(t=>t.CreateTime).ToList();
+ .ProjectTo(_mapper.ConfigurationProvider).OrderBy(t => t.CreateTime).ToList();
}
///