Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
394e090029
|
@ -108,7 +108,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
if (answerType == "upload")
|
if (answerType == "upload")
|
||||||
{
|
{
|
||||||
return "❄❅❆❇❈❉❊";
|
return "❄❅❆❇❈❉❊"+ answer;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unit == ValueUnit.Custom)
|
if (unit == ValueUnit.Custom)
|
||||||
|
@ -1325,6 +1325,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var entity = item.Entity as ReadingMedicalReviewDialog;
|
var entity = item.Entity as ReadingMedicalReviewDialog;
|
||||||
|
|
||||||
|
bool isHaveQuestion = false;
|
||||||
|
if (entitys.Any(x => x.Entity.GetType() == typeof(TaskMedicalReview)))
|
||||||
|
{
|
||||||
|
isHaveQuestion = entitys.Where(x => x.Entity.GetType() == typeof(TaskMedicalReview)).Select(x => x.Entity as TaskMedicalReview).Select(x => x.IsHaveQuestion).FirstOrDefault();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
isHaveQuestion = await _dbContext.TaskMedicalReview.Where(x => x.Id == entity.TaskMedicalReviewId).Select(t => t.IsHaveQuestion).FirstOrDefaultAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
var extraIdentification = string.Empty;
|
var extraIdentification = string.Empty;
|
||||||
|
|
||||||
//失效的时候 不区分标识
|
//失效的时候 不区分标识
|
||||||
|
@ -1341,11 +1352,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
{
|
{
|
||||||
IsDistinctionInterface = false,
|
IsDistinctionInterface = false,
|
||||||
VisitTaskId = entity.VisitTaskId,
|
VisitTaskId = entity.VisitTaskId,
|
||||||
|
|
||||||
ObjectRelationParentId = entity.TaskMedicalReviewId,
|
ObjectRelationParentId = entity.TaskMedicalReviewId,
|
||||||
|
|
||||||
ExtraIndentification = extraIdentification
|
ExtraIndentification = extraIdentification
|
||||||
|
|
||||||
|
},new {
|
||||||
|
IsHaveQuestion= isHaveQuestion,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue