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

修改一版

Uat_Study
he 2022-04-12 15:57:54 +08:00
parent d88621f2a9
commit 0c0d0a504b
8 changed files with 76 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ namespace IRaCIS.Core.API.Controllers
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
[HttpPost, Route("Inspection/Inspection/AddOrUpdateNoneDicomStudy")]
[HttpPost, Route("Inspection/noneDicomStudy/AddOrUpdateNoneDicomStudy")]
[UnitOfWork]
public async Task<IResponseOutput> AddOrUpdateNoneDicomStudy(DataInspectionDto<NoneDicomStudyAddOrEdit> opt)
{

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

@ -703,7 +703,12 @@
<param name="noneDicomStudyId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.UploadNoneDicomFile(Microsoft.AspNetCore.Http.IFormCollection,System.Guid,System.Guid,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.NewUploadNoneDicomFile(IRaCIS.Core.Application.Contracts.UploadNoneDicomFileDto)">
<summary>
上传非Dicom 文件 支持压缩包
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.UploadNoneDicomFile(Microsoft.AspNetCore.Http.IFormCollection,System.Guid,System.Guid)">
<summary>
上传非Dicom 文件 支持压缩包
</summary>

12
IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs
View File

@ -3,6 +3,9 @@
// 生成时间 2021-12-06 10:56:50
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.Service.Inspection.DTO;
using Microsoft.AspNetCore.Http;
namespace IRaCIS.Core.Application.Contracts
{
/// <summary> NoneDicomStudyFileView 列表视图模型 </summary>
@ -19,6 +22,15 @@ namespace IRaCIS.Core.Application.Contracts
}
public class UploadNoneDicomFileDto
{
public Guid subjectVisitId { get; set; }
public Guid noneDicomStudyId { get; set; }
public string AuditInfo { get; set; } = string.Empty;
}
public class NoneDicomStudyAndFile
{
public string NoneDicomStudyCode { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs
View File

@ -18,6 +18,6 @@ namespace IRaCIS.Core.Application.Contracts
Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId);
Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId);
Task<List<NoneDicomStudyFileView>> GetVisitNoneDicomStudyFileList(Guid subjectVisitId);
Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, [FromServices] IWebHostEnvironment _hostEnvironment);
Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId);
}
}

35
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -10,6 +10,9 @@ using IRaCIS.Core.Domain.Share;
using SharpCompress.Archives;
using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Infra.EFCore;
using Newtonsoft.Json;
using IRaCIS.Core.Application.Service.Inspection.Interface;
using IRaCIS.Core.Application.Service.Inspection.DTO;
namespace IRaCIS.Core.Application.Contracts
{
@ -20,11 +23,22 @@ namespace IRaCIS.Core.Application.Contracts
public class NoneDicomStudyService : BaseService, INoneDicomStudyService
{
private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
private readonly IHttpContextAccessor _httpContext;
private readonly IWebHostEnvironment _hostEnvironment;
private readonly IInspectionService _inspectionService;
private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
public NoneDicomStudyService(IRepository<NoneDicomStudy> noneDicomStudyRepository,IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository)
public NoneDicomStudyService(IRepository<NoneDicomStudy> noneDicomStudyRepository,
IHttpContextAccessor httpContext,
IWebHostEnvironment hostEnvironment,
IInspectionService inspectionService,
IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository)
{
_noneDicomStudyRepository = noneDicomStudyRepository;
this._httpContext = httpContext;
this._hostEnvironment = hostEnvironment;
this._inspectionService = inspectionService;
_noneDicomStudyFileRepository = noneDicomStudyFileRepository;
}
@ -158,6 +172,23 @@ namespace IRaCIS.Core.Application.Contracts
return await _repository.Where<NoneDicomStudyFile>(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId).ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
}
/// <summary>
/// 上传非Dicom 文件 支持压缩包
/// </summary>
[HttpPost]
public async Task<IResponseOutput> NewUploadNoneDicomFile([FromForm]UploadNoneDicomFileDto fileDto)
{
var file = this._httpContext.HttpContext?.Request.Form;
var result= await UploadNoneDicomFile(file, fileDto.subjectVisitId, fileDto.noneDicomStudyId);
if (result.IsSuccess)
{
await _inspectionService.AddInspectionRecordAsync(
JsonConvert.DeserializeObject<DataInspectionAddDTO>(fileDto.AuditInfo));
}
return result;
}
/// <summary>
/// 上传非Dicom 文件 支持压缩包
@ -170,7 +201,7 @@ namespace IRaCIS.Core.Application.Contracts
//[DisableRequestSizeLimit]
[RequestSizeLimit(1_073_741_824)]
[HttpPost("{noneDicomStudyId:guid}/{subjectVisitId:guid}")]
public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, [FromServices] IWebHostEnvironment _hostEnvironment)
public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId)
{
var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).IfNullThrowException().FullName;

1
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -149,6 +149,7 @@ namespace IRaCIS.Application.Services
SubjectId = mapedSubject.Id,
SubjectCode = subjectCommand.Code,
SubjectVisitId = item.Id,
BlindName = item.BlindName,
SubjectVisitName = item.VisitName,
IsSign = false,

3
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -143,8 +143,7 @@ namespace IRaCIS.Core.Application.Services
{
TrialId = svCommand.TrialId,
SiteId = svCommand.SiteId,
SubjectId = svCommand.Id,
SubjectId = svCommand.SubjectId,
SubjectVisitId = svCommand.Id,
SubjectVisitName = svCommand.VisitName,
IsSign = false,

22
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
View File

@ -339,11 +339,25 @@ namespace IRaCIS.Application.Services
//找到访视计划修改的Item
var changedList = await _visitStageRepository.Where(t => t.TrialId == trialId && t.IsConfirmed == false)
.Select(t => new { t.Trial.IsHaveFirstGiveMedicineDate, t.Id, t.VisitName, t.VisitWindowLeft, t.VisitWindowRight, t.VisitDay, t.VisitNum, t.IsBaseLine }).ToListAsync();
.Select(t => new { t.Trial.IsHaveFirstGiveMedicineDate, t.Id, t.VisitName, t.TrialId, t.VisitWindowLeft, t.VisitWindowRight, t.VisitDay, t.VisitNum, t.IsBaseLine }).ToListAsync();
var createtime = DateTime.Now.AddSeconds(1);
changedList.ForEach(x =>
{
datas.Add(new DataInspection()
{
IsSign = false,
SubjectVisitId = x.Id,
CreateTime = createtime,
SubjectVisitName = x.VisitName,
VisitStageId=x.Id,
TrialId = x.TrialId,
JsonDetail = JsonConvert.SerializeObject(new
{
IsConfirmed = true,
VisitPlanStatus = true,
}),
Identification = "Edit|Visit Plan Template|Data|Tria"
});
});
@ -466,7 +480,7 @@ namespace IRaCIS.Application.Services
var createtime = DateTime.Now.AddSeconds(1);
var list = await _subjectVisitRepository.Where(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id).ToListAsync();
list.ForEach(x =>