diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 3b49e4b91..684f02c44 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2293,6 +2293,9 @@
阅片期名称
+
+ ReadingTableQuestionSystemAddOrEdit 列表查询参数模型
+
PageName
@@ -2306,6 +2309,21 @@
仲裁规则
+
+
+ 需要
+
+
+
+
+ 不需要
+
+
+
+
+ 裁判不相等
+
+
是否公共分页
@@ -2566,6 +2584,16 @@
标准ID
+
+
+ 表格父问题的ID
+
+
+
+
+ 当前ID
+
+
当前ID
@@ -3420,19 +3448,44 @@
是否启用
+
+
+ 任务类型
+
+
ReadingMedicineSystemQuestionQuery 列表查询参数模型
+
+
+ 任务类型
+
+
类型值
+
+
+ 任务类型
+
+
+
+
+ 任务类型
+
+
获取项目的其他问题
+
+
+ 任务类型
+
+
ReadingMedicineSystemQuestionAddOrEdit 列表查询参数模型
@@ -3476,6 +3529,21 @@
是否启用
+
+
+ 任务类型
+
+
+
+
+ 任务类型
+
+
+
+
+ 任务类型
+
+
类型
@@ -3534,9 +3602,19 @@
项目Id
+
+
+ 任务类型
+
+
ReadingMedicineTrialQuestionAddOrEdit 列表查询参数模型
+
+
+ 任务类型
+
+
TrialExternalUserView 列表视图模型
@@ -4374,6 +4452,11 @@
裁判类型
+
+
+ 关联Value
+
+
问题名称
@@ -6308,6 +6391,34 @@
阅片问题.标准
+
+
+ 获取系统的表格问题
+
+
+
+
+
+
+ 新增修改系统表格问题
+
+
+
+
+
+
+ 删除系统表格问题
+
+
+
+
+
+
+ 获取系统表格其他问题
+
+
+
+
设置项目裁判信息
@@ -6315,11 +6426,18 @@
-
+
+
+ 验证是否要同步标准
+
+
+
+
+
同步标准到项目新（2022-08-10）
-
+
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
index d85c916b3..81fe1334f 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
@@ -149,6 +149,11 @@ namespace IRaCIS.Core.Application.Service
}
+
+
+
+
+
///
/// 123 分别是 分配，重新分配，取消分配
///
diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
index f8a72c741..bab804b6a 100644
--- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
@@ -16,6 +16,13 @@ namespace IRaCIS.Application.Contracts
[JsonIgnore]
public List DictionaryList { get; set; } = new List();
+ public List SubspecialityIds => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
+
+
+ //第二专业
+ public List SubspecialityList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Value).ToList();
+
+ public List SubspecialityCNList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.ValueCN).ToList();
@@ -26,12 +33,7 @@ namespace IRaCIS.Application.Contracts
public List ReadingTypeIds => DictionaryList.Where(t => t.ParentCode == StaticData.ReadingType).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
- //第二专业
- public List SubspecialityList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Value).ToList();
- public List SubspecialityCNList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.ValueCN).ToList();
-
- public List SubspecialityIds => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
@@ -61,10 +63,11 @@ namespace IRaCIS.Application.Contracts
//增加的
public Guid? SpecialityId { get; set; } = Guid.Empty;
- public string Speciality { get; set; } = string.Empty;
- public string SpecialityCN { get; set; } = string.Empty;
public string SpecialityOther { get; set; } = string.Empty;
public string SpecialityOtherCN { get; set; } = string.Empty;
+ public string Speciality { get; set; } = string.Empty;
+ public string SpecialityCN { get; set; } = string.Empty;
+
//职称
public string Rank { get; set; } = string.Empty;
@@ -203,6 +206,16 @@ namespace IRaCIS.Application.Contracts
public string SubmmitUserName { get; set; } = string.Empty;
public string BlindName { get; set; }
public string BlindNameCN { get; set; } = string.Empty;
+
+ public Guid? SpecialityId { get; set; } = Guid.Empty;
+ public string SpecialityOther { get; set; } = string.Empty;
+ public string SpecialityOtherCN { get; set; } = string.Empty;
+
+ [JsonIgnore]
+ public List DictionaryList { get; set; } = new List();
+ public List SubspecialityIds => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
+
+ public Guid? HospitalId { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs b/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
index c2c691b44..506885ae1 100644
--- a/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
@@ -138,6 +138,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.OptUserName, u => u.MapFrom(s => s.CreateUser.UserName));
CreateMap().IncludeMembers(t => t.Doctor, t => t.Doctor.Hospital)
+ .ForMember(o => o.DictionaryList, t => t.MapFrom(u => u.Doctor.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
.ForMember(d => d.Id, u => u.MapFrom(s => s.Doctor.Id));
CreateMap();
CreateMap();