IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -1,4 +1,5 @@
-using IP2Region.Net.Abstractions;
+using DocumentFormat.OpenXml.Bibliography;
+using IP2Region.Net.Abstractions;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Contracts;
@@ -923,8 +924,6 @@ namespace IRaCIS.Core.Application.Service
                         }
 
                         newIdentityUser.UserRoleList = addRoleList;
-
-                        await _identityUserRepository.AddAsync(newIdentityUser);
                     }
                     else
                     {
@@ -953,7 +952,7 @@ namespace IRaCIS.Core.Application.Service
                     }
 
 
-                    await _identityUserRepository.SaveChangesAsync();
+                    await _userRoleRepository.SaveChangesAsync();
                 }
 
 

IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs

@@ -1072,8 +1072,6 @@ namespace IRaCIS.Application.Contracts
 
         public string AccessionNumber { get; set; }
 
-        public string StudyIdStr { get; set; } = string.Empty;
-
         public DateTime? StudyTime { get; set; }
         public string Modalities { get; set; } = string.Empty;
 
@@ -1099,13 +1097,6 @@ namespace IRaCIS.Application.Contracts
         public string Name { get; set; }
     }
 
-
-
-    public class PatientStudyDto
-    {
-
-    }
-
     public class PatientSeriesDTO
     {
 

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -840,7 +840,6 @@ namespace IRaCIS.Application.Services
                             SCPStudyId = scpStudy.Id,
                             SeriesCount = scpStudy.SeriesCount,
                             StudyTime = scpStudy.StudyTime,
-                            StudyIdStr=scpStudy.StudyId
 
                             HospitalGroupList = scpStudy.HospitalGroupList.Select(t => new SCPStudyHospitalGroupInfo()
                             {
@@ -876,8 +875,6 @@ namespace IRaCIS.Application.Services
             return pageList;
         }
 
-
-
         /// <summary>
         /// 修改检查课题组 1是添加 2是删除，3是更新
         /// </summary>
@@ -955,13 +952,6 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok();
         }
 
-        /// <summary>
-        /// 患者 检查预览
-        /// </summary>
-        /// <param name="scpStudyId"></param>
-        /// <param name="_seriesRepository"></param>
-        /// <param name="_instanceRepository"></param>
-        /// <returns></returns>
         public async Task<IResponseOutput<List<PatientSeriesDTO>>> GetPatientSeriesList(Guid scpStudyId,
             [FromServices] IRepository<SCPSeries> _seriesRepository,
             [FromServices] IRepository<SCPInstance> _instanceRepository
@@ -996,9 +986,6 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(seriesList, study);
         }
 
-
-
-
         [UnitOfWork]
         [HttpDelete]
         public async Task<IResponseOutput> DeletePatientStudy(Guid patiendId, Guid scpStudyId,

IRaCIS.Core.Application/TestService.cs

@@ -288,8 +288,6 @@ namespace IRaCIS.Core.Application.Service
             [FromServices] IRepository<SCPStudy> _SCPStudyRepository, Guid hospitalGroupId)
         {
 
-            if ((await _SCPStudyHospitalGroupRepository.FirstOrDefaultAsync()) == null)
-            {
             var scpStudyIdList = _SCPStudyRepository.Where().Select(t => t.Id).ToList();
 
             foreach (var item in scpStudyIdList)
@@ -298,37 +296,24 @@ namespace IRaCIS.Core.Application.Service
             }
 
             await _SCPStudyRepository.SaveChangesAsync();
-            }
 
             return ResponseOutput.Ok();
         }
 
-        /// <summary>
-        /// 给所有的账户加上默认课题组
-        /// </summary>
-        /// <param name="_hospitalGroupIdentityUserRepository"></param>
-        /// <param name="_identityUserRepository"></param>
-        /// <param name="hospitalGroupId"></param>
-        /// <returns></returns>
         [AllowAnonymous]
         public async Task<IResponseOutput> NewUserHospitalGroup(
-        [FromServices] IRepository<HospitalGroupIdentityUser> _hospitalGroupIdentityUserRepository,
+    [FromServices] IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository,
-        [FromServices] IRepository<IdentityUser> _identityUserRepository, Guid hospitalGroupId)
+    [FromServices] IRepository<SCPStudy> _SCPStudyRepository, Guid hospitalGroupId)
         {
 
-            if ((await _hospitalGroupIdentityUserRepository.FirstOrDefaultAsync()) == null)
+            var scpStudyIdList = _SCPStudyRepository.Where().Select(t => t.Id).ToList();
-            {
-                var identityUserIdList = _identityUserRepository.Where().Select(t => t.Id).ToList();
 
-                foreach (var item in identityUserIdList)
+            foreach (var item in scpStudyIdList)
             {
-                    await _hospitalGroupIdentityUserRepository.AddAsync(new HospitalGroupIdentityUser() { IdentityUserId = item, HospitalGroupId = hospitalGroupId });
+                await _SCPStudyHospitalGroupRepository.AddAsync(new SCPStudyHospitalGroup() { SCPStudyId = item, HospitalGroupId = hospitalGroupId });
             }
 
-                await _hospitalGroupIdentityUserRepository.SaveChangesAsync();
+            await _SCPStudyRepository.SaveChangesAsync();
-            }
-
-
 
             return ResponseOutput.Ok();
         }