XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字典表加组字段

Uat_Study
hang 2022-04-01 16:29:10 +08:00
parent b701ce0715
commit 31f90660d3
6 changed files with 216 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
IRaCIS.Core.API/Controllers/DownLoadController.cs
View File

@ -1,74 +1,88 @@
//using AutoMapper;
//using AutoMapper.QueryableExtensions;
//using IRaCIS.Application.ViewModels;
//using IRaCIS.Core.Application.Contracts;
//using IRaCIS.Core.Application.Filter;
//using IRaCIS.Core.Application.MediatR.CommandAndQueries;
//using IRaCIS.Core.Domain.Models;
//using IRaCIS.Core.Domain.Share;
//using IRaCIS.Core.Infra.EFCore;
//using IRaCIS.Core.Infrastructure.Extention;
//using Magicodes.ExporterAndImporter.Core;
//using Magicodes.ExporterAndImporter.Excel;
//using MediatR;
//using Microsoft.AspNetCore.Hosting;
//using Microsoft.AspNetCore.Http;
//using Microsoft.AspNetCore.Mvc;
//using Microsoft.AspNetCore.WebUtilities;
//using Microsoft.Net.Http.Headers;
//using System;
//using System.IO;
//using System.Linq;
//using System.Threading.Tasks;
using AutoMapper;
//namespace IRaCIS.Core.API.Controllers
//{
// [ApiExplorerSettings(GroupName = "Image")]
// [ApiController]
// public class DownLoadController : ControllerBase
// {
// public IMapper _mapper { get; set; }
// public IUserInfo _userInfo { get; set; }
// private readonly IMediator _mediator;
using IRaCIS.Core.Domain.Models;
// private readonly IWebHostEnvironment _hostEnvironment;
using IRaCIS.Core.Infra.EFCore;
// private readonly IServiceProvider _serviceProvider;
using MediatR;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
// public DownLoadController(IMapper mapper, IUserInfo userInfo, IMediator mediator, IWebHostEnvironment hostEnvironment, IServiceProvider serviceProvider)
// {
// _serviceProvider = serviceProvider;
// _hostEnvironment = hostEnvironment;
// _mediator = mediator;
// _mapper = mapper;
// _userInfo = userInfo;
// }
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
// [HttpGet("VisitPlan/DownloadInflunceStudyList{trialId:guid}/{createTime:dateTime}")]
// public async Task<IActionResult> DownloadInflunceStudyList(Guid trialId, DateTime createTime, [FromServices] IRepository<VisitPlanInfluenceSubjectVisit> _influnceRepository)
// {
// var list = _influnceRepository.Where(t => t.TrialId == trialId && t.CreateTime == createTime)
// .ProjectTo<VisitPlanInfluenceSubjectVisitDTO>(_mapper.ConfigurationProvider).ToList();
namespace IRaCIS.Core.API.Controllers
{
[ApiExplorerSettings(GroupName = "Trial")]
[ApiController]
public class DownLoadController : ControllerBase
{
public IMapper _mapper { get; set; }
public IUserInfo _userInfo { get; set; }
// if(list.Count == 0)
// {
// list.Add(new VisitPlanInfluenceSubjectVisitDTO() { CreateTime=DateTime.Now,SubjectCode="test",StudyTime=DateTime.Now,IsDicomStudy=false,HistoryWindow="test"});
// }
// IExporter exporter = new ExcelExporter();
// var result = await exporter.ExportAsByteArray(list);
// return new XlsxFileResult(bytes: bytes);
// //return File(result, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $"检查导出_{DateTime.Now}.xlsx");
// }
private readonly IWebHostEnvironment _hostEnvironment;
public DownLoadController(IMapper mapper, IUserInfo userInfo, IMediator mediator, IWebHostEnvironment hostEnvironment)
{
_hostEnvironment = hostEnvironment;
_mapper = mapper;
_userInfo = userInfo;
}
// }
//}
//[HttpGet("VisitPlan/DownloadInflunceStudyList{trialId:guid}/{createTime:dateTime}")]
//public async Task<IActionResult> DownloadInflunceStudyList(Guid trialId, DateTime createTime, [FromServices] IRepository<VisitPlanInfluenceSubjectVisit> _influnceRepository)
//{
// var list = _influnceRepository.Where(t => t.TrialId == trialId && t.CreateTime == createTime)
// .ProjectTo<VisitPlanInfluenceSubjectVisitDTO>(_mapper.ConfigurationProvider).ToList();
// if (list.Count == 0)
// {
// list.Add(new VisitPlanInfluenceSubjectVisitDTO() { CreateTime = DateTime.Now, SubjectCode = "test", StudyTime = DateTime.Now, IsDicomStudy = false, HistoryWindow = "test" });
// }
// IExporter exporter = new ExcelExporter();
// var result = await exporter.ExportAsByteArray(list);
// return new XlsxFileResult(bytes: bytes);
// //return File(result, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $"检查导出_{DateTime.Now}.xlsx");
//}
[HttpGet("CommonDocument/DownloadCommonDoc")]
public async Task<IActionResult> DownloadCommonFile(string code, [FromServices] IRepository<CommonDocument> _commonDocumentRepository)
{
var doc = _commonDocumentRepository.AsQueryable(true).FirstOrDefault(t => t.Code == code);
if (doc == null)
{
throw new Exception("当前code 没要找到对应的文件");
}
var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName;
var filePath = Path.Combine(rootPath, doc.Path.Trim('/'));
if (!System.IO.File.Exists(filePath))
{
throw new Exception("服务器本地不存在该路径文件");
}
var stream = System.IO.File.OpenRead(filePath);
return File(stream, "application/octet-stream", Path.GetFileName(doc.Name));
}
}
}

