修改一版
parent
b5109896c2
commit
a25e9692e1
|
@ -575,11 +575,11 @@ namespace IRaCIS.Core.API.Controllers
|
||||||
var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetMedicalReviewImage(_hostEnvironment, fileName, trialId, taskMedicalReviewId);
|
var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetMedicalReviewImage(_hostEnvironment, fileName, trialId, taskMedicalReviewId);
|
||||||
|
|
||||||
|
|
||||||
await _repository.UpdatePartialFromQueryAsync<TaskMedicalReview>(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview()
|
//await _repository.UpdatePartialFromQueryAsync<TaskMedicalReview>(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview()
|
||||||
{
|
//{
|
||||||
ImagePath = relativePath,
|
// ImagePath = relativePath,
|
||||||
FileName = fileName,
|
// FileName = fileName,
|
||||||
});
|
//});
|
||||||
|
|
||||||
path = relativePath;
|
path = relativePath;
|
||||||
fileDto.Path = relativePath;
|
fileDto.Path = relativePath;
|
||||||
|
|
|
@ -252,16 +252,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public string CreateUserName { get; set; }
|
public string CreateUserName { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
public List<string> FileNameList { get; set; }
|
||||||
/// 图片路径
|
|
||||||
/// </summary>
|
|
||||||
public string ImagePath { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
public List<string> ImagePathList { get; set; }
|
||||||
/// 文件名称
|
|
||||||
/// </summary>
|
|
||||||
public string FileName { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -426,6 +420,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public Guid TaskMedicalReviewId { get; set; }
|
public Guid TaskMedicalReviewId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public List<string> FileNameList { get; set; }
|
||||||
|
|
||||||
|
public List<string> ImagePathList { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否有问题
|
/// 是否有问题
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -469,15 +468,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Questioning { get; set; } = string.Empty;
|
public string Questioning { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 图片路径
|
|
||||||
/// </summary>
|
|
||||||
public string ImagePath { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
public List<string> FileNameList { get; set; }
|
||||||
/// 文件名称
|
|
||||||
/// </summary>
|
|
||||||
public string FileName { get; set; } = string.Empty;
|
public List<string> ImagePathList { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 审核建议
|
/// 审核建议
|
||||||
|
|
|
@ -331,10 +331,12 @@ namespace IRaCIS.Core.Application.Service
|
||||||
IsHaveQuestion = inDto.IsHaveQuestion,
|
IsHaveQuestion = inDto.IsHaveQuestion,
|
||||||
Questioning = inDto.Questioning,
|
Questioning = inDto.Questioning,
|
||||||
IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion,
|
IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion,
|
||||||
|
ImagePath = string.Join(',',inDto.ImagePathList),
|
||||||
|
FileName = string.Join(',', inDto.FileNameList),
|
||||||
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
||||||
SaveConclusionTime=DateTime.Now,
|
SaveConclusionTime = DateTime.Now,
|
||||||
|
|
||||||
});
|
}); ;
|
||||||
|
|
||||||
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
|
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
|
||||||
if (inDto.IsSendDialog&& !medicalReview.IsSendMessage && inDto.IsHaveQuestion)
|
if (inDto.IsSendDialog&& !medicalReview.IsSendMessage && inDto.IsHaveQuestion)
|
||||||
|
|
|
@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Share;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace IRaCIS.Core.Domain.Models
|
namespace IRaCIS.Core.Domain.Models
|
||||||
{
|
{
|
||||||
|
@ -169,6 +170,12 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// 无效的 为True无效
|
/// 无效的 为True无效
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsInvalid { get; set; }
|
public bool IsInvalid { get; set; }
|
||||||
|
|
||||||
|
[NotMapped]
|
||||||
|
public List<string> FileNameList => this.FileName.Split(',').ToList();
|
||||||
|
|
||||||
|
[NotMapped]
|
||||||
|
public List<string> ImagePathList => this.ImagePath.Split(',').ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,8 @@ using System;
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace IRaCIS.Core.Domain.Models
|
namespace IRaCIS.Core.Domain.Models
|
||||||
{
|
{
|
||||||
///<summary>
|
///<summary>
|
||||||
|
@ -99,6 +101,13 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
public TaskMedicalReview TaskMedicalReview { get; set; }
|
public TaskMedicalReview TaskMedicalReview { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
[NotMapped]
|
||||||
|
public List<string> FileNameList => this.FileName.Split(',').ToList();
|
||||||
|
|
||||||
|
[NotMapped]
|
||||||
|
public List<string> ImagePathList => this.ImagePath.Split(',').ToList();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue