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

修改

Uat_Study
hang 2022-08-29 11:17:25 +08:00
parent 84153c4cf2
commit 414ebc311c
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5361,6 +5361,21 @@
病灶类型 病灶类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.MaxQuestionCount">
<summary>
最大问题数
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsShowInDicom">
<summary>
是否显示在Dicom阅片中
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.OrderMark">
<summary>
序号标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName">
<summary> <summary>
问题名称 问题名称

4
IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs
View File

@ -45,8 +45,8 @@ namespace IRaCIS.Application.Services
.WhereIf(!string.IsNullOrWhiteSpace(doctorSearch.Name), t => t.ChineseName.Contains(doctorSearch.Name) || (t.LastName + t.FirstName).Contains(doctorSearch.Name)) .WhereIf(!string.IsNullOrWhiteSpace(doctorSearch.Name), t => t.ChineseName.Contains(doctorSearch.Name) || (t.LastName + t.FirstName).Contains(doctorSearch.Name))
.WhereIf(doctorSearch.Nation != null, t => t.Nation == doctorSearch.Nation) .WhereIf(doctorSearch.Nation != null, t => t.Nation == doctorSearch.Nation)
.WhereIf(evaluationCriteriaCount > 0, t => t.TrialExperienceCriteriaList.Count(t => doctorSearch.EvaluationCriteriaIdList.Contains(t.EvaluationCriteriaId)) == evaluationCriteriaCount) .WhereIf(evaluationCriteriaCount > 0, t => t.TrialExperienceCriteriaList.Count(t => doctorSearch.EvaluationCriteriaIdList.Contains(t.EvaluationCriteriaId)) == evaluationCriteriaCount)
//用户类型 看到简历的范围这里需要确认 ////用户类型 看到简历的范围这里需要确认
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ReviewerCoordinator, t => t.UserList.Any(u => u.UserId == _userInfo.Id)) //.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ReviewerCoordinator, t => t.UserList.Any(u => u.UserId == _userInfo.Id))
.WhereIf(count > 0, t => t.DoctorDicRelationList.Count(u => guidList.Contains(u.DictionaryId)) == count) .WhereIf(count > 0, t => t.DoctorDicRelationList.Count(u => guidList.Contains(u.DictionaryId)) == count)
.WhereIf(doctorSearch.EnrollStatus != null && doctorSearch.EnrollStatus == (int)ReviewerEnrollStatus.Yes, t => t.EnrollList.Any(u => u.EnrollStatus == EnrollStatus.DoctorReading)) .WhereIf(doctorSearch.EnrollStatus != null && doctorSearch.EnrollStatus == (int)ReviewerEnrollStatus.Yes, t => t.EnrollList.Any(u => u.EnrollStatus == EnrollStatus.DoctorReading))

14
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -769,6 +769,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
if(entitys.Any(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)))
{
var list = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile));
//await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, x => new InspectionConvertDTO()
//{
// ObjectRelationParentId = x.SubjectVisitId,
//});
}
#region 阅片人入组 #region 阅片人入组