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

稽查修改

Uat_Study
hang 2022-08-18 14:57:19 +08:00
parent d461ceaa21
commit 32ff20cf7a
3 changed files with 89 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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>
获取获取系统阅片标准下拉

54
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -29,20 +29,22 @@ namespace IRaCIS.Core.Application.Service.Inspection
{
//_repository.GetQueryable.GetQueryable < DataInspection >
var trialData= await _repository.GetQueryable<Trial>().Where(x=>x.Id== dto.TrialId).AsNoTracking().FirstOrDefaultAsync();
var trialData = await _repository.GetQueryable<Trial>().Where(x => x.Id == dto.TrialId).AsNoTracking().FirstOrDefaultAsync();
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()
join site in _repository.GetQueryable<Site>().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp
from leftsite in sitetemp.DefaultIfEmpty()
join trialSite in _repository.GetQueryable<TrialSite>().IgnoreQueryFilters() on new { SiteId = leftsite.Id, Trialid= leftrial.Id } equals new { SiteId = trialSite.SiteId , Trialid = trialSite.TrialId } into trialSitetemp
join trialSite in _repository.GetQueryable<TrialSite>().IgnoreQueryFilters() on new { SiteId = leftsite.Id, Trialid = leftrial.Id } equals new { SiteId = trialSite.SiteId, Trialid = trialSite.TrialId } into trialSitetemp
from lefttrialSite in trialSitetemp.DefaultIfEmpty()
@ -75,7 +77,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
join trialSign in _repository.GetQueryable<TrialSign>().IgnoreQueryFilters() on data.SignId equals trialSign.Id into trialSigntemp
from lefttrialSign in trialSigntemp.DefaultIfEmpty()
join leftfrontAuditConfig in _repository.GetQueryable<FrontAuditConfig>().Where(x=>x.ConfigType=="M"&&x.Identification!=null&&x.IsEnable==true) on
join leftfrontAuditConfig in _repository.GetQueryable<FrontAuditConfig>().Where(x => x.ConfigType == "M" && x.Identification != null && x.IsEnable == true) on
data.Identification.ToLower()
equals
leftfrontAuditConfig.Identification.ToLower()
@ -113,37 +115,40 @@ namespace IRaCIS.Core.Application.Service.Inspection
UserFirstName = leftuser.FirstName,
UserLastName = leftuser.LastName,
//SubjectCode=leftsubject.Code,
SubjectCode =leftsubject.Code,
SubjectVisitName=leftsubjectVisit.VisitName,
SubjectCode = leftsubject.Code,
SubjectVisitName = leftsubjectVisit.VisitName,
CreateUserName = leftuser.FirstName + leftuser.LastName,
RoleName= leftusertype.UserTypeShortName,
TrialName= leftrial.ExperimentName,
SiteCode= lefttrialSite.TrialSiteCode,
ResearchProgramNo= leftrial.ResearchProgramNo,
ObjectTypeId=data.ObjectTypeId,
Description=leftfrontAuditConfig.Description,
ModuleTypeName= leftmoduleTypec.ValueCN,
SignText= lefttrialSign.SignText,
Identification= leftfrontAuditConfig.Identification,
FrontAuditConfigId= leftfrontAuditConfig.Id,
RoleName = leftusertype.UserTypeShortName,
TrialName = leftrial.ExperimentName,
SiteCode = lefttrialSite.TrialSiteCode,
ResearchProgramNo = leftrial.ResearchProgramNo,
ObjectTypeId = data.ObjectTypeId,
Description = leftfrontAuditConfig.Description,
ModuleTypeName = leftmoduleTypec.ValueCN,
SignText = lefttrialSign.SignText,
Identification = leftfrontAuditConfig.Identification,
FrontAuditConfigId = leftfrontAuditConfig.Id,
ParentIdentification = leftparent.Identification,
OptTypeId = leftOptType.Id,
VisitNum=leftsubjectVisit.VisitNum,
InPlan= leftsubjectVisit.InPlan,
VisitNum = leftsubjectVisit.VisitNum,
InPlan = leftsubjectVisit.InPlan,
//IsFrontAdd=data.IsFrontAdd,
BatchId =data.BatchId,
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)
.WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)
.WhereIf(dto.EndTime != null, x => x.CreateTime <= dto.EndTime)
.WhereIf(dto.ModuleType!=null, x => x.ModuleTypeId == dto.ModuleType)
.WhereIf(dto.ModuleType != null, x => x.ModuleTypeId == dto.ModuleType)
.WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description)
.WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName))
//.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
@ -152,11 +157,12 @@ 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);
}
return await query.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField.IsNullOrEmpty()?nameof(GetDataInspectionOutDto.CreateTime): dto.SortField, dto.Asc);
return await query.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField.IsNullOrEmpty() ? nameof(GetDataInspectionOutDto.CreateTime) : dto.SortField, dto.Asc);
}

2
IRaCIS.Core.Domain/Trial/DataInspection.cs
View File

@ -129,7 +129,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 通用Id
/// </summary>
public Guid? GeneralId { get; set; }
public Guid GeneralId { get; set; }