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

修改警告

Uat_Study
hang 2022-08-10 14:38:11 +08:00
parent 6e4fb5e407
commit 682a3fd5db
8 changed files with 102 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -467,6 +467,7 @@ namespace IRaCIS.Core.API.Controllers
Path = relativePath
});
await Task.CompletedTask;
return serverFilePath;
});
@ -503,6 +504,7 @@ namespace IRaCIS.Core.API.Controllers
Path = relativePath
});
await Task.CompletedTask;
return serverFilePath;
});
@ -527,6 +529,7 @@ namespace IRaCIS.Core.API.Controllers
var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetFilePath(_hostEnvironment, fileName, trialId, visitTaskId, StaticData.Folder.JudgeTask);
fileDto.Path = relativePath;
fileDto.FileName = fileName;
await Task.CompletedTask;
return serverFilePath;
});
@ -551,10 +554,12 @@ namespace IRaCIS.Core.API.Controllers
var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetFilePath(_hostEnvironment, fileName, trialId, visitTaskId, StaticData.Folder.JudgeTask);
fileDto.Path = relativePath;
fileDto.FileName = fileName;
await Task.CompletedTask;
return serverFilePath;
});
await _repository.SaveChangesAsync();
return ResponseOutput.Ok(fileDto);
}

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

@ -91,6 +91,7 @@
确认生成自身一致性分析任务
</summary>
<param name="inCommand"></param>
<param name="_visitTaskCommonService"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentRuleSubjectList(IRaCIS.Core.Application.ViewModel.GroupConsistentQuery)">
@ -105,6 +106,7 @@
确认生成组间一致性分析任务
</summary>
<param name="inCommand"></param>
<param name="_visitTaskCommonService"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetIQueryableDoctorSelfConsistentSubjectView(IRaCIS.Core.Domain.Models.TaskConsistentRule,System.Guid,System.Collections.Generic.List{System.Guid})">
@ -654,17 +656,16 @@
<summary>
格式化日期和时间
</summary>
<param name="Data">稽查数据</param>
<param name="identificationList"></param>
<param name="jsonStr"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.GetInspectionEnumValue(System.Collections.Generic.List{System.String},System.String)">
<summary>
获取外键表数据
</summary>
<param name="Table">表名称</param>
<param name="ForeignKeyValue">外键value</param>
<param name="ForeignKeyText">要查询的外键值</param>
<param name="value">传入的纸</param>
<param name="identificationList"></param>
<param name="jsonStr"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetEnum(System.Guid,System.Collections.Generic.List{System.String},System.String)">
@ -672,7 +673,7 @@
获取枚举
</summary>
<param name="trialId">标识</param>
<param name="identifications">标识</param>
<param name="identificationList">标识</param>
<param name="jsonStr">Json对象</param>
<returns></returns>
</member>
@ -1682,6 +1683,11 @@
图片数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.ShowQuestion">
<summary>
是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.IRConfirmMedicalReviewInDto.DoctorUserIdeaEnum">
<summary>
阅片人是否认同
@ -2375,11 +2381,6 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ShowOrder">
<summary>
排序
@ -2425,6 +2426,16 @@
图片数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ShowQuestion">
<summary>
是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Id">
<summary>
Id
@ -2435,6 +2446,16 @@
分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.RelevanceId">
<summary>
关联ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.RelevanceValue">
<summary>
关联Value
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Remark">
<summary>
备注
@ -2460,11 +2481,6 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ShowOrder">
<summary>
排序
@ -2490,6 +2506,16 @@
图片数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ShowQuestion">
<summary>
是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialViewInDto.ReadingQuestionCriterionTrialId">
<summary>
系统标准Id
@ -2620,6 +2646,16 @@
系统标准Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.RelevanceId">
<summary>
关联ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.RelevanceValue">
<summary>
关联Value
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Type">
<summary>
类型
@ -2635,11 +2671,6 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ShowOrder">
<summary>
排序
@ -2665,6 +2696,16 @@
类型值
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ShowQuestion">
<summary>
是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ImageCount">
<summary>
图片数量
@ -2715,11 +2756,6 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ShowOrder">
<summary>
排序
@ -2755,6 +2791,16 @@
图片数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.IsRequired">
<summary>
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ShowQuestion">
<summary>
是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemView.Id">
<summary>
返回的对象
@ -4113,16 +4159,6 @@
阅片是否显示既往结果
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialBasicConfigView.QCProcessEnum">
<summary>
QC流程 0 不审，1 单审，2双审
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialBasicConfigView.IsImageConsistencyVerification">
<summary>
影像一致性核查
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialBasicConfigView.IsTrialProcessConfirmed">
<summary>
流程是否确认
@ -4283,6 +4319,11 @@
是否是必须
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ShowQuestion">
<summary>
是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.TypeValue">
<summary>
类型值

