Uat_Study
parent
63ba5e4823
commit
551210901b
|
@ -252,14 +252,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public string CreateUserName { get; set; }
|
||||
|
||||
|
||||
public List<string> FileNameList { get; set; }
|
||||
|
||||
|
||||
public List<string> ImagePathList { get; set; }
|
||||
public List<ImageInfo> FileList { get; set; }
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public class GetMedicalReviewDialogInDto
|
||||
{
|
||||
[NotDefault]
|
||||
|
@ -413,6 +412,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public string DialogCloseReason { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public class SaveMedicalReviewInfoInDto
|
||||
{
|
||||
public bool IsSendDialog { get; set; }
|
||||
|
@ -420,9 +421,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public Guid TaskMedicalReviewId { get; set; }
|
||||
|
||||
|
||||
public List<string> FileNameList { get; set; }
|
||||
|
||||
public List<string> ImagePathList { get; set; }
|
||||
public List<ImageInfo> FileList { get; set; } = new List<ImageInfo>();
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
@ -469,10 +468,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public string Questioning { get; set; } = string.Empty;
|
||||
|
||||
|
||||
public List<string> FileNameList { get; set; }
|
||||
|
||||
|
||||
public List<string> ImagePathList { get; set; }
|
||||
public List<ImageInfo> FileList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 审核建议
|
||||
|
|
|
@ -10,6 +10,7 @@ using IRaCIS.Core.Application.Service.Reading.Dto;
|
|||
using IRaCIS.Core.Domain.Share;
|
||||
using Panda.DynamicWebApi.Attributes;
|
||||
using IRaCIS.Core.Application.Contracts;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
|
@ -331,12 +332,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),
|
||||
ImagePath = JsonConvert.SerializeObject(inDto.FileList),
|
||||
|
||||
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
||||
SaveConclusionTime = DateTime.Now,
|
||||
|
||||
}); ;
|
||||
});
|
||||
|
||||
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
|
||||
if (inDto.IsSendDialog&& !medicalReview.IsSendMessage && inDto.IsHaveQuestion)
|
||||
|
@ -350,9 +351,9 @@ namespace IRaCIS.Core.Application.Service
|
|||
IsHaveQuestion=inDto.IsHaveQuestion,
|
||||
Questioning=inDto.Questioning,
|
||||
VisitTaskId= medicalReview.VisitTaskId,
|
||||
FileName = medicalReview.FileName,
|
||||
|
||||
UserTypeEnumInt = _userInfo.UserTypeEnumInt,
|
||||
ImagePath= medicalReview.ImagePath,
|
||||
ImagePath = JsonConvert.SerializeObject(inDto.FileList),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ using System.ComponentModel.DataAnnotations;
|
|||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace IRaCIS.Core.Domain.Models
|
||||
{
|
||||
|
@ -171,11 +172,41 @@ namespace IRaCIS.Core.Domain.Models
|
|||
/// </summary>
|
||||
public bool IsInvalid { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 文件
|
||||
/// </summary>
|
||||
[NotMapped]
|
||||
public List<string> FileNameList => this.FileName.Split(',').ToList();
|
||||
public List<ImageInfo> FileList
|
||||
{
|
||||
get
|
||||
{
|
||||
|
||||
[NotMapped]
|
||||
public List<string> ImagePathList => this.ImagePath.Split(',').ToList();
|
||||
|
||||
try
|
||||
{
|
||||
return JsonConvert.DeserializeObject<List<ImageInfo>>(this.ImagePath);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
return new List<ImageInfo>();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
#region 文件对象
|
||||
|
||||
public class ImageInfo
|
||||
{
|
||||
public string FileName { get; set; }
|
||||
|
||||
public string ImagePath { get; set; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
|
|
@ -102,11 +102,28 @@ namespace IRaCIS.Core.Domain.Models
|
|||
public TaskMedicalReview TaskMedicalReview { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 文件
|
||||
/// </summary>
|
||||
[NotMapped]
|
||||
public List<string> FileNameList => this.FileName.Split(',').ToList();
|
||||
public List<ImageInfo> FileList
|
||||
{
|
||||
get
|
||||
{
|
||||
|
||||
[NotMapped]
|
||||
public List<string> ImagePathList => this.ImagePath.Split(',').ToList();
|
||||
|
||||
try
|
||||
{
|
||||
return JsonConvert.DeserializeObject<List<ImageInfo>>(this.ImagePath);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
return new List<ImageInfo>();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue