diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 2566f292e..89b498ac5 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -213,6 +213,13 @@
+
+
+ 提交阅片裁判表单
+
+
+
+
配置 基础逻辑信息并确认
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 54c4ee799..b83f2209f 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -10522,6 +10522,21 @@
默认SegmentName
+
+
+ 仲裁模式
+
+
+
+
+ 裁判规则
+
+
+
+
+ 仲裁对象
+
+
返回对象
@@ -12328,6 +12343,21 @@
仲裁规则
+
+
+ 仲裁模式
+
+
+
+
+ 裁判规则
+
+
+
+
+ 裁判任务生成
+
+
需要
@@ -14358,6 +14388,11 @@
+
+
+ 编辑裁判规则配置
+
+
新增修改项目问题标准（项目）
@@ -14459,11 +14494,22 @@
阅片问题.标准
-
+
阅片问题.标准
+
+
+ 获取项目阅片标准各访视的裁判规则配置。
+ 未配置规则的访视问题也会返回，供前端直接进行配置。
+
+
+
+
+ 编辑项目阅片标准各访视的裁判规则配置。
+
+
设置项目问题导出
@@ -14833,7 +14879,7 @@
-
+
IR影像阅片
@@ -15263,6 +15309,30 @@
+
+
+ 获取单访视裁判答案
+
+
+
+
+
+
+ 获取裁判表单
+
+
+
+
+ 编辑裁判表单
+
+
+
+
+ 提交裁判表单
+
+
+
+
获取裁判阅片任务信息
@@ -15296,6 +15366,16 @@
+
+
+ 应用访视裁判规则 以及剔除排除的问题
+
+
+
+
+ 应用访视裁判规则 以及剔除排除的问题
+
+
发送微信通知
diff --git a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
index f33aeb28a..6ec1759e7 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
@@ -162,17 +162,20 @@ namespace IRaCIS.Core.Application.Service.Common
var fields = new List<(string FieldName, int excelIndex)>()
{
- ("Parameters", 5),
- ("ManufacturerType", 6),
- ("ScannerType", 7),
- ("MagneticFieldStrengthType", 8),
- ("BodyCoilChannelCount", 9),
- ("HasDedicatedPdfFatQuantificationSequence", 10),
- ("PdfFatQuantificationSequenceType", 11),
- ("OtherSequenceSpecification", 11),
- ("HasT2R2Correction", 12),
- ("CanFullyExportPdfParameterMapsAndRawDicom", 13),
- ("Note", 14),
+ ("AverageEngravingCycle", 7),
+ ("IsConfirmImagingTechnologist", 8),
+ ("EfficacyEvaluatorType", 9),
+ ("IsFollowStudyParameters", 10),
+ ("NotFollowReson", 10),
+
+
+ ("IsRoutineMRIPDEE", 11),
+ ("MRIPDFFScanTime", 12),
+ ("MRIPDFFLeadTime", 13),
+ ("MRIPDFFOther", 14),
+ ("AssignFixedTechnologists", 15),
+ ("ISStrictManualBurnFlag", 16),
+ ("NotStrictManualBurnFlagReason",16)
};
@@ -191,7 +194,7 @@ namespace IRaCIS.Core.Application.Service.Common
exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
- return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteSurvey_Info_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SiteSurveyEquipmentDto));
+ return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteSurvey_Info_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SiteSurveyEquipmentDto), removeExcelIndexList: columnsToDelete);
}
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 27aff3c18..e286a37d1 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -563,6 +563,9 @@ namespace IRaCIS.Core.Application.Contracts
survey.IsDeleted = true;
+ await _siteSurveyLogRepository.AddAsync(new SiteSurveyLog() { TrialSiteSurveyId = trialSiteSurveyId, Name = $"{_userInfo.FullName} ({_userInfo.UserName})" , OptType = SiteSurveyOptTyp.Over });
+
+
await _trialSiteSurveyRepository.SaveChangesAsync();
return ResponseOutput.Ok();
@@ -695,7 +698,7 @@ namespace IRaCIS.Core.Application.Contracts
}
//更新调研表日志 - 老的调研表
- //currentLatest.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Over });
+ currentLatest.SiteSurveyLogList.Add(new SiteSurveyLog() { Name = userInfo.ReplaceUserEmailOrPhone, OptType = SiteSurveyOptTyp.Over });
var copy = currentLatest.Clone();