14
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -941,7 +941,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
.Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
.WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!))
.WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
.WhereIf(queryVisitTask.ReReadingApplyState != null, t => t.OriginalReReadingTask.ReReadingApplyState == queryVisitTask.ReReadingApplyState)
.WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
@ -950,11 +950,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
.WhereIf(queryVisitTask.DoctorUserId != null, t => t.OriginalReReadingTask.DoctorUserId == queryVisitTask.DoctorUserId)
.WhereIf(queryVisitTask.ReadingTaskState != null, t => t.OriginalReReadingTask.ReadingTaskState == queryVisitTask.ReadingTaskState)
.WhereIf(queryVisitTask.TaskAllocationState != null, t => t.OriginalReReadingTask.TaskAllocationState == queryVisitTask.TaskAllocationState)
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TrialSiteCode), t => (t.OriginalReReadingTask.BlindTrialSiteCode.Contains(queryVisitTask.TrialSiteCode) && t.OriginalReReadingTask.IsAnalysisCreate) || (t.OriginalReReadingTask.Subject.TrialSite.TrialSiteCode.Contains(queryVisitTask.TrialSiteCode) && t.OriginalReReadingTask.IsAnalysisCreate == false))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TrialSiteCode), t => (t.OriginalReReadingTask.BlindTrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.OriginalReReadingTask.IsAnalysisCreate) || (t.OriginalReReadingTask.Subject.TrialSite.TrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.OriginalReReadingTask.IsAnalysisCreate == false))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskName), t => t.OriginalReReadingTask.TaskName.Contains(queryVisitTask.TaskName) || t.NewReReadingTask.TaskBlindName.Contains(queryVisitTask.TaskName))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => t.OriginalReReadingTask.Subject.Code.Contains(queryVisitTask.SubjectCode) || t.OriginalReReadingTask.BlindSubjectCode.Contains(queryVisitTask.SubjectCode))
.WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime > queryVisitTask.BeginAllocateDate)
.WhereIf(queryVisitTask.EndAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime < queryVisitTask.EndAllocateDate.Value.AddDays(1))
.WhereIf(queryVisitTask.EndAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
.ProjectTo<ReReadingTaskView>(_mapper.ConfigurationProvider);
@ -974,7 +974,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
var visitTaskQueryable = _visitTaskReReadingRepository.Where(t => t.RequestReReadingType == RequestReReadingType.TrialGroupApply && t.OriginalReReadingTask.IsAnalysisCreate == false)
.Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
.WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!))
.WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
.WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
.WhereIf(queryVisitTask.SubjectId != null, t => t.OriginalReReadingTask.SubjectId == queryVisitTask.SubjectId)
@ -982,11 +982,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
.WhereIf(queryVisitTask.DoctorUserId != null, t => t.OriginalReReadingTask.DoctorUserId == queryVisitTask.DoctorUserId)
.WhereIf(queryVisitTask.ReadingTaskState != null, t => t.OriginalReReadingTask.ReadingTaskState == queryVisitTask.ReadingTaskState)
.WhereIf(queryVisitTask.TaskAllocationState != null, t => t.OriginalReReadingTask.TaskAllocationState == queryVisitTask.TaskAllocationState)
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TrialSiteCode), t => (t.OriginalReReadingTask.BlindTrialSiteCode.Contains(queryVisitTask.TrialSiteCode) && t.OriginalReReadingTask.IsAnalysisCreate) || (t.OriginalReReadingTask.Subject.TrialSite.TrialSiteCode.Contains(queryVisitTask.TrialSiteCode) && t.OriginalReReadingTask.IsAnalysisCreate == false))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TrialSiteCode), t => (t.OriginalReReadingTask.BlindTrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.OriginalReReadingTask.IsAnalysisCreate) || (t.OriginalReReadingTask.Subject.TrialSite.TrialSiteCode.Contains(queryVisitTask.TrialSiteCode!) && t.OriginalReReadingTask.IsAnalysisCreate == false))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskName), t => t.OriginalReReadingTask.TaskName.Contains(queryVisitTask.TaskName) || t.NewReReadingTask.TaskBlindName.Contains(queryVisitTask.TaskName))
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => t.OriginalReReadingTask.Subject.Code.Contains(queryVisitTask.SubjectCode) || t.OriginalReReadingTask.BlindSubjectCode.Contains(queryVisitTask.SubjectCode))
.WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime > queryVisitTask.BeginAllocateDate)
.WhereIf(queryVisitTask.EndAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime < queryVisitTask.EndAllocateDate.Value.AddDays(1))
.WhereIf(queryVisitTask.EndAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
.ProjectTo<ReReadingTaskView>(_mapper.ConfigurationProvider);
var defalutSortArray = new string[] { nameof(ReReadingTaskView.RequestReReadingTime) };
@ -1309,6 +1309,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// 重阅原任务跟踪处理 只会在同意的时候调用这个
/// </summary>
/// <param name="origenalTask"></param>
/// <param name="agreeReReadingCommand"></param>
private void ReReadingTaskTrackingDeal(VisitTask origenalTask, ConfirmReReadingCommand agreeReReadingCommand)
{
origenalTask.ReReadingApplyState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject;
@ -1351,6 +1352,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// 确认重阅与否 1同意 2 拒绝
/// </summary>
/// <param name="agreeReReadingCommand"></param>
/// <param name="_visitTaskCommonService"></param>
/// <returns></returns>
[HttpPost]
[UnitOfWork]

1
IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs
View File

@ -81,7 +81,6 @@ namespace IRaCIS.Core.Application.Contracts
///<summary> TrialQCQuestionAddOrEdit 列表查询参数模型</summary>
public class TrialQCQuestionAddOrEdit:TrialQCQuestionConfigureBatchAdd
{
public Guid? Id{ get; set; }
public Guid TrialId { get; set; }
}

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

@ -170,7 +170,7 @@ namespace IRaCIS.Application.Services
.WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode == dto.SubjectCode)
.WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType)
.WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
.WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name)).OrderBy(x => x.SiteCode);
.WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode);
var subjectIds = await subjectQuery.OrderBy(dto.SortField).Select(x => x.SubjectId).Distinct().Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@ -334,7 +334,7 @@ namespace IRaCIS.Application.Services
visitQuery = visitQuery
//.WhereIf(dto.ExpirationDate != null, x => x.LatestScanDate <= dto.ExpirationDate.Value)
.WhereIf(dto.ExpirationVisitNum != null, x => x.VisitNum == dto.ExpirationVisitNum.Value);
.WhereIf(dto.ExpirationVisitNum != null, x => x.VisitNum == dto.ExpirationVisitNum!);
var visit = visitQuery.OrderByDescending(x => x.VisitNum).FirstOrDefault();
if (visit != null)

