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

修改标准

Uat_Study
hang 2022-10-28 09:12:57 +08:00
parent 7408bd2abb
commit 62cbff488c
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
View File

@ -24,7 +24,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
public int? CriterionEnum { get; set; } public CriterionType? CriterionTypeEnum { get; set; }
public bool? IsGeneral { get; set; }
public Guid? TrialReadingCriterionId { get; set; } public Guid? TrialReadingCriterionId { get; set; }
@ -189,9 +191,9 @@ namespace IRaCIS.Core.Application.ViewModel
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
public string CriterionEnumStr { get; set; } = string.Empty; public CriterionType CriterionTypeEnum { get; set; }
public List<int> CriterionEnumList { get; set; } public bool IsGeneral { get; set; }
} }
public class ReadingMedicineTrialQuestionView : ReadingMedicineSystemQuestionAddOrEdit public class ReadingMedicineTrialQuestionView : ReadingMedicineSystemQuestionAddOrEdit

7
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
View File

@ -54,8 +54,9 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)) .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type)) .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory) .WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
.WhereIf(inDto.CriterionEnum != null, x => x.CriterionEnumStr.Contains($"|{inDto.CriterionEnum}|") ) .WhereIf(inDto.CriterionTypeEnum != null, x => x.CriterionTypeEnum==inDto.CriterionTypeEnum)
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionEnumStr.Contains($"|{criterionEnum}|")) .WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionTypeEnum== criterionEnum || x.IsGeneral==true)
.WhereIf(inDto.IsGeneral != null, x => x.IsGeneral == inDto.IsGeneral)
.ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder); .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize,inDto.SortField,inDto.Asc); return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize,inDto.SortField,inDto.Asc);
@ -107,7 +108,7 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.NotOk("当前问题序号存在重复"); return ResponseOutput.NotOk("当前问题序号存在重复");
} }
inDto.CriterionEnumStr = $"|{String.Join('|', inDto.CriterionEnumList)}|"; //inDto.CriterionEnumStr = $"|{String.Join('|', inDto.CriterionEnumList)}|";
var entity = await _readingMedicineSystemQuestionRepository.InsertOrUpdateAsync(inDto); var entity = await _readingMedicineSystemQuestionRepository.InsertOrUpdateAsync(inDto);
await _readingMedicineSystemQuestionRepository.SaveChangesAsync(); await _readingMedicineSystemQuestionRepository.SaveChangesAsync();

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -76,7 +76,7 @@ namespace IRaCIS.Application.Services
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository, IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository, IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
IRepository<ReadingQuestionSystem> ReadingQuestionSystem, IRepository<ReadingQuestionSystem> ReadingQuestionSystem,
ITrialEmailNoticeConfigService trialEmailNoticeConfigService ITrialEmailNoticeConfigService trialEmailNoticeConfigService,
IRepository<NoneDicomStudyFile> noneDicomStudyFileSystem, IRepository<NoneDicomStudyFile> noneDicomStudyFileSystem,
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository IRepository<ReadingQuestionTrial> readingQuestionTrialRepository
) )

14
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
View File

@ -90,11 +90,17 @@ namespace IRaCIS.Core.Domain.Models
public ReadingMedicineSystemQuestion ParentQuestion { get; set; } public ReadingMedicineSystemQuestion ParentQuestion { get; set; }
// |1|2| 这种保存
public string CriterionEnumStr { get; set; } = string.Empty;
[NotMapped] public CriterionType CriterionTypeEnum { get; set; }
public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList();
public bool IsGeneral { get; set; }
//// |1|2| 这种保存
// public string CriterionEnumStr { get; set; } = string.Empty;
// [NotMapped]
// public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList();
} }
} }