修改一版
parent
9c48ccd692
commit
0a5b212846
|
@ -259,6 +259,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public MedicalReviewAuditState AuditState { get; set; }
|
public MedicalReviewAuditState AuditState { get; set; }
|
||||||
|
|
||||||
|
public bool IsSendMsg { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否关闭
|
/// 是否关闭
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -355,6 +357,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 是否关闭
|
/// 是否关闭
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsClosedDialog { get; set; }
|
public bool IsClosedDialog { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public bool IsSendMsg { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ReadingMedicineQuestion
|
public class ReadingMedicineQuestion
|
||||||
|
|
|
@ -73,7 +73,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
|
medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
|
||||||
medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog;
|
medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog;
|
||||||
medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState;
|
medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState;
|
||||||
|
medicalReviewInfo.IsSendMsg = medicalReviewInfo.MedicalReviewInfo.IsSendMsg;
|
||||||
|
|
||||||
#region 取任务
|
#region 取任务
|
||||||
if (medicalReviewInfo.IsReadingTaskViewInOrder)
|
if (medicalReviewInfo.IsReadingTaskViewInOrder)
|
||||||
|
@ -251,16 +251,17 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
IsHaveQuestion = inDto.IsHaveQuestion,
|
IsHaveQuestion = inDto.IsHaveQuestion,
|
||||||
Questioning = inDto.Questioning,
|
Questioning = inDto.Questioning,
|
||||||
|
IsSendMsg= inDto.IsSendDialog && inDto.IsHaveQuestion,
|
||||||
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
||||||
|
|
||||||
SaveConclusionTime=DateTime.Now,
|
SaveConclusionTime=DateTime.Now,
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if(inDto.IsSendDialog)
|
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
|
||||||
|
if (inDto.IsSendDialog&& !medicalReview.IsSendMsg&& inDto.IsHaveQuestion)
|
||||||
{
|
{
|
||||||
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
|
|
||||||
await _readingMedicalReviewDialogRepository.AddAsync(new ReadingMedicalReviewDialog()
|
await _readingMedicalReviewDialogRepository.AddAsync(new ReadingMedicalReviewDialog()
|
||||||
{
|
{
|
||||||
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
||||||
|
|
|
@ -145,6 +145,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
|
public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否发送消息
|
||||||
|
/// </summary>
|
||||||
|
public bool IsSendMsg { get; set; } = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue