影响上传导出

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -3,6 +3,7 @@ using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
+using MiniExcelLibs.OpenXml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -25,10 +26,10 @@ public static class ExcelExportHelper
 
             //字典表查询出所有需要翻译的数据
 
-            var translateDataList = await  _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).ToArray());
+            var translateDataList = await  _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
 
 
-            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonStr());
+            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull());
 
             foreach (var key in dic.Keys)
             {
@@ -41,7 +42,7 @@ public static class ExcelExportHelper
 
                     foreach (var item in dic[key] as JArray)
                     {
-                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonStr());
+                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
 
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
@@ -80,7 +81,12 @@ public static class ExcelExportHelper
 
         var memoryStream = new MemoryStream();
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data);
+        var config = new OpenXmlConfiguration()
+        {
+            IgnoreTemplateParameterMissing = true,
+        };
+
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);
 

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

@@ -6925,6 +6925,22 @@
             <param name="subjectVisitId"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.CRCVisitListExport(IRaCIS.Core.Application.Contracts.CRCVisitSearchDTO,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService)">
+            <summary>
+            影像上传列表    只导出已上传状态的访视记录
+            </summary>
+            <param name="visitSearchDTO"></param>
+            <param name="_commonDocumentRepository"></param>
+            <param name="_dictionaryService"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.GetQCChallengeList_EXport(IRaCIS.Core.Application.Contracts.ChallengeQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService)">
+            <summary>
+             质疑列表   
+            </summary>
+            <param name="challengeQuery"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.GetCRCVisitList(IRaCIS.Core.Application.Contracts.CRCVisitSearchDTO)">
             <summary>
             CRC 访视上传列表

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

@@ -102,7 +102,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
 
-            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == querySubjectAssign.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
+            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == querySubjectAssign.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType,x.IsArbitrationReading,x.IsOncologyReading }).FirstOrDefaultAsync()).IfNullThrowException();
 
             return (pageList, criterionConfig);
         }

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -121,6 +121,8 @@ namespace IRaCIS.Core.Application.Contracts
     public class CRCVisitExportDTO
     {
         public ChallengeStateEnum ChallengeState { get; set; }
+
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsUrgent { get; set; }
         public string BlindName { get; set; } = String.Empty;
         public string VisitName { get; set; } = string.Empty;
@@ -149,6 +151,78 @@ namespace IRaCIS.Core.Application.Contracts
     }
 
 