25
IRaCIS.Core.API/Controllers/UploadController.cs
View File

@ -153,31 +153,6 @@ namespace IRaCIS.Core.API.Controllers
[HttpGet("CommonDocument/DownloadCommonDoc")]
public async Task<IActionResult> DownloadCommonFile(string code, [FromServices] IRepository<CommonDocument> _commonDocumentRepository)
{
var doc = _commonDocumentRepository.AsQueryable(true).FirstOrDefault(t => t.Code == code);
if (doc==null)
{
throw new Exception("当前code 没要找到对应的文件");
}
var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName;
var filePath = Path.Combine(rootPath, doc.Path.Trim('/'));
if (!System.IO.File.Exists(filePath))
{
throw new Exception("服务器本地不存在该路径文件");
}
var stream = System.IO.File.OpenRead(filePath);
return File(stream, "application/octet-stream", Path.GetFileName(doc.Name));
}
private void DealCommonStorePath(string fileType, string moduleType, string fileRealName, out string serverFilePath, out string relativePath)
{

200
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -4,106 +4,6 @@
<name>IRaCIS.Core.API</name>
</assembly>
<members>
<member name="M:EasyCaching.Demo.Interceptors.Controllers.ErrorController.Error(System.Int32)">
<summary>
主要处理 前端404等错误 全局业务异常已统一处理了，非业务错误会来到这里
</summary>
<param name="code"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Api.Controllers.ExtraController">
<summary>
医生基本信息 、工作信息 专业信息、审核状态
</summary>
</member>
<member name="M:IRaCIS.Api.Controllers.ExtraController.GetDoctorDetail(IRaCIS.Application.Interfaces.IAttachmentService,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Application.Interfaces.IEducationService,IRaCIS.Application.Interfaces.ITrialExperienceService,IRaCIS.Application.Interfaces.IResearchPublicationService,IRaCIS.Application.Interfaces.IVacationService,System.Guid)">
<summary>
获取医生详情
</summary>
<param name="attachmentService"></param>
<param name="_doctorService"></param>
<param name="_educationService"></param>
<param name="_trialExperienceService"></param>
<param name="_researchPublicationService"></param>
<param name="_vacationService"></param>
<param name="doctorId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,EasyCaching.Core.IEasyCachingProvider,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,Microsoft.Extensions.Configuration.IConfiguration)">
<summary> 系统用户登录接口[New] </summary>
</member>
<member name="T:IRaCIS.Api.Controllers.FileController">
<summary>
文件上传
</summary>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadOrdinaryFile(System.String,System.Guid)">
<summary>
上传文件[FileUpload]
</summary>
<param name="attachmentType">附件类型</param>
<param name="doctorId">医生Id</param>
<returns>返回文件信息</returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadNonDoctorFile(System.String)">
<summary>
上传文件（ 不是医生个人的文件）[FileUpload]
例如：阅片章程等
</summary>
<param name="type">文件类型</param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.WriteFileAsync(System.IO.Stream,System.String)">
<summary>
写文件导到磁盘
</summary>
<param name="stream">流</param>
<param name="path">文件保存路径</param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.DownloadAttachment(System.Guid[])">
<summary>
下载多个医生的所有附件
</summary>
<param name="doctorIds"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.DownloadOfficialResume(System.Int32,System.Guid[])">
<summary>
下载医生官方简历
</summary>
<param name="language"></param>
<param name="doctorIds"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.DownloadAttachmentById(System.Guid,System.Guid[])">
<summary>
下载指定医生的指定附件
</summary>
<param name="doctorId">医生Id</param>
<param name="attachmentIds">要下载的附件Id</param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadingStream(System.Guid,System.Guid,System.Guid,System.Guid,System.Guid,IRaCIS.Core.Application.Contracts.Image.IStudyDTFService)">
<summary>
流式上传 临时文件
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadingNoneDicomStream(IRaCIS.Core.Application.Contracts.ArchiveStudyCommand,IRaCIS.Application.Interfaces.IStudyService)">
<summary>
流式上传 非Dicom文件
</summary>
<returns></returns>
</member>
<member name="T:IRaCIS.Api.Controllers.StudyController">
<summary>
Study
</summary>
</member>
<member name="M:IRaCIS.Api.Controllers.StudyController.ArchiveStudy(IRaCIS.Core.Application.Contracts.ArchiveStudyCommand)">
<summary> 归档</summary>
</member>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand)">
<summary> 添加实验项目-返回新增Id[AUTH]</summary>
<param name="param"></param>
@ -237,6 +137,99 @@
<param name="memberSerialization">序列化成员</param>
<returns></returns>
</member>
<member name="T:IRaCIS.Api.Controllers.ExtraController">
<summary>
医生基本信息 、工作信息 专业信息、审核状态
</summary>
</member>
<member name="M:IRaCIS.Api.Controllers.ExtraController.GetDoctorDetail(IRaCIS.Application.Interfaces.IAttachmentService,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Application.Interfaces.IEducationService,IRaCIS.Application.Interfaces.ITrialExperienceService,IRaCIS.Application.Interfaces.IResearchPublicationService,IRaCIS.Application.Interfaces.IVacationService,System.Guid)">
<summary>
获取医生详情
</summary>
<param name="attachmentService"></param>
<param name="_doctorService"></param>
<param name="_educationService"></param>
<param name="_trialExperienceService"></param>
<param name="_researchPublicationService"></param>
<param name="_vacationService"></param>
<param name="doctorId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,EasyCaching.Core.IEasyCachingProvider,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,Microsoft.Extensions.Configuration.IConfiguration)">
<summary> 系统用户登录接口[New] </summary>
</member>
<member name="T:IRaCIS.Api.Controllers.FileController">
<summary>
文件上传
</summary>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadOrdinaryFile(System.String,System.Guid)">
<summary>
上传文件[FileUpload]
</summary>
<param name="attachmentType">附件类型</param>
<param name="doctorId">医生Id</param>
<returns>返回文件信息</returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadNonDoctorFile(System.String)">
<summary>
上传文件（ 不是医生个人的文件）[FileUpload]
例如：阅片章程等
</summary>
<param name="type">文件类型</param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.WriteFileAsync(System.IO.Stream,System.String)">
<summary>
写文件导到磁盘
</summary>
<param name="stream">流</param>
<param name="path">文件保存路径</param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.DownloadAttachment(System.Guid[])">
<summary>
下载多个医生的所有附件
</summary>
<param name="doctorIds"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.DownloadOfficialResume(System.Int32,System.Guid[])">
<summary>
下载医生官方简历
</summary>
<param name="language"></param>
<param name="doctorIds"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.DownloadAttachmentById(System.Guid,System.Guid[])">
<summary>
下载指定医生的指定附件
</summary>
<param name="doctorId">医生Id</param>
<param name="attachmentIds">要下载的附件Id</param>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadingStream(System.Guid,System.Guid,System.Guid,System.Guid,System.Guid,IRaCIS.Core.Application.Contracts.Image.IStudyDTFService)">
<summary>
流式上传 临时文件
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Api.Controllers.FileController.UploadingNoneDicomStream(IRaCIS.Core.Application.Contracts.ArchiveStudyCommand,IRaCIS.Application.Interfaces.IStudyService)">
<summary>
流式上传 非Dicom文件
</summary>
<returns></returns>
</member>
<member name="T:IRaCIS.Api.Controllers.StudyController">
<summary>
Study
</summary>
</member>
<member name="M:IRaCIS.Api.Controllers.StudyController.ArchiveStudy(IRaCIS.Core.Application.Contracts.ArchiveStudyCommand)">
<summary> 归档</summary>
</member>
<member name="M:IRaCIS.WX.CoreApi.Auth.AuthMiddleware.Invoke(Microsoft.AspNetCore.Http.HttpContext)">
<summary>
为了前端 一段时间无操作，需要重新登陆
@ -244,6 +237,13 @@
<param name="httpContext"></param>
<returns></returns>
</member>
<member name="M:EasyCaching.Demo.Interceptors.Controllers.ErrorController.Error(System.Int32)">
<summary>
主要处理 前端404等错误 全局业务异常已统一处理了，非业务错误会来到这里
</summary>
<param name="code"></param>
<returns></returns>
</member>
<member name="T:ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt.CustomHSJWTService">
<summary>
对称可逆加密

