修改阅片标准提交

2022-10-09 17:19:45 +08:00
parent b9e0c3369d
commit 369d3238d2
5 changed files with 34 additions and 24 deletions
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.ViewModel
    {
        public Guid TrialId { get; set; }

-        public ReadingMethod ReadingType { get; set; }
+        //public ReadingMethod ReadingType { get; set; }

        public Guid? DoctorUserId { get; set; }

@@ -163,7 +163,7 @@ namespace IRaCIS.Core.Application.Service
                        select new TrialDoctorUserSelectView()
                        {
                            TrialId = enroll.TrialId,
-                            ReadingType = enroll.Trial.ReadingType,
+                            //ReadingType = enroll.Trial.ReadingType,
                            DoctorUserId = user.Id,
                            FullName = user.FullName,
                            UserCode = user.UserCode,
@@ -186,7 +186,7 @@ namespace IRaCIS.Core.Application.Service
                        select new TrialDoctorUserSelectView()
                        {
                            TrialId = allocationRule.TrialId,
-                            ReadingType = allocationRule.Trial.ReadingType,
+                            //ReadingType = allocationRule.Trial.ReadingType,
                            DoctorUserId = user.Id,
                            FullName = user.FullName,
                            UserCode = user.UserCode,
@@ -500,7 +500,7 @@ namespace IRaCIS.Core.Application.Service
            var trialId = filterObj.TrialId;
            var trialReadingCriterionId = filterObj.TrialReadingCriterionId;

-            var trialConfig = (await _repository.Where<Trial>(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
+            //var trialConfig = (await _repository.Where<Trial>(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();



@@ -162,12 +162,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
        /// 阅片人维度  Subject统计表
        /// </summary>
        /// <param name="trialId"></param>
+        /// <param name="trialReadingCriterionId"></param>
        /// <returns></returns>
-        public async Task<List<AssignDoctorStatView>> GetDoctorSubjectStat(Guid trialId)
+        public async Task<(List<AssignDoctorStatView>,object)> GetDoctorSubjectStat(Guid trialId, Guid trialReadingCriterionId )
        {
            var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<AssignDoctorStatView>(_mapper.ConfigurationProvider).ToListAsync();

-            return list;
+            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder,x.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
+
+            return (list, criterionConfig);
        }