Uat_Study
parent
8051a130f7
commit
d9d48da62b
|
@ -283,11 +283,12 @@ namespace IRaCIS.Application.Services
|
|||
public async Task<IResponseOutput> DeleteReadingRowAnswer(DeleteReadingRowAnswerInDto inDto)
|
||||
{
|
||||
|
||||
if (!(await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId)))
|
||||
var deleteRowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId).FirstNotNullAsync();
|
||||
if (deleteRowInfo==null)
|
||||
{
|
||||
return ResponseOutput.Ok(true);
|
||||
}
|
||||
var deleteRowInfo=await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId).FirstNotNullAsync();
|
||||
|
||||
|
||||
if(await _readingTableAnswerRowInfoRepository.AnyAsync(x=>x.SplitRowId== deleteRowInfo.Id&&x.MergeRowId==deleteRowInfo.Id))
|
||||
{
|
||||
|
@ -1184,7 +1185,7 @@ namespace IRaCIS.Application.Services
|
|||
new GlobalQuestionInfo()
|
||||
{
|
||||
Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? String.Empty,
|
||||
QuestionName = "是否同意访视结果",
|
||||
QuestionName = "是否同意",
|
||||
Type = "input",
|
||||
GlobalAnswerType=GlobalAnswerType.AgreeOrNot,
|
||||
|
||||
|
@ -1195,7 +1196,7 @@ namespace IRaCIS.Application.Services
|
|||
List<GetGlobalQuestionType> questionTypes = new List<GetGlobalQuestionType>()
|
||||
{
|
||||
new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.UpdateType,QuestionName="评估更新类型" },
|
||||
new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.Reason,QuestionName="原因" },
|
||||
new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.Reason,QuestionName="全局阅片备注" },
|
||||
//new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.AgreeOrNot,QuestionName="是否同意访视结果" },
|
||||
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue