Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
a8b732abb9
|
@ -53,6 +53,14 @@
|
|||
"ASPNETCORE_ENVIRONMENT": "CertificateApply"
|
||||
},
|
||||
"applicationUrl": "http://localhost:6400"
|
||||
},
|
||||
"IRaCIS.CenterImageDev": {
|
||||
"commandName": "Project",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "CenterImageDev"
|
||||
},
|
||||
"applicationUrl": "http://localhost:6100"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -872,11 +872,11 @@ namespace IRaCIS.Core.Application
|
|||
CriterionName = g.Key.CriterionName,
|
||||
TrialReadingCriterionId = g.Key.TrialReadingCriterionId,
|
||||
|
||||
UrgentCount = g.Where(u => u.VisitTask.IsUrgent
|
||||
&& u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
|
||||
//UrgentCount = g.Where(u => u.VisitTask.IsUrgent
|
||||
//&& u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
|
||||
|
||||
ToBeReplyedCount = g.Where(u =>
|
||||
u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
|
||||
//ToBeReplyedCount = g.Where(u =>
|
||||
// u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
|
||||
|
||||
});
|
||||
|
||||
|
@ -934,14 +934,15 @@ namespace IRaCIS.Core.Application
|
|||
TrialCode = g.Key.TrialCode,
|
||||
CriterionName = g.Key.CriterionName,
|
||||
|
||||
UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First())
|
||||
.Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
|
||||
//UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First())
|
||||
//.Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
|
||||
|
||||
ToBeReplyedCount = g.Select(t => t.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First()).Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
|
||||
//ToBeReplyedCount = g.Select(t => t.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First()).Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
|
||||
|
||||
ToBeReviewedCount = g.Where(u => !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count()
|
||||
|
||||
});
|
||||
|
||||
#endregion
|
||||
//var query = _trialReadingCriterionRepository
|
||||
// .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
|
||||
|
|
Loading…
Reference in New Issue