Compare commits
No commits in common. "655aad41195f28c9192c23faed4fb86c776923cd" and "c4301f848c64a022dd80348c77907e2274e4bf72" have entirely different histories.
655aad4119
...
c4301f848c
|
|
@ -8,26 +8,6 @@
|
||||||
},
|
},
|
||||||
"ObjectStoreService": {
|
"ObjectStoreService": {
|
||||||
"ObjectStoreUse": "AliyunOSS",
|
"ObjectStoreUse": "AliyunOSS",
|
||||||
"IsOpenStoreSync": true,
|
|
||||||
"ApiDeployRegion": "CN",
|
|
||||||
"SyncConfigList": [
|
|
||||||
{
|
|
||||||
"Domain": "irc.uat.extimaging.com",
|
|
||||||
"Primary": "AliyunOSS",
|
|
||||||
"Target": "AWS",
|
|
||||||
"UploadRegion": "CN",
|
|
||||||
"TargetRegion": "US",
|
|
||||||
"IsOpenSync": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Domain": "lili.uat.extimaging.com",
|
|
||||||
"Primary": "AWS",
|
|
||||||
"Target": "AliyunOSS",
|
|
||||||
"UploadRegion": "US",
|
|
||||||
"TargetRegion": "CN",
|
|
||||||
"IsOpenSync": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"AliyunOSS": {
|
"AliyunOSS": {
|
||||||
"RegionId": "cn-shanghai",
|
"RegionId": "cn-shanghai",
|
||||||
"InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
|
"InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
|
||||||
|
|
|
||||||
|
|
@ -17479,17 +17479,17 @@
|
||||||
</member>
|
</member>
|
||||||
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
|
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
|
||||||
<summary>
|
<summary>
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
质疑
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
|
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
|
||||||
<summary>
|
<summary>
|
||||||
һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
|
一致性核查
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
|
<member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
|
||||||
<summary>
|
<summary>
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
复制
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
|
<member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
|
||||||
|
|
|
||||||
|
|
@ -3708,12 +3708,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
var questionAnswer= entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer)
|
var questionAnswer= entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer)
|
||||||
.Where(x => x.VisitTaskId == entity.VisitTaskId && x.ReadingQuestionTrialId == entity.QuestionId).FirstOrDefault();
|
.Where(x => x.VisitTaskId == entity.VisitTaskId && x.ReadingQuestionTrialId == entity.QuestionId).FirstOrDefault();
|
||||||
|
|
||||||
if (questionAnswer != null)
|
var quesionInfo = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == questionAnswer.ReadingQuestionTrialId).Select(t =>
|
||||||
{
|
|
||||||
var quesionInfo = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == questionAnswer.ReadingQuestionTrialId).Select(t =>
|
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
|
|
||||||
t.Unit,
|
t.Unit,
|
||||||
t.CustomUnit,
|
t.CustomUnit,
|
||||||
t.DictionaryCode,
|
t.DictionaryCode,
|
||||||
|
|
@ -3725,8 +3723,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
})
|
})
|
||||||
.OrderBy(t => t.ShowOrder).FirstOrDefaultAsync();
|
.OrderBy(t => t.ShowOrder).FirstOrDefaultAsync();
|
||||||
|
|
||||||
answer = Translationunit(quesionInfo.AnswerType, quesionInfo.Unit, quesionInfo.CustomUnit, unitDataList, questionAnswer.Answer);
|
answer = Translationunit(quesionInfo.AnswerType, quesionInfo.Unit, quesionInfo.CustomUnit, unitDataList, questionAnswer.Answer);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
|
var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue