Compare commits

..

No commits in common. "7544bc81a3961e74312888c5c57a94e0533b9b4f" and "3dc5507b6b3de45386c07a03fa2251540af7f46e" have entirely different histories.

2 changed files with 2 additions and 6 deletions

View File

@ -230,7 +230,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<(DoctorSummarize,bool)> AddOrUpdateGneralSituation(SummarizeInfoDto inDto) public async Task<DoctorSummarize> AddOrUpdateGneralSituation(SummarizeInfoDto inDto)
{ {
if (inDto.TrialId != null&&inDto.Id==null) if (inDto.TrialId != null&&inDto.Id==null)
{ {
@ -262,7 +262,6 @@ namespace IRaCIS.Core.Application.Service
inDto.IndicationEn = "Default"; inDto.IndicationEn = "Default";
} }
var exists = await _doctorSummarizeRepository var exists = await _doctorSummarizeRepository
.Where(x=> x.IndicationEn!=string.Empty && x.Indication!=string.Empty)
.Where( x => x.IndicationEn == inDto.IndicationEn|| x.Indication == inDto.Indication) .Where( x => x.IndicationEn == inDto.IndicationEn|| x.Indication == inDto.Indication)
.AnyAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null&&x.Id!=inDto.Id); .AnyAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null&&x.Id!=inDto.Id);
@ -321,7 +320,7 @@ namespace IRaCIS.Core.Application.Service
var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(inDto, true); var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(inDto, true);
return (entity,true); return entity;
} }
/// <summary> /// <summary>

View File

@ -500,9 +500,6 @@ namespace IRaCIS.Core.Application.Service
await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionAnswer>(t => t.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionAnswer>(t => t.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionTrial>(t => t.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionTrial>(t => t.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionMark>(t => t.VisitTask.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<ReadingTaskRelation>(t => t.VisitTask.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<ReadingTaskRelation>(t => t.VisitTask.TrialId == trialId);