筛选提交

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs

@@ -149,6 +149,11 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+
+
+
+
+
         /// <summary>
         ///   123 分别是  分配，重新分配，取消分配
         /// </summary>

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -16,6 +16,13 @@ namespace IRaCIS.Application.Contracts
 
         [JsonIgnore]
         public List<DicView> DictionaryList { get; set; } = new List<DicView>();
+        public List<Guid> SubspecialityIds => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
+
+
+        //第二专业
+        public List<string> SubspecialityList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Value).ToList();
+
+        public List<string> 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<Guid> ReadingTypeIds => DictionaryList.Where(t => t.ParentCode == StaticData.ReadingType).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
 
 
-        //第二专业
-        public List<string> SubspecialityList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Value).ToList();
 
-        public List<string> SubspecialityCNList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.ValueCN).ToList();
-
-        public List<Guid> 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<DicView> DictionaryList { get; set; } = new List<DicView>();
+        public List<Guid> SubspecialityIds => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
+
+        public Guid? HospitalId { get; set; }
     }
 
 

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<Enroll, ConfirmationReviewerDTO>().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<Doctor, ConfirmationReviewerDTO>();
             CreateMap<Hospital, ConfirmationReviewerDTO>();