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

修改一版

Uat_Study
he 2022-06-02 14:57:28 +08:00
parent 68ac0941c2
commit c2db091522
3 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,7 +472,7 @@
截止日期
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.ExpirationVisit">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.ExpirationVisitNum">
<summary>
截止访视
</summary>
@ -722,7 +722,7 @@
截止日期
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.ExpirationVisit">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.ExpirationVisitNum">
<summary>
截止访视
</summary>
@ -762,7 +762,7 @@
截止日期
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.ExpirationVisit">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.ExpirationVisitNum">
<summary>
截止访视
</summary>
@ -812,7 +812,7 @@
设置阅片是否生效
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetQuery.ExpirationVisit">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetQuery.ExpirationVisitNum">
<summary>
截止访视
</summary>
@ -3015,14 +3015,21 @@
</member>
<member name="T:IRaCIS.Application.Services.ReadModuleService">
<summary>
生成的阅片模块(在大列表上展示的)
生成的阅片模块(在大列表上展示的) 阅片期
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.GetReadModule(IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto)">
<summary>
获取读片模块
获取读片模块
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.GetVisitSubmitStateEnum(IRaCIS.Core.Domain.Models.SubjectVisit)">
<summary>
获取访视的状态
</summary>
<param name="visit"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.GetReadModuleSingle(IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleSingleIndto)">
<summary>
获取单条信息

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

@ -111,17 +111,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
public string Remark { get; set; } = String.Empty;
/// <summary>
/// 中心Id
/// </summary>
public List<Guid?> SiteIds { get; set; }
public List<Guid> SiteIds { get; set; }
/// <summary>
/// 中心name
/// </summary>
public List<string?> SiteCodes { get; set; }
public List<string> SiteCodes { get; set; }
}
public class SetReadingPeriodSetEffect

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

@ -65,7 +65,7 @@ namespace IRaCIS.Application.Services
IsUrgent = x.IsUrgent, // 是否加急
SubjectVisitId = y.Id, // 访视ID
SubjectVisitName=y.VisitName, // 访视名称
Status= y.SubmitState== SubmitStateEnum.None|| y.SubmitState== SubmitStateEnum.ToSubmit? ReadModuleEnum.ImageUpload: ReadModuleEnum.ImageUpload, // 状态
Status= GetVisitSubmitStateEnum(y), // 状态
CreateTime = y.CreateTime, // 创建时间
SubjectCode = y.Subject.Code, // 受试者code
SiteCode = x.Site.SiteCode, // 中心Code
@ -101,7 +101,7 @@ namespace IRaCIS.Application.Services
Name=y.ModuleName,
SubjectId=x.SubjectId,
ModuleType=y.ModuleType,
Status=y.Status,
Status= GetVisitSubmitStateEnum(y.SubjectVisit),
SubjectCode= x.SubjectCode,
SiteCode=x.SiteCode,
SubjectVisitId= y.SubjectVisitId,
@ -117,27 +117,37 @@ namespace IRaCIS.Application.Services
x.Data.OrderBy(y => y.ModuleType);
});
return (pageList, new
{
MaxLength = pageList.CurrentPageData.ToList().Max(x => x.Data.Count)
});
}
///// <summary>
///// 获取访视的状态
///// </summary>
///// <param name="visit"></param>
///// <returns></returns>
//[NonDynamicWebApi]
//public async Task<ReadModuleEnum> GetVisitSubmitStateEnum(SubjectVisit visit)
//{
// if (visit.SubmitState != SubmitStateEnum.Submitted)
// {
// return ReadModuleEnum.ImageUpload;
// }else if()
//}
/// <summary>
/// 获取访视的状态
/// </summary>
/// <param name="visit"></param>
/// <returns></returns>
[NonDynamicMethod]
public static ReadModuleEnum GetVisitSubmitStateEnum(SubjectVisit visit)
{
if (visit.SubmitState != SubmitStateEnum.Submitted) // 未提交
{
return ReadModuleEnum.ImageUpload;
}
else if (visit.AuditState != AuditStateEnum.QCPassed) // 审核未通过
{
return ReadModuleEnum.ImageUpload;
}
else if (visit.ForwardState != ForwardStateEnum.Forwarded) // 未通过一致性核查
{
return ReadModuleEnum.ConsistencyCheck;
}
else {
// 暂时
return ReadModuleEnum.ReadComplete;
}
}
///// <summary>
@ -172,6 +182,18 @@ namespace IRaCIS.Application.Services
Stakeholders = string.Empty
}).FirstOrDefault();
var visit = (await _subjectVisitRepository.Where(x => x.Id == GetReadModuleOutDto.SubjectVisitId).FirstOrDefaultAsync()).IfNullThrowConvertException();
//switch (GetVisitSubmitStateEnum(visit))
//{
// case ReadModuleEnum.ImageUpload:
// break;
//};
return GetReadModuleOutDto;
}