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

修改

Uat_Study
he 2022-05-09 13:23:37 +08:00
parent f13ecb5972
commit 9e19dcb8b6
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -128,11 +128,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as SubjectVisit; var entity = item.Entity as SubjectVisit;
switch (GetRequestUrl()) switch (GetRequestUrl())
{ {
case "QCOperation/ObtainOrCancelQCTask": case "QCOperation/obtainOrCancelQCTask":
type = type +"/"+ entity.IsTake.ToString(); type = type +"/"+ entity.IsTake.ToString();
break;
case "QCOperation/QCPassedOrFailed":
try
{
type = type + "/" + (40 % (int)entity.AuditState).ToString();
}
catch (Exception)
{
}
break; break;
} }
var subjectCode = entity.Subject?.Code; var subjectCode = entity.Subject?.Code;
await InsertInspection<SubjectVisit>(item, type, x => new DataInspection() await InsertInspection<SubjectVisit>(item, type, x => new DataInspection()
{ {
@ -207,6 +221,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 非Dicom // 非Dicom
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy)))
{ {
var entity = item.Entity as NoneDicomStudy;
switch (GetRequestUrl().ToLower())
{
case "nonedicomstudy/addorupdatenonedicomstudy":
type = _userInfo.UserTypeShortName + "/" + type;
break;
}
await InsertInspection<NoneDicomStudy>(item, type, x => new DataInspection() await InsertInspection<NoneDicomStudy>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,

4
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -715,6 +715,10 @@ namespace IRaCIS.Core.Infra.EFCore
/// <exception cref="BusinessValidationFailedException"></exception> /// <exception cref="BusinessValidationFailedException"></exception>
public async Task<string> SetEnum(Guid trilaid, string identification, string json) public async Task<string> SetEnum(Guid trilaid, string identification, string json)
{ {
if (json == null||json=="null")
{
return null;
}
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification) var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification)
join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType == "Dictionary"&&x.IsEnable.HasValue&& x.IsEnable.Value) on u.Id equals p.ParentId join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType == "Dictionary"&&x.IsEnable.HasValue&& x.IsEnable.Value) on u.Id equals p.ParentId
select new select new