diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs index 56add61fa..5685f2b87 100644 --- a/IRaCIS.Core.API/Controllers/ExtraController.cs +++ b/IRaCIS.Core.API/Controllers/ExtraController.cs @@ -25,6 +25,7 @@ using Aliyun.Acs.Core; using Aliyun.Acs.Core.Profile; using Aliyun.Acs.Sts.Model.V20150401; using Microsoft.AspNetCore.Hosting; +using MassTransit; namespace IRaCIS.Api.Controllers { @@ -152,7 +153,7 @@ namespace IRaCIS.Api.Controllers AssumeRoleRequest request = new AssumeRoleRequest { RoleArn = "acs:ram::1899121822495495:role/oss-upload", // 角色ARN，需要替换为你的角色ARN - RoleSessionName = $"session-name-{Guid.NewGuid()}", // 角色会话名称，可自定义 + RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义 DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时 }; diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 587a426ad..81d47f5b6 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -10884,20 +10884,6 @@ - - - 获取附加评估选项列表 - - - - - - - 保存附加评估设置 （自动添加 或者删除附加评估问题） - - - - 获取签名文本 diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 64556463d..620998555 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -27,7 +27,6 @@ namespace IRaCIS.Core.Application.Services private readonly IRepository _trialRepository; private readonly IRepository _systemDocConfirmedUserRepository; private readonly IRepository _systemDocumentRepository; - private readonly IRepository _trialCriterionAdditionalAssessmentTypeRepository; private readonly IRepository _readingQuestionCriterionTrialRepository; @@ -35,7 +34,6 @@ namespace IRaCIS.Core.Application.Services IRepository trialDocUserTypeConfirmedUserRepository, IRepository trialRepository, IRepository systemDocConfirmedUserRepository, - IRepository trialCriterionAdditionalAssessmentTypeRepository, IRepository readingQuestionCriterionTrialRepository , IRepository systemDocumentRepository) { @@ -45,7 +43,6 @@ namespace IRaCIS.Core.Application.Services this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository; _systemDocumentRepository = systemDocumentRepository; _readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository; - _trialCriterionAdditionalAssessmentTypeRepository = trialCriterionAdditionalAssessmentTypeRepository; } /// @@ -227,13 +224,11 @@ namespace IRaCIS.Core.Application.Services var trialTaskConfig = _trialRepository.Where(t => t.Id == querySystemDocument.TrialId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefault(); - //var trialCriterionAdditionalAssessmentTypeList = _trialCriterionAdditionalAssessmentTypeRepository - // .Where(t => t.TrialReadingCriterion.TrialId == trialId && t.IsSelected == true && t.TrialReadingCriterion.IsSigned).Select(t=>new { t.CriterionType,t.AdditionalAssessmentType}).ToList(); var isManualGenerateTask= _readingQuestionCriterionTrialRepository.Where(t=>t.TrialId==trialId && t.IsSigned && t.IsAutoCreate==false).Any(); - var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true - &&t.TrialCriterionAdditionalAssessmentTypeList.Any(c=>/*c.AdditionalAssessmentType==Domain.Share.Reading.AdditionalAssessmentType.BrainMetastasis &&*/ c.IsSelected==true)).Any(); + + var isAdditionalAssessment =false; var isAllOnlySRReading = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned).All(t => t.ReadingDivisionEnum == ReadingDivisionEnum.OnlySR); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index cebb72bfa..a912aff0a 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -518,7 +518,7 @@ namespace IRaCIS.Core.Application.Contracts public bool IsAutoCreate { get; set; } - public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); + public int ReadingDivisionEnum { get; set; } @@ -986,7 +986,6 @@ namespace IRaCIS.Core.Application.Contracts /// public bool IsUrgent { get; set; } = false; - public List TrialCriterionAdditionalAssessmentTypeList { get; set; }=new List(); public ReadingDivisionEnum ReadingDivisionEnum { get; set; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 3b2e23a57..039a80267 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -40,7 +40,6 @@ namespace IRaCIS.Core.Application private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; private readonly IReadingQuestionService iReadingQuestionService; - private readonly IRepository _trialCriterionAdditionalAssessmentTypeRepository; private readonly IRepository _readingTaskQuestionAnswer; @@ -65,7 +64,6 @@ namespace IRaCIS.Core.Application IReadingQuestionService iReadingQuestionService, IEasyCachingProvider provider, IOrganInfoService iOrganInfoService, - IRepository trialCriterionAdditionalAssessmentTypeRepository, IRepository visitTaskRepository, IRepository readingTableQuestionTrialRepository, IRepository readingTableQuestionAnswerRepository, @@ -74,7 +72,6 @@ namespace IRaCIS.Core.Application ) { - _trialCriterionAdditionalAssessmentTypeRepository = trialCriterionAdditionalAssessmentTypeRepository; _trialRepository = trialRepository; this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository; @@ -188,7 +185,6 @@ namespace IRaCIS.Core.Application trialInfo.ReadingTool = ReadingTool.Dicom; } - trialInfo.TrialCriterionAdditionalAssessmentTypeList = await _trialCriterionAdditionalAssessmentTypeRepository.Where(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId).ToListAsync(); return trialInfo; @@ -212,23 +208,7 @@ namespace IRaCIS.Core.Application if (trialCriterion.SynchronizeOriginalTime == null) { - //同步附加评估类型 - if (!await _trialCriterionAdditionalAssessmentTypeRepository.AnyAsync(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) - { - AdditionalAssessment additional = new AdditionalAssessment(); - var addList = additional.GetSystemDefeaultAdditionalAssessmentList(trialCriterion.CriterionType); - - foreach (var addItem in addList) - { - await _trialCriterionAdditionalAssessmentTypeRepository.AddAsync(new TrialCriterionAdditionalAssessmentType() - { - CriterionType = trialCriterion.CriterionType, - TrialReadingCriterionId = inDto.TrialReadingCriterionId, - AdditionalAssessmentType = addItem.AdditionalAssessmentType - }); - } - } @@ -604,72 +584,7 @@ namespace IRaCIS.Core.Application }); - //判断是否存在附加评估 - if (inDto.IsAdditionalAssessment) - { - #region 存在，就将标准对应的附加评估选项加进去--废弃 修改到同步标准的地方去了，不管存在附加评估与否，都增加附加评估类型 - //if (!await _trialCriterionAdditionalAssessmentTypeRepository.AnyAsync(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) - //{ - // AdditionalAssessment additional = new AdditionalAssessment(); - // var addList = additional.GetSystemDefeaultAdditionalAssessmentList(inDto.CriterionType); - // foreach (var addItem in addList) - // { - // await _trialCriterionAdditionalAssessmentTypeRepository.AddAsync(new TrialCriterionAdditionalAssessmentType() - // { - // CriterionType = inDto.CriterionType, - // TrialReadingCriterionId = inDto.TrialReadingCriterionId, - // AdditionalAssessmentType = addItem.AdditionalAssessmentType - // }); - // } - //} - #endregion - - - if (inDto.TrialCriterionAdditionalAssessmentTypeList.All(t => t.IsSelected != true)) - { - //---选择了附加评估,必须勾选附加评估类型 - throw new BusinessValidationFailedException(_localizer["TrialConfig_AddEvalReq"]); - } - - var trialId = _readingQuestionTrialRepository.Where(t => t.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).Select(t => t.TrialId).FirstOrDefault(); - - - if (inDto.TrialCriterionAdditionalAssessmentTypeList.Count != 0) - { - foreach (var updateItem in inDto.TrialCriterionAdditionalAssessmentTypeList) - { - if (updateItem.IsSelected == true) - { - //添加默认问题 - AdditionalAssessment additional = new AdditionalAssessment(); - var addTypeList = additional.GetSystemDefeaultAdditionalAssessmentList(updateItem.CriterionType, updateItem.AdditionalAssessmentType); - - if (!await _readingQuestionTrialRepository.AsQueryable().IgnoreQueryFilters().AnyAsync(t => t.ReadingQuestionCriterionTrialId == updateItem.TrialReadingCriterionId && t.IsAdditional == true)) - { - foreach (var addType in addTypeList) - { - foreach (var question in addType.AdditionalQuestionList) - { - question.ReadingQuestionCriterionTrialId = updateItem.TrialReadingCriterionId; - question.TrialId = trialId; - - await _readingQuestionTrialRepository.AddAsync(question); - } - } - } - } - - await _trialCriterionAdditionalAssessmentTypeRepository.UpdatePartialFromQueryAsync(updateItem.Id, t => new TrialCriterionAdditionalAssessmentType() { IsSelected = updateItem.IsSelected }); - } - } - - } - else - { - //删除附加问题 - await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(t => t.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId && t.IsAdditional == true); - } var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync(); @@ -677,67 +592,9 @@ namespace IRaCIS.Core.Application return ResponseOutput.Ok(result); } - /// - /// 获取附加评估选项列表 - /// - /// - /// - [Obsolete] - public async Task> GetTrialCriterionAdditionalAssessmentOptionList(Guid trialReadingCriterionId) - { - return await _trialCriterionAdditionalAssessmentTypeRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).ToListAsync(); - } - /// - /// 保存附加评估设置 （自动添加 或者删除附加评估问题） - /// - /// - /// - [Obsolete] - public async Task SetTrialCriterionAdditionalAssessment(List updateList) - { - if (updateList.Count == 0) - { - return ResponseOutput.Ok(); - } - - var trialId = _readingQuestionTrialRepository.Where(t => t.ReadingQuestionCriterionTrialId == updateList.First().TrialReadingCriterionId).Select(t => t.TrialId).FirstOrDefault(); - - foreach (var updateItem in updateList) - { - if (updateItem.IsSelected == true) - { - //添加默认问题 - AdditionalAssessment additional = new AdditionalAssessment(); - var addTypeList = additional.GetSystemDefeaultAdditionalAssessmentList(updateItem.CriterionType, updateItem.AdditionalAssessmentType); - - foreach (var addType in addTypeList) - { - foreach (var question in addType.AdditionalQuestionList) - { - question.ReadingQuestionCriterionTrialId = updateItem.TrialReadingCriterionId; - question.TrialId = trialId; - - await _readingQuestionTrialRepository.AddAsync(question); - } - } - } - else - { - //删除附加问题 - - await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(t => t.ReadingQuestionCriterionTrialId == updateItem.TrialReadingCriterionId && t.IsAdditional == true); - } - - await _trialCriterionAdditionalAssessmentTypeRepository.UpdatePartialFromQueryAsync(updateItem.Id, t => new TrialCriterionAdditionalAssessmentType() { IsSelected = updateItem.IsSelected }); - } - - - await _readingQuestionTrialRepository.SaveChangesAsync(); - return ResponseOutput.Ok(); - } /// diff --git a/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs b/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs index 86fb420db..f72acc924 100644 --- a/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs @@ -22,14 +22,13 @@ namespace IRaCIS.Core.Application.Triggers private readonly IRepository _readingTaskQuestionAnswerRepository; - private readonly IRepository _subjectAdditionalEvaluationResultRepository; public VisitTaskIsFrontTaskNeedSignButNotSignTrigger( IRepository visitTaskRepository, IRepository trialReadingCriterionRepository, IRepository trialReadingQuestionRepository - , IRepository readingTaskQuestionAnswerRepository, IRepository subjectAdditionalEvaluationResultRepository) + , IRepository readingTaskQuestionAnswerRepository) { _trialReadingCriterionRepository = trialReadingCriterionRepository; @@ -37,7 +36,6 @@ namespace IRaCIS.Core.Application.Triggers _trialReadingQuestionRepository = trialReadingQuestionRepository; _readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository; - _subjectAdditionalEvaluationResultRepository = subjectAdditionalEvaluationResultRepository; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs deleted file mode 100644 index bb5b63628..000000000 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ /dev/null @@ -1,79 +0,0 @@ - -//-------------------------------------------------------------------- -// 此代码由T4模板自动生成 byzhouhang 20210918 -// 生成时间 2023-03-17 11:50:31 -// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models -{ - /// - ///SubjectAdditionalEvaluationResult - /// - [Table("SubjectAdditionalEvaluationResult")] - public class SubjectAdditionalEvaluationResult : Entity, IAuditUpdate, IAuditAdd - { - - - [JsonIgnore] - [ForeignKey("TrialReadingQuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } - - - public Guid TrialReadingQuestionId { get; set; } - - - - - public Guid SubjectId { get; set; } - - - public Guid TrialReadingCriterionId { get; set; } - - - public DateTime CreateTime { get; set; } - - - public Guid CreateUserId { get; set; } - - - public Guid UpdateUserId { get; set; } - - - public DateTime UpdateTime { get; set; } - - - public Guid? VisitTaskId { get; set; } - - - public string Answer { get; set; } - - /// - /// 附加评估答案翻译字典 - /// - [Required] - public string TranslateDictionaryCode { get; set; }=string.Empty; - - /// - /// 是否是最终结果 - /// - [Required] - public bool IsFinalResult { get; set; } - - /// - /// 最终结果 - /// - [Required] - public string FinalAnswer { get; set; } - - /// - /// 最终结果翻字典 - /// - [Required] - public string FinalTranslateDictionaryCode { get; set; } - - } - -} diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index cda0d91d1..36163fa6b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -264,9 +264,7 @@ namespace IRaCIS.Core.Domain.Models public List ReadingQuestionTrialList = new List(); - [JsonIgnore] - public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); [JsonIgnore] diff --git a/IRaCIS.Core.Domain/SQLFile/20230713删除表.sql b/IRaCIS.Core.Domain/SQLFile/20230713删除表.sql index 20de530f0..56628854a 100644 --- a/IRaCIS.Core.Domain/SQLFile/20230713删除表.sql +++ b/IRaCIS.Core.Domain/SQLFile/20230713删除表.sql @@ -1,6 +1,7 @@ --医生相关 DROP TABLE Attachment; DROP TABLE Doctor; +DROP TABLE DoctorPayInformation DROP TABLE Postgraduate; DROP TABLE Education; DROP TABLE ResearchPublication; @@ -22,6 +23,11 @@ DROP TABLE TrialRevenuesPrice; DROP TABLE TrialRevenuesPriceVerification; DROP TABLE VolumeReward; +--new +DROP TABLE Payment +DROP TABLE PaymentAdjustment +DROP TABLE PaymentDetail + --工作量 DROP TABLE [Workload]; @@ -48,6 +54,11 @@ DROP TABLE SubjectCriteriaEvaluation; DROP TABLE SubjectCriteriaEvaluationVisitFilter; DROP TABLE SubjectCriteriaEvaluationVisitStudyFilter; +--new +DROP TABLE SubjectAdditionalEvaluationResult +DROP TABLE TrialCriterionAdditionalAssessmentType + + diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index 9b1d0c066..dcece25c9 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -26,11 +26,6 @@ namespace IRaCIS.Core.Domain.Models - [JsonIgnore] - - public List SubjectAdditionalEvaluationResult { get; set; } - - [JsonIgnore] public List ReadingTaskQuestionAnswerList { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index ae3bc93d8..eff31d601 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -249,10 +249,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common dicValueList = await _dbContext.Dictionary.Where(t => dicIdList.Contains(t.Id)).Select(t => t.Value).ToListAsync(); } - // 附加评估 - - var addtionalAssesementList = await _dbContext.TrialCriterionAdditionalAssessmentType.Where(t => t.TrialReadingCriterionId == entity.Id && t.IsSelected != null) - .Select(t => new { t.AdditionalAssessmentType, t.IsSelected }).ToListAsync(); await InsertInspection(entity, type, x => new InspectionConvertDTO() @@ -268,7 +264,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common }, new { EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty, - AdditionalAssessmentTypeList = addtionalAssesementList + }); } diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index fd26a923c..80d3a9a6a 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -260,10 +260,8 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet TrialClinicalDataSetCriterion { get; set; } - public virtual DbSet TrialCriterionAdditionalAssessmentType { get; set; } - public virtual DbSet SubjectAdditionalEvaluationResult { get; set; }