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

附加评估与提交

Uat_Study
hang 2023-03-17 14:26:13 +08:00
parent 82070e9bbf
commit 08281d161f
22 changed files with 948 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1941,6 +1941,49 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService">
<summary>
SubjectCriteriaEvaluationService
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.GetSubjectCriteriaEvaluationList(IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationQuery)">
<summary>
subject 某标准 是否评估列表
</summary>
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.AddOrUpdateSubjectCriteriaEvaluation(IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationAddOrEdit)">
<summary>
添加 编辑 是否参与评估
</summary>
<param name="addOrEditSubjectCriteriaEvaluation"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.GetSubjectCriteriaEvaluationVisitFilterList(IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterQuery)">
<summary>
评估访视筛选列表
</summary>
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.AddOrUpdateSubjectCriteriaEvaluationVisitFilter(IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterAddOrEdit)">
<summary>
评估访视 判断结果 影像筛选状态 手动添加/编辑接口
</summary>
<param name="addOrEditSubjectCriteriaEvaluationVisitFilter"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationVisitFilterService">
<summary>
SubjectCriteriaEvaluationVisitFilterService
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationVisitStudyFilterService">
<summary>
SubjectCriteriaEvaluationVisitStudyFilterService
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataSetName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataSetName">
<summary> <summary>
名称 名称
@ -6620,6 +6663,33 @@
检查日期 检查日期
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationView">
<summary> SubjectCriteriaEvaluationView 列表视图模型 </summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationQuery">
<summary>SubjectCriteriaEvaluationQuery 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationAddOrEdit">
<summary> SubjectCriteriaEvaluationAddOrEdit 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterView">
<summary> SubjectCriteriaEvaluationVisitFilterView 列表视图模型 </summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterQuery">
<summary>SubjectCriteriaEvaluationVisitFilterQuery 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterAddOrEdit">
<summary> SubjectCriteriaEvaluationVisitFilterAddOrEdit 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitStudyFilterView">
<summary> SubjectCriteriaEvaluationVisitStudyFilterView 列表视图模型 </summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitStudyFilterQuery">
<summary>SubjectCriteriaEvaluationVisitStudyFilterQuery 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit">
<summary> SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit 列表查询参数模型</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyView"> <member name="T:IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyView">
<summary> DefaultShortcutKeyView 列表视图模型 </summary> <summary> DefaultShortcutKeyView 列表视图模型 </summary>
</member> </member>
@ -7104,6 +7174,21 @@
ISystemNoticeService ISystemNoticeService
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Interfaces.ISubjectCriteriaEvaluationService">
<summary>
ISubjectCriteriaEvaluationService
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Interfaces.ISubjectCriteriaEvaluationVisitFilterService">
<summary>
ISubjectCriteriaEvaluationVisitFilterService
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Interfaces.ISubjectCriteriaEvaluationVisitStudyFilterService">
<summary>
ISubjectCriteriaEvaluationVisitStudyFilterService
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Interfaces.IOrganInfoService"> <member name="T:IRaCIS.Core.Application.Interfaces.IOrganInfoService">
<summary> <summary>
IOrganInfoService IOrganInfoService

4
IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs
View File

@ -42,8 +42,8 @@ namespace IRaCIS.Core.Application.Service
IsJudgeQuestion=false, IsJudgeQuestion=false,
IsShowInDicom=false, IsShowInDicom=false,
GlobalReadingShowType=GlobalReadingShowType.NotShow, GlobalReadingShowType=GlobalReadingShowType.NotShow,
QuestionEnName="存在脑转移", QuestionEnName="Brain metastases present",
QuestionName="Brain metastases present", QuestionName="存在脑转移",
Type="radio", Type="radio",
QuestionGenre=TableQuestionType.Dictionary, QuestionGenre=TableQuestionType.Dictionary,
DataSource=DataSources.ManualEntry, DataSource=DataSources.ManualEntry,

57
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs Normal file
View File

