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

修改一版

Browse Source
This commit is contained in:
he
2022-07-05 15:41:08 +08:00
parent a75bd015ba
commit ecef78fa6f
5 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+21 -4
View File
@@ -109,6 +109,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
}
public class GetMedicalReviewDialogInDto
@@ -236,10 +242,16 @@ 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 ImagePath { get; set; } = string.Empty;
///// <summary>
///// 文件名称
///// </summary>
//public string FileName { get; set; } = string.Empty;
/// <summary>
/// 审核建议
@@ -268,6 +280,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 审核建议
/// </summary>
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+7 -5
View File
@@ -98,7 +98,7 @@ namespace IRaCIS.Core.Application.Service
}).ToListAsync();
List< TaskInfo > otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
&& x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{
@@ -253,15 +253,16 @@ namespace IRaCIS.Core.Application.Service
{
IsHaveQuestion = inDto.IsHaveQuestion,
Questioning = inDto.Questioning,
ImagePath = inDto.ImagePath,
AuditAdviceEnum = inDto.AuditAdviceEnum,
SaveConclusionTime=DateTime.Now,
});
if(inDto.IsSendDialog)
{
var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
await _readingMedicalReviewDialogRepository.AddAsync(new ReadingMedicalReviewDialog()
{
AuditAdviceEnum = inDto.AuditAdviceEnum,
@@ -269,9 +270,10 @@ namespace IRaCIS.Core.Application.Service
UserTypeShortName = _userInfo.UserTypeShortName,
IsHaveQuestion=inDto.IsHaveQuestion,
Questioning=inDto.Questioning,
VisitTaskId= visitTaskId,
VisitTaskId= medicalReview.VisitTaskId,
FileName = medicalReview.FileName,
UserTypeEnumInt = _userInfo.UserTypeEnumInt,
ImagePath= inDto.ImagePath,
ImagePath= medicalReview.ImagePath,
});
}