2
IRaCIS.Core.Application/TestService.cs
View File

@ -100,7 +100,7 @@ namespace IRaCIS.Application.Services
//var d = _dicRepository.UpdateFromDTOAsync(new AddOrEditBasicDic() { Id = Guid.Parse("60d86683-c33b-4349-b672-08da1e91b622"), ParentId = null, ChildGroup = null, Code = null }, true, true).Result;
var a = 123;
//var a = 123;
var b = _localizer["test{0}", "测试"];
//return _localizer["test{0}", "测试"];

2
IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
View File

@ -71,7 +71,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 对应Name
/// </summary>
public string? ReadModuleName { get; set; }
public string ReadModuleName { get; set; }

12
IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs
View File

@ -122,32 +122,32 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
/// <summary>
/// 项目名称
/// </summary>
public string? TrialName { get; set; }
public string TrialName { get; set; }
/// <summary>
/// 中心Code
/// </summary>
public string? SiteCode { get; set; }
public string SiteCode { get; set; }
/// <summary>
/// 项目编码
/// </summary>
public string? ResearchProgramNo { get; set; }
public string ResearchProgramNo { get; set; }
/// <summary>
/// 中心名称
/// </summary>
public string? SiteName { get; set; }
public string SiteName { get; set; }
/// <summary>
/// 受试者名称
/// </summary>
public string? SubjectCode { get; set; }
public string SubjectCode { get; set; }
/// <summary>
/// 访视名称
/// </summary>
public string? SubjectVisitName { get; set; }
public string SubjectVisitName { get; set; }