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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Browse Source
This commit is contained in:
he
2023-01-12 10:04:21 +08:00
parent 25daabda9c af3b22551d
commit fda332f424
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+2 -2
View File
@@ -8450,7 +8450,7 @@
</member>
<member name="M:IRaCIS.Application.Services.DoctorService.AddDoctorCriterionFile(IRaCIS.Application.Contracts.AddDoctorCriterionFileDto)">
<summary>
添加医生标准文件
添加修改医生标准文件
</summary>
<param name="inDto"></param>
<returns></returns>
@@ -10143,7 +10143,7 @@
文件类型
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.CriterionReadingCategory.ToDoQuantity">
<member name="P:IRaCIS.Application.Contracts.CriterionReadingCategory.PendingCount">
<summary>
待办数量
</summary>
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+12 -1
View File
@@ -286,6 +286,8 @@ namespace IRaCIS.Application.Services
var needSignCount = 0;
var haveSignedCount = _readingClinicalDataRepository.Where(t => t.TrialId==trialId && t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
if (isVisit)
{
var isBaseLine = await _subjectVisitRepository.Where(t => t.Id == readingId).Select(t => t.IsBaseLine).FirstOrDefaultAsync();
@@ -310,7 +312,7 @@ namespace IRaCIS.Application.Services
IsClinicalDataSign = true
});
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
var visitTaskIdQueryable = _visitTaskRepository.Where(visitTaskLambda) //该Subject 该标准的任务
@@ -348,6 +350,15 @@ namespace IRaCIS.Application.Services
{
IsClinicalDataSign = true
});
var visitTaskIdQueryable = _visitTaskRepository.Where(visitTaskLambda) //该Subject 该标准的任务
//小于自己任务号的任务 存在需要签名 但是没签名
.Where(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum)).Select(t => t.Id);
await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => visitTaskIdQueryable.Contains(t.Id), u => new VisitTask()
{
IsFrontTaskNeedSignButNotSign = true
});
}
}