@ -0,0 +1,57 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:59:00
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel
{
/// <summary> SubjectCriteriaEvaluationView 列表视图模型 </summary>
public class SubjectCriteriaEvaluationView : SubjectCriteriaEvaluationAddOrEdit
{
public DateTime? CreateTime { get; set; }
public Guid? CreateUserId { get; set; }
public Guid? UpdateUserId { get; set; }
public DateTime? UpdateTime { get; set; }
public bool IsImageFiltering { get; set; }
//public string AdditionalResult { get; set; }
public string SubjectCode { get; set; }
public string TrialSiteCode { get; set; }
public SubjectStatus SubjectStatus { get; set; }
}
///<summary>SubjectCriteriaEvaluationQuery 列表查询参数模型</summary>
public class SubjectCriteriaEvaluationQuery : PageInput
{
[NotDefault]
public Guid TrialReadingCriterionId { get; set; }
public string SubjectCode { get; set; } = string.Empty;
public string TrialSiteCode { get; set; } = string.Empty;
public SubjectStatus? SubjectStatus { get; set; }
}
///<summary> SubjectCriteriaEvaluationAddOrEdit 列表查询参数模型</summary>
public class SubjectCriteriaEvaluationAddOrEdit
{
public Guid? Id { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public bool IsJoinEvaluation { get; set; }
}
}

54
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs Normal file
View File

@ -0,0 +1,54 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:58:25
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel
{
/// <summary> SubjectCriteriaEvaluationVisitFilterView 列表视图模型 </summary>
public class SubjectCriteriaEvaluationVisitFilterView: SubjectCriteriaEvaluationVisitFilterAddOrEdit
{
public DateTime? CreateTime { get; set; }
public Guid? CreateUserId { get; set; }
public Guid? UpdateUserId { get; set; }
public DateTime? UpdateTime { get; set; }
public bool IsGeneratedTask { get; set; }
public string VisitName { get; set; }
public DateTime? EarliestScanDate { get; set; }
public DateTime? LatestScanDate { get; set; }
}
///<summary>SubjectCriteriaEvaluationVisitFilterQuery 列表查询参数模型</summary>
public class SubjectCriteriaEvaluationVisitFilterQuery : PageInput
{
[NotDefault]
public Guid TrialReadingCriterionId { get; set; }
[NotDefault]
public Guid SubjectId { get; set; }
}
///<summary> SubjectCriteriaEvaluationVisitFilterAddOrEdit 列表查询参数模型</summary>
public class SubjectCriteriaEvaluationVisitFilterAddOrEdit
{
public Guid? Id { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
public int ImageFilterState { get; set; }
public int ImageDeterminationResultState { get; set; }
//public bool IsGeneratedTask { get; set; }
}
}

51
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitStudyFilterViewModel.cs Normal file
View File

@ -0,0 +1,51 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:58:25
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
namespace IRaCIS.Core.Application.ViewModel
{
/// <summary> SubjectCriteriaEvaluationVisitStudyFilterView 列表视图模型 </summary>
public class SubjectCriteriaEvaluationVisitStudyFilterView
{
public Guid Id { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public bool IsConfirmed { get; set; }
}
///<summary>SubjectCriteriaEvaluationVisitStudyFilterQuery 列表查询参数模型</summary>
public class SubjectCriteriaEvaluationVisitStudyFilterQuery
{
}
///<summary> SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit 列表查询参数模型</summary>
public class SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit
{
public Guid Id { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public bool IsConfirmed { get; set; }
}
}

25
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/Interface/ISubjectCriteriaEvaluationService.cs Normal file
View File

@ -0,0 +1,25 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:58:54
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
{
/// <summary>
/// ISubjectCriteriaEvaluationService
/// </summary>
public interface ISubjectCriteriaEvaluationService
{
Task<PageOutput<SubjectCriteriaEvaluationView>> GetSubjectCriteriaEvaluationList(SubjectCriteriaEvaluationQuery inQuery);
Task<IResponseOutput> AddOrUpdateSubjectCriteriaEvaluation(SubjectCriteriaEvaluationAddOrEdit addOrEditSubjectCriteriaEvaluation);
//Task<IResponseOutput> DeleteSubjectCriteriaEvaluation(Guid subjectCriteriaEvaluationId);
}
}

25
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/Interface/ISubjectCriteriaEvaluationVisitFilterService.cs Normal file
View File

@ -0,0 +1,25 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:57:18
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
{
/// <summary>
/// ISubjectCriteriaEvaluationVisitFilterService
/// </summary>
public interface ISubjectCriteriaEvaluationVisitFilterService
{
Task<List<SubjectCriteriaEvaluationVisitFilterView>> GetSubjectCriteriaEvaluationVisitFilterList(SubjectCriteriaEvaluationVisitFilterQuery inQuery);
Task<IResponseOutput> AddOrUpdateSubjectCriteriaEvaluationVisitFilter(SubjectCriteriaEvaluationVisitFilterAddOrEdit addOrEditSubjectCriteriaEvaluationVisitFilter);
Task<IResponseOutput> DeleteSubjectCriteriaEvaluationVisitFilter(Guid subjectCriteriaEvaluationVisitFilterId);
}
}

25
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/Interface/ISubjectCriteriaEvaluationVisitStudyFilterService.cs Normal file
View File

@ -0,0 +1,25 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:57:18
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
{
/// <summary>
/// ISubjectCriteriaEvaluationVisitStudyFilterService
/// </summary>
public interface ISubjectCriteriaEvaluationVisitStudyFilterService
{
Task<List<SubjectCriteriaEvaluationVisitStudyFilterView>> GetSubjectCriteriaEvaluationVisitStudyFilterList(SubjectCriteriaEvaluationVisitStudyFilterQuery inQuery);
Task<IResponseOutput> AddOrUpdateSubjectCriteriaEvaluationVisitStudyFilter(SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit addOrEditSubjectCriteriaEvaluationVisitStudyFilter);
Task<IResponseOutput> DeleteSubjectCriteriaEvaluationVisitStudyFilter(Guid subjectCriteriaEvaluationVisitStudyFilterId);
}
}

164
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs Normal file
View File

@ -0,0 +1,164 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:58:57
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Domain.Models;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Service
{
/// <summary>
/// SubjectCriteriaEvaluationService
/// </summary>
[ApiExplorerSettings(GroupName = "Trial")]
public class SubjectCriteriaEvaluationService : BaseService, ISubjectCriteriaEvaluationService
{
private readonly IRepository<SubjectCriteriaEvaluation> _subjectCriteriaEvaluationRepository;
private readonly IRepository<Subject> _subjectRepository;
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<SubjectCriteriaEvaluationVisitFilter> _subjectCriteriaEvaluationVisitFilterRepository;
public SubjectCriteriaEvaluationService(IRepository<SubjectCriteriaEvaluation> subjectCriteriaEvaluationRepository, IRepository<Subject> subjectRepository,
IRepository<SubjectCriteriaEvaluationVisitFilter> subjectCriteriaEvaluationVisitFilterRepository, IRepository<SubjectVisit> subjectVisitRepository)
{
_subjectCriteriaEvaluationRepository = subjectCriteriaEvaluationRepository;
_subjectRepository = subjectRepository;
_subjectCriteriaEvaluationVisitFilterRepository = subjectCriteriaEvaluationVisitFilterRepository;
_subjectVisitRepository = subjectVisitRepository;
}
/// <summary>
/// subject 某标准 是否评估列表
/// </summary>
/// <param name="inQuery"></param>
/// <returns></returns>
[HttpPost]
public async Task<PageOutput<SubjectCriteriaEvaluationView>> GetSubjectCriteriaEvaluationList(SubjectCriteriaEvaluationQuery inQuery)
{
var subjectCriteriaEvaluationQueryable = from subject in _subjectRepository
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectCode), t => t.Code.Contains(inQuery.SubjectCode))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteCode), t => t.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
.WhereIf(inQuery.SubjectStatus != null, t => t.Status == inQuery.SubjectStatus)
join subjectCriteriaEvaluation in _subjectCriteriaEvaluationRepository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) on subject.Id equals subjectCriteriaEvaluation.SubjectId into d
from subjectCriteriaEvaluation in d.DefaultIfEmpty()
select new SubjectCriteriaEvaluationView()
{
SubjectCode = subject.Code,
SubjectId = subject.Id,
SubjectStatus = subject.Status,
TrialSiteCode = subject.TrialSite.TrialSiteCode,
Id = subjectCriteriaEvaluation.Id,
TrialReadingCriterionId = inQuery.TrialReadingCriterionId,
IsImageFiltering=subjectCriteriaEvaluation.IsImageFiltering,
IsJoinEvaluation=subjectCriteriaEvaluation.IsJoinEvaluation,
};
var pageList = await subjectCriteriaEvaluationQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField == string.Empty ? nameof(SubjectCriteriaEvaluationView.SubjectCode) : inQuery.SortField, inQuery.Asc);
return pageList;
}
/// <summary>
/// 添加 编辑 是否参与评估
/// </summary>
/// <param name="addOrEditSubjectCriteriaEvaluation"></param>
/// <returns></returns>
public async Task<IResponseOutput> AddOrUpdateSubjectCriteriaEvaluation(SubjectCriteriaEvaluationAddOrEdit addOrEditSubjectCriteriaEvaluation)
{
// 在此处拷贝automapper 映射
var entity = await _subjectCriteriaEvaluationRepository.InsertOrUpdateAsync(addOrEditSubjectCriteriaEvaluation, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
/// <summary>
/// 评估访视筛选列表
/// </summary>
/// <param name="inQuery"></param>
/// <returns></returns>
public async Task<List<SubjectCriteriaEvaluationVisitFilterView>> GetSubjectCriteriaEvaluationVisitFilterList(SubjectCriteriaEvaluationVisitFilterQuery inQuery)
{
var subjectCriteriaEvaluationVisitFilterQueryable = from subjectVisit in _subjectVisitRepository.Where(t => t.SubjectId == inQuery.SubjectId)
join subjectCriteriaEvaluationVisitFilter in _subjectCriteriaEvaluationVisitFilterRepository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) on subjectVisit.Id equals subjectCriteriaEvaluationVisitFilter.SubjectVisitId into d
from subjectCriteriaEvaluationVisitFilter in d.DefaultIfEmpty()
select new SubjectCriteriaEvaluationVisitFilterView()
{
VisitName = subjectVisit.VisitName,
SubjectVisitId = subjectVisit.Id,
SubjectId = subjectVisit.SubjectId,
TrialReadingCriterionId=inQuery.TrialReadingCriterionId,
LatestScanDate=subjectVisit.LatestScanDate,
EarliestScanDate=subjectVisit.LatestScanDate,
ImageDeterminationResultState= subjectCriteriaEvaluationVisitFilter.ImageDeterminationResultState,
ImageFilterState= subjectCriteriaEvaluationVisitFilter.ImageFilterState,
IsGeneratedTask=subjectCriteriaEvaluationVisitFilter.IsGeneratedTask,
};
return await subjectCriteriaEvaluationVisitFilterQueryable.ToListAsync();
}
/// <summary>
/// 评估访视 判断结果 影像筛选状态 手动添加/编辑接口
/// </summary>
/// <param name="addOrEditSubjectCriteriaEvaluationVisitFilter"></param>
/// <returns></returns>
public async Task<IResponseOutput> AddOrUpdateSubjectCriteriaEvaluationVisitFilter(SubjectCriteriaEvaluationVisitFilterAddOrEdit addOrEditSubjectCriteriaEvaluationVisitFilter)
{
// 在此处拷贝automapper 映射
//CreateMap<SubjectCriteriaEvaluationVisitFilter, SubjectCriteriaEvaluationVisitFilterView>();
// CreateMap< SubjectCriteriaEvaluationVisitFilter,SubjectCriteriaEvaluationVisitFilterAddOrEdit>().ReverseMap();
var entity = await _subjectCriteriaEvaluationVisitFilterRepository.InsertOrUpdateAsync(addOrEditSubjectCriteriaEvaluationVisitFilter, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
//[HttpDelete("{subjectCriteriaEvaluationId:guid}")]
// public async Task<IResponseOutput> DeleteSubjectCriteriaEvaluation(Guid subjectCriteriaEvaluationId)
//{
// var success = await _subjectCriteriaEvaluationRepository.DeleteFromQueryAsync(t => t.Id == subjectCriteriaEvaluationId,true);
// return ResponseOutput.Ok();
//}
}
}

40
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilterService.cs Normal file
View File

@ -0,0 +1,40 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:57:21
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Domain.Models;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Service
{
/// <summary>
/// SubjectCriteriaEvaluationVisitFilterService
/// </summary>
[ ApiExplorerSettings(GroupName = "Test")]
public class SubjectCriteriaEvaluationVisitFilterService: BaseService
{
public SubjectCriteriaEvaluationVisitFilterService()
{
}
//[HttpDelete("{subjectCriteriaEvaluationVisitFilterId:guid}")]
// public async Task<IResponseOutput> DeleteSubjectCriteriaEvaluationVisitFilter(Guid subjectCriteriaEvaluationVisitFilterId)
//{
// var success = await _subjectCriteriaEvaluationVisitFilterRepository.DeleteFromQueryAsync(t => t.Id == subjectCriteriaEvaluationVisitFilterId,true);
// return ResponseOutput.Ok();
//}
}
}

64
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilterService.cs Normal file
View File

@ -0,0 +1,64 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:57:21
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Domain.Models;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Service
{
/// <summary>
/// SubjectCriteriaEvaluationVisitStudyFilterService
/// </summary>
[ ApiExplorerSettings(GroupName = "Test")]
public class SubjectCriteriaEvaluationVisitStudyFilterService: BaseService, ISubjectCriteriaEvaluationVisitStudyFilterService
{
private readonly IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository;
public SubjectCriteriaEvaluationVisitStudyFilterService(IRepository<SubjectCriteriaEvaluationVisitStudyFilter> subjectCriteriaEvaluationVisitStudyFilterRepository)
{
_subjectCriteriaEvaluationVisitStudyFilterRepository = subjectCriteriaEvaluationVisitStudyFilterRepository;
}
public async Task<List<SubjectCriteriaEvaluationVisitStudyFilterView>> GetSubjectCriteriaEvaluationVisitStudyFilterList(SubjectCriteriaEvaluationVisitStudyFilterQuery inQuery)
{
var subjectCriteriaEvaluationVisitStudyFilterQueryable = _subjectCriteriaEvaluationVisitStudyFilterRepository
.ProjectTo<SubjectCriteriaEvaluationVisitStudyFilterView>(_mapper.ConfigurationProvider);
return await subjectCriteriaEvaluationVisitStudyFilterQueryable.ToListAsync();
}
public async Task<IResponseOutput> AddOrUpdateSubjectCriteriaEvaluationVisitStudyFilter(SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit addOrEditSubjectCriteriaEvaluationVisitStudyFilter)
{
// 在此处拷贝automapper 映射
//CreateMap<SubjectCriteriaEvaluationVisitStudyFilter, SubjectCriteriaEvaluationVisitStudyFilterView>();
// CreateMap< SubjectCriteriaEvaluationVisitStudyFilter,SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit>().ReverseMap();
var entity = await _subjectCriteriaEvaluationVisitStudyFilterRepository.InsertOrUpdateAsync(addOrEditSubjectCriteriaEvaluationVisitStudyFilter, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
[HttpDelete("{subjectCriteriaEvaluationVisitStudyFilterId:guid}")]
public async Task<IResponseOutput> DeleteSubjectCriteriaEvaluationVisitStudyFilter(Guid subjectCriteriaEvaluationVisitStudyFilterId)
{
var success = await _subjectCriteriaEvaluationVisitStudyFilterRepository.DeleteFromQueryAsync(t => t.Id == subjectCriteriaEvaluationVisitStudyFilterId,true);
return ResponseOutput.Ok();
}
}
}

11
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -246,6 +246,17 @@ namespace IRaCIS.Core.Application.Service
CreateMap<OrganInfoAddOrEdit, OrganInfo>(); CreateMap<OrganInfoAddOrEdit, OrganInfo>();
CreateMap<OrganInfo, OrganInfoView>(); CreateMap<OrganInfo, OrganInfoView>();
#endregion #endregion
#region 附加评估
//CreateMap<SubjectCriteriaEvaluation, SubjectCriteriaEvaluationView>()
// .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.subject.TrialSite.TrialSiteCode))
// .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.subject.Code))
// .ForMember(d => d.SubjectStatus, u => u.MapFrom(s => s.subject.Status));
CreateMap<SubjectCriteriaEvaluation, SubjectCriteriaEvaluationView>();
#endregion
} }
} }

3
IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
View File

@ -2,6 +2,7 @@
using IRaCIS.Core.Infrastructure.Extention; using IRaCIS.Core.Infrastructure.Extention;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Org.BouncyCastle.Bcpg.OpenPgp;
namespace IRaCIS.Application.Contracts namespace IRaCIS.Application.Contracts
{ {
@ -80,6 +81,8 @@ namespace IRaCIS.Application.Contracts
} }
public class SubjectQueryView: SubjectCommand public class SubjectQueryView: SubjectCommand
{ {

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

@ -159,5 +159,7 @@ namespace IRaCIS.Application.Services
} }
} }
} }

93
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs Normal file
View File

@ -0,0 +1,93 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:50:31
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SubjectAdditionalEvaluationResult
///</summary>
[Table("SubjectAdditionalEvaluationResult")]
public class SubjectAdditionalEvaluationResult : Entity, IAuditUpdate, IAuditAdd
{
/// <summary>
/// SubjectId
/// </summary>
[Required]
public Guid SubjectId { get; set; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
/// <summary>
/// VisitTaskId
/// </summary>
public Guid? VisitTaskId { get; set; }
/// <summary>
/// 附加评估答案
/// </summary>
[Required]
public string Answer { get; set; }
/// <summary>
/// 附加评估答案翻译字典
/// </summary>
[Required]
public string TranslateDictionaryCode { get; set; }
/// <summary>
/// 是否是最终结果
/// </summary>
[Required]
public bool IsFinalResult { get; set; }
/// <summary>
/// 最终结果
/// </summary>
[Required]
public string FinalAnswer { get; set; }
/// <summary>
/// 最终结果翻字典
/// </summary>
[Required]
public string FinalTranslateDictionaryCode { get; set; }
}
}

