diff --git a/IRaCIS.Core.Application/Service/Visit/Interface/ISubjectService.cs b/IRaCIS.Core.Application/Service/Visit/Interface/ISubjectService.cs index 0db901be6..004a4843e 100644 --- a/IRaCIS.Core.Application/Service/Visit/Interface/ISubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/Interface/ISubjectService.cs @@ -9,6 +9,7 @@ namespace IRaCIS.Application.Interfaces Task DeleteSubject(Guid id); Task UpdateSubjectStatus(SubjectStatusChangeCommand subjectStatusChangeCommand); - Task, TrialSubjectConfig>> GetSubjectList(SubjectQueryParam param); + + } } \ No newline at end of file diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index 3c20b6b25..c27d90ac2 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -114,7 +114,7 @@ namespace IRaCIS.Application.Services /// 分页获取受试者列表[New] /// /// state:1-访视中,2-出组。0-全部 [HttpPost] - public async Task, TrialSubjectConfig>> GetSubjectList(SubjectQueryParam param) + public async Task>> GetSubjectList(SubjectQueryParam param) { var subjectQuery = _subjectRepository.Where(u => u.TrialId == param.TrialId) diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index bbae1fda2..a91ec42f9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -255,7 +255,7 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] - public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); + public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); } diff --git a/IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs index 3c1e273ad..9c713a8a0 100644 --- a/IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs +++ b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs @@ -30,13 +30,13 @@ T Data { get; } } - public interface IResponseOutput : IResponseOutput - { - /// - /// 返回数据 - /// - T Data { get; } + //public interface IResponseOutput : IResponseOutput + //{ + // /// + // /// 返回数据 + // /// + // T Data { get; } - T2 OtherInfo { get; } - } + // T2 OtherInfo { get; } + //} } diff --git a/IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs index deacf6512..b0ae8448b 100644 --- a/IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs +++ b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs @@ -28,7 +28,7 @@ namespace IRaCIS.Core.Infrastructure.Extention public T Data { get; private set; } - + [JsonProperty("OtherInfo")] public object OtherData { get; set; } @@ -77,31 +77,31 @@ namespace IRaCIS.Core.Infrastructure.Extention } - public class ResponseOutput : IResponseOutput - { - [JsonProperty("Result")] - public T Data { get; private set; } + //public class ResponseOutput : IResponseOutput + //{ + // [JsonProperty("Result")] + // public T Data { get; private set; } - public T2 OtherInfo { get; private set; } + // public T2 OtherInfo { get; private set; } - public bool IsSuccess { get; private set; } + // public bool IsSuccess { get; private set; } - public ApiResponseCodeEnum Code { get; set; } + // public ApiResponseCodeEnum Code { get; set; } - public string ErrorMessage { get; private set; } + // public string ErrorMessage { get; private set; } - public ResponseOutput Ok(T data, T2 otherInfo, string msg = "") - { - IsSuccess = true; - Data = data; - OtherInfo = otherInfo; - ErrorMessage = msg; + // public ResponseOutput Ok(T data, T2 otherInfo, string msg = "") + // { + // IsSuccess = true; + // Data = data; + // OtherInfo = otherInfo; + // ErrorMessage = msg; - return this; - } - } + // return this; + // } + //} /// @@ -111,10 +111,10 @@ namespace IRaCIS.Core.Infrastructure.Extention { - public static IResponseOutput Ok(T data, T2 otherInfo, string msg = "") - { - return new ResponseOutput().Ok(data, otherInfo); - } + //public static IResponseOutput Ok(T data, T2 otherInfo, string msg = "") + //{ + // return new ResponseOutput().Ok(data, otherInfo); + //} ///