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

临时解决不统一的方案

Uat_Study
hang 2022-08-26 15:27:46 +08:00
parent e67b5e0134
commit 37455f539d
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -4179,11 +4179,6 @@
病灶类型 病灶类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoQuery.LesionType">
<summary>
病灶类型
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit"> <member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit">
<summary> OrganInfoAddOrEdit 列表查询参数模型</summary> <summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
</member> </member>

19
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -195,7 +195,7 @@ namespace IRaCIS.Core.Application.Service
var currentInspection = await _dataInspectionRepository.Where(t => t.Id == id).Select(t => new { t.GeneralId, t.ObjectRelationParentId, t.CreateTime }).FirstOrDefaultAsync(); var currentInspection = await _dataInspectionRepository.Where(t => t.Id == id).Select(t => new { t.GeneralId, t.ObjectRelationParentId, t.CreateTime }).FirstOrDefaultAsync();
var beforeId = await _dataInspectionRepository.Where(x => x.GeneralId == currentInspection.GeneralId /*&& x.ObjectRelationParentId == currentInspection.ObjectRelationParentId*/ && x.CreateTime <= currentInspection.CreateTime && x.Id != id).OrderByDescending(x => x.CreateTime).Select(t => t.Id) var beforeId = await _dataInspectionRepository.Where(x => x.GeneralId == currentInspection.GeneralId && x.CreateTime <= currentInspection.CreateTime && x.Id != id).OrderByDescending(x => x.CreateTime).Select(t => t.Id)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
List<Guid> searchGuidList = new List<Guid>() { id }; List<Guid> searchGuidList = new List<Guid>() { id };
@ -330,9 +330,24 @@ namespace IRaCIS.Core.Application.Service
str2 = await SetEnum(dto.TrialId, listIdentification, str2); str2 = await SetEnum(dto.TrialId, listIdentification, str2);
str2 = await SetDataInspectionDateType(listIdentification, str2); str2 = await SetDataInspectionDateType(listIdentification, str2);
jsonDict[nameof(InspectionJsonDetail.CommonData)] = JsonConvert.DeserializeObject<object>(str2); //jsonDict[nameof(InspectionJsonDetail.CommonData)] = JsonConvert.DeserializeObject<object>(str2);
#endregion #endregion
//后续移除 避免前端看到的不统一 因为采用了新的关联方式，之前数据在Data里面取 现在配置在CommonData 里取
var dataDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(str);
var commonDic= JsonConvert.DeserializeObject<IDictionary<string, object>>(str2);
foreach (var valuePair in dataDic)
{
if (!commonDic.ContainsKey(valuePair.Key))
{
commonDic.Add(valuePair.Key, valuePair.Value);
}
}
jsonDict[nameof(InspectionJsonDetail.CommonData)] = JsonConvert.DeserializeObject<object>(commonDic.ToJsonStr());
item.JsonStr = JsonConvert.SerializeObject(jsonDict); item.JsonStr = JsonConvert.SerializeObject(jsonDict);
} }

11
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -826,22 +826,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
var entity = item.Entity as ReadingClinicalData; var entity = item.Entity as ReadingClinicalData;
if (entity.ClinicalDataTrialSet == null && entity.ClinicalDataTrialSetId != Guid.Empty)
{
entity.ClinicalDataTrialSet = await _dbContext.ClinicalDataTrialSet.FindAsync(entity.ClinicalDataTrialSetId);
}
await InsertInspection<ReadingClinicalData>(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO() await InsertInspection<ReadingClinicalData>(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO()
{ {
SubjectVisitId = x.IsVisit ? x.ReadingId : null, SubjectVisitId = x.IsVisit ? x.ReadingId : null,
ObjectRelationParentId = entity.ClinicalDataTrialSetId, ObjectRelationParentId = entity.ClinicalDataTrialSetId,
}, new
{
entity.ClinicalDataTrialSet.ClinicalUploadType,
entity.ClinicalDataTrialSet.ClinicalDataSetName,
entity.ClinicalDataTrialSet.ClinicalDataLevel,
}); });
} }