72
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs Normal file
View File

@ -0,0 +1,72 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:46:55
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SubjectCriteriaEvaluation
///</summary>
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : Entity, IAuditUpdate, IAuditAdd
{
[JsonIgnore]
public Subject subject { get; set; }
/// <summary>
/// SubjectId
/// </summary>
[Required]
public Guid SubjectId { get; set; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// 是否参与评估
/// </summary>
[Required]
public bool IsJoinEvaluation { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
/// <summary>
/// 是否影像筛选
/// </summary>
[Required]
public bool IsImageFiltering { get; set; }
}
}

83
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs Normal file
View File

@ -0,0 +1,83 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:51:12
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SubjectCriteriaEvaluationVisitFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : Entity, IAuditUpdate, IAuditAdd
{
/// <summary>
/// SubjectId
/// </summary>
[Required]
public Guid SubjectId { get; set; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
[Required]
public Guid SubjectVisitId { get; set; }
/// <summary>
/// 影像筛选状态
/// </summary>
[Required]
public int ImageFilterState { get; set; }
/// <summary>
/// 影像判断结果
/// </summary>
[Required]
public int ImageDeterminationResultState { get; set; }
/// <summary>
/// 是否已生成任务
/// </summary>
[Required]
public bool IsGeneratedTask { get; set; }
}
}

82
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs Normal file
View File

@ -0,0 +1,82 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-03-17 11:51:13
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SubjectCriteriaEvaluationVisitStudyFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : Entity, IAuditUpdate, IAuditAdd
{
/// <summary>
/// SubjectId
/// </summary>
[Required]
public Guid SubjectId { get; set; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
[Required]
public Guid SubjectVisitId { get; set; }
/// <summary>
/// StudyId
/// </summary>
[Required]
public Guid StudyId { get; set; }
/// <summary>
/// SeriesId
/// </summary>
[Required]
public Guid SeriesId { get; set; }
/// <summary>
/// 是否确认
/// </summary>
[Required]
public bool IsConfirmed { get; set; }
}
}

1
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -6,6 +6,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using IRaCIS.Core.Domain.Share.Reading;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {

3
IRaCIS.Core.Domain/Visit/Subject.cs
View File

@ -26,7 +26,8 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
public List<ReadingClinicalData> ClinicalDataList { get; set; } public List<ReadingClinicalData> ClinicalDataList { get; set; }
[JsonIgnore]
public List<SubjectCriteriaEvaluation> SubjectCriteriaEvaluationList { get; set; }
[JsonIgnore] [JsonIgnore]
[ForeignKey("FinalSubjectVisitId")] [ForeignKey("FinalSubjectVisitId")]

5
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -270,6 +270,11 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentType { get; set; } public virtual DbSet<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentType { get; set; }
public virtual DbSet<SubjectCriteriaEvaluation> SubjectCriteriaEvaluation { get; set; }
public virtual DbSet<SubjectAdditionalEvaluationResult> SubjectAdditionalEvaluationResult { get; set; }
public virtual DbSet<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilter { get; set; }
public virtual DbSet<SubjectCriteriaEvaluationVisitStudyFilter> SubjectCriteriaEvaluationVisitStudyFilter { get; set; }
//public virtual DbSet<TrialClinicalDataCriterion> TrialClinicalDataCriterion { get; set; } //public virtual DbSet<TrialClinicalDataCriterion> TrialClinicalDataCriterion { get; set; }

2
IRaCIS.Core.Test/DbHelper.ttinclude
View File

@ -4,7 +4,7 @@
public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"; public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
public static readonly string DbDatabase = "IRaCIS_New_Tet"; public static readonly string DbDatabase = "IRaCIS_New_Tet";
//表名称用字符串,拼接 //表名称用字符串,拼接
public static readonly string TableName = "TrialCriterionAdditionalAssessmentType"; public static readonly string TableName = "SubjectCriteriaEvaluation";
//具体文件里面 例如service 可以配置是否分页 //具体文件里面 例如service 可以配置是否分页
} }
#> #>