From 83c46a5e14caed1aef2e4614a8b4057539979c6d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 26 Apr 2022 11:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Triggers/SubjectVisitTrigger.cs           | 19 ++++++++++++++++++-
 .../Repository/Repository.cs                  | 14 ++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
index 044e4b62f..fc6664766 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
@@ -1,4 +1,5 @@
 using EntityFrameworkCore.Triggered;
+using IRaCIS.Core.Domain.Common;
 using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Triggers
@@ -70,7 +71,23 @@ namespace IRaCIS.Core.Application.Triggers
                     .SelectMany(t => t.NoneDicomStudyList).SelectMany(u => u.NoneDicomFileList).CountAsync() == 0)
             {
 
-               
+                var subjectvisit =await _subjectVisitRepository.FirstOrDefaultAsync(x => x.Id == subjectVisitId&&x.SubmitState == SubmitStateEnum.ToSubmit);
+
+                subjectvisit.SubmitState = SubmitStateEnum.None;
+                List<DataInspection> datas = new List<DataInspection>();
+                datas.Add(new DataInspection()
+                {
+                    Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
+                    TrialId = subjectvisit.TrialId,
+                    SiteId = subjectvisit.SiteId,
+                    SubjectId = subjectvisit.SubjectId,
+                    SubjectVisitId = subjectvisit.Id,
+                    Reason = "删除影像",
+                    JsonDetail = subjectvisit.ToJcJson(),
+                });
+
+                await  _subjectVisitRepository.AddListInspectionRecordAsync(datas);
+
                 await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,
                     u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None });
             }
diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
index a8107e7e3..15fb57979 100644
--- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
+++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
@@ -554,7 +554,7 @@ namespace IRaCIS.Core.Infra.EFCore
         public async Task<string> SetEnum(Guid trilaid, string Identification, string json)
         {
             var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == Identification)
-                              join p in _dbContext.FrontAuditConfig.Where(x => x.Code == "AuditState" || (x.DictionaryCode != null && x.DictionaryCode != string.Empty && x.DictionaryType != null && x.DictionaryType != string.Empty)) on u.Id equals p.ParentId
+                              join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" || (x.DictionaryCode != null && x.DictionaryCode != string.Empty && x.DictionaryType != null && x.DictionaryType != string.Empty)) on u.Id equals p.ParentId
                               select new
                               {
                                   Key = p.Code,
@@ -746,10 +746,11 @@ namespace IRaCIS.Core.Infra.EFCore
                 await UpdateSubjectVisit(data.SubjectVisitId, SubmitStateEnum.ToSubmit, "上传Dicom影像");
             }
             // 非Dicom影像
-            else if (typeof(TEntity) == typeof(NoneDicomStudy))
+            else if (typeof(TEntity) == typeof(NoneDicomStudyFile))
             {
-                DicomStudy data = entity as DicomStudy;
-                await UpdateSubjectVisit(data.SubjectVisitId, SubmitStateEnum.ToSubmit, "上传非Dicom影像");
+                NoneDicomStudyFile data = entity as NoneDicomStudyFile;
+                var subjectVisitId =await _dbContext.NoneDicomStudy.Where(x => x.Id == data.NoneDicomStudyId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
+                await UpdateSubjectVisit(subjectVisitId, SubmitStateEnum.ToSubmit, "上传非Dicom影像");
             }
 
             // 修改访视状态记录稽查
@@ -761,8 +762,8 @@ namespace IRaCIS.Core.Infra.EFCore
                     subjectvisit.SubmitState = submit;
                 }
 
-                List<DataInspection> inspections = new List<DataInspection>();
-                inspections.Add(new DataInspection()
+
+                datas.Add(new DataInspection()
                 {
                     Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
                     TrialId = subjectvisit.TrialId,
@@ -770,6 +771,7 @@ namespace IRaCIS.Core.Infra.EFCore
                     SubjectId = subjectvisit.SubjectId,
                     SubjectVisitId = subjectvisit.Id,
                     Reason = reason,
+                    CreateTime= createtime.AddMilliseconds(100),
                     JsonDetail = subjectvisit.ToJcJson(),
                 });