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/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
index 4142a62b5..66335d4ae 100644
--- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
@@ -136,7 +136,7 @@ public static class ExcelExportHelper
#region 根据中英文 删除模板sheet
// 打开模板文件
- var templateFile = new FileStream(tplPath, FileMode.Open, FileAccess.Read);
+ using var templateFile = new FileStream(tplPath, FileMode.Open, FileAccess.Read);
// 获取文件流
var templateStream = new MemoryStream();
@@ -161,13 +161,13 @@ public static class ExcelExportHelper
if (removeExcelIndexList != null)
{
var worksheet = workbook.Worksheet(1); // 索引从1开始
- foreach (int colIndex in removeExcelIndexList.OrderByDescending(t=>t))
+ foreach (int colIndex in removeExcelIndexList.OrderByDescending(t => t))
{
// 删除整列
worksheet.Column(colIndex).Delete();
}
}
-
+
//中文替换项目术语
if (data.TrialObjectNameList?.Count > 0)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 54c4ee799..b727a5120 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -10522,6 +10522,21 @@
默认SegmentName
+
+
+ 仲裁模式
+
+
+
+
+ 裁判规则
+
+
+
+
+ 仲裁对象
+
+
返回对象
@@ -11967,6 +11982,31 @@
阅片期名称
+
+
+ 类型
+
+
+
+
+ 问题类型
+
+
+
+
+ 字典code
+
+
+
+
+ 单位
+
+
+
+
+ 答案组合
+
+
标准ID
@@ -12328,6 +12368,21 @@
仲裁规则
+
+
+ 仲裁模式
+
+
+
+
+ 裁判规则
+
+
+
+
+ 裁判任务生成
+
+
需要
@@ -14358,6 +14413,11 @@
+
+
+ 编辑裁判规则配置
+
+
新增修改项目问题标准（项目）
@@ -14459,11 +14519,22 @@
阅片问题.标准
-
+
阅片问题.标准
+
+
+ 获取项目阅片标准各访视的裁判规则配置。
+ 未配置规则的访视问题也会返回，供前端直接进行配置。
+
+
+
+
+ 编辑项目阅片标准各访视的裁判规则配置。
+
+
设置项目问题导出
@@ -14833,7 +14904,7 @@
-
+
IR影像阅片
@@ -15263,6 +15334,30 @@
+
+
+ 获取单访视裁判答案
+
+
+
+
+
+
+ 获取裁判表单
+
+
+
+
+ 编辑裁判表单
+
+
+
+
+ 提交裁判表单
+
+
+
+
获取裁判阅片任务信息
@@ -15296,6 +15391,16 @@
+
+
+ 应用访视裁判规则 以及剔除排除的问题
+
+
+
+
+ 应用访视裁判规则 以及剔除排除的问题
+
+
发送微信通知
diff --git a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
index b5d9c719f..c8438f4f8 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
@@ -109,7 +109,7 @@ namespace IRaCIS.Core.Application.Service.Common
("BodyCoilChannelCount", 12),
("HasDedicatedPdfFatQuantificationSequence", 13),
("PdfFatQuantificationSequenceType", 14),
- ("OtherSequenceSpecification", 14),
+ //("OtherSequenceSpecification", 14),
("HasT2R2Correction", 15),
("CanFullyExportPdfParameterMapsAndRawDicom", 16),
("Note", 17),
@@ -179,9 +179,9 @@ namespace IRaCIS.Core.Application.Service.Common
};
- var viewNameList = config.EquipmentControlFieldList.Where(t => t.IsView == true).Select(t => t.FiledName).ToList();
+ //var viewNameList = config.NotShowFieldList;
- var columnsToDelete = fields.Where(f => !viewNameList.Any(t => f.FieldName == t)).Select(f => f.excelIndex).Distinct().OrderByDescending(i => i).ToList();
+ var columnsToDelete = fields.Where(f => config.NotShowFieldList.Any(t => f.FieldName == t)).Select(f => f.excelIndex).Distinct().OrderByDescending(i => i).ToList();
//var defalutSortArray = new string[] { /*nameof(TrialSiteSurveyView.LanguageType) + " desc", nameof(TrialSiteSurveyView.ShowOrder)*/ };
@@ -194,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), removeExcelIndexList: columnsToDelete);
+ return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteSurvey_Info_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialSiteSurveyView), removeExcelIndexList: columnsToDelete);
}
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
index 3a0948654..96cc917a4 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
@@ -329,14 +329,21 @@ namespace IRaCIS.Core.Application.Contracts
public string UserName { get; set; } = string.Empty;
public string Phone { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
+
public int AverageEngravingCycle { get; set; }
+
+ [DictionaryTranslate("YesOrNo")]
public bool IsConfirmImagingTechnologist { get; set; }
public string NotConfirmReson { get; set; } = string.Empty;
+
+ [DictionaryTranslate("EfficacyEvaluatorType")]
public int EfficacyEvaluatorType { get; set; }
+
+ [DictionaryTranslate("YesOrNo")]
public bool IsFollowStudyParameters { get; set; }
public string NotFollowReson { get; set; } = string.Empty;
-
+ [DictionaryTranslate("YesOrNo")]
[Comment("MRI-PDEE 是否为本中心该适应症的常规诊疗检查项目")]
public bool? IsRoutineMRIPDEE { get; set; }
@@ -349,14 +356,17 @@ namespace IRaCIS.Core.Application.Contracts
[Comment("MRI-PDEE 其他")]
public string MRIPDFFOther { get; set; }
+ [DictionaryTranslate("YesOrNo")]
[Comment("是否授权影像科老师参与")]
public bool? IsAuthorizeRadiologistsParticipate { get; set; }
+ [DictionaryTranslate("YesOrNo")]
[Comment("保持 1-2 名固定技师")]
public bool? AssignFixedTechnologists { get; set; }
+ [DictionaryTranslate("YesOrNo")]
[Comment("是否严格按照影像手册参数完成刻盘")]
public bool? ISStrictManualBurnFlag { get; set; }