筛选提交

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2293,6 +2293,9 @@
             阅片期名称
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit">
+            <summary> ReadingTableQuestionSystemAddOrEdit  列表查询参数模型</summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageQuery.PageName">
             <summary> PageName</summary>
         </member>
@@ -2306,6 +2309,21 @@
             仲裁规则
             </summary>
         </member>
+        <member name="F:IRaCIS.Core.Application.Service.Reading.Dto.NeedSynchronize.Need">
+            <summary>
+            需要
+            </summary>
+        </member>
+        <member name="F:IRaCIS.Core.Application.Service.Reading.Dto.NeedSynchronize.NotNeed">
+            <summary>
+            不需要
+            </summary>
+        </member>
+        <member name="F:IRaCIS.Core.Application.Service.Reading.Dto.NeedSynchronize.JudgeNotEqual">
+            <summary>
+            裁判不相等
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageAddOrEdit.IsPublicPage">
             <summary>
             是否公共分页
@@ -2566,6 +2584,16 @@
             标准ID
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTableOtherQuestionSystemInDto.ReadingQuestionId">
+            <summary>
+            表格父问题的ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTableOtherQuestionSystemInDto.Id">
+            <summary>
+            当前ID
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionOtherQuestionInDto.Id">
             <summary>
             当前ID
@@ -3420,19 +3448,44 @@
             是否启用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionView.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery">
             <summary>ReadingMedicineSystemQuestionQuery  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.TypeValue">
             <summary>
             类型值
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialQuestion.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionInDto">
             <summary>
             获取项目的其他问题
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionInDto.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit">
             <summary> ReadingMedicineSystemQuestionAddOrEdit  列表查询参数模型</summary>
         </member>
@@ -3476,6 +3529,21 @@
             是否启用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionView.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewInDto.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.Type">
             <summary>
             类型
@@ -3534,9 +3602,19 @@
             项目Id
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit">
             <summary> ReadingMedicineTrialQuestionAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.TrialExternalUserView">
             <summary> TrialExternalUserView  列表视图模型 </summary>
         </member>
@@ -4374,6 +4452,11 @@
             裁判类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.RelevanceValue">
+            <summary>
+            关联Value
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName">
             <summary>
             问题名称
@@ -6308,6 +6391,34 @@
             阅片问题.标准
             </summary>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetReadingTableQuestionSystemList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemQuery)">
+            <summary>
+            获取系统的表格问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingTableQuestionSystem(IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit)">
+            <summary>
+            新增修改系统表格问题
+            </summary>
+            <param name="addOrEditReadingTableQuestionSystem"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.DeleteReadingTableQuestionSystem(System.Guid)">
+            <summary>
+            删除系统表格问题
+            </summary>
+            <param name="Id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetReadingTableOtherQuestionSystem(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTableOtherQuestionSystemInDto)">
+            <summary>
+            获取系统表格其他问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetTrialJudgyInfo(IRaCIS.Core.Application.Service.Reading.Dto.SetTrialJudgyInfoInDto)">
             <summary>
             设置项目裁判信息
@@ -6315,11 +6426,18 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.SynchronizeCriterion(System.Guid)">
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.VerifyeCriterionNeedSynchronize(IRaCIS.Core.Application.Service.Reading.Dto.VerifyeCriterionNeedSynchronizeInDto)">
+            <summary>
+            验证是否要同步标准
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.SynchronizeCriterion(IRaCIS.Core.Application.Service.Reading.Dto.SynchronizeCriterionInDto)">
             <summary>
             同步标准到项目新（2022-08-10）
             </summary>
-            <param name="trialCriterionId"></param>
+            <param name="inDto"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetTrialJudgyInfo(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialJudgyInfoInDto)">

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>();