Compare commits
No commits in common. "921c66140fb4ebb006836a981e1ccf8cc5a59a4e" and "a16f567adea0dff65e53e5fc6de03c0bb2e67ec1" have entirely different histories.
921c66140f
...
a16f567ade
|
|
@ -478,7 +478,6 @@ namespace IRaCIS.Application.Services
|
||||||
var needSignCount = 0;
|
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();
|
var haveSignedCount = _readingClinicalDataRepository.Where(t => t.TrialId == trialId && t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
|
||||||
|
|
||||||
ReadModule readModule = null;
|
|
||||||
|
|
||||||
if (isVisit)
|
if (isVisit)
|
||||||
{
|
{
|
||||||
|
|
@ -514,7 +513,7 @@ namespace IRaCIS.Application.Services
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//判断是影像学 还是肿瘤学阅片
|
//判断是影像学 还是肿瘤学阅片
|
||||||
readModule = await _readModuleRepository.Where(t => t.Id == readingId).FirstNotNullAsync();
|
var readModule = await _readModuleRepository.Where(t => t.Id == readingId).FirstNotNullAsync();
|
||||||
|
|
||||||
//CRC 阅片期自定义结构化录入是否签名
|
//CRC 阅片期自定义结构化录入是否签名
|
||||||
bool crcReadModuleSign = true;
|
bool crcReadModuleSign = true;
|
||||||
|
|
@ -576,7 +575,7 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
|
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
|
||||||
|
|
||||||
if (isVisit ||(isVisit==false && readModule.ReadingSetType == ReadingSetType.ImageReading))
|
if (isVisit)
|
||||||
{
|
{
|
||||||
//访视类型的任务 不影响肿瘤学任务的临床数据状态
|
//访视类型的任务 不影响肿瘤学任务的临床数据状态
|
||||||
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
|
visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue