diff --git a/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs b/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs deleted file mode 100644 index d1f6797f8..000000000 --- a/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs +++ /dev/null @@ -1,90 +0,0 @@ -//using IRaCIS.Application.Interfaces; -//using IRaCIS.Core.Infra.EFCore; -//using IRaCIS.Core.Domain.Share; -//using IRaCIS.Core.Application.Filter; -//using Microsoft.AspNetCore.Mvc; -//using IRaCIS.Core.Application.Service.WorkLoad.DTO; -//using Microsoft.AspNetCore.Authorization; -//using IRaCIS.Core.Application.Auth; -//using IRaCIS.Core.Application.Service.Reading.Dto; -//using IRaCIS.Core.Domain.Share.Reading; -//using IRaCIS.Core.Application.Contracts; - -//namespace IRaCIS.Application.Services -//{ -// /// -// /// 临床数据 原表 -// /// -// [ApiExplorerSettings(GroupName = "Reading")] -// public class PreviousPDFService : BaseService -// { - -// public IRepository _subjectVisitRepository; -// private readonly IRepository _previousPDFRepository; - -// public PreviousPDFService(IRepository subjectVisitRepository, -// IRepository PreviousPDFRepository -// ) -// { -// _subjectVisitRepository = subjectVisitRepository; -// _previousPDFRepository = PreviousPDFRepository; - -// } - -// #region 历史 接口名暂未修改 - - -// /// -// /// 新增或者修改 -// /// -// /// -// /// -// [HttpPost] -// public async Task AddOrUpdateReadingPreviousPDF(PreviousPDFAddOrEdit addOrEditPreviousPDF) -// { -// var entity = await _repository.InsertOrUpdateAsync(addOrEditPreviousPDF, true); -// return ResponseOutput.Ok(entity.Id.ToString()); -// } - - - - -// /// -// /// 获取 -// /// -// /// -// /// -// [HttpPost] -// public async Task GetPreviousPDFList(PreviousPDFInDto inDto) -// { -// var list= await _previousPDFRepository.AsQueryable().Where(x => x.TrialId == inDto.TrialId) -// .Where(x => (x.ClinicalLevel == ClinicalLevel.Subject && x.SubjectId == inDto.SubjectId) || x.SubjectVisitId == inDto.VisitOrReadId) -// .Select(x=>new { -// x.Path, -// x.DataType, -// x.CreateTime, -// x.ClinicalLevel, -// x.FileName, -// x.UploadType, -// x.Id, -// }).ToListAsync(); -// return list; -// } - - -// #endregion - - -// /// -// /// 删除 -// /// -// /// -// /// -// [HttpDelete("{previousPDFId:guid}")] -// public async Task DeletePreviousPDF(Guid previousPDFId) -// { -// var success = await _previousPDFRepository.DeleteFromQueryAsync(t => t.Id == previousPDFId,true); -// return ResponseOutput.Result(true); -// } -// } -//} diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 76d075abc..a6c3a759f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -378,7 +378,7 @@ namespace IRaCIS.Application.Services public async Task> GetSubjectReadVisitList(GetSubjectReadVisitsInDto inDto) { var maxReadVisit = await _readModuleRepository.Where(x => x.SubjectId == inDto.SubjectId&&x.ReadingSetType==inDto.ReadingSetType).OrderByDescending(x=>x.VisitNum).FirstOrDefaultAsync(); - var maxReadVisitNum= maxReadVisit==null?0:maxReadVisit.VisitNum; + var maxReadVisitNum= maxReadVisit==null?-1:maxReadVisit.VisitNum; var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null&&!x.IsLostVisit); var finalVisitNum = await visitQuery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync(); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs new file mode 100644 index 000000000..ea01fb5bb --- /dev/null +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -0,0 +1,62 @@ +using IRaCIS.Application.Interfaces; +using IRaCIS.Core.Infra.EFCore; +using IRaCIS.Core.Domain.Share; +using IRaCIS.Core.Application.Filter; +using Microsoft.AspNetCore.Mvc; +using IRaCIS.Core.Application.Service.WorkLoad.DTO; +using Microsoft.AspNetCore.Authorization; +using IRaCIS.Core.Application.Auth; +using IRaCIS.Core.Application.Service.Reading.Dto; +using IRaCIS.Core.Domain.Share.Reading; +using MassTransit; +using IRaCIS.Core.Application.Service.Reading; + +namespace IRaCIS.Application.Services +{ + /// + /// 阅片问题.标准 + /// + [ApiExplorerSettings(GroupName = "Reading")] + public class ReadingQuestionService : BaseService + { + + public IRepository _subjectVisitRepository; + + private readonly IRepository _clinicalDataTrialSetRepository; + private readonly IRepository _clinicalDataSystemSetRepository; + private readonly IRepository _previousPDFRepository; + + public ReadingQuestionService(IRepository subjectVisitRepository, + + IRepository ClinicalDataTrialSetRepository, + IRepository ClinicalDataSystemSetRepository, + IRepository previousPDFRepository + ) + { + _subjectVisitRepository = subjectVisitRepository; + + _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository; + _clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository; + this._previousPDFRepository = previousPDFRepository; + } + + + + + /// + /// 新增修改 + /// + /// + /// + [HttpPost] + public async Task AddOrUpdateReadingQuestionCriterionSystem(AddOrUpdateReadingQuestionCriterionSystemInDto indto) + { + var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto,true); + return ResponseOutput.Ok(entity.Id.ToString()); + } + + + + + } +} diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionViewModel.cs new file mode 100644 index 000000000..046a7091e --- /dev/null +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionViewModel.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace IRaCIS.Core.Application.Service.Reading +{ + public class AddOrUpdateReadingQuestionCriterionSystemInDto + { + public Guid? Id { get; set; } + + /// + /// 标准ID + /// + public Guid CriterionId { get; set; } + + /// + /// 标准 + /// + public string CriterionName { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + } +} diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 72509e2a4..83058e06b 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -20,8 +20,6 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode))) .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count)); - - CreateMap(); // CreateMap() //.ForMember(d => d.ClinicalDataLevel, u => u.MapFrom(s => s.ClinicalDataTrialSet.ClinicalDataLevel)) @@ -29,15 +27,11 @@ namespace IRaCIS.Core.Application.Service //.ForMember(d => d.ClinicalUploadType, u => u.MapFrom(s => s.ClinicalDataTrialSet.ClinicalUploadType)); //.ForMember(d => d.FileCount, u => u.MapFrom(s => s.ReadingClinicalDataPDFList.Count())); - - CreateMap(); //.ForMember(d => d.SiteNames, u => u.MapFrom(s => s.ReadingPeriodSites.SelectMany(x => x.Site.SiteName).ToList())); - - CreateMap().ReverseMap(); CreateMap().ReverseMap(); @@ -56,6 +50,9 @@ namespace IRaCIS.Core.Application.Service CreateMap(); + #region 阅片问题 + + #endregion diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs new file mode 100644 index 000000000..52e3cf354 --- /dev/null +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs @@ -0,0 +1,53 @@ + + +using System; +using IRaCIS.Core.Domain.Share; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using IRaCIS.Core.Domain.Share.Reading; +using System.Collections.Generic; + +namespace IRaCIS.Core.Domain.Models +{ + /// + /// 系统阅片标准 + /// + [Table("ReadingQuestionCriterionSystem")] + public class ReadingQuestionCriterionSystem : Entity, IAuditAdd + { + /// + /// 标准ID + /// + public Guid CriterionId { get; set; } + + /// + /// 标准 + /// + public string CriterionName { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 创建人 + /// + public Guid CreateUserId { get; set; } + + + + + } + + + + + + +} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 53ccfcecc..20144bd1b 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -182,6 +182,8 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet ReadingClinicalData { get; set; } + public virtual DbSet ReadingQuestionCriterionSystem { get; set; } + public virtual DbSet ReadingClinicalDataView { get; set; } public virtual DbSet ReadingClinicalDataPDF { get; set; }