稽查修改
parent
d461ceaa21
commit
32ff20cf7a
|
|
@ -2388,6 +2388,11 @@
|
|||
依赖父问题
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.SystemCriterionId">
|
||||
<summary>
|
||||
系统标准Id
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageQuery.PageName">
|
||||
<summary> PageName</summary>
|
||||
</member>
|
||||
|
|
@ -3089,13 +3094,6 @@
|
|||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.OrganInfoService.GetTrialCheckOrganList(IRaCIS.Core.Application.ViewModel.GetTrialOrganListInDto)">
|
||||
<summary>
|
||||
获取项目勾选器官信息
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.OrganInfoService.SynchronizeSystemOrganToTrial(IRaCIS.Core.Application.ViewModel.SynchronizeSystemOrganToTrialInDto)">
|
||||
<summary>
|
||||
同步系统器官到项目
|
||||
|
|
@ -3630,35 +3628,50 @@
|
|||
<member name="T:IRaCIS.Core.Application.ViewModel.CriterionNidusAddOrEdit">
|
||||
<summary> CriterionNidusAddOrEdit 列表查询参数模型</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.CriterionNidusAddOrEdit.LesionType">
|
||||
<summary>
|
||||
病灶类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoView">
|
||||
<summary> OrganInfoView 列表视图模型 </summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.Part">
|
||||
<summary>
|
||||
部位
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.TULOC">
|
||||
<summary>
|
||||
TULOC
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.TULAT">
|
||||
<summary>
|
||||
位置
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.Remark">
|
||||
<summary>
|
||||
备注
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.NidusType">
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.IsLymphNodes">
|
||||
<summary>
|
||||
是否是淋巴结
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.LesionType">
|
||||
<summary>
|
||||
病灶类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.NidusTypeCN">
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListInDto.LesionType">
|
||||
<summary>
|
||||
病灶类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoView.IsDepend">
|
||||
<summary>
|
||||
是否关联
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.NidusType">
|
||||
<summary>
|
||||
病灶类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.NidusTypeCN">
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.LesionType">
|
||||
<summary>
|
||||
病灶类型
|
||||
</summary>
|
||||
|
|
@ -3668,9 +3681,19 @@
|
|||
备注
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialOrganListOutDto.IsLymphNodes">
|
||||
<summary>
|
||||
是否是淋巴结
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoQuery">
|
||||
<summary>OrganInfoQuery 列表查询参数模型</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoQuery.LesionType">
|
||||
<summary>
|
||||
病灶类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit">
|
||||
<summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
|
||||
</member>
|
||||
|
|
@ -3684,12 +3707,12 @@
|
|||
是否是淋巴结
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.CriterionNidusId">
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.LesionType">
|
||||
<summary>
|
||||
标准 病灶类型
|
||||
病灶类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.CriterionId">
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit.SystemCriterionId">
|
||||
<summary>
|
||||
标准 病灶类型
|
||||
</summary>
|
||||
|
|
@ -6700,6 +6723,13 @@
|
|||
阅片问题.标准
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.CopySystemCriterionData(IRaCIS.Core.Application.Service.Reading.Dto.CopySystemCriterionDataInDto)">
|
||||
<summary>
|
||||
赋值一个系统标准到另一系统标准
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetSystemCriterionList">
|
||||
<summary>
|
||||
获取获取系统阅片标准下拉
|
||||
|
|
|
|||
|
|
@ -35,7 +35,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
|
|||
trialData.TrialFinishTime = trialData.TrialFinishTime == null ? DateTime.Now : trialData.TrialFinishTime;
|
||||
|
||||
#region 逻辑代码
|
||||
var query = from data in _repository.GetQueryable<DataInspection>().Where(x => (x.TrialId == dto.TrialId)||(x.TrialId==null&&x.CreateTime>= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
|
||||
var query = from data in _repository.GetQueryable<DataInspection>()
|
||||
//.Where(x => (x.TrialId == dto.TrialId)||(x.TrialId==null&&x.CreateTime>= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
|
||||
|
||||
|
||||
join trial in _repository.GetQueryable<Trial>().IgnoreQueryFilters() on data.TrialId equals trial.Id into trialtemp
|
||||
from leftrial in trialtemp.DefaultIfEmpty()
|
||||
|
|
@ -133,11 +135,14 @@ namespace IRaCIS.Core.Application.Service.Inspection
|
|||
//IsFrontAdd=data.IsFrontAdd,
|
||||
BatchId = data.BatchId,
|
||||
OptType = leftOptType.Value,
|
||||
ObjectRelationParentId = data.ObjectRelationParentId,
|
||||
GeneralId=data.GeneralId
|
||||
};
|
||||
|
||||
query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
|
||||
//.WhereIf(dto.BatchId != null, x => x.BatchId == dto.BatchId)
|
||||
.WhereIf(dto.ObjectRelationParentId != null && dto.BatchId!=null && dto.RelationDeadlineTime!=null, x => (x.ObjectRelationParentId == dto.ObjectRelationParentId && x.CreateTime<= dto.RelationDeadlineTime) ||x.BatchId==dto.BatchId )
|
||||
.WhereIf(dto.TrialId != null, t => (t.TrialId == dto.TrialId) || (t.CreateTime >= trialData.CreateTime && t.CreateTime <= trialData.TrialFinishTime))
|
||||
.WhereIf(dto.BatchId != null && dto.ObjectRelationParentId == null, x => x.BatchId == dto.BatchId)
|
||||
.WhereIf(dto.ObjectRelationParentId != null && dto.BatchId != null && dto.RelationDeadlineTime != null, x =>( x.GeneralId == dto.ObjectRelationParentId &&x.CreateTime <=dto.RelationDeadlineTime)||x.BatchId==dto.BatchId)
|
||||
.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
|
||||
//.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)
|
||||
//.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
|
||||
|
|
@ -152,7 +157,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
|
|||
if (dto.VisitPlanInfo != null && dto.VisitPlanInfo.Value != (decimal)1.11)
|
||||
{
|
||||
query = query.Where(x => x.VisitNum == dto.VisitPlanInfo.Value);
|
||||
} else if (dto.VisitPlanInfo != null)
|
||||
}
|
||||
else if (dto.VisitPlanInfo != null)
|
||||
{
|
||||
query = query.Where(x => x.InPlan == false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ namespace IRaCIS.Core.Domain.Models
|
|||
/// <summary>
|
||||
/// 通用Id
|
||||
/// </summary>
|
||||
public Guid? GeneralId { get; set; }
|
||||
public Guid GeneralId { get; set; }
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue