IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -519,9 +519,9 @@ namespace IRaCIS.Core.API.Controllers
             {
                 fileName = realFileName;
 
-                if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".xls"))
+                if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".csv") && !fileName.EndsWith(".xls"))
                 {
-                    //---支持.xlsx、.xls格式的文件上传。
+                    //---支持.xlsx、.xls、.csv格式的文件上传。
                     throw new BusinessValidationFailedException(_localizer["UploadDownLoad_SupportedFormats"]);
                 }
 
@@ -944,11 +944,11 @@ namespace IRaCIS.Core.API.Controllers
             }
             var generateUserTypeList = new List<string>() { "CRC", "CRA" };
 
-            //if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
+            if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
-            //{
+            {
-            //    //用户类型仅能为 CRC,SR,CRA 请核查Excel数据
+                //用户类型仅能为 CRC,SR,CRA 请核查Excel数据
-            //    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidUserType"]);
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidUserType"]);
-            //}
+            }
             if (excelList.Count == 0)
             {
                 throw new BusinessValidationFailedException(_localizer["UploadDownLoad_NoValiddata"]);

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -26,13 +26,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsUrgent { get; set; }
 
-        public bool? IsSelfAnalysis { get; set; }
-
-        /// <summary>
-        /// 是否是一致性分析产生
-        /// </summary>
-        public bool IsAnalysisCreate { get; set; }
-
         /// <summary>
         /// 加急类型
         /// </summary>
@@ -210,11 +203,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
 
         public bool IsHaveFeedBack { get; set; }
-
-        /// <summary>
-        /// 是否手动生成
-        /// </summary>
-        public bool IsManualGeneration { get; set; }
         //public bool IsAfterConvertedTask { get; set; }
     }
 
@@ -270,12 +258,6 @@ namespace IRaCIS.Core.Application.ViewModel
         //产生重阅的根任务Id
         public Guid RootReReadingTaskId { get; set; }
 
-        /// <summary>
-        /// 是否是一致性分析产生
-        /// </summary>
-        public bool IsAnalysisCreate { get; set; }
-
-        public bool? IsSelfAnalysis { get; set; }
 
     }
 

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

@@ -145,7 +145,6 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList));
 
             CreateMap<VisitTask, ReadingTaskView>().IncludeBase<VisitTask, VisitTaskView>()
-                .ForMember(o=>o.IsManualGeneration,t=> t.MapFrom(u => !u.TrialReadingCriterion.IsAutoCreate))
                 .ForMember(o => o.IsHaveFeedBack, t => t.MapFrom(u => u.UserFeedBackList.Any(t=>t.State==0)))
                  ;
 

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -2061,12 +2061,12 @@ namespace IRaCIS.Core.Application.Image.QA
                     return ResponseOutput.NotOk(_localizer["QCOperation_CannotModifyConfirmation"]);
                 }
 
-               // if (await _subjectVisitRepository.Where(t => t.Id == command.SubjectVisitId)
+                if (await _subjectVisitRepository.Where(t => t.Id == command.SubjectVisitId)
-               //.AnyAsync(t => t.IsEnrollmentConfirm != command.IsEnrollmentConfirm && t.RequestBackState == RequestBackStateEnum.PM_AgressBack))
+               .AnyAsync(t => t.IsEnrollmentConfirm != command.IsEnrollmentConfirm && t.RequestBackState == RequestBackStateEnum.PM_AgressBack))
-               // {
+                {
-               //     //---该访视为回退访视，不允许修改PD确认状态
+                    //---该访视为回退访视，不允许修改PD确认状态
-               //     return ResponseOutput.NotOk(_localizer["QCOperation_CannotModifyPDStatus"]);
+                    return ResponseOutput.NotOk(_localizer["QCOperation_CannotModifyPDStatus"]);
-               // }
+                }
 
                 dbSubjectVisit.IsEnrollmentConfirm = command.IsEnrollmentConfirm.Value;
             }

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -409,7 +409,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 if (await _readModuleRepository.AnyAsync(x =>x.SubjectId== inDto.SubjectId&& x.SubjectVisit.LatestScanDate <= clinicalForm.CheckDate && x.IsCRCConfirm))
                 {
-					throw new BusinessValidationFailedException(_localizer["ClinicalAnswer_unableToAddOrUpdate", clinicalForm.CheckDate.Value.ToString("yyyy-MM-dd")]);
+					throw new BusinessValidationFailedException(_localizer["ClinicalAnswer_unableToAddOrUpdate"]);
 				}
 
 			}

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -138,13 +138,11 @@ namespace IRaCIS.Application.Services
                     .Include(x => x.ReadingPeriodSet).Include(x => x.SubjectVisit).ToList();
                 var needAddVisitIds = plans.Select(x => x.SubjectVisitId).ToList();
 
