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:
hang
2023-02-23 15:21:58 +08:00
parent 0f55406cef cda209d3d3
commit d8d1eb3915
8 changed files with 161 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+10 -1
View File
@@ -24,6 +24,16 @@ namespace IRaCIS.Core.Application.ViewModel
public decimal VisitTaskNum { get; set; }
public bool IsUrgent { get; set; }
/// <summary>
/// 加急类型
/// </summary>
public TaskUrgentType? TaskUrgentType { get; set; }
public string TaskUrgentRemake { get; set; } = string.Empty;
public ReadingCategory ReadingCategory { get; set; }
public TaskAllocationState TaskAllocationState { get; set; }
@@ -34,7 +44,6 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; }
public bool IsUrgent { get; set; }
public Arm ArmEnum { get; set; }
public Guid? DoctorUserId { get; set; }
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+17 -1
View File
@@ -158,6 +158,21 @@ namespace IRaCIS.Core.Application.Service
currentMaxCodeInt = currentMaxCodeInt + 1;
TaskUrgentType? taskUrgentType = null;
if (subjectVisit.PDState == PDStateEnum.PDProgress)
{
taskUrgentType = TaskUrgentType.PDProgress;
}
else if (subjectVisit.IsEnrollmentConfirm)
{
taskUrgentType = TaskUrgentType.EnrollmentConfirm;
}
else if (subjectVisit.IsUrgent)
{
taskUrgentType = TaskUrgentType.VisitUrgent;
}
task1 = await _visitTaskRepository.AddAsync(new VisitTask()
{
TrialId = trialId,
@@ -166,6 +181,7 @@ namespace IRaCIS.Core.Application.Service
TaskBlindName = blindTaskName,
TaskName = subjectVisit.VisitName,
VisitTaskNum = subjectVisit.VisitNum,
TaskUrgentType = taskUrgentType,
//CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm1,//特殊
Code = currentMaxCodeInt,
@@ -176,7 +192,7 @@ namespace IRaCIS.Core.Application.Service
TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
IsNeedClinicalDataSign = isNeedClinicalDataSign,
IsClinicalDataSign = isClinicalDataSign
});
}) ;
}
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+18
View File
@@ -66,6 +66,24 @@ namespace IRaCIS.Core.Application.Service.Allocation
_trialReadingCriterionRepository = trialReadingCriterionRepository;
}
/// <summary>
/// 设置任务加急
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<bool> SetTaskUrgent(SetTaskUrgentInDto inDto)
{
await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
{
IsUrgent = inDto.IsUrgent,
TaskUrgentType = inDto.TaskUrgentType,
TaskUrgentRemake = inDto.TaskUrgentRemake,
});
return await _visitTaskRepository.SaveChangesAsync();
}
public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true)
{
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+48 -4
View File
@@ -33,8 +33,7 @@ namespace IRaCIS.Core.Application.Image.QA
private readonly IRepository<QCChallengeDialog> _qCChallengeDialogrepository;
private readonly IRepository<CheckChallengeDialog> _checkChallengeDialogrepository;
private readonly IRepository<Trial> _trialRepository;
private readonly IRepository<VisitTask> _visitTaskRepository;
private readonly IVisitTaskHelpeService _IVisitTaskHelpeService;
private readonly AsyncLock _mutex = new AsyncLock();
@@ -42,6 +41,7 @@ namespace IRaCIS.Core.Application.Image.QA
public QCOperationService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<QCChallenge> qcChallengeRepository,
IRepository<Trial> trialRepository,
IRepository<VisitTask> visitTaskRepository,
IRepository<DicomStudy> dicomStudyRepository,
IRepository<DicomSeries> dicomSeriesrepository,
IRepository<Subject> subjectRepository,
@@ -60,8 +60,8 @@ namespace IRaCIS.Core.Application.Image.QA
this._qCChallengeDialogrepository = qCChallengeDialogrepository;
this._checkChallengeDialogrepository = checkChallengeDialogrepository;
_trialRepository = trialRepository;
_IVisitTaskHelpeService= visitTaskHelpeService;
this._visitTaskRepository = visitTaskRepository;
_IVisitTaskHelpeService = visitTaskHelpeService;
}
#region QC质疑 以及回复 关闭
@@ -1233,6 +1233,47 @@ namespace IRaCIS.Core.Application.Image.QA
//项目或者Subject IsUrgent 提交时 访视也设置为紧急
if (trialConfig.IsUrgent || dbSubjectVisit.Subject.IsUrgent || (dbSubjectVisit.PDState == PDStateEnum.PDProgress && !dbSubjectVisit.IsBaseLine) || (dbSubjectVisit.IsEnrollmentConfirm && dbSubjectVisit.IsBaseLine))
{
if (dbSubjectVisit.PDState == PDStateEnum.PDProgress)
{
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(x => x.SubjectId == dbSubjectVisit.SubjectId && x.VisitNum < dbSubjectVisit.VisitNum, x => new SubjectVisit()
{
IsUrgent = true
});
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.SourceSubjectVisitId == dbSubjectVisit.Id && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
{
IsUrgent = true,
TaskUrgentType = TaskUrgentType.PDProgress,
});
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.SubjectId == dbSubjectVisit.SubjectId && x.VisitTaskNum < dbSubjectVisit.VisitNum && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
{
IsUrgent = true,
TaskUrgentType = TaskUrgentType.PDProgress,
});
}
else if (dbSubjectVisit.IsEnrollmentConfirm)
{
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.SourceSubjectVisitId == dbSubjectVisit.Id && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
{
IsUrgent = true,
TaskUrgentType = TaskUrgentType.EnrollmentConfirm,
});
}
else
{
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.SourceSubjectVisitId == dbSubjectVisit.Id && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
{
IsUrgent = true,
TaskUrgentType = TaskUrgentType.VisitUrgent,
});
}
dbSubjectVisit.IsUrgent = true;
@@ -1296,6 +1337,9 @@ namespace IRaCIS.Core.Application.Image.QA
//非基线设置为PD的话 或者设置为末次访视 根据配置自动生成阅片期
if (!dbSubjectVisit.IsBaseLine && dbSubjectVisit.PDState == PDStateEnum.PDProgress && dbSubjectVisit.IsFinalVisit)
{
//该标准需要添加阅片期
foreach (var trialReadingCriterionId in trialReadingCriterionIdList)
{
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+16
View File
@@ -439,6 +439,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
};
// 没有靶病灶只计算最后几个
if (inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).Sum(x => x.TableRowInfoList.Count()) == 0)
{
List<QuestionType> questionTypes = new List<QuestionType>()
{
QuestionType.TargetLesion,
QuestionType.NoTargetLesion,
QuestionType.NewLesions,
QuestionType.Tumor,
QuestionType.ExistDisease,
};
calculateList = calculateList.Where(x => questionTypes.Contains(x.QuestionType)).ToList();
}
if (calculateType != null)
{
calculateList = calculateList.Where(x => calculateType.Contains(x.QuestionType)).ToList();
IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+16
View File
@@ -304,7 +304,23 @@ namespace IRaCIS.Application.Contracts
}
public class SetTaskUrgentInDto
{
public Guid VisitTaskId { get; set; }
public bool IsUrgent { get; set; }
/// <summary>
/// 加急类型
/// </summary>
public TaskUrgentType? TaskUrgentType { get; set; }
/// <summary>
/// 任务加急备注
/// </summary>
public string TaskUrgentRemake { get; set; } = string.Empty;
}
public class DoctorUserTask
{
public ReadingTaskState ReadingTaskState { get; set; }