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

修改

Uat_Study
he 2022-06-07 16:10:42 +08:00
parent 33e5704b76
commit c9a8b8083a
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ namespace IRaCIS.Core.API.Controllers
/// 获取稽查数据 /// 获取稽查数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Inspection/GetInspectionData")] [HttpPost, Route("Inspection/GetInspectionList")]
public async Task<PageOutput<GetDataInspectionOutDto>> GetInspectionList(GetDataInspectionDto dto) public async Task<PageOutput<GetDataInspectionOutDto>> GetInspectionList(GetDataInspectionDto dto)
{ {
return await _inspectionService.GetInspectionList(dto); return await _inspectionService.GetInspectionList(dto);

2
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -41,6 +41,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
from leftrial in trialtemp.DefaultIfEmpty() from leftrial in trialtemp.DefaultIfEmpty()
join site in _repository.GetQueryable<Site>().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp join site in _repository.GetQueryable<Site>().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp
from leftsite in sitetemp.DefaultIfEmpty() from leftsite in sitetemp.DefaultIfEmpty()
join subject in _repository.GetQueryable<Subject>().IgnoreQueryFilters() on data.SubjectId equals subject.Id into subtemp join subject in _repository.GetQueryable<Subject>().IgnoreQueryFilters() on data.SubjectId equals subject.Id into subtemp
from leftsubject in subtemp.DefaultIfEmpty() from leftsubject in subtemp.DefaultIfEmpty()
join subjectVisit in _repository.GetQueryable<SubjectVisit>().IgnoreQueryFilters() on data.SubjectVisitId equals subjectVisit.Id into subjectVisittemp join subjectVisit in _repository.GetQueryable<SubjectVisit>().IgnoreQueryFilters() on data.SubjectVisitId equals subjectVisit.Id into subjectVisittemp

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

@ -160,31 +160,6 @@ namespace IRaCIS.Application.Services
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> GenerateReadingTask(ReadingToGenerateInDto inDto) public async Task<IResponseOutput> GenerateReadingTask(ReadingToGenerateInDto inDto)
{ {
//var readset = (await _readingPeriodSetRepository.Where(x => x.Id == inDto.ReadingPeriodSetId).Include(x => x.ReadingPeriodSites).FirstOrDefaultAsync()).IfNullThrowConvertException();
//var visits = await _subjectVisitRepository.Where(x => inDto.SubjectVisitIds.Contains(x.Id)).ToListAsync();
//List<ReadModule> readModules = new List<ReadModule>();
//foreach (var item in visits)
//{
// readModules.Add(new ReadModule()
// {
// Id = NewId.NextGuid(),
// SubjectId = item.SubjectId,
// ModuleType = readset.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Read : ModuleTypeEnum.Oncology,
// IsUrgent = item.IsUrgent,
// ModuleName = readset.ReadingPeriodName,
// SubjectVisitId = item.Id,
// ReadingSetType = readset.ReadingSetType,
// Status = ReadingCommon.GetVisitSubmitStateEnum(item),
// });
//};
//await _readModuleRepository.AddRangeAsync(readModules);
//var res = await _subjectVisitRepository.SaveChangesAsync();
List<ReadingPeriodPlan> plans = new List<ReadingPeriodPlan>(); List<ReadingPeriodPlan> plans = new List<ReadingPeriodPlan>();
inDto.SubjectVisitIds.ForEach(x => inDto.SubjectVisitIds.ForEach(x =>
{ {
@ -223,8 +198,6 @@ namespace IRaCIS.Application.Services
SubjectCode = x.SubjectVisit.Subject.Code, SubjectCode = x.SubjectVisit.Subject.Code,
SubjectId = x.SubjectVisit.SubjectId, SubjectId = x.SubjectVisit.SubjectId,
SubjectVisitName = x.SubjectVisit.VisitName, SubjectVisitName = x.SubjectVisit.VisitName,
//Remark= readset.Remark
}); });
return await plans.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? "SubjectId" : inDto.SortField, return await plans.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? "SubjectId" : inDto.SortField,