XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Test.EIImageViewer
hang 2023-02-21 16:45:06 +08:00
parent 5786c493c7
commit 62c39ee163
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
View File

@ -77,14 +77,14 @@
<PackageReference Include="Hangfire" Version="1.7.31">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Magicodes.IE.Core" Version="2.6.9" />
<PackageReference Include="Magicodes.IE.Csv" Version="2.6.9">
<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.2" />
<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.2">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Magicodes.IE.Excel" Version="2.6.9">
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.6.9" />
<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.2" />
<PackageReference Include="MailKit" Version="3.4.2" />
<PackageReference Include="MediatR" Version="11.0.0" />
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.10" />
@ -92,7 +92,7 @@
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="MimeKit" Version="3.4.2" />
<PackageReference Include="MiniExcel" Version="1.28.1" />
<PackageReference Include="MiniExcel" Version="1.30.1" />
<PackageReference Include="MiniWord" Version="0.6.1" />
<PackageReference Include="My.Extensions.Localization.Json" Version="3.0.0">
<TreatAsUsed>true</TreatAsUsed>

12
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -4,6 +4,7 @@ using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Share;
using MiniExcelLibs.Attributes;
using Newtonsoft.Json;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.Contracts
@ -243,9 +244,13 @@ namespace IRaCIS.Core.Application.Contracts
//public DateTime? SignDate { get; set; }
//public bool IsUrgent { get; set; }
//[ExcelFormat("yyyy-MM-dd")]
[ExcelFormat("MMMM dd, yyyy")]
public DateTime? FirstGiveMedicineTime { get; set; }
[ExcelColumn(Name = "FirstGiveMedicineTime", Format = "yyyy-MM-dd")]
public string FirstGiveMedicineTimeStr => FirstGiveMedicineTime?.ToString("yyyy-MM-dd");
public DateTime? OutEnrollmentTime { get; set; }
public DateTime? VisitOverTime { get; set; }
@ -416,7 +421,7 @@ namespace IRaCIS.Core.Application.Contracts
public SubjectStatus SubjectStatus { get; set; }
public string TrialReadingCriterionName { get; set; }
[ExcelFormat("yyyy-MM-dd")]
public DateTime? FirstGiveMedicineTime { get; set; }
public string ModuleName { get; set; }
@ -439,7 +444,7 @@ namespace IRaCIS.Core.Application.Contracts
public string Modality { get; set; } = string.Empty;
//[ExcelFormat("yyyy-MM-dd")]
[ExcelFormat("yyyy-MM-dd")]
public DateTime? StudyTime { get; set; }
public string SubjectCode { get; set; } = String.Empty;
@ -1141,6 +1146,7 @@ namespace IRaCIS.Core.Application.Contracts
public RequestBackStateEnum RequestBackState { get; set; }
[ExcelFormat("yyyy-MM-dd")]
public DateTime? StudyTime { get; set; }
public DateTime? CheckTime { get; set; }
public CheckChanllengeTypeEnum CheckChallengeState { get; set; }

12
IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
View File

@ -19,13 +19,13 @@ namespace IRaCIS.Core.Domain.Models
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public List<VisitTask> ModuleTaskList { get; set; }
[JsonIgnore]
public List<VisitTask> ModuleTaskList { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }

4
IRaCIS.Core.Domain/Visit/SubjectVisit.cs
View File

@ -231,10 +231,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<ReadingQuestionCriterionTrial> TrialReadingCriterionList { get; set; }
public ReadingStatusEnum ReadingStatus { get; set; }