XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2022-03-29 09:37:41 +08:00
parent 7c5b848e9a a96de2f416
commit 90db06d241
8 changed files with 66 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -66,18 +66,18 @@ namespace IRaCIS.Core.API.Controllers
return await _inspectionService.GetInspectionData(dto);
}
/// <summary>
/// 用户 签名某个文档 签署文件
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
[HttpPost, Route("Inspection/trialDocument/userConfirm")]
[UnitOfWork]
public async Task<IResponseOutput> UserConfirm(TrialDocumentConfirmDTO opt)
{
var fun = _trialDocumentService.UserConfirm;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
}
///// <summary>
///// 用户 签名某个文档 签署文件
///// </summary>
///// <param name="opt"></param>
///// <returns></returns>
//[HttpPost, Route("Inspection/trialDocument/userConfirm")]
//[UnitOfWork]
//public async Task<IResponseOutput> UserConfirm(TrialDocumentConfirmDTO opt)
//{
// var fun = _trialDocumentService.UserConfirm;
// return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
//}
#region setting

7
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -158,13 +158,6 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.UserConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.TrialDocumentConfirmDTO)">
<summary>
用户 签名某个文档 签署文件
</summary>
<param name="opt"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.AddOrUpdateSubject(IRaCIS.Core.Application.Service.Inspection.DTO.InsSubjectCommand)">
<summary>
添加或更新受试者信息[New]

21
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -537,6 +537,27 @@
FrontAuditConfigService
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.GetFrontAuditConfigList(IRaCIS.Core.Application.ViewModel.FrontAuditConfigQuery)">
<summary>
获取列表
</summary>
<param name="iq"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.AddOrUpdateFrontAuditConfig(IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit)">
<summary>
新增或者修改
</summary>
<param name="addOrEditFrontAuditConfig"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.DeleteFrontAuditConfig(System.Guid)">
<summary>
删除
</summary>
<param name="frontAuditConfigId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.Preview(System.Guid)">
<summary> 指定资源Id，渲染Dicom检查的Jpeg预览图像 </summary>
<param name="studyId"> Dicom检查的Id </param>

4
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -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; }
}

34
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
View File

@ -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
{
/// <summary>
/// FrontAuditConfigService
/// </summary>
[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<List<FrontAuditConfigView>> GetFrontAuditConfigList(FrontAuditConfigQuery queryFrontAuditConfig)
/// <summary>
/// 获取列表
/// </summary>
/// <param name="iq"></param>
/// <returns></returns>
public async Task<List<FrontAuditConfigView>> GetFrontAuditConfigList(FrontAuditConfigQuery iq)
{
var query = _repository.GetQueryable<FrontAuditConfig>()
.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<FrontAuditConfig>()
var frontAuditConfigQueryable = query
.ProjectTo<FrontAuditConfigView>(_mapper.ConfigurationProvider);
return await frontAuditConfigQueryable.ToListAsync();
}
/// <summary>
/// 新增或者修改
/// </summary>
/// <param name="addOrEditFrontAuditConfig"></param>
/// <returns></returns>
public async Task<IResponseOutput> AddOrUpdateFrontAuditConfig(FrontAuditConfigAddOrEdit addOrEditFrontAuditConfig)
{
// 在此处拷贝automapper 映射
@ -53,7 +69,11 @@ namespace IRaCIS.Core.Application.Service
}
/// <summary>
/// 删除
/// </summary>
/// <param name="frontAuditConfigId"></param>
/// <returns></returns>
[HttpDelete("{frontAuditConfigId:guid}")]
public async Task<IResponseOutput> DeleteFrontAuditConfig(Guid frontAuditConfigId)
{

4
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// <summary>
/// 子类
/// </summary>
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
/// <summary>
/// 子类
/// </summary>
public int? ChildrenType { get; set; }
public string ChildrenType { get; set; }
/// <summary>
/// 修改原因

2
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -86,7 +86,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// ModuleTypeId
/// </summary>
public int? ModuleTypeId { get; set; }
public string ModuleTypeId { get; set; }
/// <summary>
/// OptTypeId

2
IRaCIS.Core.Domain/Trial/DataInspection.cs
View File

@ -91,7 +91,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 子类
/// </summary>
public int? ChildrenType { get; set; }
public string ChildrenType { get; set; }
/// <summary>
/// Json 对象