-                var repeatVisitIds = _readModuleRepository.Where(x => x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId && x.ReadingSetType == readingPeriodSet.ReadingSetType && needAddVisitIds.Contains(x.SubjectVisitId)).Select(x => x.SubjectVisitId).ToList();
+                var repeatVisitNames = _readModuleRepository.Where(x => x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId && x.ReadingSetType == readingPeriodSet.ReadingSetType && needAddVisitIds.Contains(x.SubjectVisitId)).Select(x => x.Subject.Code + "的" + x.SubjectVisit.VisitName).ToList();
-
+                if (repeatVisitNames.Count != 0)
-
+                {
-                plans = plans.Where(x => !repeatVisitIds.Contains(x.SubjectVisitId)).ToList();
+                    return ResponseOutput.NotOk(_localizer["ReadingPeriodSet_AlreadyAdded", string.Join(",", repeatVisitNames)]);
-
+                }
-
-
                 List<ReadModule> readModules = new List<ReadModule>();
                 foreach (var item in plans)
                 {

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -117,18 +117,6 @@ namespace IRaCIS.Core.Application
                 throw new BusinessValidationFailedException(_localizer["TrialConfig_JudgeTaskFail"]);
             }
 
-            var criterionFormType = trialCriterion.FormType;
-            var count = _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
-         .WhereIf(criterionFormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
-         .WhereIf(criterionFormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null).Count();
-
-            if (count == 0)
-            {
-                //---当前标准下未配置问题
-                throw new BusinessValidationFailedException(_localizer["TrialConfig_StdConfigMissing"]);
-            }
-
-
             await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
             {
                 IsSigned = true,
@@ -517,40 +505,40 @@ namespace IRaCIS.Core.Application
 
 
 
-        ///// <summary>
+        /// <summary>
-        ///// 设置项目阅片标准
+        /// 设置项目阅片标准
-        ///// </summary>
+        /// </summary>
-        ///// <returns></returns>
+        /// <returns></returns>
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        //public async Task<IResponseOutput> SetTrialReadingCriterion(SetTrialReadingCriterionInDto inDto)
+        public async Task<IResponseOutput> SetTrialReadingCriterion(SetTrialReadingCriterionInDto inDto)
-        //{
+        {
-        //    if (inDto.IsSignSave)
+            if (inDto.IsSignSave)
-        //    {
+            {
-        //        var criterionFormType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.FormType).FirstOrDefaultAsync();
+                var criterionFormType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.FormType).FirstOrDefaultAsync();
-        //        var count = _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
+                var count = _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
-        //     .WhereIf(criterionFormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
+             .WhereIf(criterionFormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
-        //     .WhereIf(criterionFormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null).Count();
+             .WhereIf(criterionFormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null).Count();
 
-        //        if (count == 0)
+                if (count == 0)
-        //        {
+                {
-        //            //---当前标准下未配置问题
+                    //---当前标准下未配置问题
-        //            throw new BusinessValidationFailedException(_localizer["TrialConfig_StdConfigMissing"]);
+                    throw new BusinessValidationFailedException(_localizer["TrialConfig_StdConfigMissing"]);
-        //        }
+                }
-        //    }
+            }
 
-        //    await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
+            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
-        //    {
+            {
-        //        FormType = inDto.FormType,
+                FormType = inDto.FormType,
-        //    });
+            });
 
 
 
 
-        //    var result = await _trialRepository.SaveChangesAsync();
+            var result = await _trialRepository.SaveChangesAsync();
 
 
-        //    return ResponseOutput.Ok(result);
+            return ResponseOutput.Ok(result);
-        //}
+        }
 
         /// <summary>
         /// 设置项目阅片信息

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

@@ -138,7 +138,7 @@ namespace IRaCIS.Application.Services
                 if (readingCategoryList.Except(inDto.ReadingCategorys).Count() > 0)
                 {
                     //---已分配任务，不允许减少阅片类型
-                    //return ResponseOutput.NotOk(_localizer["DoctorWorkload_AssignType"]);
+                    return ResponseOutput.NotOk(_localizer["DoctorWorkload_AssignType"]);
 
                 }
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -397,9 +397,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public bool IsHistoryConvertedTask { get; set; } = false;
 
-        /// <summary>
-        /// 是否是自身一致性
-        /// </summary>
         public bool? IsSelfAnalysis { get; set; }
 
         public string BlindSubjectCode { get; set; } = string.Empty;