+    public class QCChanllengeExportDto
+    {
+
+        [DictionaryTranslateAttribute("Subject_Visit_Status")]
+        public SubjectStatus SubjectState { get; set; }
+
+        public string ChallengeCode { get; set; } = String.Empty;
+
+        public String TrialSiteCode { get; set; } = String.Empty;
+
+        public string SubjectCode { get; set; } = String.Empty;
+
+        public string VisitName { get; set; } = string.Empty;
+
+
+        public DateTime? CreateTime { get; set; }
+
+
+        public string CreateUserName { get; set; } = String.Empty;
+
+
+
+        public DateTime? LatestMsgTime { get; set; }
+
+
+        public string LatestReplyUserName { get; set; } = String.Empty;
+
+        public string Content { get; set; } = string.Empty;
+
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsClosed { get; set; }
+
+        public DateTime? ClosedTime { get; set; }
+
+        public DateTime? DeadlineTime { get; set; }
+
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsOverTime => IsClosed ? ClosedTime > DeadlineTime : DateTime.Now > DeadlineTime;
+
+        public string ChallengeDuration
+        {
+            get
+            {
+                if (!ClosedTime.HasValue)
+                    return "";
+                else return string.Format("{0}天{1}小时{2}分钟", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes);
+            }
+        }
+
+
+        //public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
+        //public SubmitStateEnum SubmitState { get; set; }
+        //public string? CurrentActionUserName { get; set; }
+
+        //public bool IsUrgent { get; set; }
+
+        //public DateTime? ReUploadedTime { get; set; }
+
+        //public RequestBackStateEnum RequestBackState { get; set; }
+
+        //public string PreliminaryAuditUserName { get; set; } = String.Empty;
+        //public AuditStateEnum AuditState { get; set; }
+        //public CurrentQC CurrentQCEnum { get; set; }
+        //public string ChallengeType { get; set; } = string.Empty;
+        //public string Note { get; set; } = string.Empty;
+
+
+
+    }
+
+
+
 
     public class QCCRCVisitViewModel : QCVisitBasicListViewModel
     {

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

@@ -41,7 +41,13 @@ namespace IRaCIS.Core.Application.Image.QA
         #region 导表查询
 
 
-        //影像上传列表
+        /// <summary>
+        /// 影像上传列表    只导出已上传状态的访视记录
+        /// </summary>
+        /// <param name="visitSearchDTO"></param>
+        /// <param name="_commonDocumentRepository"></param>
+        /// <param name="_dictionaryService"></param>
+        /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
         public async Task<IActionResult> CRCVisitListExport(CRCVisitSearchDTO visitSearchDTO,
@@ -49,7 +55,6 @@ namespace IRaCIS.Core.Application.Image.QA
             [FromServices] IDictionaryService _dictionaryService)
         {
 
-
             var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
 
             var list = await _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId)
@@ -67,24 +72,54 @@ namespace IRaCIS.Core.Application.Image.QA
                        .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
                        .ProjectTo<CRCVisitExportDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-            //var needTranslatePropertyList = typeof(CRCVisitExportDTO).GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), false))
+            var exportInfo = (await _trialRepository.Where(t => t.Id == visitSearchDTO.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
-            //    .Select(c => new { c.Name, DicParentCode = ((DictionaryTranslateAttribute?)c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false)[0])?.DicParentCode }).ToList()
-            //    ;
 
-            //var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).ToArray());
+            exportInfo.List = list;
-
-            //var obj = new { cc = "aa", list };
 
 
-            var exportInfo = (await _trialRepository.Where(t => t.Id == visitSearchDTO.TrialId).IgnoreQueryFilters().ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
+
+        }
 
 
-            dynamic obj = exportInfo;
 
-            ((IDictionary<string, object>)obj).Add("List", list);
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, obj, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
+        /// <summary>
+        ///  质疑列表   
+        /// </summary>
+        /// <param name="challengeQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> GetQCChallengeList_EXport(ChallengeQuery challengeQuery,
+             [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
+            [FromServices] IDictionaryService _dictionaryService)
             
+        {
+
+            var svExpression = QCCommon.GetQCChallengeFilter(challengeQuery.VisitPlanArray);
+
+            var list =await  _repository.Where<QCChallenge>(x => x.TrialId == challengeQuery.TrialId)
+                //.WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState)
+                .WhereIf(challengeQuery.ReuploadEnum != null, t => t.ReuploadEnum == challengeQuery.ReuploadEnum)
+                .WhereIf(challengeQuery.IsClosed != null, t => t.IsClosed == challengeQuery.IsClosed)
+                .WhereIf(challengeQuery.SiteId != null, t => t.SubjectVisit.SiteId == challengeQuery.SiteId)
+                .WhereIf(challengeQuery.SubjectId != null, t => t.SubjectVisit.SubjectId == challengeQuery.SubjectId)
+                .WhereIf(challengeQuery.CreateUserId != null, t => t.CreateUserId == challengeQuery.CreateUserId)
+                .WhereIf(!string.IsNullOrEmpty(challengeQuery.SubjectCode), t => t.SubjectVisit.Subject.Code.Contains(challengeQuery.SubjectCode))
+                .WhereIf(challengeQuery.VisitPlanArray != null && challengeQuery.VisitPlanArray?.Length > 0, svExpression)
+                //.WhereIf(!string.IsNullOrEmpty(challengeQuery.VisitPlanInfo), challengeQuery.VisitPlanInfo.Contains('.') ? t => t.SubjectVisit.InPlan == false : t => t.SubjectVisit.VisitNum == decimal.Parse(challengeQuery.VisitPlanInfo))
+                .WhereIf(challengeQuery.IsUrgent != null, t => t.SubjectVisit.IsUrgent == challengeQuery.IsUrgent)
+                .WhereIf(challengeQuery.IsOverTime != null, t => DateTime.Now > t.DeadlineTime)
+                .ProjectTo<QCChanllengeExportDto>(_mapper.ConfigurationProvider).ToListAsync();
+
+
+            var exportInfo = (await _trialRepository.Where(t => t.Id == challengeQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+
+            exportInfo.List = list;
+
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialQCImageChanllengeList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
         }
 
 

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

@@ -1,5 +1,6 @@
 using AutoMapper;
 using AutoMapper.EquivalencyExpression;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.MediatR.CommandAndQueries;
@@ -14,7 +15,7 @@ namespace IRaCIS.Core.Application.Service
             #region 导出列表
 
 
-
+            CreateMap<Trial, ExcelExportInfo>();
             CreateMap<SubjectVisit, CRCVisitExportDTO>()
           .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
           .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
@@ -24,6 +25,17 @@ namespace IRaCIS.Core.Application.Service
            || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count() > 0)
            || t.PreviousSurgeryList.Any() : false));
 
+
+
+            CreateMap<QCChallenge, QCChanllengeExportDto>()
+
+              .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.SubjectVisit.Subject.Code))
+              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.SubjectVisit.TrialSite.TrialSiteCode))
+              .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
+
+              .ForMember(d => d.CreateUserName, u => u.MapFrom(s => s.CreateUser.UserName))
+              .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName))
+              .ForMember(d => d.SubjectState, u => u.MapFrom(s => s.SubjectVisit.Subject.Status));
             #endregion
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -104,25 +104,30 @@ namespace IRaCIS.Application.Contracts
     }
 
 
-    public class TrialCRCUploadImageList_Export: ExcelExportTrialInfo
+    public class TrialCRCUploadImageList_Export: ExcelExportInfo
     {
 
+
+
     }
 
-    public class ExcelExportTrialInfo : TrialSelectDTO
+    public class ExcelExportInfo : TrialSelectDTO
     {
         public DateTime CurrentTime { get; set; } = DateTime.Now;
 
+
+        public object List { get; set; }
+
     }
 
-    public class TrialUserExportDTO : ExcelExportTrialInfo
+    public class TrialUserExportDTO : ExcelExportInfo
     {
 
         public List<TrialMaintenanceDTO> TrialUserList { get; set; } = new List<TrialMaintenanceDTO>();
     }
 
 
-    public class TrialSiteUserExportDto : ExcelExportTrialInfo
+    public class TrialSiteUserExportDto : ExcelExportInfo
     {
 
         public List<SiteUserExportDTO> TrialSiteUserList { get; set; } = new List<SiteUserExportDTO>();
@@ -136,7 +141,7 @@ namespace IRaCIS.Application.Contracts
         public string TrialSiteAliasName { get; set; } = String.Empty;
     }
 
-    public class TrialSiteUserSummaryExportDto : ExcelExportTrialInfo
+    public class TrialSiteUserSummaryExportDto : ExcelExportInfo
     {
 
         public List<TrialSiteUserSummaryDto> TrialSiteUserList { get; set; } = new List<TrialSiteUserSummaryDto>();

IRaCIS.Core.Domain/_Config/_StaticData.cs

@@ -124,6 +124,8 @@ public static class StaticData
         public const string TrialUserList_Export = "TrialUserList_Export";
 
         public const string TrialCRCUploadImageList_Export = "TrialCRCUploadImageList_Export";
+
+        public const string TrialQCImageChanllengeList_Export = "TrialQCImageChanllengeList_Export";
     }
 
 

IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs

@@ -29,5 +29,16 @@ namespace IRaCIS.Core.Infrastructure.Extention
 		
 			return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Ignore });
 		}
+
+		/// <summary>
+		/// 将对象序列化成稽查需要的Json字符串
+		/// </summary>
+		/// <param name="obj"></param>
+		/// <returns></returns>
+		public static string ToJsonNotIgnoreNull(this object obj)
+		{
+
+			return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Include });
+		}
 	}
 }