From 414ebc311c8fd8c4e9b768e298c12acb41e1b2a7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 29 Aug 2022 11:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 15 +++++++++++++++
.../Service/Doctor/DoctorListService.cs | 4 ++--
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 14 ++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index d9e4c1fcf..c22aa5ddc 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5361,6 +5361,21 @@
病灶类型
+
+
+ 最大问题数
+
+
+
+
+ 是否显示在Dicom阅片中
+
+
+
+
+ 序号标记
+
+
问题名称
diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs
index 9ca8c0232..0d4d8b551 100644
--- a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs
@@ -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(doctorSearch.Nation != null, t => t.Nation == doctorSearch.Nation)
.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(doctorSearch.EnrollStatus != null && doctorSearch.EnrollStatus == (int)ReviewerEnrollStatus.Yes, t => t.EnrollList.Any(u => u.EnrollStatus == EnrollStatus.DoctorReading))
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 766167d69..1abff5887 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -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(item.Entity as NoneDicomStudy, type, x => new InspectionConvertDTO()
+ //{
+ // ObjectRelationParentId = x.SubjectVisitId,
+
+ //});
+
+ }
+
+
#region 阅片人入组