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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2438,6 +2438,11 @@
             问题英文分组
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TaskQuestionAnswer.GlobalChangeAnswer">
+            <summary>
+            全局阅片修改的答案
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VistTaskTableQuestionRowInfo.OrderMark">
             <summary>
             序号标记

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -419,6 +419,9 @@ namespace IRaCIS.Core.Application.Service
 
             int currentMaxCodeInt = cacheMaxCodeInt > dbMaxCode ? cacheMaxCodeInt : dbMaxCode;
 
+     
+
+
             switch (generateTaskCommand.ReadingCategory)
             {
                 case GenerateTaskCategory.Visit:
@@ -1010,8 +1013,6 @@ namespace IRaCIS.Core.Application.Service
                     }
 
 
-
-
                     break;
 
 
@@ -1019,8 +1020,7 @@ namespace IRaCIS.Core.Application.Service
 
                     var reReadingVisitTask = generateTaskCommand.ReReadingTask;
 
-
+                    var subjectVisitUrgent = _subjectVisitRepository.Where(t => t.Id == reReadingVisitTask.SourceSubjectVisitId).Select(t=>t.IsUrgent).FirstOrDefault();
-
 
                     var newTask = await _visitTaskRepository.AddAsync(new VisitTask()
                     {
@@ -1031,6 +1031,8 @@ namespace IRaCIS.Core.Application.Service
                         TaskName = reReadingVisitTask.TaskName,
                         TaskBlindName = reReadingVisitTask.TaskBlindName,
 
+                        IsUrgent = reReadingVisitTask.IsAnalysisCreate?false: subjectVisitUrgent,
+
                         VisitTaskNum = reReadingVisitTask.VisitTaskNum,
                         ReadingCategory = reReadingVisitTask.ReadingCategory,
                         SourceSubjectVisitId = reReadingVisitTask.SourceSubjectVisitId,
@@ -1055,7 +1057,7 @@ namespace IRaCIS.Core.Application.Service
                         // AllocateTime = DateTime.Now,
                         //DoctorUserId = reReadingVisitTask.DoctorUserId,
 
-                    });
+                    });;
 
                     generateTaskCommand.Action(newTask);
 
@@ -1253,7 +1255,7 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 TrialId = trialId,
                                 SubjectId = item.SubjectId,
-                                IsUrgent = item.IsUrgent,
+                                IsUrgent = originalTaskInfo.IsUrgent,
                                 VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
                                 TaskName = item.ReadingName,
                                 ArmEnum = originalTaskInfo.ArmEnum,//特殊
@@ -1299,7 +1301,7 @@ namespace IRaCIS.Core.Application.Service
                         {
                             TrialId = trialId,
                             SubjectId = item.SubjectId,
-                            IsUrgent = item.IsUrgent,
+                            IsUrgent = originalTaskInfo.IsUrgent,
                             TaskName = item.ReadingName,
                             // 原任务是全局任务  加0.03 就好
                             VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -763,7 +763,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
                 .ProjectTo<ReReadingTaskView>(_mapper.ConfigurationProvider);
 
-            var defalutSortArray = new string[] { nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.IsUrgent) + " desc", nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.SubjectId), nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.VisitTaskNum) };
+            //var defalutSortArray = new string[] { nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.IsUrgent) + " desc", nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.SubjectId), nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.VisitTaskNum) };
+
+            var defalutSortArray = new string[] { nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.TaskState), nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.IsUrgent) + " desc", 
+                nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.SubjectId),nameof(ReReadingTaskView.OriginalReReadingTask) + "." + nameof(ReReadingTaskView.OriginalReReadingTask.VisitTaskNum) };
+
+
 
             var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
 
@@ -1180,7 +1185,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                         && t.OriginalReReadingTask.TrialReadingCriterionId == task.TrialReadingCriterionId
                                                         && t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.RequestReReadingType == RequestReReadingType.TrialGroupApply && t.RequestReReadingResultEnum == RequestReReadingResult.Default))
                         {
-                            return ResponseOutput.NotOk("当前为有序阅片，该受试者已有访视已申请重阅还未处理，暂不能继续申请重阅");
+                            return ResponseOutput.NotOk("当前为有序阅片，该受试者已有访视已申请重阅还未处理(项目组申请)，暂不能继续申请重阅");
                         }
                     }
 

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -33,7 +33,7 @@ namespace IRaCIS.Application.Contracts
         public List<Guid> ReadingTypeIds => DictionaryList.Where(t => t.ParentCode == StaticData.ReadingType).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
 
 
-
+        public string AccountUserName { get; set; }
 
 
 

IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs

@@ -82,6 +82,7 @@ namespace IRaCIS.Core.Application.Service
             #region 医生基本信息  
             CreateMap<Doctor, SelectionReviewerDTO>();
             CreateMap<Doctor, DoctorDTO>().IncludeMembers(t => t.Hospital).Include<Doctor, SelectionReviewerDTO>()
