wxd 1 year ago
parent
commit
c29ba64baa
  1. 2
      src/Shentun.Peis.Application.Contracts/BigtextResultTypes/CreateBigtextResultTypeDto.cs
  2. 7
      src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
  3. 12
      src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs

2
src/Shentun.Peis.Application.Contracts/BigtextResultTypes/CreateBigtextResultTypeDto.cs

@ -17,6 +17,6 @@ namespace Shentun.Peis.BigtextResultTypes
/// </summary>
public Guid ItemTypeId { get; set; }
public Guid? ParentId { get; set; }
}
}

7
src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs

@ -60,7 +60,7 @@ namespace Shentun.Peis.PacsBusiness
throw new UserFriendlyException("图片数据不存在");
}
string PatientRegisterId = "";
var patientRegisterCompleteFlag = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
@ -68,7 +68,8 @@ namespace Shentun.Peis.PacsBusiness
select new
{
registerCheckId = registerCheck.Id,
CompleteFlag = patientRegister.CompleteFlag
CompleteFlag = patientRegister.CompleteFlag,
PatientRegisterId = patientRegister.Id
}).ToList();
if (patientRegisterCompleteFlag.Count == 0)
@ -80,6 +81,8 @@ namespace Shentun.Peis.PacsBusiness
throw new UserFriendlyException("已总检人员不能导入图片");
string PatientRegisterId = patientRegisterCompleteFlag.FirstOrDefault().PatientRegisterId.ToString();
Guid registerCheckId = patientRegisterCompleteFlag.FirstOrDefault().registerCheckId;

12
src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs

@ -159,14 +159,15 @@ namespace Shentun.Peis.RegisterCheckPictures
throw new UserFriendlyException("请求参数有误");
}
string PatientRegisterId = "";
var patientRegisterCompleteFlag = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
where registerCheck.Id == input.RegisterCheckId
select new
{
CompleteFlag = patientRegister.CompleteFlag
CompleteFlag = patientRegister.CompleteFlag,
PatientRegisterId = patientRegister.Id
}).ToList();
if (patientRegisterCompleteFlag.Count == 0)
@ -177,6 +178,7 @@ namespace Shentun.Peis.RegisterCheckPictures
if (patientRegisterCompleteFlag.FirstOrDefault().CompleteFlag == PatientRegisterCompleteFlag.SumCheck)
throw new UserFriendlyException("已总检人员不能导入图片");
string PatientRegisterId = patientRegisterCompleteFlag.FirstOrDefault().PatientRegisterId.ToString();
List<RegisterCheckPicture> entlist_insert = new List<RegisterCheckPicture>();
@ -485,14 +487,15 @@ namespace Shentun.Peis.RegisterCheckPictures
throw new UserFriendlyException("请求参数有误");
}
string PatientRegisterId = "";
var patientRegisterCompleteFlag = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
where registerCheck.Id == input.RegisterCheckId
select new
{
CompleteFlag = patientRegister.CompleteFlag
CompleteFlag = patientRegister.CompleteFlag,
PatientRegisterId = patientRegister.Id
}).ToList();
if (patientRegisterCompleteFlag.Count == 0)
@ -503,6 +506,7 @@ namespace Shentun.Peis.RegisterCheckPictures
if (patientRegisterCompleteFlag.FirstOrDefault().CompleteFlag == PatientRegisterCompleteFlag.SumCheck)
throw new UserFriendlyException("已总检人员不能导入图片");
string PatientRegisterId = patientRegisterCompleteFlag.FirstOrDefault().PatientRegisterId.ToString();
List<RegisterCheckPicture> entlist_insert = new List<RegisterCheckPicture>();

Loading…
Cancel
Save