Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
e6e2e8a91d
|
@ -1253,7 +1253,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
await InsertInspection<ReadingMedicineTrialQuestion>(entity, type, x => new InspectionConvertDTO()
|
await InsertInspection<ReadingMedicineTrialQuestion>(entity, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
IsDistinctionInterface = false,
|
IsDistinctionInterface = false,
|
||||||
ObjectRelationParentId = x.TrialId
|
|
||||||
|
ObjectRelationParentId = entity.TrialId,
|
||||||
|
TrialReadingCriterionId = x.TrialReadingCriterionId,
|
||||||
|
|
||||||
|
|
||||||
}, new { ParentQuestionName = parentQuestionName });
|
}, new { ParentQuestionName = parentQuestionName });
|
||||||
}
|
}
|
||||||
|
@ -1832,6 +1835,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
SubjectVisitId = x.Id,
|
SubjectVisitId = x.Id,
|
||||||
SiteId = x.SiteId,
|
SiteId = x.SiteId,
|
||||||
|
|
||||||
|
ExtraIndentification = extraIdentification,
|
||||||
|
|
||||||
},
|
},
|
||||||
//兼容之前的配置名
|
//兼容之前的配置名
|
||||||
new { SubjectVisitName = entity.VisitName }
|
new { SubjectVisitName = entity.VisitName }
|
||||||
|
@ -2303,12 +2308,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
if (entity.RequestReReadingResultEnum == RequestReReadingResult.Agree)
|
if (entity.RequestReReadingResultEnum == RequestReReadingResult.Agree)
|
||||||
{
|
{
|
||||||
extraIdentification = "/" + 1;
|
extraIdentification = extraIdentification+"/" + 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (entity.RequestReReadingResultEnum == RequestReReadingResult.Reject)
|
else if (entity.RequestReReadingResultEnum == RequestReReadingResult.Reject)
|
||||||
{
|
{
|
||||||
extraIdentification = "/" + 2;
|
extraIdentification = extraIdentification+ "/" + 2;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue