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

修改

Browse Source
This commit is contained in:
he
2023-04-28 14:42:33 +08:00
parent 9b73522a8e
commit f43c384a27
23 changed files with 417 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+7 -4
View File
@@ -53,11 +53,12 @@ namespace IRaCIS.Application.Services
var existsQuery = _clinicalDataSystemSetRepository
.WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName);
.Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName);
if (await existsQuery.AnyAsync())
{
return ResponseOutput.NotOk("存在同类型的临床数据,操作失败");
//---存在同类型的临床数据,操作失败
return ResponseOutput.NotOk(_localizer["ClinicalDataSet_DupTypeFail"]);
}
indto.CriterionEnumListStr= $"|{String.Join('|', indto.CriterionEnumList)}|";
@@ -124,11 +125,12 @@ namespace IRaCIS.Application.Services
{
var existsQuery = _clinicalDataTrialSetRepository
.WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName && x.TrialId == indto.TrialId);
.Where(x => (x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName) && x.TrialId == indto.TrialId);
if (await existsQuery.AnyAsync())
{
return ResponseOutput.NotOk("存在同类型的临床数据,操作失败");
//---存在同类型的临床数据,操作失败
return ResponseOutput.NotOk(_localizer["ClinicalDataSet_DupTypeFail"]);
}
//indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|";
@@ -272,6 +274,7 @@ namespace IRaCIS.Application.Services
ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalDataLevel = x.ClinicalDataLevel,
ClinicalUploadType = x.ClinicalUploadType,
ClinicalDataSetEnName=x.ClinicalDataSetEnName,
UploadRole = x.UploadRole,
FileName = x.FileName,
Path = x.Path,
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+12 -6
View File
@@ -83,7 +83,8 @@ namespace IRaCIS.Application.Services
if (await existsQuery.AnyAsync())
{
return ResponseOutput.NotOk("存在同类型的临床数据");
//---存在同类型的临床数据,操作失败
return ResponseOutput.NotOk(_localizer["ReadingClinicalData_DupTypeFail"]);
}
var clinicalDataTrialSet = (await _clinicalDataTrialSetRepository.Where(x => x.Id == indto.ClinicalDataTrialSetId).FirstOrDefaultAsync()).IfNullThrowException();
@@ -191,8 +192,9 @@ namespace IRaCIS.Application.Services
.Select(x => new GetCRCClinicalDataOutDto()
{
Id = x.Id,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetName, _userInfo.IsEn_Us) ,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
FileName = x.ClinicalDataTrialSet.FileName,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
@@ -280,7 +282,8 @@ namespace IRaCIS.Application.Services
if (data.ReadingClinicalDataState != ReadingClinicalDataStatus.HaveChecked)
{
throw new BusinessValidationFailedException("当前临床数据状态不是已核查状态，不允许签名！");
//---当前临床数据状态不是已核查状态，不允许签名！
throw new BusinessValidationFailedException(_localizer["ReadingClinicalData_Unchecked"]);
}
data.IsSign = true;
data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
@@ -482,7 +485,8 @@ namespace IRaCIS.Application.Services
.Select(x => new GetTrialClinicalDataSelectOutDto()
{
ClinicalDataLevel = x.ClinicalDataLevel,
ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName=x.ClinicalDataSetEnName,
ClinicalUploadType = x.ClinicalUploadType,
FileName = x.FileName,
Path = x.Path,
@@ -625,7 +629,8 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId,
ReadingId = x.ReadingId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
@@ -694,7 +699,8 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId,
ReadingId = x.ReadingId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName =x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,