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

修改一版

Uat_Study
he 2022-07-07 16:00:15 +08:00
parent 5033b39427
commit ac7a97706d
2 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -184,7 +184,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TaskMedicalReviewId { get; set; }
}
public class ApplyReReadingInDto: SendMedicalReviewDialogInDto
public class ApplyReReadingInDto
{
public Guid TrialId { get; set; }
@ -195,10 +195,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string RequestReReadingReason { get; set; } = string.Empty;
}
public class SendMedicalReviewDialogInDto
{
public Guid TaskMedicalReviewId { get; set; }
public string Content { get; set; }
@ -208,6 +205,26 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } = MedicalReviewDoctorUserIdea.defalut;
/// <summary>
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool? IsApplyHeavyReading { get; set; }
}
public class SendMedicalReviewDialogInDto
{
public Guid TaskMedicalReviewId { get; set; }
public string Content { get; set; }
/// <summary>
/// 是否有问题
/// </summary>
@ -223,15 +240,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; } = AuditAdvice.None;
/// <summary>
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool? IsApplyHeavyReading { get; set; }
}
public class SaveMedicineQuestionInDto

52
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
View File

@ -345,9 +345,7 @@ namespace IRaCIS.Core.Application.Service
UserTypeEnumInt = _userInfo.UserTypeEnumInt,
VisitTaskId = visitTaskId,
AuditAdviceEnum=inDto.AuditAdviceEnum,
DisagreeReason=inDto.DisagreeReason,
DoctorUserIdeaEnum=inDto.DoctorUserIdeaEnum,
IsApplyHeavyReading=inDto.IsApplyHeavyReading,
IsHaveQuestion=inDto.IsHaveQuestion,
Questioning=inDto.Questioning,
};
@ -366,26 +364,40 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> ApplyReReading(ApplyReReadingInDto inDto)
{
var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
await _visitTaskService.ApplyReReading(new ApplyReReadingCommand()
if (inDto.IsApplyHeavyReading??false)
{
IsCopyOrigenalForms = inDto.IsCopyOrigenalForms,
RequestReReadingReason = inDto.RequestReReadingReason,
RequestReReadingType = inDto.RequestReReadingType,
TrialId = inDto.TrialId,
TaskIdList = new List<Guid>()
{
visitTaskId
await _visitTaskService.ApplyReReading(new ApplyReReadingCommand()
{
IsCopyOrigenalForms = inDto.IsCopyOrigenalForms,
RequestReReadingReason = inDto.RequestReReadingReason,
RequestReReadingType = inDto.RequestReReadingType,
TrialId = inDto.TrialId,
TaskIdList = new List<Guid>()
{
visitTaskId
}
});
await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{
IsClosedDialog = true
});
}
});
#region 重阅修改医学审核状态
await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => !x.IsClosedDialog && x.Id==inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
{
IsClosedDialog = true
});
#endregion
return await this.SendMedicalReviewDialog(inDto);
TaskMedicalReviewId = inDto.TaskMedicalReviewId,
UserTypeShortName = _userInfo.UserTypeShortName,
Content = inDto.Content,
UserTypeEnumInt = _userInfo.UserTypeEnumInt,
VisitTaskId = visitTaskId,
DisagreeReason = inDto.DisagreeReason,
DoctorUserIdeaEnum = inDto.DoctorUserIdeaEnum,
IsApplyHeavyReading = inDto.IsApplyHeavyReading,
};
await _readingMedicalReviewDialogRepository.AddAsync(dialog);
var result = await _readingMedicalReviewDialogRepository.SaveChangesAsync();
return ResponseOutput.Result(result);
}