diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index 0701c7836..e29e4b9c6 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -66,18 +66,18 @@ namespace IRaCIS.Core.API.Controllers
return await _inspectionService.GetInspectionData(dto);
}
- ///
- /// 用户 签名某个文档 签署文件
- ///
- ///
- ///
- [HttpPost, Route("Inspection/trialDocument/userConfirm")]
- [UnitOfWork]
- public async Task UserConfirm(TrialDocumentConfirmDTO opt)
- {
- var fun = _trialDocumentService.UserConfirm;
- return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
- }
+ /////
+ ///// 用户 签名某个文档 签署文件
+ /////
+ /////
+ /////
+ //[HttpPost, Route("Inspection/trialDocument/userConfirm")]
+ //[UnitOfWork]
+ //public async Task UserConfirm(TrialDocumentConfirmDTO opt)
+ //{
+ // var fun = _trialDocumentService.UserConfirm;
+ // return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+ //}
#region setting
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 9f4508f58..dab7da8b9 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -158,13 +158,6 @@
-
-
- 用户 签名某个文档 签署文件
-
-
-
-
添加或更新受试者信息[New]
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 15b935e07..c130a8f4d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -537,6 +537,27 @@
FrontAuditConfigService
+
+
+ 获取列表
+
+
+
+
+
+
+ 新增或者修改
+
+
+
+
+
+
+ 删除
+
+
+
+
指定资源Id,渲染Dicom检查的Jpeg预览图像
Dicom检查的Id
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index a7f2ebd80..f786582c7 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? ParentId { get; set; }
public bool IsEnable { get; set; }
public bool IsConfig { get; set; }
- public int? ModuleTypeId { get; set; }
+ public string ModuleTypeId { get; set; }
public string OptTypeId { get; set; }
public string ChildrenTypeId { get; set; }
}
@@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? ParentId { get; set; }
public bool IsEnable { get; set; }
public bool IsConfig { get; set; }
- public int? ModuleTypeId { get; set; }
+ public string ModuleTypeId { get; set; }
public string OptTypeId { get; set; }
public string ChildrenTypeId { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
index 4d04a096e..86f74fc99 100644
--- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
@@ -8,14 +8,14 @@ using IRaCIS.Core.Domain.Models;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel;
+using Castle.Core.Internal;
-
-namespace IRaCIS.Core.Application.Service
+namespace IRaCIS.Core.Application.Service
{
///
/// FrontAuditConfigService
///
- [ApiExplorerSettings(GroupName = "Test")]
+ [ApiExplorerSettings(GroupName = "Reviewer")]
public class FrontAuditConfigService : BaseService, IFrontAuditConfigService
{
@@ -26,18 +26,34 @@ namespace IRaCIS.Core.Application.Service
_frontAuditConfigRepository = frontAuditConfigRepository;
}
-
- public async Task> GetFrontAuditConfigList(FrontAuditConfigQuery queryFrontAuditConfig)
+ ///
+ /// 获取列表
+ ///
+ ///
+ ///
+ public async Task> GetFrontAuditConfigList(FrontAuditConfigQuery iq)
{
+ var query = _repository.GetQueryable()
+ .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Value == iq.Value)
+ .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ValueCN == iq.ValueCN)
+ .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Description == iq.Description)
+ .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.OptTypeId == iq.OptTypeId)
+ .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Code == iq.Code)
+ .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId);
- var frontAuditConfigQueryable = _repository.GetQueryable()
+ var frontAuditConfigQueryable = query
.ProjectTo(_mapper.ConfigurationProvider);
return await frontAuditConfigQueryable.ToListAsync();
}
+ ///
+ /// 新增或者修改
+ ///
+ ///
+ ///
public async Task AddOrUpdateFrontAuditConfig(FrontAuditConfigAddOrEdit addOrEditFrontAuditConfig)
{
// 在此处拷贝automapper 映射
@@ -53,7 +69,11 @@ namespace IRaCIS.Core.Application.Service
}
-
+ ///
+ /// 删除
+ ///
+ ///
+ ///
[HttpDelete("{frontAuditConfigId:guid}")]
public async Task DeleteFrontAuditConfig(Guid frontAuditConfigId)
{
diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index 7a246a119..06e66e8db 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
///
/// 子类
///
- public int ChildrenType { get; set; }
+ public string ChildrenType { get; set; }
public bool IsSign { get; set; }
public string JsonDetail { get; set; } = string.Empty;
@@ -183,7 +183,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
///
/// 子类
///
- public int? ChildrenType { get; set; }
+ public string ChildrenType { get; set; }
///
/// 修改原因
diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
index 5c55e2ce5..8e90ba493 100644
--- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
+++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
@@ -86,7 +86,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// ModuleTypeId
///
- public int? ModuleTypeId { get; set; }
+ public string ModuleTypeId { get; set; }
///
/// OptTypeId
diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs
index 9f0666e6f..83ba2e18c 100644
--- a/IRaCIS.Core.Domain/Trial/DataInspection.cs
+++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs
@@ -91,7 +91,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// 子类
///
- public int? ChildrenType { get; set; }
+ public string ChildrenType { get; set; }
///
/// Json 对象