3
IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
View File

@ -29,7 +29,8 @@ namespace IRaCIS.Application.Contracts
public string Description { get; set; } = String.Empty;
public string ChildGroup { get; set; } = String.Empty;
public string Value { get; set; } = String.Empty;

52
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -17,7 +17,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<TrialUser> _trialUseRepository;
private readonly IRepository<Trial> _trialRepository;
public TrialMaintenanceService(IRepository<TrialUser> trialUseRepository,IRepository<Trial> trialRepository)
public TrialMaintenanceService(IRepository<TrialUser> trialUseRepository, IRepository<Trial> trialRepository)
{
_trialUseRepository = trialUseRepository;
_trialRepository = trialRepository;
@ -33,7 +33,7 @@ namespace IRaCIS.Application.Services
{
var query = _trialUseRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
.WhereIf(param.UserTypeId!=null, t => t.User.UserTypeId==param.UserTypeId)
.WhereIf(param.UserTypeId != null, t => t.User.UserTypeId == param.UserTypeId)
.WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.User.UserName.Contains(param.UserName))
.WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
@ -46,24 +46,44 @@ namespace IRaCIS.Application.Services
}
[HttpGet]
public async Task<IActionResult> TrialUserListExport(Guid trialId)
{
var list = _trialUseRepository.Where(t => t.TrialId == trialId).IgnoreQueryFilters()
.ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToList();
//[HttpGet]
//public async Task<IActionResult> TrialUserListExport(Guid trialId)
//{
// var exportInfo = new TrialUserExportDTO()
// {
// TrialInfo = await _trialRepository.ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync(),
// TrialUserList = await _trialUseRepository.Where(t => t.TrialId == trialId).IgnoreQueryFilters().ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync()
// };
// IExporter exporter = new ExcelExporter();
// ////模板路径
// //var tplPath = Path.Combine(Directory.GetCurrentDirectory(), "TestFiles", "ExportTemplates",
// // "2020年春季教材订购明细样表.xlsx");
// ////创建Excel导出对象
// //IExportFileByTemplate exporter = new ExcelExporter();
// ////导出路径
// //var filePath = Path.Combine(Directory.GetCurrentDirectory(), nameof(ExportByTemplate_Test) + ".xlsx");
// //if (File.Exists(filePath)) File.Delete(filePath);
// ////根据模板导出
// //await exporter.ExportByTemplate(filePath,
// // new TextbookOrderInfo("湖南心莱信息科技有限公司", "湖南长沙岳麓区", "雪雁", "1367197xxxx", "雪雁", DateTime.Now.ToLongDateString(),
// // new List<BookInfo>()
// // {
// // new BookInfo(1, "0000000001", "《XX从入门到放弃》", "张三", "机械工业出版社", "3.14", 100, "备注"),
// // new BookInfo(2, "0000000002", "《XX从入门到放弃》", "张三", "机械工业出版社", "3.14", 100, "备注"),
// // new BookInfo(3, "0000000003", "《XX从入门到放弃》", "张三", "机械工业出版社", "3.14", 100, "备注")
// // }),
// // tplPath);
// //var result = await exporter.ExportAsByteArray(list);
//var trialInfo= _re
IExporter exporter = new ExcelExporter();
var result = await exporter.ExportAsByteArray(list);
// return new XlsxFileResult(bytes: result, fileDownloadName: $"检查导出_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx");
return new XlsxFileResult(bytes: result, fileDownloadName: $"检查导出_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx");
}
//}

2
IRaCIS.Core.Domain/Common/Dictionary.cs
View File

@ -32,7 +32,7 @@ namespace IRaCIS.Core.Domain.Models
public int ShowOrder { get; set; }
public string Type { get; set; }
public string ChildGroup { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }