diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 680eb367c..7ceebbdd4 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -16149,6 +16149,11 @@ + + + 访视数据模型 + + 遮挡影像 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index f260a0e8b..7deb0cfdc 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -273,7 +273,11 @@ namespace IRaCIS.Core.Application.Service new SiteSurveyEquipmentField() { FiledName = "ScannerType", ShowOrder = 5, IsView = true }, new SiteSurveyEquipmentField() { FiledName = "Note", ShowOrder = 6, IsView = true }, - } + + + }, + NotShowFieldList = new List() { "IsRoutineMRIPDEE", "MRIPDFFScanTime", "MRIPDFFLeadTime", "MRIPDFFOther", "IsAuthorizeRadiologistsParticipate", "AssignFixedTechnologists", "ISStrictManualBurnFlag", "NotStrictManualBurnFlagReason" }; + }; trial.TrialExtraConfigJsonStr = trialExtalConfig.ToJsonStr(); diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 9544e7352..1d6230106 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service /// /// [AllowAnonymous] - [HttpPost("{email}")] + [HttpPost] public async Task SiteSuveryEquipment() { //默认配置 @@ -195,6 +195,47 @@ namespace IRaCIS.Core.Application.Service return ResponseOutput.Ok(); } + + /// + /// 访视数据模型 + /// + public class SubjectVisitExcel + { + public string SubjectCode { get; set; } + + public Guid? SubjectVisitId { get; set; } + public decimal VisitNum { get; set; } + public string VisitName { get; set; } + } + + [AllowAnonymous] + public async Task ExtralUndownloadImages() + { + var newVisits = MiniExcel.Query(@"C:\Users\PC\Desktop\New.xlsx").ToList(); + + var oldVisits = MiniExcel.Query(@"C:\Users\PC\Desktop\Old.xlsx").ToList(); + + var downloadVisit = new List(); + + foreach (var item in newVisits) + { + if (oldVisits.Any(t => t.VisitNum == item.VisitNum && t.SubjectCode == item.SubjectCode)) + { + continue; + } + else + { + downloadVisit.Add(item); + } + } + + + string exportPath = @$"C:\Users\PC\Desktop\newDownload.xlsx"; + MiniExcel.SaveAs(exportPath, downloadVisit); + + return ResponseOutput.Ok(downloadVisit); + } + //创建一个模型验证的方法 [AllowAnonymous] [HttpPost("{email}")]