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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-05-19 11:14:49 +08:00
parent 8556f7cdf6 0d82e3e72b
commit 8a1a07980d
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Visit/Interface/ISubjectService.cs
View File

@ -9,6 +9,7 @@ namespace IRaCIS.Application.Interfaces
Task<IResponseOutput> DeleteSubject(Guid id);
Task<IResponseOutput> UpdateSubjectStatus(SubjectStatusChangeCommand subjectStatusChangeCommand);
Task<IResponseOutput<PageOutput<SubjectQueryView>, TrialSubjectConfig>> GetSubjectList(SubjectQueryParam param);
}
}

2
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -114,7 +114,7 @@ namespace IRaCIS.Application.Services
/// <summary> 分页获取受试者列表[New] </summary>
/// /// <param name="param">state:1-访视中，2-出组。0-全部</param>
[HttpPost]
public async Task<IResponseOutput<PageOutput<SubjectQueryView>, TrialSubjectConfig>> GetSubjectList(SubjectQueryParam param)
public async Task<IResponseOutput<PageOutput<SubjectQueryView>>> GetSubjectList(SubjectQueryParam param)
{
var subjectQuery = _subjectRepository.Where(u => u.TrialId == param.TrialId)

2
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -255,7 +255,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<ReadingQuestionTrial>();
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
}

16
IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs
View File

@ -30,13 +30,13 @@
T Data { get; }
}
public interface IResponseOutput<T,T2> : IResponseOutput
{
/// <summary>
/// 返回数据
/// </summary>
T Data { get; }
//public interface IResponseOutput<T,T2> : IResponseOutput
//{
// /// <summary>
// /// 返回数据
// /// </summary>
// T Data { get; }
T2 OtherInfo { get; }
}
// T2 OtherInfo { get; }
//}
}

44
IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs
View File

@ -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<T, T2> : IResponseOutput<T, T2>
{
[JsonProperty("Result")]
public T Data { get; private set; }
//public class ResponseOutput<T, T2> : IResponseOutput<T, T2>
//{
// [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<T, T2> Ok(T data, T2 otherInfo, string msg = "")
{
IsSuccess = true;
Data = data;
OtherInfo = otherInfo;
ErrorMessage = msg;
// public ResponseOutput<T, T2> Ok(T data, T2 otherInfo, string msg = "")
// {
// IsSuccess = true;
// Data = data;
// OtherInfo = otherInfo;
// ErrorMessage = msg;
return this;
}
}
// return this;
// }
//}
/// <summary>
@ -111,10 +111,10 @@ namespace IRaCIS.Core.Infrastructure.Extention
{
public static IResponseOutput<T, T2> Ok<T, T2>(T data, T2 otherInfo, string msg = "")
{
return new ResponseOutput<T, T2>().Ok(data, otherInfo);
}
//public static IResponseOutput<T, T2> Ok<T, T2>(T data, T2 otherInfo, string msg = "")
//{
// return new ResponseOutput<T, T2>().Ok(data, otherInfo);
//}
/// <summary>