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

修改

Uat_Study
he 2022-06-01 11:43:04 +08:00
parent a79c8a8242
commit 9f32f865e7
7 changed files with 119 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,24 +467,34 @@
排序字段
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.PageIndex">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.SubjectId">
<summary>
页码
受试者ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.PageSize">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.ModuleType">
<summary>
每页大小
模块类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.SortField">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.ModuleName">
<summary>
排序字段
模块名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto.SortAsc">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.IsUrgent">
<summary>
排序字段
是否加急
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.SubjectVisitId">
<summary>
访视ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit.Status">
<summary>
状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleResultDto.PageIndex">
@ -2735,7 +2745,7 @@
<summary>
删除
</summary>
<param name="PreviousPDFId"></param>
<param name="previousPDFId"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ReadingPeriodSetService">
@ -2781,6 +2791,20 @@
获取读片模块
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.AddOrUpdateReadModuleService(IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit)">
<summary>
新增或者修改
</summary>
<param name="addOrEditReadModule"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.DeleteReadModule(System.Guid)">
<summary>
删除
</summary>
<param name="readModuleId"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.StatisticsService">
<summary>
Dashboard统计、全局工作量统计、入组两个维度统计（按照项目、按照人）

61
IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
View File

@ -7,31 +7,50 @@ using System.Threading.Tasks;
namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public class GetReadModuleDto
public class GetReadModuleDto:PageInput
{
public Guid? TrialId { get; set; }
/// <summary>
/// 页码
/// </summary>
public int PageIndex { get; set; } = 1;
/// <summary>
/// 每页大小
/// </summary>
public int PageSize { get; set; } = 10;
/// <summary>
/// 排序字段
/// </summary>
public string? SortField { get; set; }
/// <summary>
/// 排序字段
/// </summary>
public bool SortAsc { get; set; } = true;
}
public class ReadModuleAddOrEdit
{
public Guid? Id { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid? SubjectId { get; set; }
/// <summary>
/// 模块类型
/// </summary>
public ModuleTypeEnum ModuleType { get; set; }
/// <summary>
/// 模块名称
/// </summary>
public string ModuleName { get; set; }
/// <summary>
/// 是否加急
/// </summary>
public bool? IsUrgent { get; set; }
/// <summary>
/// 访视ID
/// </summary>
public Guid? SubjectVisitId { get; set; }
/// <summary>
/// 状态
/// </summary>
public ReadModuleEnum? Status { get; set; }
}
public class GetReadModuleOutDto : ReadModule
{

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs
View File

@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ReadingPeriodName { get; set; }
public string Remark { get; set; }
/// <summary>
/// 阅片范围
/// </summary>
@ -29,7 +31,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 截止日期
/// </summary>
public DateTime ExpirationDate { get; set; }
public DateTime? ExpirationDate { get; set; }
/// <summary>
/// 截止访视

7
IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs
View File

@ -65,7 +65,6 @@ namespace IRaCIS.Application.Services
x.FileName,
x.UploadType,
x.Id,
}).ToListAsync();
return list;
}
@ -77,13 +76,13 @@ namespace IRaCIS.Application.Services
/// <summary>
/// 删除
/// </summary>
/// <param name="PreviousPDFId"></param>
/// <param name="previousPDFId"></param>
/// <returns></returns>
[HttpDelete("{previousPDFId:guid}")]
public async Task<IResponseOutput> DeletePreviousPDF(Guid previousPDFId)
{
var success = await _repository.BatchDeleteAsync<PreviousPDF>(t => t.Id == previousPDFId);
return ResponseOutput.Result(success);
var success = await _previousPDFRepository.DeleteFromQueryAsync(t => t.Id == previousPDFId,true);
return ResponseOutput.Result(true);
}
}
}

34
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
View File

@ -20,13 +20,16 @@ namespace IRaCIS.Application.Services
public IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<Subject> _subjectRepository;
private readonly IRepository<ReadModule> _readModuleRepository;
public ReadModuleService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<Subject> subjectRepository
IRepository<Subject> subjectRepository,
IRepository<ReadModule> readModuleRepository
)
{
_subjectVisitRepository = subjectVisitRepository;
this._subjectRepository = subjectRepository;
this._readModuleRepository = readModuleRepository;
}
@ -60,7 +63,7 @@ namespace IRaCIS.Application.Services
}).ToList()
});
var pageList = await subjectquery.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField == null ? "SiteCode" : dto.SortField,
dto.SortAsc);
dto.Asc);
return (pageList, new
{
@ -69,9 +72,32 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 新增或者修改
/// </summary>
/// <param name="addOrEditReadModule"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateReadModuleService(ReadModuleAddOrEdit addOrEditReadModule)
{
var entity = await _repository.InsertOrUpdateAsync<ReadModule, ReadModuleAddOrEdit>(addOrEditReadModule, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
/// <summary>
/// 删除
/// </summary>
/// <param name="readModuleId"></param>
/// <returns></returns>
[HttpDelete("{readModuleId:guid}")]
public async Task<IResponseOutput> DeleteReadModule(Guid readModuleId)
{
var success = await _readModuleRepository.DeleteFromQueryAsync(t => t.Id == readModuleId, true);
return ResponseOutput.Result(true);
}
}
}

5
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -24,10 +24,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap<PreviousPDF, PreviousPDFView>();
CreateMap<ReadModuleAddOrEdit, ReadModule>();
}
}

7
IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs
View File

@ -34,7 +34,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 截止日期
/// </summary>
public DateTime ExpirationDate { get; set; }
public DateTime? ExpirationDate { get; set; }
/// <summary>
/// 截止访视
@ -61,6 +61,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
}