+                 .ForMember(d => d.AccountUserName, u => u.MapFrom(s => s.EnrollList.Where(t=>t.DoctorUserId!=null).Select(c=>c.DoctorUser.UserName).FirstOrDefault()))
                  .ForMember(d => d.Department, u => u.MapFrom(s => s.Department.Value))
                  .ForMember(d => d.DepartmentCN, u => u.MapFrom(s => s.Department.ValueCN))
                  .ForMember(d => d.Position, u => u.MapFrom(s => s.Position.Value))

IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Service.WorkLoad.DTO;
 using Microsoft.AspNetCore.Authorization;
 using IRaCIS.Core.Application.Auth;
+using System.Text.RegularExpressions;
 
 namespace IRaCIS.Application.Services
 {
@@ -376,31 +377,44 @@ namespace IRaCIS.Application.Services
             //更新入组表
             var intoGroupList = await _enrollRepository.Where(t => t.TrialId == trialId,true).ToListAsync();
 
+            //验证邮件
+            var emaiList = await _doctorRepository.Where(t => intoGroupList.Select(t => t.DoctorId).Contains(t.Id))
+                .Select(t => new { t.EMail, t.FirstName, t.LastName }).ToListAsync();
+
+
+            var errorList = emaiList.Where(t => !Regex.IsMatch(t.EMail, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+                .ToList();
+
+            if (errorList.Count() > 0)
+            {
+                return ResponseOutput.NotOk(string.Join(',', errorList.Select(c => c.LastName+" / "+c.FirstName)) +"邮箱格式存在问题") ;
+            }
+
             if (confirmReviewerCommand.ConfirmState == 1) //确认入组
             {
                 foreach (var intoGroupItem in intoGroupList)
                 {
                     if (confirmReviewerCommand.DoctorIdArray.Contains(intoGroupItem.DoctorId))
                     {
-                        intoGroupItem.EnrollStatus = EnrollStatus.ConfirmIntoGroup;
-                        intoGroupItem.EnrollTime = DateTime.Now;
 
+                        //当邮件发送没有问题的时候，才修改状态  如果有问题，就当前不做处理
+                        try
+                        {
                             var userId = await _mailVerificationService.DoctorJoinTrialEmail(trialId, intoGroupItem.DoctorId, confirmReviewerCommand.BaseUrl, confirmReviewerCommand.RouteUrl);
 
-                        if ( !await _trialUserRepository.AnyAsync(t=>t.TrialId==trialId && t.UserId== userId, true))
+                            if (!await _trialUserRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == userId, true))
                             {
-                            await  _trialUserRepository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId ,JoinTime = DateTime.Now });
+                                await _trialUserRepository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });
                             }
 
                             await _enrollRepository.BatchUpdateNoTrackingAsync(t => t.Id == intoGroupItem.Id, u => new Enroll() { DoctorUserId = userId });
 
-                        if (!await _taskAllocationRuleRepository.AnyAsync(t => t.TrialId == trialId && t.DoctorUserId == userId&& t.EnrollId == intoGroupItem.Id, true))
+                            if (!await _taskAllocationRuleRepository.AnyAsync(t => t.TrialId == trialId && t.DoctorUserId == userId && t.EnrollId == intoGroupItem.Id, true))
                             {
                                 await _taskAllocationRuleRepository.AddAsync(new TaskAllocationRule() { TrialId = trialId, DoctorUserId = userId, EnrollId = intoGroupItem.Id });
 
                             }
 
-
                             await _enrollDetailRepository.AddAsync(new EnrollDetail()
                             {
                                 DoctorId = intoGroupItem.DoctorId,
@@ -408,6 +422,16 @@ namespace IRaCIS.Application.Services
                                 EnrollStatus = EnrollStatus.ConfirmIntoGroup,
                                 OptUserType = (int)SystemUserType.AdminUser, //后台用户
                             });
+
+                            intoGroupItem.EnrollStatus = EnrollStatus.ConfirmIntoGroup;
+                            intoGroupItem.EnrollTime = DateTime.Now;
+                        }
+                        catch (Exception )
+                        {
+                            intoGroupItem.EnrollStatus = EnrollStatus.ConfirmIntoGroupFailed;
+
+                        }
+                                        
                     }
                 }
               

IRaCIS.Core.Domain.Share/Trial/EnrollStatus.cs

@@ -24,7 +24,7 @@
 
         ConfirmIntoGroup = 10, // 确认入组
 
-        //HasUploadAgreement = 11, // 已上传协议
+        ConfirmIntoGroupFailed = 11, 
 
         DoctorTrained = 12,   // 参加培训