XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2022-11-28 16:31:31 +08:00
parent b5109896c2
commit a25e9692e1
5 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,11 +575,11 @@ namespace IRaCIS.Core.API.Controllers
var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetMedicalReviewImage(_hostEnvironment, fileName, trialId, taskMedicalReviewId);
await _repository.UpdatePartialFromQueryAsync<TaskMedicalReview>(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview()
{
ImagePath = relativePath,
FileName = fileName,
});
//await _repository.UpdatePartialFromQueryAsync<TaskMedicalReview>(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview()
//{
// ImagePath = relativePath,
// FileName = fileName,
//});
path = relativePath;
fileDto.Path = relativePath;

37
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -251,19 +251,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string CreateUserName { get; set; }
/// <summary>
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
public List<string> FileNameList { get; set; }
public List<string> ImagePathList { get; set; }
}
public class GetMedicalReviewDialogInDto
@ -425,7 +419,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TaskMedicalReviewId { get; set; }
public List<string> FileNameList { get; set; }
public List<string> ImagePathList { get; set; }
/// <summary>
/// 是否有问题
/// </summary>
@ -469,15 +468,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string Questioning { get; set; } = string.Empty;
/// <summary>
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
public List<string> FileNameList { get; set; }
public List<string> ImagePathList { get; set; }
/// <summary>
/// 审核建议

6
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -331,10 +331,12 @@ namespace IRaCIS.Core.Application.Service
IsHaveQuestion = inDto.IsHaveQuestion,
Questioning = inDto.Questioning,
IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion,
ImagePath = string.Join(',',inDto.ImagePathList),
FileName = string.Join(',', inDto.FileNameList),
AuditAdviceEnum = inDto.AuditAdviceEnum,
SaveConclusionTime=DateTime.Now,
SaveConclusionTime = DateTime.Now,
});
}); ;
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (inDto.IsSendDialog&& !medicalReview.IsSendMessage && inDto.IsHaveQuestion)

7
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
View File

@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
{
@ -169,6 +170,12 @@ namespace IRaCIS.Core.Domain.Models
/// 无效的 为True无效
/// </summary>
public bool IsInvalid { get; set; }
[NotMapped]
public List<string> FileNameList => this.FileName.Split(',').ToList();
[NotMapped]
public List<string> ImagePathList => this.ImagePath.Split(',').ToList();
}
}

9
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs
View File

@ -7,6 +7,8 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -99,6 +101,13 @@ namespace IRaCIS.Core.Domain.Models
public TaskMedicalReview TaskMedicalReview { get; set; }
[NotMapped]
public List<string> FileNameList => this.FileName.Split(',').ToList();
[NotMapped]
public List<string> ImagePathList => this.ImagePath.Split(',').ToList();
}