From b03a5da2a144710d7ce7c0407212b718a899f1d0 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 8 Jul 2022 13:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/Dto/ReadingMedicalReviewDto.cs | 5 +++++
.../Service/Reading/ReadingMedicalReviewService.cs | 13 ++++++++++++-
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs | 8 +++++++-
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 1328c8e03..be2f9bbde 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -312,6 +312,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public bool IsClosedDialog { get; set; }
+ ///
+ /// 医学审核对话关闭原因
+ ///
+ public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
+
///
/// 对话关闭原因
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index 78d576d8c..a61366975 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -328,9 +328,20 @@ namespace IRaCIS.Core.Application.Service
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{
IsClosedDialog = inDto.IsClosedDialog,
+ MedicalDialogCloseEnum=inDto.MedicalDialogCloseEnum,
DialogCloseReason=inDto.DialogCloseReason,
});
+
+ ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
+ {
+ TaskMedicalReviewId = inDto.TaskMedicalReviewId,
+ UserTypeShortName = _userInfo.UserTypeShortName,
+ Content = "MIM关闭医学审核对话",
+ UserTypeEnumInt = _userInfo.UserTypeEnumInt,
+ };
+
+ await _readingMedicalReviewDialogRepository.AddAsync(dialog);
var result = await _taskMedicalReviewRepository.SaveChangesAsync();
return ResponseOutput.Result(result);
}
@@ -387,7 +398,7 @@ namespace IRaCIS.Core.Application.Service
await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{
IsClosedDialog = true,
- DialogCloseReason= "IR申请重阅",
+ MedicalDialogCloseEnum = MedicalDialogClose.IRApplyReReading,
});
}
ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index a992d382a..faba25c4e 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -153,7 +153,13 @@ namespace IRaCIS.Core.Domain.Models
///
public bool IsSendMessage { get; set; } = false;
- ///
+
+ ///
+ /// 医学审核对话关闭原因
+ ///
+ public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
+
+ ///
/// 对话关闭原因
///
public string DialogCloseReason { get; set; } = string.Empty;