XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改课题组删除操作
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-08-29 17:47:11 +08:00
parent 87c22f1033
commit 5d1499025b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -858,7 +858,7 @@ namespace IRaCIS.Application.Services
{ {
foreach (var hospitalGroupId in incommand.HospitalGroupIdList) foreach (var hospitalGroupId in incommand.HospitalGroupIdList)
{ {
if (_studySubjectVisitRepository.Any(t => t.SCPStudy.HospitalGroupList.Any(c => c.HospitalGroupId == hospitalGroupId))) if (_studySubjectVisitRepository.Where(t => t.SCPStudyId == item).Any(t => t.SCPStudy.HospitalGroupList.Any(c => c.HospitalGroupId == hospitalGroupId)))
{ {
//已经添加到项目，不允许删除课题组 //已经添加到项目，不允许删除课题组
return ResponseOutput.NotOk(_localizer["Patient_StudyHospitalGroupBinded"]); return ResponseOutput.NotOk(_localizer["Patient_StudyHospitalGroupBinded"]);
@ -876,6 +876,16 @@ namespace IRaCIS.Application.Services
//更新 //更新
foreach (var item in incommand.SCPstudyIdList) foreach (var item in incommand.SCPstudyIdList)
{ {
var existList = _SCPStudyHospitalGroupRepository.Where(t => t.SCPStudyId == item).Select(t => t.HospitalGroupId).ToList();
var deleteIdList = existList.Except(incommand.HospitalGroupIdList);
if (_studySubjectVisitRepository.Where(t => t.SCPStudyId == item).Any(t => t.SCPStudy.HospitalGroupList.Any(c => deleteIdList.Contains(c.HospitalGroupId))))
{
//已经添加到项目，不允许删除课题组
return ResponseOutput.NotOk(_localizer["Patient_StudyHospitalGroupBinded"]);
}
await _SCPStudyHospitalGroupRepository.BatchDeleteNoTrackingAsync(t => t.SCPStudyId == item); await _SCPStudyHospitalGroupRepository.BatchDeleteNoTrackingAsync(t => t.SCPStudyId == item);
foreach (var hospitalGroupId in incommand.HospitalGroupIdList) foreach (var hospitalGroupId in incommand.HospitalGroupIdList)
@ -2177,7 +2187,7 @@ namespace IRaCIS.Application.Services
VisitMinStudyTime = g.Min(c => c.StudyTime) VisitMinStudyTime = g.Min(c => c.StudyTime)
}).ToList(); }).ToList();
var list = _subjectVisitReposiotry.Where(t => t.SubjectId == inQuery.SubjectId).ProjectTo<SubjectVisitSelectDto>(_mapper.ConfigurationProvider).OrderBy(t=>t.VisitNum).ToList(); var list = _subjectVisitReposiotry.Where(t => t.SubjectId == inQuery.SubjectId).ProjectTo<SubjectVisitSelectDto>(_mapper.ConfigurationProvider).OrderBy(t => t.VisitNum).ToList();
foreach (var item in list) foreach (var item in list)
{ {