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

修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-06-27 14:25:20 +08:00
parent acad258319
commit 27d9104607
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[NotDefault] [NotDefault]
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid? TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectId { get; set; }
} }
@ -55,7 +57,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool? IsUrgent { get; set; } public bool? IsUrgent { get; set; }
public MedicalReviewAuditState? AuditState { get; set; } public Guid? SubjectId { get; set; }
public MedicalReviewAuditState? AuditState { get; set; }
public string SubjectCode { get; set; } = string.Empty; public string SubjectCode { get; set; } = string.Empty;

22
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -792,13 +792,28 @@ namespace IRaCIS.Core.Application.Service
var list = await GetIRMedicalFeedbackList(new GetIRMedicalFeedbackListInDto() var list = await GetIRMedicalFeedbackList(new GetIRMedicalFeedbackListInDto()
{ {
TrialId=inDto.TrialId, TrialId=inDto.TrialId,
IsNotHaveSigned=true, AuditState= MedicalReviewAuditState.Auditing,
TrialReadingCriterionId=inDto.TrialReadingCriterionId, TrialReadingCriterionId=inDto.TrialReadingCriterionId,
SubjectId=inDto.SubjectId,
PageIndex=1, PageIndex=1,
PageSize=1, PageSize=1,
}); });
if (list.CurrentPageData.Count() > 0)
if (list.CurrentPageData.Count() == 0)
{
list = await GetIRMedicalFeedbackList(new GetIRMedicalFeedbackListInDto()
{
TrialId = inDto.TrialId,
AuditState = MedicalReviewAuditState.Auditing,
TrialReadingCriterionId = inDto.TrialReadingCriterionId,
PageIndex = 1,
PageSize = 1,
});
}
if (list.CurrentPageData.Count() > 0)
{ {
return list.CurrentPageData[0]; return list.CurrentPageData[0];
} }
@ -825,7 +840,8 @@ namespace IRaCIS.Core.Application.Service
.Where(x => x.VisitTask.DoctorUserId == _userInfo.Id) .Where(x => x.VisitTask.DoctorUserId == _userInfo.Id)
.Where(x => x.IsHaveQuestion) .Where(x => x.IsHaveQuestion)
.WhereIf(!inDto.TaskBlindName.IsNullOrEmpty(), x => x.VisitTask.TaskBlindName == inDto.TaskBlindName) .WhereIf(!inDto.TaskBlindName.IsNullOrEmpty(), x => x.VisitTask.TaskBlindName == inDto.TaskBlindName)
.WhereIf(inDto.IsUrgent != null, x => x.VisitTask.IsUrgent == inDto.IsUrgent!) .WhereIf(inDto.SubjectId != null, x => x.VisitTask.SubjectId == inDto.SubjectId!)
.WhereIf(inDto.IsUrgent != null, x => x.VisitTask.IsUrgent == inDto.IsUrgent!)
.WhereIf(inDto.AuditState != null, x => x.AuditState == inDto.AuditState!) .WhereIf(inDto.AuditState != null, x => x.AuditState == inDto.AuditState!)
.WhereIf(inDto.IsNotHaveSigned, x => x.AuditState != MedicalReviewAuditState.HaveSigned) .WhereIf(inDto.IsNotHaveSigned, x => x.AuditState != MedicalReviewAuditState.HaveSigned)
.WhereIf(inDto.ReadingCategory != null, x => x.VisitTask.ReadingCategory == inDto.ReadingCategory!) .WhereIf(inDto.ReadingCategory != null, x => x.VisitTask.ReadingCategory == inDto.ReadingCategory!)