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

修改一版

Uat_Study
he 2022-06-01 14:30:34 +08:00
parent 2ca7a63053
commit e3941c2092
8 changed files with 188 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,6 +637,71 @@
是否生效
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.Id">
<summary>
id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.TrialId">
<summary>
项目ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.ReadingPeriodName">
<summary>
阅片期名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.ReadingScope">
<summary>
阅片范围
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.ExpirationDate">
<summary>
截止日期
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.ExpirationVisit">
<summary>
截止访视
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.VisitStageId">
<summary>
访视计划ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.IsTakeEffect">
<summary>
是否生效
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.CreateUserId">
<summary>
创建人
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.Remark">
<summary>
备注
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.SiteIds">
<summary>
中心Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.SiteCodes">
<summary>
中心name
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect.Id">
<summary>
项目ID
@ -2807,6 +2872,13 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.GetReadingPeriodSet(System.Guid)">
<summary>
获取单挑
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.SetReadingPeriodSetEffect(IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect)">
<summary>
设置阅片期配置是否生效

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

@ -99,6 +99,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string SiteCode { get; set; }
public bool IsFinalVisit { get; set; } = false;
public string VisitName { get; set; }
public Guid? SiteId { get; set; }

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

@ -54,9 +54,74 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
}
public class ReadingPeriodSetView : ReadingPeriodSet
public class ReadingPeriodSetView
{
/// <summary>
/// id
/// </summary>
public Guid Id { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public Guid? TrialId { get; set; }
/// <summary>
/// 阅片期名称
/// </summary>
public string ReadingPeriodName { get; set; }
/// <summary>
/// 阅片范围
/// </summary>
public ReadingScopeEnum? ReadingScope { get; set; }
/// <summary>
/// 截止日期
/// </summary>
public DateTime? ExpirationDate { get; set; }
/// <summary>
/// 截止访视
/// </summary>
public decimal? ExpirationVisit { get; set; }
/// <summary>
/// 访视计划ID
/// </summary>
public Guid? VisitStageId { get; set; }
/// <summary>
/// 是否生效
/// </summary>
public int? IsTakeEffect { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 中心Id
/// </summary>
public List<Guid?> SiteIds { get; set; }
/// <summary>
/// 中心name
/// </summary>
public List<string?> SiteCodes { get; set; }
}
public class SetReadingPeriodSetEffect

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

@ -51,16 +51,17 @@ namespace IRaCIS.Application.Services
{
CreateTime = y.CreateTime,
Id = y.Id,
IsFinalVisit=y.IsFinalVisit, // 是否末次访视
SubjectId = x.Id,
SubjectVisitId = y.Id,
IsUrgent = x.IsUrgent,
ModuleName = y.InPlan ? "计划内访视" : "计划外访视",
ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit,
ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit, //
SubjectCode = y.Subject.Code,
SiteCode = x.Site.SiteCode,
SiteId = x.Site.Id,
VisitName = y.VisitName,
}).ToList()
});

28
IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
View File

@ -20,13 +20,16 @@ namespace IRaCIS.Application.Services
public IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
private readonly IRepository<Site> _siteSetRepository;
public ReadingPeriodSetService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ReadingPeriodSet> ReadingPeriodSetRepository
IRepository<ReadingPeriodSet> ReadingPeriodSetRepository,
IRepository<Site> SiteSetRepository
)
{
_subjectVisitRepository = subjectVisitRepository;
_readingPeriodSetRepository = ReadingPeriodSetRepository;
_siteSetRepository = SiteSetRepository;
}
@ -73,7 +76,6 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<PageOutput<ReadingPeriodSetView>> GetReadingPeriodSetList(ReadingPeriodSetQuery query)
{
var readquery =_readingPeriodSetRepository.AsQueryable().Include(x=>x.ReadingPeriodSites)
.WhereIf(query.TrialId!=null,x=>x.TrialId==query.TrialId)
.WhereIf(query.ReadingPeriodName != null, x => x.ReadingPeriodName.Contains(query.ReadingPeriodName))
@ -84,6 +86,20 @@ namespace IRaCIS.Application.Services
return pageList;
}
/// <summary>
/// 获取单挑
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPost("ReadingPeriodSet/GetReadingPeriodSet/{id:guid}")]
public async Task<ReadingPeriodSetView> GetReadingPeriodSet(Guid id)
{
var data = await _readingPeriodSetRepository.AsQueryable().Include(x => x.ReadingPeriodSites).Where(x => x.Id == id).ProjectTo<ReadingPeriodSetView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
return data;
}
/// <summary>
/// 设置阅片期配置是否生效
@ -91,15 +107,13 @@ namespace IRaCIS.Application.Services
/// <param name="indto"></param>
/// <returns></returns>
[HttpPut]
public async Task SetReadingPeriodSetEffect(SetReadingPeriodSetEffect indto)
public async Task<IResponseOutput> SetReadingPeriodSetEffect(SetReadingPeriodSetEffect indto)
{
var readquery =await _readingPeriodSetRepository.UpdatePartialNowNoQueryAsync(indto.Id, x => new ReadingPeriodSet() {
IsTakeEffect = indto.IsTakeEffect
});
await _readingPeriodSetRepository.SaveChangesAsync();
bool result= await _readingPeriodSetRepository.SaveChangesAsync();
return ResponseOutput.Result(result);
}

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

@ -12,9 +12,14 @@ namespace IRaCIS.Core.Application.Service
public ReadingConfig()
{
CreateMap<ReadingPeriodSetAddOrEdit, ReadingPeriodSet>();
CreateMap<ReadingPeriodSet, ReadingPeriodSetView>();
CreateMap<ReadingPeriodSet, ReadingPeriodSetView>()
.ForMember(d => d.SiteIds, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.SiteId)))
.ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.Site.SiteCode)));
//.ForMember(d => d.SiteNames, u => u.MapFrom(s => s.ReadingPeriodSites.SelectMany(x => x.Site.SiteName).ToList()));
CreateMap<ClinicalData, ClinicalDataAddOrEdit>().ReverseMap();

10
IRaCIS.Core.Domain/Reading/ReadModule.cs
View File

@ -55,6 +55,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// 阅片计划ID
/// </summary>
public Guid? ReadingPeriodSetId { get; set; }
/// <summary>
/// 上一次访视(截止访视)
/// </summary>
public Guid? LastVisitIdSetId { get; set; }
}

5
IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs
View File

@ -38,6 +38,11 @@ namespace IRaCIS.Core.Domain.Models
public ReadingPeriodSet ReadingPeriodSet { get; set; }
/// <summary>
/// 中心
/// </summary>
public Site Site { get; set; }
}